Skip to content

Commit

Permalink
[RELEASE] 1.2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
zsdonghao committed Oct 29, 2016
1 parent 37b0f0b commit 037d2a7
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
6 changes: 3 additions & 3 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@
# built documents.
#
# The short X.Y version.
version = '1.2.2'
version = '1.2.3'
# The full version, including alpha/beta/rc tags.
release = '1.2.2'
release = '1.2.3'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down Expand Up @@ -143,7 +143,7 @@
# The name for this set of Sphinx documents.
# "<project> v<release> documentation" by default.
#
# html_title = 'TensorLayer v1.2.2'
# html_title = 'TensorLayer v1.2.3'

# A shorter title for the navigation bar. Default is the same as html_title.
#
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

setup(
name = "tensorlayer",
version = "1.2.2",
version = "1.2.3",
include_package_data=True,
author='TensorLayer Contributors',
author_email='[email protected]',
Expand Down
7 changes: 6 additions & 1 deletion tensorlayer/layers.py
Original file line number Diff line number Diff line change
Expand Up @@ -2554,6 +2554,8 @@ class LambdaLayer(Layer):
The `Layer` class feeding into this layer.
fn : a function
The function that applies to the outputs of previous layer.
fn_args : a dictionary
The arguments for the function (option).
name : a string or None
An optional name to attach to this layer.
Expand All @@ -2571,14 +2573,15 @@ def __init__(
self,
layer = None,
fn = None,
kwargs = {},
name = 'lambda_layer',
):
Layer.__init__(self, name=name)
self.inputs = layer.outputs

print(" tensorlayer:Instantiate LambdaLayer %s" % self.name)
with tf.variable_scope(name) as vs:
self.outputs = fn(self.inputs)
self.outputs = fn(self.inputs, **kwargs)

self.all_layers = list(layer.all_layers)
self.all_params = list(layer.all_params)
Expand Down Expand Up @@ -2649,6 +2652,8 @@ class SlimNetsLayer(Layer):
The `Layer` class feeding into this layer.
slim_layer : a slim network function
The network you want to stack onto, end with ``return net, end_points``.
slim_args : dictionary
The arguments for the slim model.
name : a string or None
An optional name to attach to this layer.
Expand Down

0 comments on commit 037d2a7

Please sign in to comment.