You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@singa.apache.org by wa...@apache.org on 2016/10/06 06:31:25 UTC
[2/2] incubator-singa git commit: Merge pull request 262 into master
Merge pull request 262 into master
Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/3a64342d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/3a64342d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/3a64342d
Branch: refs/heads/master
Commit: 3a64342d0044fb62c727dc5fc177cca5b7b9ad35
Parents: 5716105 17ac160
Author: WANG Sheng <wa...@gmail.com>
Authored: Thu Oct 6 14:29:57 2016 +0800
Committer: WANG Sheng <wa...@gmail.com>
Committed: Thu Oct 6 14:29:57 2016 +0800
----------------------------------------------------------------------
python/singa/data.py | 134 ++++++++++++++++++++++++++++++++++++++++
python/singa/image_tool.py | 11 ++--
python/singa/layer.py | 1 -
3 files changed, 138 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/3a64342d/python/singa/layer.py
----------------------------------------------------------------------
diff --cc python/singa/layer.py
index 950f26d,6eaf329..a22af55
--- a/python/singa/layer.py
+++ b/python/singa/layer.py
@@@ -659,9 -659,9 +659,8 @@@ class Merge(Layer)
def backward(self, flag, grad):
assert isinstance(grad, tensor.Tensor), 'The input must be Tensor'
- return [grad] *self.num_input, [] # * self.num_input
-
+ return [grad] * self.num_input, [] # * self.num_input
-
class Split(Layer):
'''Replicate the input tensor.