Add a new layer ElementwiseLambdaLayer #579

One-sixth · 2018-05-16T03:35:00Z

Checklist

I've tested that my changes are compatible with the latest version of Tensorflow.
I've read the Contribution Guidelines
I've updated the documentation if necessary.

Motivation and Context

Description

DEKHTIARJonathan

Please add an entry in the Changelog following the existing formating and syntax.

DEKHTIARJonathan · 2018-05-16T09:25:18Z

tensorlayer/layers/merge.py

+            self,
+            layers,
+            fn,
+            fn_args=None,


please add parameter

act=None

DEKHTIARJonathan · 2018-05-16T09:26:12Z

tensorlayer/layers/merge.py

+            fn_args = {}
+
+        self.inputs = [layer.outputs for layer in layers]
+        with tf.variable_scope(name) as vs:


Add a linebreak before the new scope

DEKHTIARJonathan · 2018-05-16T09:28:09Z

tensorlayer/layers/merge.py

+
+        self.inputs = [layer.outputs for layer in layers]
+        with tf.variable_scope(name) as vs:
+            self.outputs = fn(*self.inputs, **fn_args)


self.outputs = fn(*self.inputs, **fn_args) if act: self.outputs = act(self.outputs)

Update CHANGELOG.md

One-sixth · 2018-05-16T11:33:17Z

I have finished modifying it.

DEKHTIARJonathan · 2018-05-16T11:45:43Z

CHANGELOG.md

 - CI Tool:
  - Danger CI has been added to enforce the update of the changelog (by @lgarithm and @DEKHTIARJonathan in #563)
  - https://github.com/apps/stale/ added to clean stale issues (by @DEKHTIARJonathan in #573)
+- API:


Change for Layer

DEKHTIARJonathan · 2018-05-16T11:48:00Z

CHANGELOG.md

  - Danger CI has been added to enforce the update of the changelog (by @lgarithm and @DEKHTIARJonathan in #563)
  - https://github.com/apps/stale/ added to clean stale issues (by @DEKHTIARJonathan in #573)
+- API:
+  - Add new layer ElementwiseLambdaLayer (by @One-sixth in #576)


Incorrect PR number => #579

Please avoid using 'add of blablabla'. We already know you added something thanks to the Changelog Section.

Make smthg like this:

ElementwiseLambdaLayer to perform ????????????????? (by @One-sixth in Add a new layer ElementwiseLambdaLayer #579)

DEKHTIARJonathan · 2018-05-16T11:50:57Z

tensorlayer/layers/merge.py

+
+
+class ElementwiseLambdaLayer(Layer):
+    """A layer uses a custom function to join multiple layer inputs.


English Syntax: A layer that use a custom function to combine multiple :class:Layer inputs.

DEKHTIARJonathan · 2018-05-16T11:51:40Z

tensorlayer/layers/merge.py

+        The function that applies to the outputs of previous layer.
+    fn_args : dictionary or None
+        The arguments for the function (option).
+    name : str


Missing:

act : activation function The activation function of this layer.

Wrong Approval

DEKHTIARJonathan

Please modify the comments.

Other changes need to be made, however let's proceed step by step

Wrong Approval

One-sixth · 2018-05-16T12:24:13Z

Have any other problems?

DEKHTIARJonathan · 2018-05-16T12:45:10Z

@One-sixth I was first focusing on the "cosmetic" aspects.

Now I see two major issues before merging:

The layer you implemented is missing some unittest to make sure everything works as planned: test_layers_merge.py
You need to update the documentation to insert this layer:
https://github.com/tensorlayer/tensorlayer/edit/master/docs/modules/layers.rst#L326

DEKHTIARJonathan · 2018-05-16T12:48:46Z

CHANGELOG.md

  - Danger CI has been added to enforce the update of the changelog (by @lgarithm and @DEKHTIARJonathan in #563)
  - https://github.com/apps/stale/ added to clean stale issues (by @DEKHTIARJonathan in #573)
+- Layer:
+  - ElementwiseLambdaLayer added to use custom function to connect multiple layer inputs. (by @One-sixth in #579)


remove "." before "(by @One-sixth in #579)"

DEKHTIARJonathan · 2018-05-16T13:57:19Z

Error with YAPF, run the following:
yapf -i --style=setup.cfg tests/test_layers_merge.py

DEKHTIARJonathan · 2018-05-16T14:35:04Z

@One-sixth congratulation on this PR! I merge immediately :D

One-sixth · 2018-05-16T14:44:52Z

Good

* Add a new layer ElementwiseLambdaLayer * delete assert * fix style * add act parameter, fix style * Update CHANGELOG.md * Update CHANGELOG.md * Update merge.py * Update test_layers_merge.py * Update test_layers_merge.py * Update layers.rst * Update CHANGELOG.md

One-sixth added 3 commits May 16, 2018 11:27

Add a new layer ElementwiseLambdaLayer

2e59479

delete assert

8834eb2

fix style

a4de964

One-sixth changed the title ~~Add a new layer ElementwiseLambdaLayer~~ [WIP ]Add a new layer ElementwiseLambdaLayer May 16, 2018

One-sixth changed the title ~~[WIP ]Add a new layer ElementwiseLambdaLayer~~ [WIP] Add a new layer ElementwiseLambdaLayer May 16, 2018

One-sixth changed the title ~~[WIP] Add a new layer ElementwiseLambdaLayer~~ Add a new layer ElementwiseLambdaLayer May 16, 2018

DEKHTIARJonathan self-requested a review May 16, 2018 09:22

DEKHTIARJonathan requested changes May 16, 2018

View reviewed changes

add act parameter, fix style

0248e2d

tensorlayer deleted a comment May 16, 2018

One-sixth added 2 commits May 16, 2018 19:16

Update CHANGELOG.md

7ba166c

Merge pull request #1 from One-sixth/patch-2

e51a8a1

Update CHANGELOG.md

DEKHTIARJonathan previously approved these changes May 16, 2018

View reviewed changes

DEKHTIARJonathan requested changes May 16, 2018

View reviewed changes

DEKHTIARJonathan added enhancement feature_request labels May 16, 2018

DEKHTIARJonathan changed the title ~~Add a new layer ElementwiseLambdaLayer~~ [WIP] Add a new layer ElementwiseLambdaLayer May 16, 2018

Update CHANGELOG.md

55396df

DEKHTIARJonathan previously approved these changes May 16, 2018

View reviewed changes

Update merge.py

cd5d31d

tensorlayer deleted a comment May 16, 2018

DEKHTIARJonathan requested changes May 16, 2018

View reviewed changes

tensorlayer deleted a comment May 16, 2018

Update test_layers_merge.py

465506c

One-sixth added 3 commits May 16, 2018 22:03

Update test_layers_merge.py

4d6705b

Update layers.rst

a806520

Update CHANGELOG.md

fe7d6cd

DEKHTIARJonathan changed the title ~~[WIP] Add a new layer ElementwiseLambdaLayer~~ Add a new layer ElementwiseLambdaLayer May 16, 2018

DEKHTIARJonathan approved these changes May 16, 2018

View reviewed changes

DEKHTIARJonathan merged commit 9933525 into tensorlayer:master May 16, 2018

One-sixth deleted the patch-1 branch May 16, 2018 14:45

DEKHTIARJonathan mentioned this pull request May 30, 2018

Release 1.8.6rc0 #660

Merged



		class ElementwiseLambdaLayer(Layer):
		"""A layer uses a custom function to join multiple layer inputs.

Add a new layer ElementwiseLambdaLayer #579

Add a new layer ElementwiseLambdaLayer #579

Uh oh!

Conversation

One-sixth commented May 16, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Checklist

Motivation and Context

Description

Uh oh!

DEKHTIARJonathan left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

One-sixth commented May 16, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

DEKHTIARJonathan left a comment

Choose a reason for hiding this comment

Uh oh!

One-sixth commented May 16, 2018

Uh oh!

DEKHTIARJonathan commented May 16, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

DEKHTIARJonathan commented May 16, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

DEKHTIARJonathan commented May 16, 2018

Uh oh!

One-sixth commented May 16, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

One-sixth commented May 16, 2018 •

edited

Loading

DEKHTIARJonathan left a comment •

edited

Loading

DEKHTIARJonathan commented May 16, 2018 •

edited

Loading

DEKHTIARJonathan commented May 16, 2018 •

edited

Loading