From 1bfdf7fb8179705846ace40b375fc66a972dd2a3 Mon Sep 17 00:00:00 2001 From: lg Date: Fri, 23 Feb 2018 23:58:01 +0800 Subject: [PATCH 1/2] run `make format` --- example/tutorial_atari_pong.py | 3 ++- example/tutorial_bipedalwalker_a3c_continuous_action.py | 3 ++- example/tutorial_cartpole_ac.py | 3 ++- example/tutorial_cifar10_tfrecord.py | 2 +- example/tutorial_frozenlake_dqn.py | 4 +++- example/tutorial_frozenlake_q_table.py | 4 +++- example/tutorial_generate_text.py | 3 ++- example/tutorial_image_preprocess.py | 1 + example/tutorial_imagenet_inceptionV3_distributed.py | 3 ++- example/tutorial_inceptionV3_tfslim.py | 4 +++- example/tutorial_keras.py | 4 +++- example/tutorial_mlp_dropout1.py | 1 + example/tutorial_mlp_dropout2.py | 1 + example/tutorial_mnist_float16.py | 1 + example/tutorial_ptb_lstm.py | 1 + example/tutorial_ptb_lstm_state_is_tuple.py | 1 + example/tutorial_tfrecord.py | 1 + example/tutorial_tfrecord2.py | 1 + example/tutorial_tfrecord3.py | 1 + example/tutorial_vgg16.py | 1 + example/tutorial_vgg19.py | 1 - tensorlayer/_logging.py | 2 +- tensorlayer/cli/__main__.py | 1 + tensorlayer/layers/importer.py | 1 + .../third_party/roi_pooling/roi_pooling/roi_pooling_test.py | 1 + tensorlayer/third_party/roi_pooling/roi_pooling_example.py | 1 + 26 files changed, 38 insertions(+), 12 deletions(-) diff --git a/example/tutorial_atari_pong.py b/example/tutorial_atari_pong.py index 6f08bd020..1d360a880 100644 --- 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 index e861f5124..67d856958 100644 --- 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 index afc2e4b39..eae6ee92a 100644 --- 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 index 65d32c7ef..efdb2812b 100644 --- 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 index 1f93adc20..6e8aab41c 100644 --- 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 index 8184d2b93..4de85a6a1 100644 --- 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 index 404dc07df..36dd46f2b 100644 --- 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 index 2ea016c77..99f1c27dc 100755 --- 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_imagenet_inceptionV3_distributed.py b/example/tutorial_imagenet_inceptionV3_distributed.py index 7a3ceae08..cb19b347d 100644 --- a/example/tutorial_imagenet_inceptionV3_distributed.py +++ b/example/tutorial_imagenet_inceptionV3_distributed.py @@ -22,7 +22,8 @@ import tensorflow as tf import tensorlayer as tl from tensorflow.contrib import slim -from tensorflow.contrib.slim.python.slim.nets.inception_v3 import (inception_v3, inception_v3_arg_scope) +from tensorflow.contrib.slim.python.slim.nets.inception_v3 import (inception_v3, + inception_v3_arg_scope) from tensorflow.python.framework.errors_impl import OutOfRangeError from tensorflow.python.training import session_run_hook from tensorflow.python.training.basic_session_run_hooks import StopAtStepHook diff --git a/example/tutorial_inceptionV3_tfslim.py b/example/tutorial_inceptionV3_tfslim.py index 08b98dc85..5030b54bf 100644 --- 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,8 @@ 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_base) + inception_v3_arg_scope) slim = tf.contrib.slim try: diff --git a/example/tutorial_keras.py b/example/tutorial_keras.py index b60820d7a..bef35a808 100644 --- 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 index ad0ea9d73..96528c9ef 100644 --- 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 index dfbeaa1af..9954a3eca 100644 --- 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 index e9740f6d6..d3759eb1a 100644 --- 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 index ea1a18fff..c54c96e88 100644 --- 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 index 6c1a7cf53..9fadd52c5 100644 --- 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 index 32a3fd4b1..ef2d6fa74 100644 --- 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 index 00e8b3501..d050a8ed0 100755 --- 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 index b111bf127..a4ffb0d77 100644 --- 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 index 1f376fd30..f40e65f66 100644 --- 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 index 498b3eddd..6fa8855f3 100755 --- 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 index 09a4a0543..8e386ad21 100644 --- a/tensorlayer/_logging.py +++ b/tensorlayer/_logging.py @@ -8,4 +8,4 @@ def info(fmt, *args): def warning(fmt, *args): - logging.warning(fmt, *args) \ No newline at end of file + logging.warning(fmt, *args) diff --git a/tensorlayer/cli/__main__.py b/tensorlayer/cli/__main__.py index f20479e3b..1a65b3d6b 100644 --- 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 index 1dd02eb30..0a5c60d65 100644 --- 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 index 952e556ad..a21bd6a88 100644 --- 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 index 050f6debf..f5366c242 100644 --- 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 From 365f0222f74c18f128608239b0b1c392c7705328 Mon Sep 17 00:00:00 2001 From: lg Date: Sat, 24 Feb 2018 00:04:31 +0800 Subject: [PATCH 2/2] run yapf after isort --- Makefile | 8 ++++---- example/tutorial_imagenet_inceptionV3_distributed.py | 3 +-- example/tutorial_inceptionV3_tfslim.py | 3 +-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 56de1bf1e..6ceb88193 100644 --- a/Makefile +++ b/Makefile @@ -14,10 +14,6 @@ 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 @@ -25,5 +21,9 @@ format: 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_imagenet_inceptionV3_distributed.py b/example/tutorial_imagenet_inceptionV3_distributed.py index cb19b347d..7a3ceae08 100644 --- a/example/tutorial_imagenet_inceptionV3_distributed.py +++ b/example/tutorial_imagenet_inceptionV3_distributed.py @@ -22,8 +22,7 @@ import tensorflow as tf import tensorlayer as tl from tensorflow.contrib import slim -from tensorflow.contrib.slim.python.slim.nets.inception_v3 import (inception_v3, - inception_v3_arg_scope) +from tensorflow.contrib.slim.python.slim.nets.inception_v3 import (inception_v3, inception_v3_arg_scope) from tensorflow.python.framework.errors_impl import OutOfRangeError from tensorflow.python.training import session_run_hook from tensorflow.python.training.basic_session_run_hooks import StopAtStepHook diff --git a/example/tutorial_inceptionV3_tfslim.py b/example/tutorial_inceptionV3_tfslim.py index 5030b54bf..db32c21e4 100644 --- a/example/tutorial_inceptionV3_tfslim.py +++ b/example/tutorial_inceptionV3_tfslim.py @@ -34,8 +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_base) - inception_v3_arg_scope) +from tensorflow.contrib.slim.python.slim.nets.inception_v3 import (inception_v3, inception_v3_arg_scope) slim = tf.contrib.slim try: