From dev-return-3250-archive-asf-public=cust-asf.ponee.io@singa.incubator.apache.org Fri Aug 9 11:07:57 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 835D318063F for ; Fri, 9 Aug 2019 13:07:57 +0200 (CEST) Received: (qmail 41802 invoked by uid 500); 9 Aug 2019 11:07:56 -0000 Mailing-List: contact dev-help@singa.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@singa.incubator.apache.org Delivered-To: mailing list dev@singa.incubator.apache.org Received: (qmail 41792 invoked by uid 99); 9 Aug 2019 11:07:56 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Aug 2019 11:07:56 +0000 From: GitBox To: dev@singa.apache.org Subject: [GitHub] [incubator-singa] chrishkchris edited a comment on issue #499: SINGA -475 add Div operator Message-ID: <156534887668.26864.12597558364475583471.gitbox@gitbox.apache.org> Date: Fri, 09 Aug 2019 11:07:56 -0000 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit chrishkchris edited a comment on issue #499: SINGA -475 add Div operator URL: https://github.com/apache/incubator-singa/pull/499#issuecomment-519877683 There are conflicts and there are two solutions (same as what happened in log operator): 1. merge this branch with the latest master 2. checkout a new branch from the latest master. Then copy the added code into the autograd.py and test_operations.py; send a new PR. (I guess this maybe because different PRs put the new functions at the same line, so git detected it as conflicts) ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org With regards, Apache Git Services