Merge branch 'master' into quantized_layer

Author: Laicheng0830

CHANGELOG.md

@@ -67,7 +67,6 @@ To release a new version, please update the changelog as followed:
 
 <!-- YOU CAN EDIT FROM HERE -->
 
-
 ## [Unreleased]
 
 ### Added
@@ -80,6 +79,27 @@ To release a new version, please update the changelog as followed:
 
 ### Fixed
 
+### Removed
+
+### Security
+
+### Contributors
+
+## [2.2.1] - 2020-01-14
+
+TensorLayer 2.2.1 is a maintenance release.
+It contains numerous bug fixes.
+
+### Added
+
+### Changed
+
+### Dependencies Update
+
+### Deprecated
+
+### Fixed
+
 - Fix README. (#1044)
 - Fix package info. (#1046)
 - Fix build test (Using YAPF 0.29) (#1057)
@@ -92,7 +112,6 @@ To release a new version, please update the changelog as followed:
 
 - @luomai (#1044, #1046, #1057)
 
-
 ## [2.2.0] - 2019-09-13
 
 TensorLayer 2.2.0 is a maintenance release.
@@ -572,12 +591,13 @@ To many PR for this update, please check [here](https://github.com/tensorlayer/t
 @zsdonghao @luomai @DEKHTIARJonathan
 
 [Unreleased]: https://github.com/tensorlayer/tensorlayer/compare/2.0....master
-[2.2.0]: https://github.com/tensorlayer/tensorlayer/compare/2.2.0...2.2.0
-[2.1.0]: https://github.com/tensorlayer/tensorlayer/compare/2.1.0...2.1.0
-[2.0.2]: https://github.com/tensorlayer/tensorlayer/compare/2.0.2...2.0.2
-[2.0.1]: https://github.com/tensorlayer/tensorlayer/compare/2.0.1...2.0.1
-[2.0.0]: https://github.com/tensorlayer/tensorlayer/compare/2.0.0...2.0.0
-[1.11.1]: https://github.com/tensorlayer/tensorlayer/compare/1.11.0...1.11.0
+[2.2.1]: https://github.com/tensorlayer/tensorlayer/compare/2.2.0...2.2.1
+[2.2.0]: https://github.com/tensorlayer/tensorlayer/compare/2.1.0...2.2.0
+[2.1.0]: https://github.com/tensorlayer/tensorlayer/compare/2.0.2...2.1.0
+[2.0.2]: https://github.com/tensorlayer/tensorlayer/compare/2.0.1...2.0.2
+[2.0.1]: https://github.com/tensorlayer/tensorlayer/compare/2.0.0...2.0.1
+[2.0.0]: https://github.com/tensorlayer/tensorlayer/compare/1.11.1...2.0.0
+[1.11.1]: https://github.com/tensorlayer/tensorlayer/compare/1.11.0...1.11.1
 [1.11.0]: https://github.com/tensorlayer/tensorlayer/compare/1.10.1...1.11.0
 [1.10.1]: https://github.com/tensorlayer/tensorlayer/compare/1.10.0...1.10.1
 [1.10.0]: https://github.com/tensorlayer/tensorlayer/compare/1.9.1...1.10.0

README.md

@@ -158,7 +158,7 @@ We suggest users to report bugs using Github issues. Users can also discuss how
 
 <br/>
 
-<a href="https://join.slack.com/t/tensorlayer/shared_invite/enQtMjUyMjczMzU2Njg4LWI0MWU0MDFkOWY2YjQ4YjVhMzI5M2VlZmE4YTNhNGY1NjZhMzUwMmQ2MTc0YWRjMjQzMjdjMTg2MWQ2ZWJhYzc" target="\_blank">
+<a href="https://join.slack.com/t/tensorlayer/shared_invite/enQtODk1NTQ5NTY1OTM5LTQyMGZhN2UzZDBhM2I3YjYzZDBkNGExYzcyZDNmOGQzNmYzNjc3ZjE3MzhiMjlkMmNiMmM3Nzc4ZDY2YmNkMTY" target="\_blank">
 	<div align="center">
 		<img src="img/join_slack.png" width="40%"/>
 	</div>

tensorlayer/package_info.py

@@ -4,7 +4,7 @@
 
 MAJOR = 2
 MINOR = 2
-PATCH = 0
+PATCH = 1
 PRE_RELEASE = ''
 # Use the following formatting: (major, minor, patch, prerelease)
 VERSION = (MAJOR, MINOR, PATCH, PRE_RELEASE)

tests/layers/test_layers_activation.py

@@ -165,7 +165,8 @@ def test_ptrelu6_1(self):
                 else:
                     gt[i][j] = prelulayer.alpha_low_constrained.numpy() * self.data[i][j]
 
-        self.assertTrue(np.array_equal(out.numpy(), gt))
+        # FIXME: Figure out why this assert randomly fail in CI.
+        # self.assertTrue(np.array_equal(out.numpy(), gt))
 
     def test_ptrelu6_2(self):
         inputs = tl.layers.Input([10, 5])