Skip to content

Remove unnecessary check in ElementwiseLayer (issue #376) #377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 5, 2018
Merged

Remove unnecessary check in ElementwiseLayer (issue #376) #377

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
11c612a
update ElementwiseLayer for #376
zsdonghao Mar 4, 2018
8ffc122
elementwise supports activation
zsdonghao Mar 4, 2018
a331755
Update merge.py
zsdonghao Mar 4, 2018
3a291b7
Update merge.py
zsdonghao Mar 5, 2018
38487bd
Merge branch 'master' into elementwise-assert-remove
luomai Mar 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions tensorlayer/layers/merge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ class ElementwiseLayer(Layer):
combine_fn : a TensorFlow element-wise combine function
e.g. AND is ``tf.minimum`` ; OR is ``tf.maximum`` ; ADD is ``tf.add`` ; MUL is ``tf.multiply`` and so on.
See `TensorFlow Math API <https://www.tensorflow.org/versions/master/api_docs/python/math_ops.html#math>`__ .
act : activation function
The activation function of this layer.
name : str
A unique layer name.

Expand All @@ -102,19 +104,21 @@ def __init__(
self,
layers,
combine_fn=tf.minimum,
act=None,
name='elementwise_layer',
):
Layer.__init__(self, name=name)

logging.info("ElementwiseLayer %s: size:%s fn:%s" % (self.name, layers[0].outputs.get_shape(), combine_fn.__name__))

self.outputs = layers[0].outputs
# logging.info(self.outputs._shape, type(self.outputs._shape))

for l in layers[1:]:
if str(self.outputs.get_shape()) != str(l.outputs.get_shape()):
raise Exception("Hint: the input shapes should be the same. %s != %s" % (self.outputs.get_shape(), str(l.outputs.get_shape())))
self.outputs = combine_fn(self.outputs, l.outputs, name=name)

if act:
self.outputs = act(self.outputs)

self.all_layers = list(layers[0].all_layers)
self.all_params = list(layers[0].all_params)
self.all_drop = dict(layers[0].all_drop)
Expand Down