Merge branch 'master' into patch-1

Author: DEKHTIARJonathan

docs/conf.py

@@ -67,9 +67,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.8.4rc1'
+version = '1.8.4'
 # The full version, including alpha/beta/rc tags.
-release = '1.8.4rc1'
+release = '1.8.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -143,7 +143,7 @@
 # The name for this set of Sphinx documents.
 # "<project> v<release> documentation" by default.
 #
-# html_title = 'TensorLayer v1.8.4rc1'
+# html_title = 'TensorLayer v1.8.4'
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
 #

example/tutorial_tf_dataset_voc.py

@@ -41,8 +41,8 @@ def _data_aug_fn(im, ann):
     ann = ann.decode()
     ann = tl.prepro.parse_darknet_ann_str_to_list(ann)
     clas, coords = tl.prepro.parse_darknet_ann_list_to_cls_box(ann)
-    ## random brightness, contrast and saturation
-    im = tl.prepro.brightness(im, gamma=0.5, gain=1, is_random=True)
+    ## random brightness, contrast and saturation (tf.image API is faster)
+    # im = tl.prepro.brightness(im, gamma=0.5, gain=1, is_random=True)
     # im = tl.prepro.illumination(im, gamma=(0.5, 1.5),
     #          contrast=(0.5, 1.5), saturation=(0.5, 1.5), is_random=True)    # TypeError: Cannot handle this data type
     ## random horizontal flip
@@ -65,7 +65,12 @@ def _map_fn(filename, annotation):
     image = tf.read_file(filename)
     image = tf.image.decode_jpeg(image, channels=3)
     image = tf.image.convert_image_dtype(image, dtype=tf.float32)
-    ## data augmentation
+    ## data augmentation for image only  0.02s
+    image = tf.image.random_brightness(image, max_delta=63)
+    image = tf.image.random_contrast(image, lower=0.2, upper=1.8)
+    # subtract off the mean and divide by the variance of the pixels. (optional)
+    # img = tf.image.per_image_standardization(img)
+    ## data augmentation for image and bounding box
     image, annotation = tf.py_func(_data_aug_fn, [image, annotation], [tf.float32, tf.string])
     return image, annotation
 

setup.py

@@ -10,7 +10,7 @@
 
 setup(
     name="tensorlayer",
-    version="1.8.4rc1",
+    version="1.8.4",
     include_package_data=True,
     author='TensorLayer Contributors',
     author_email='[email protected]',

tensorlayer/__init__.py

@@ -24,7 +24,7 @@
 act = activation
 vis = visualize
 
-__version__ = "1.8.4rc1"
+__version__ = "1.8.4"
 
 global_flag = {}
 global_dict = {}