merge rl branch with master

Author: quantumiracle

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,17 +79,38 @@ To release a new version, please update the changelog as followed:
 
 ### Fixed
 
-- Fix README. (#PR 1044)
-- Fix package info. (#PR 1046)
-
 ### Removed
 
 ### Security
 
 ### Contributors
 
-- @luomai (PR #1044, 1046)
+## [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)
+
+### Removed
+
+### Security
+
+### Contributors
 
+- @luomai (#1044, #1046, #1057)
 
 ## [2.2.0] - 2019-09-13
 
@@ -150,7 +170,7 @@ This release is compatible with TensorFlow 2 RC1.
 - Replace tf.nn.func with tf.nn.func.\_\_name\_\_ in model config. (PR #994)
 - Add Reinforcement learning tutorials. (PR #995)
 - Add RNN layers with simple rnn cell, GRU cell, LSTM cell. (PR #998)
-- Update Seq2seq (#998) 
+- Update Seq2seq (#998)
 - Add Seq2seqLuongAttention model (#998)
 
 ### Fixed
@@ -571,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

Makefile

@@ -14,16 +14,17 @@ test:
 	python3 tests/files/test_utils_saveload.py
 
 format:
-	autoflake -i examples/*.py
-	autoflake -i tensorlayer/*.py
-	autoflake -i tensorlayer/**/*.py
+	autoflake -ir examples
+	autoflake -ir tensorlayer
+	autoflake -ir tests
 
 	isort -rc examples
 	isort -rc tensorlayer
+	isort -rc tests
 
-	yapf -i examples/*.py
-	yapf -i tensorlayer/*.py
-	yapf -i tensorlayer/**/*.py
+	yapf -ir examples
+	yapf -ir tensorlayer
+	yapf -ir tests
 
 install3:
 	pip3 install -U . --user

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>

docs/user/installation.rst

@@ -35,6 +35,8 @@ For stable version:
 .. code-block:: bash
 
   pip3 install tensorlayer
+  
+  pip install tensorlayer -i https://pypi.tuna.tsinghua.edu.cn/simple  (faster in China)
 
 For latest version, please install from Github.
 
@@ -60,7 +62,7 @@ Alternatively, you can build from the source.
   cd tensorlayer
 
   # Install virtualenv if necessary
-  pip install virtualenv
+  sudo pip3 install virtualenv
   # Then create a virtualenv called `venv`
   virtualenv venv
 
@@ -73,29 +75,29 @@ Alternatively, you can build from the source.
   venv\Scripts\activate.bat
 
   # basic installation
-  pip install .
+  pip3 install .
 
   # ============= IF TENSORFLOW IS NOT ALREADY INSTALLED ============= #
 
   # for a machine **without** an NVIDIA GPU
-  pip install -e ".[all_cpu_dev]"
+  pip3 install -e ".[all_cpu_dev]"
 
   # for a machine **with** an NVIDIA GPU
-  pip install -e ".[all_gpu_dev]"
+  pip3 install -e ".[all_gpu_dev]"
 
 If you want install TensorLayer 1.X, the simplest way to install TensorLayer 1.X is as follow. It will also install the numpy and matplotlib automatically.
 
 .. code-block:: bash
 
-  [stable version] pip install tensorlayer==1.x.x
+  [stable version] pip3 install tensorlayer==1.x.x
 
 However, if you want to modify or extend TensorLayer 1.X, you can download the repository from
 `Github`_ and install it as follow.
 
 .. code-block:: bash
 
   cd to the root of the git tree
-  pip install -e .
+  pip3 install -e .
 
 This command will run the ``setup.py`` to install TensorLayer. The ``-e`` reflects
 editable, then you can edit the source code in ``tensorlayer`` folder, and ``import`` the edited
@@ -194,9 +196,9 @@ For TensorLayer, please refer to the steps mentioned above.
 
 .. code-block:: bash
 
-  pip install tensorflow        #CPU version
-  pip install tensorflow-gpu    #GPU version (GPU version and CPU version just choose one)
-  pip install tensorlayer       #Install tensorlayer
+  pip3 install tensorflow        #CPU version
+  pip3 install tensorflow-gpu    #GPU version (GPU version and CPU version just choose one)
+  pip3 install tensorlayer       #Install tensorlayer
 
 
 

examples/basic_tutorials/tutorial_cifar10_cnn_static.py

@@ -125,7 +125,7 @@ def _map_fn_train(img, target):
 
 def _map_fn_test(img, target):
     # 1. Crop the central [height, width] of the image.
-    img = tf.image.resize_with_crop_or_pad(img, 24, 24)
+    img = tf.image.resize_with_pad(img, 24, 24)
     # 2. Subtract off the mean and divide by the variance of the pixels.
     img = tf.image.per_image_standardization(img)
     img = tf.reshape(img, (24, 24, 3))

examples/data_process/tutorial_fast_affine_transform.py

@@ -8,10 +8,10 @@
 import multiprocessing
 import time
 
-import cv2
 import numpy as np
 import tensorflow as tf
 
+import cv2
 import tensorlayer as tl
 
 # tl.logging.set_verbosity(tl.logging.DEBUG)
@@ -98,7 +98,6 @@ def _map_fn(image_path, target):
     st = time.time()
     for img, target in dataset:
         n_step += 1
-        pass
     assert n_step == n_epoch * n_data / batch_size
     print("dataset APIs took %fs for each image" % ((time.time() - st) / batch_size / n_step))  # CPU ~ 100%
 

examples/data_process/tutorial_tfrecord3.py

@@ -231,8 +231,8 @@ def distort_image(image, thread_id):
 
 
 def prefetch_input_data(
-        reader, file_pattern, is_training, batch_size, values_per_shard, input_queue_capacity_factor=16,
-        num_reader_threads=1, shard_queue_name="filename_queue", value_queue_name="input_queue"
+    reader, file_pattern, is_training, batch_size, values_per_shard, input_queue_capacity_factor=16,
+    num_reader_threads=1, shard_queue_name="filename_queue", value_queue_name="input_queue"
 ):
     """Prefetches string values from disk into an input queue.