Mailing-List: contact commits-help@singa.incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@singa.incubator.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: zhaojing@apache.org
To: commits@singa.incubator.apache.org
Message-Id: <dd0c84abf89044a29c735a3ec3b2a668@git.apache.org>
Subject: incubator-singa git commit: SINGA-283 Fix a bug of net.py backward
 function for layers with multiple inputs
Date: Fri, 16 Dec 2016 13:42:26 +0000 (UTC)
archived-at: Fri, 16 Dec 2016 13:42:34 -0000

Repository: incubator-singa
Updated Branches:
  refs/heads/master a43f2912b -> 7956019cf


SINGA-283 Fix a bug of net.py backward function for layers with multiple inputs

1. reversed(list) returns a reversedlistiterator, it should return a list. fixed by using list[::-1]
2. add debugging output for backward function


Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/7956019c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/7956019c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/7956019c

Branch: refs/heads/master
Commit: 7956019cf326c5f84401551f31f1e597fba77d46
Parents: a43f291
Author: Wei Wang <wangwei.cs@gmail.com>
Authored: Fri Dec 16 15:52:03 2016 +0800
Committer: Wei Wang <wangwei.cs@gmail.com>
Committed: Fri Dec 16 15:52:03 2016 +0800

----------------------------------------------------------------------
 python/singa/layer.py |  9 ++++++---
 python/singa/net.py   | 11 ++++++++++-
 2 files changed, 16 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/7956019c/python/singa/layer.py
----------------------------------------------------------------------
diff --git a/python/singa/layer.py b/python/singa/layer.py
index f82d2df..a9f6a3b 100644
--- a/python/singa/layer.py
+++ b/python/singa/layer.py
@@ -206,7 +206,8 @@ class Layer(object):
             y = self.layer.ForwardWithMultInputs(flag, xs)
         else:
             assert isinstance(x, tensor.Tensor), \
-                'input must be a Tensor or a list of Tensor'
+                    'input of %s (type:%s) must be a Tensor or Tensor list'\
+                    % (self.name, type(x).__name__)
             y = self.layer.Forward(flag, x.singa_tensor)
         if type(y) is tuple:
             return tensor.from_raw_tensors(y)
@@ -235,7 +236,8 @@ class Layer(object):
             ret = self.layer.BackwardWithMultInputs(flag, dys)
         else:
             assert isinstance(dy, tensor.Tensor), \
-                'the input must be a Tensor or a set of Tensor'
+                    'input of %s (type:%s) must be a Tensor or Tensor list'\
+                    % (self.name, type(dy).__name__)
             dys = dy.singa_tensor
             ret = self.layer.Backward(flag, dys)
         if type(ret[0]) is tuple:
@@ -761,7 +763,8 @@ class Merge(Layer):
         Returns:
             A list of replicated grad, one per source layer
         '''
-        assert isinstance(grad, tensor.Tensor), 'The input must be Tensor'
+        assert isinstance(grad, tensor.Tensor), 'The input must be Tensor'\
+                ' instead of %s' % type(grad).__name__
         return [grad] * self.num_input, []  # * self.num_input
 
 
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/7956019c/python/singa/net.py
----------------------------------------------------------------------
diff --git a/python/singa/net.py b/python/singa/net.py
index b6f973d..36c70f8 100644
--- a/python/singa/net.py
+++ b/python/singa/net.py
@@ -301,8 +301,17 @@ class FeedForwardNet(object):
                 grads = grads[0]
             outs, _pgrads = cur.backward(kTrain, grads)
             pgrads.append(_pgrads)
+            if verbose:
+                disp_src = '+'.join(
+                        [dst.name for dst in self.dst_of_layer[cur.name]])
+                disp_src += '-->' + cur.name
+                if type(outs) is list:
+                    print '%s: %s' % (disp_src,
+                                      ' '.join([str(o.l1()) for o in outs]))
+                else:
+                    print '%s: %f' % (disp_src, outs.l1())
             if type(outs) is list:
-                output_of_layer[cur.name] = reversed(outs)
+                output_of_layer[cur.name] = outs[::-1]
             else:
                 output_of_layer[cur.name] = outs
             grads = []