run make format (#356)

lgarithm · luomai · commit 205328290b05 · 2018-02-24T00:10:55.000+08:00
* run `make format`

* run yapf after isort
diff --git a/Makefile b/Makefile
@@ -14,16 +14,16 @@ test:
 	python tests/test_mnist_simple.py
 
 format:
-	yapf -i example/*.py
-	yapf -i tensorlayer/*.py
-	yapf -i tensorlayer/**/*.py
-
 	autoflake -i example/*.py
 	autoflake -i tensorlayer/*.py
 	autoflake -i tensorlayer/**/*.py
 
 	isort -rc example
 	isort -rc tensorlayer
 
+	yapf -i example/*.py
+	yapf -i tensorlayer/*.py
+	yapf -i tensorlayer/**/*.py
+
 install3:
 	pip3 install -U . --user
diff --git a/example/tutorial_atari_pong.py b/example/tutorial_atari_pong.py
@@ -22,12 +22,13 @@
 
 import time
 
-import gym
 import numpy as np
 import tensorflow as tf
 import tensorlayer as tl
 from tensorlayer.layers import *
 
+import gym
+
 # hyper-parameters
 image_size = 80
 D = image_size * image_size
diff --git a/example/tutorial_bipedalwalker_a3c_continuous_action.py b/example/tutorial_bipedalwalker_a3c_continuous_action.py
@@ -34,12 +34,13 @@
 import multiprocessing
 import threading
 
-import gym
 import numpy as np
 import tensorflow as tf
 import tensorlayer as tl
 from tensorlayer.layers import *
 
+import gym
+
 GAME = 'BipedalWalker-v2'  # BipedalWalkerHardcore-v2
 OUTPUT_GRAPH = False
 LOG_DIR = './log'
diff --git a/example/tutorial_cartpole_ac.py b/example/tutorial_cartpole_ac.py
@@ -34,12 +34,13 @@
 
 import time
 
-import gym
 import numpy as np
 import tensorflow as tf
 import tensorlayer as tl
 from tensorlayer.layers import *
 
+import gym
+
 np.random.seed(2)
 tf.set_random_seed(2)  # reproducible
 
diff --git a/example/tutorial_cifar10_tfrecord.py b/example/tutorial_cifar10_tfrecord.py
@@ -39,9 +39,9 @@
 
 """
 
-import io
 import os
 import time
+
 # import numpy as np
 import tensorflow as tf
 import tensorlayer as tl
diff --git a/example/tutorial_frozenlake_dqn.py b/example/tutorial_frozenlake_dqn.py
@@ -27,13 +27,15 @@
 """
 
 import time
-import gym
+
 import matplotlib.pyplot as plt
 import numpy as np
 import tensorflow as tf
 import tensorlayer as tl
 from tensorlayer.layers import *
 
+import gym
+
 env = gym.make('FrozenLake-v0')
 
 
diff --git a/example/tutorial_frozenlake_q_table.py b/example/tutorial_frozenlake_q_table.py
@@ -14,9 +14,11 @@
 """
 
 import time
-import gym
+
 import numpy as np
 
+import gym
+
 ## Load the environment
 env = gym.make('FrozenLake-v0')
 render = False  # display the game environment
diff --git a/example/tutorial_generate_text.py b/example/tutorial_generate_text.py
@@ -25,12 +25,13 @@
 import re
 import time
 
-import nltk
 import numpy as np
 import tensorflow as tf
 import tensorlayer as tl
 from tensorlayer.layers import *
 
+import nltk
+
 # # _UNK = "_UNK"
 
 
diff --git a/example/tutorial_image_preprocess.py b/example/tutorial_image_preprocess.py
@@ -6,6 +6,7 @@
 """
 
 import time
+
 import tensorlayer as tl
 
 X_train, y_train, X_test, y_test = tl.files.load_cifar10_dataset(shape=(-1, 32, 32, 3), plotable=False)
diff --git a/example/tutorial_inceptionV3_tfslim.py b/example/tutorial_inceptionV3_tfslim.py
@@ -23,6 +23,7 @@
 
 import os
 import time
+
 import numpy as np
 # from tensorflow.contrib.slim.python.slim.nets.resnet_v2 import resnet_v2_152
 # from tensorflow.contrib.slim.python.slim.nets.vgg import vgg_16
@@ -33,7 +34,7 @@
 import tensorlayer as tl
 # from scipy.misc import imread, imresize
 # from tensorflow.contrib.slim.python.slim.nets.alexnet import alexnet_v2
-from tensorflow.contrib.slim.python.slim.nets.inception_v3 import (inception_v3, inception_v3_arg_scope)  #, inception_v3_base)
+from tensorflow.contrib.slim.python.slim.nets.inception_v3 import (inception_v3, inception_v3_arg_scope)
 
 slim = tf.contrib.slim
 try:
diff --git a/example/tutorial_keras.py b/example/tutorial_keras.py
@@ -2,11 +2,13 @@
 # -*- coding: utf-8 -*-
 
 import time
+
 import tensorflow as tf
 import tensorlayer as tl
+from tensorlayer.layers import *
+
 from keras import backend as K
 from keras.layers import *
-from tensorlayer.layers import *
 
 X_train, y_train, X_val, y_val, X_test, y_test = \
                 tl.files.load_mnist_dataset(shape=(-1, 784))
diff --git a/example/tutorial_mlp_dropout1.py b/example/tutorial_mlp_dropout1.py
@@ -1,5 +1,6 @@
 # train the network
 import time
+
 import tensorflow as tf
 import tensorlayer as tl
 
diff --git a/example/tutorial_mlp_dropout2.py b/example/tutorial_mlp_dropout2.py
@@ -1,5 +1,6 @@
 # train the network
 import time
+
 import tensorflow as tf
 import tensorlayer as tl
 
diff --git a/example/tutorial_mnist_float16.py b/example/tutorial_mnist_float16.py
@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import time
+
 import tensorflow as tf
 import tensorlayer as tl
 from tensorlayer.layers import *
diff --git a/example/tutorial_ptb_lstm.py b/example/tutorial_ptb_lstm.py
@@ -101,6 +101,7 @@
 """
 
 import time
+
 import numpy as np
 import tensorflow as tf
 import tensorlayer as tl
diff --git a/example/tutorial_ptb_lstm_state_is_tuple.py b/example/tutorial_ptb_lstm_state_is_tuple.py
@@ -102,6 +102,7 @@
 """
 
 import time
+
 import numpy as np
 import tensorflow as tf
 import tensorlayer as tl
diff --git a/example/tutorial_tfrecord.py b/example/tutorial_tfrecord.py
@@ -21,6 +21,7 @@
 """
 
 import os
+
 import numpy as np
 import tensorflow as tf
 import tensorlayer as tl
diff --git a/example/tutorial_tfrecord2.py b/example/tutorial_tfrecord2.py
@@ -12,6 +12,7 @@
 """
 
 import os
+
 import numpy as np
 # import matplotlib
 # matplotlib.use('GTK')
diff --git a/example/tutorial_tfrecord3.py b/example/tutorial_tfrecord3.py
@@ -17,6 +17,7 @@
 
 import json
 import os
+
 import numpy as np
 import tensorflow as tf
 import tensorlayer as tl
diff --git a/example/tutorial_vgg16.py b/example/tutorial_vgg16.py
@@ -37,6 +37,7 @@
 """
 
 import os
+
 import tensorlayer as tl
 from scipy.misc import imread, imresize
 from tensorlayer.layers import *
diff --git a/example/tutorial_vgg19.py b/example/tutorial_vgg19.py
@@ -12,7 +12,6 @@
 
 """
 
-import inspect
 import os
 import time
 
diff --git a/tensorlayer/_logging.py b/tensorlayer/_logging.py
@@ -8,4 +8,4 @@ def info(fmt, *args):
 
 
 def warning(fmt, *args):
-    logging.warning(fmt, *args)
+    logging.warning(fmt, *args)
diff --git a/tensorlayer/cli/__main__.py b/tensorlayer/cli/__main__.py
@@ -1,4 +1,5 @@
 import argparse
+
 from tensorlayer.cli import train
 
 if __name__ == "__main__":
diff --git a/tensorlayer/layers/importer.py b/tensorlayer/layers/importer.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from tensorflow.python.util.deprecation import deprecated
+
 from .core import *
 
 
diff --git a/tensorlayer/third_party/roi_pooling/roi_pooling/roi_pooling_test.py b/tensorlayer/third_party/roi_pooling/roi_pooling/roi_pooling_test.py
@@ -1,5 +1,6 @@
 import numpy as np
 import tensorflow as tf
+
 from roi_pooling_ops import roi_pooling
 
 
diff --git a/tensorlayer/third_party/roi_pooling/roi_pooling_example.py b/tensorlayer/third_party/roi_pooling/roi_pooling_example.py
@@ -2,6 +2,7 @@
 
 import numpy as np
 import tensorflow as tf
+
 from roi_pooling.roi_pooling_ops import roi_pooling
 
 # input feature map going into the RoI pooling
