Skip to content

Commit 319505d

Browse files
author
Jonathan DEKHTIAR
authored
Release TL 1.10.1 (#825)
* Release 1.10.1 * Pin imageio to latest version 2.4.0 * Pin pytest to latest version 3.8.0 * Update requirements_test.txt * Update requirements.txt * Update CHANGELOG.md * Changelog Updated * Travis Updated * support channel_first * YAPF Applied * YAPF Corrections Applied * YAPF Corrections * Changelog cleaned
1 parent 6fea9d9 commit 319505d

File tree

8 files changed

+52
-32
lines changed

8 files changed

+52
-32
lines changed

.gitignore

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ instance/
6767
# Sphinx documentation
6868
docs/_build/
6969
docs/test_build/
70+
docs/build_test/
7071

7172
# PyBuilder
7273
target/
@@ -94,6 +95,8 @@ venv.bak/
9495
venv_/
9596
venv2/
9697
venv3/
98+
venv_doc/
99+
venv_py2/
97100

98101
# Spyder project settings
99102
.spyderproject
@@ -125,6 +128,4 @@ update_tl.py
125128

126129
# Data Files and ByteCode files
127130
*.gz
128-
*.npz
129-
venv_doc/
130-
venv_py2/
131+
*.npz

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ branches:
99
only:
1010
- master
1111
- TensorLayer-1.x
12-
- /\d+\.\d+(\.\d+)?(\S*)?$/
12+
- /^\d+\.\d+(\.\d+)?(\S*)?$/
1313

1414
python:
1515
- "3.6"

CHANGELOG.md

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@ To release a new version, please update the changelog as followed:
4747
4848
### Changed
4949
50-
### Deprecated
50+
### Dependencies Update
5151
52-
### Removed
52+
### Deprecated
5353
5454
### Fixed
5555
56-
### Security
56+
### Removed
5757
58-
### Dependencies Update
58+
### Security
5959
6060
### Contributors
6161
@@ -70,19 +70,34 @@ To release a new version, please update the changelog as followed:
7070
## [Unreleased]
7171

7272
### Added
73-
- unittest `tests\test_timeout.py` has been added to ensure the network creation process does not freeze.
7473

7574
### Changed
76-
- remove 'tensorboard' param, replaced by 'tensorboard_dir' in `tensorlayer/utils.py` with customizable tensorboard directory (PR #819)
75+
76+
### Dependencies Update
7777

7878
### Deprecated
7979

80+
### Fixed
81+
82+
### Removed
83+
84+
### Security
85+
86+
### Contributors
87+
88+
## [1.10.1] - 2018-09-07
89+
90+
### Added
91+
- unittest `tests\test_timeout.py` has been added to ensure the network creation process does not freeze.
92+
93+
### Changed
94+
- remove 'tensorboard' param, replaced by 'tensorboard_dir' in `tensorlayer/utils.py` with customizable tensorboard directory (PR #819)
95+
8096
### Removed
8197
- TL Graph API removed. Memory Leaks Issues with this API, will be fixed and integrated in TL 2.0 (PR #818)
8298

8399
### Fixed
84-
85-
### Security
100+
- Issue #817 fixed: TL 1.10.0 - Memory Leaks and very slow network creation.
86101

87102
### Dependencies Update
88103
- autopep8>=1.3,<1.4 => autopep8>=1.3,<1.5 (PR #815)
@@ -359,7 +374,8 @@ To release a new version, please update the changelog as followed:
359374

360375
@zsdonghao @luomai @DEKHTIARJonathan
361376

362-
[Unreleased]: https://github.com/tensorlayer/tensorlayer/compare/1.10.0...master
377+
[Unreleased]: https://github.com/tensorlayer/tensorlayer/compare/1.10.1...master
378+
[1.10.1]: https://github.com/tensorlayer/tensorlayer/compare/1.10.0...1.10.1
363379
[1.10.0]: https://github.com/tensorlayer/tensorlayer/compare/1.9.1...1.10.0
364380
[1.9.1]: https://github.com/tensorlayer/tensorlayer/compare/1.9.0...1.9.1
365381
[1.9.0]: https://github.com/tensorlayer/tensorlayer/compare/1.8.5...1.9.0

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
![PyPI Stable Version](http://ec2-35-178-47-120.eu-west-2.compute.amazonaws.com/github/release/tensorlayer/tensorlayer.svg?label=PyPI%20-%20Release)
1515
![PyPI RC Version](http://ec2-35-178-47-120.eu-west-2.compute.amazonaws.com/github/release/tensorlayer/tensorlayer/all.svg?label=PyPI%20-%20Pre-Release)
16-
[![Github commits (since latest release)](http://ec2-35-178-47-120.eu-west-2.compute.amazonaws.com/github/commits-since/tensorlayer/tensorlayer/latest.svg)](https://github.com/tensorlayer/tensorlayer/compare/1.9.0...master)
16+
[![Github commits (since latest release)](http://ec2-35-178-47-120.eu-west-2.compute.amazonaws.com/github/commits-since/tensorlayer/tensorlayer/latest.svg)](https://github.com/tensorlayer/tensorlayer/compare/1.10.1...master)
1717
[![PyPI - Python Version](http://ec2-35-178-47-120.eu-west-2.compute.amazonaws.com/pypi/pyversions/tensorlayer.svg)](https://pypi.org/project/tensorlayer/)
1818
[![Supported TF Version](http://ec2-35-178-47-120.eu-west-2.compute.amazonaws.com/badge/tensorflow-1.6.0+-blue.svg)](https://github.com/tensorflow/tensorflow/releases)
1919

@@ -23,7 +23,7 @@
2323
[![Documentation Status](http://ec2-35-178-47-120.eu-west-2.compute.amazonaws.com/readthedocs/tensorlayercn/latest.svg?label=ReadTheDocs-CN)](https://tensorlayercn.readthedocs.io/)
2424
[![PyUP Updates](https://pyup.io/repos/github/tensorlayer/tensorlayer/shield.svg)](https://pyup.io/repos/github/tensorlayer/tensorlayer/)
2525
[![Docker Pulls](http://ec2-35-178-47-120.eu-west-2.compute.amazonaws.com/docker/pulls/tensorlayer/tensorlayer.svg?maxAge=604800)](https://hub.docker.com/r/tensorlayer/tensorlayer/)
26-
[![Codacy Badge](http://ec2-35-178-47-120.eu-west-2.compute.amazonaws.com/codacy/grade/ca2a29ddcf7445588beff50bee5406d9.svg)](https://app.codacy.com/app/tensorlayer/tensorlayer)
26+
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/d6b118784e25435498e7310745adb848)](https://www.codacy.com/app/tensorlayer/tensorlayer)
2727

2828
<br/>
2929

README.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ TensorLayer is released under the Apache 2.0 license.
178178
.. |PyPI-Prerelease| image:: http://ec2-35-178-47-120.eu-west-2.compute.amazonaws.com/github/release/tensorlayer/tensorlayer/all.svg?label=PyPI%20-%20Pre-Release
179179
:target: https://pypi.org/project/tensorlayer/
180180
.. |Commits-Since| image:: http://ec2-35-178-47-120.eu-west-2.compute.amazonaws.com/github/commits-since/tensorlayer/tensorlayer/latest.svg
181-
:target: https://github.com/tensorlayer/tensorlayer/compare/1.9.0...master
181+
:target: https://github.com/tensorlayer/tensorlayer/compare/1.10.1...master
182182
.. |Python| image:: http://ec2-35-178-47-120.eu-west-2.compute.amazonaws.com/pypi/pyversions/tensorlayer.svg
183183
:target: https://pypi.org/project/tensorlayer/
184184
.. |TensorFlow| image:: https://img.shields.io/badge/tensorflow-1.6.0+-blue.svg
@@ -196,5 +196,5 @@ TensorLayer is released under the Apache 2.0 license.
196196
:target: https://pyup.io/repos/github/tensorlayer/tensorlayer/
197197
.. |Docker-Pulls| image:: http://ec2-35-178-47-120.eu-west-2.compute.amazonaws.com/docker/pulls/tensorlayer/tensorlayer.svg
198198
:target: https://hub.docker.com/r/tensorlayer/tensorlayer/
199-
.. |Code-Quality| image:: http://ec2-35-178-47-120.eu-west-2.compute.amazonaws.com/codacy/grade/ca2a29ddcf7445588beff50bee5406d9.svg
200-
:target: https://app.codacy.com/app/tensorlayer/tensorlayer
199+
.. |Code-Quality| image:: https://api.codacy.com/project/badge/Grade/d6b118784e25435498e7310745adb848
200+
:target: https://www.codacy.com/app/tensorlayer/tensorlayer

tensorlayer/layers/convolution/simplified_conv.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class Conv1d(Layer):
3636
padding : str
3737
The padding algorithm type: "SAME" or "VALID".
3838
data_format : str
39-
Default is 'NWC' as it is a 1D CNN.
39+
channels_last 'NWC' (default) or channels_first.
4040
W_init : initializer
4141
The initializer for the weight matrix.
4242
b_init : initializer or None
@@ -117,6 +117,8 @@ class Conv2d(Layer):
117117
The activation function of this layer.
118118
padding : str
119119
The padding algorithm type: "SAME" or "VALID".
120+
data_format : str
121+
"channels_last" (NHWC, default) or "channels_first" (NCHW).
120122
W_init : initializer
121123
The initializer for the the weight matrix.
122124
b_init : initializer or None
@@ -127,8 +129,6 @@ class Conv2d(Layer):
127129
The arguments for the bias vector initializer (for TF < 1.5).
128130
use_cudnn_on_gpu : bool
129131
Default is False (for TF < 1.5).
130-
data_format : str
131-
"NHWC" or "NCHW", default is "NHWC" (for TF < 1.5).
132132
name : str
133133
A unique layer name.
134134
@@ -159,13 +159,13 @@ def __init__(
159159
strides=(1, 1),
160160
act=None,
161161
padding='SAME',
162+
data_format='channels_last',
162163
dilation_rate=(1, 1),
163164
W_init=tf.truncated_normal_initializer(stddev=0.02),
164165
b_init=tf.constant_initializer(value=0.0),
165166
W_init_args=None,
166167
b_init_args=None,
167168
use_cudnn_on_gpu=None,
168-
data_format=None,
169169
name='conv2d',
170170
):
171171
# if len(strides) != 2:
@@ -194,7 +194,7 @@ def __init__(
194194
kernel_size=filter_size,
195195
strides=strides,
196196
padding=padding,
197-
data_format='channels_last',
197+
data_format=data_format,
198198
dilation_rate=dilation_rate,
199199
activation=self.act,
200200
use_bias=(False if b_init is None else True),

tensorlayer/layers/convolution/simplified_deconv.py

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,10 @@ class DeConv2d(Layer):
3535
The stride step (height, width).
3636
padding : str
3737
The padding algorithm type: "SAME" or "VALID".
38-
batch_size : int or None
39-
Require if TF < 1.3, int or None.
40-
If None, try to find the `batch_size` from the first dim of net.outputs (you should define the `batch_size` in the input placeholder).
4138
act : activation function
4239
The activation function of this layer.
40+
data_format : str
41+
"channels_last" (NHWC, default) or "channels_first" (NCHW).
4342
W_init : initializer
4443
The initializer for the weight matrix.
4544
b_init : initializer or None
@@ -61,11 +60,12 @@ def __init__(
6160
prev_layer,
6261
n_filter=32,
6362
filter_size=(3, 3),
64-
out_size=(30, 30), # remove
63+
# out_size=(30, 30), # remove
6564
strides=(2, 2),
6665
padding='SAME',
67-
batch_size=None, # remove
66+
# batch_size=None, # remove
6867
act=None,
68+
data_format='channels_last',
6969
W_init=tf.truncated_normal_initializer(stddev=0.02),
7070
b_init=tf.constant_initializer(value=0.0),
7171
W_init_args=None, # TODO: Remove when TF <1.3 not supported
@@ -86,8 +86,8 @@ def __init__(
8686
raise ValueError("len(strides) should be 2, DeConv2d and DeConv2dLayer are different.")
8787

8888
conv2d_transpose = tf.layers.Conv2DTranspose(
89-
filters=n_filter, kernel_size=filter_size, strides=strides, padding=padding, activation=self.act,
90-
kernel_initializer=W_init, bias_initializer=b_init, name=name
89+
filters=n_filter, kernel_size=filter_size, strides=strides, padding=padding, data_format=data_format,
90+
activation=self.act, kernel_initializer=W_init, bias_initializer=b_init, name=name
9191
)
9292

9393
self.outputs = conv2d_transpose(self.inputs)
@@ -116,6 +116,8 @@ class DeConv3d(Layer):
116116
The padding algorithm type: "SAME" or "VALID".
117117
act : activation function
118118
The activation function of this layer.
119+
data_format : str
120+
"channels_last" (NDHWC, default) or "channels_first" (NCDHW).
119121
W_init : initializer
120122
The initializer for the weight matrix.
121123
b_init : initializer or None
@@ -138,6 +140,7 @@ def __init__(
138140
strides=(2, 2, 2),
139141
padding='SAME',
140142
act=None,
143+
data_format='channels_last',
141144
W_init=tf.truncated_normal_initializer(stddev=0.02),
142145
b_init=tf.constant_initializer(value=0.0),
143146
W_init_args=None, # TODO: Remove when TF <1.3 not supported
@@ -157,7 +160,7 @@ def __init__(
157160
# with tf.variable_scope(name) as vs:
158161
nn = tf.layers.Conv3DTranspose(
159162
filters=n_filter, kernel_size=filter_size, strides=strides, padding=padding, activation=self.act,
160-
kernel_initializer=W_init, bias_initializer=b_init, name=name
163+
data_format=data_format, kernel_initializer=W_init, bias_initializer=b_init, name=name
161164
)
162165

163166
self.outputs = nn(self.inputs)

tensorlayer/package_info.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"""Deep learning and Reinforcement learning library for Researchers and Engineers"""
44

55
# Use the following formatting: (major, minor, patch, prerelease)
6-
VERSION = (1, 10, 1, "rc0")
6+
VERSION = (1, 10, 1, "")
77
__shortversion__ = '.'.join(map(str, VERSION[:3]))
88
__version__ = '.'.join(map(str, VERSION[:3])) + "".join(VERSION[3:])
99

0 commit comments

Comments
 (0)