From 5a742d7498cde02217e4b437f8d5419fbe167c81 Mon Sep 17 00:00:00 2001 From: lg Date: Sun, 18 Feb 2018 17:47:06 +0800 Subject: [PATCH 1/4] run `autoflake -i tensorlayer/*.py` (#317) --- tensorlayer/cost.py | 1 - tensorlayer/db.py | 1 - tensorlayer/distributed.py | 1 - tensorlayer/nlp.py | 1 - tensorlayer/prepro.py | 5 ----- tensorlayer/utils.py | 1 - 6 files changed, 10 deletions(-) diff --git a/tensorlayer/cost.py b/tensorlayer/cost.py index 5539fe0b0..3ab232cc3 100644 --- a/tensorlayer/cost.py +++ b/tensorlayer/cost.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- import logging -import numbers import tensorflow as tf from tensorflow.python.framework import ops diff --git a/tensorlayer/db.py b/tensorlayer/db.py index 16cf7dc44..888ad4542 100644 --- a/tensorlayer/db.py +++ b/tensorlayer/db.py @@ -7,7 +7,6 @@ """ import inspect -import math import pickle import time import uuid diff --git a/tensorlayer/distributed.py b/tensorlayer/distributed.py index ed71058c2..a96a9368b 100644 --- a/tensorlayer/distributed.py +++ b/tensorlayer/distributed.py @@ -2,7 +2,6 @@ # -*- coding: utf-8 -*- import json import os -import sys import time import tensorflow as tf diff --git a/tensorlayer/nlp.py b/tensorlayer/nlp.py index c41e6b156..32c81f969 100755 --- a/tensorlayer/nlp.py +++ b/tensorlayer/nlp.py @@ -8,7 +8,6 @@ import subprocess import tempfile import warnings -from sys import platform as _platform import numpy as np import tensorflow as tf diff --git a/tensorlayer/prepro.py b/tensorlayer/prepro.py index 2087b6e9d..24b915c80 100644 --- a/tensorlayer/prepro.py +++ b/tensorlayer/prepro.py @@ -1,13 +1,8 @@ # -*- coding: utf-8 -*- -import numbers -import os -import random -import re import sys import threading import time -from multiprocessing import Pool import numpy as np import scipy diff --git a/tensorlayer/utils.py b/tensorlayer/utils.py index 6bccd53bc..a6e162aa5 100644 --- a/tensorlayer/utils.py +++ b/tensorlayer/utils.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -import math import random import time From 3d99bb94e9f853cfa23b8913d83cf9565c4be3d3 Mon Sep 17 00:00:00 2001 From: lg Date: Sun, 18 Feb 2018 19:40:08 +0800 Subject: [PATCH 2/4] run isort --- tensorlayer/db.py | 5 +++-- tensorlayer/files.py | 2 +- tensorlayer/layers/core.py | 2 +- tensorlayer/layers/flow_control.py | 2 +- tensorlayer/nlp.py | 1 + tensorlayer/ops.py | 1 + tensorlayer/utils.py | 2 +- tensorlayer/visualize.py | 2 +- 8 files changed, 10 insertions(+), 7 deletions(-) diff --git a/tensorlayer/db.py b/tensorlayer/db.py index 888ad4542..9466bf615 100644 --- a/tensorlayer/db.py +++ b/tensorlayer/db.py @@ -12,11 +12,12 @@ import uuid from datetime import datetime -import gridfs import numpy as np -import pymongo import tensorflow as tf import tensorlayer as tl + +import gridfs +import pymongo from pymongo import MongoClient diff --git a/tensorlayer/files.py b/tensorlayer/files.py index 30e151887..8b24efed1 100644 --- a/tensorlayer/files.py +++ b/tensorlayer/files.py @@ -45,8 +45,8 @@ from six.moves import cPickle, urllib, zip from tensorflow.python.platform import gfile -from . import nlp, utils, visualize from . import _logging as logging +from . import nlp, utils, visualize ## Load dataset functions diff --git a/tensorlayer/layers/core.py b/tensorlayer/layers/core.py index 0b1c96b01..7e89ead15 100644 --- a/tensorlayer/layers/core.py +++ b/tensorlayer/layers/core.py @@ -6,8 +6,8 @@ import tensorflow as tf from six.moves import xrange -from .. import cost, files, iterate, ops, utils, visualize from .. import _logging as logging +from .. import cost, files, iterate, ops, utils, visualize # __all__ = [ # "Layer", diff --git a/tensorlayer/layers/flow_control.py b/tensorlayer/layers/flow_control.py index 977178fe8..6d3795e97 100644 --- a/tensorlayer/layers/flow_control.py +++ b/tensorlayer/layers/flow_control.py @@ -93,4 +93,4 @@ def __init__(self, layers, name='mux_layer'): self.all_layers = list_remove_repeat(self.all_layers) self.all_params = list_remove_repeat(self.all_params) - # self.all_drop = list_remove_repeat(self.all_drop) \ No newline at end of file + # self.all_drop = list_remove_repeat(self.all_drop) diff --git a/tensorlayer/nlp.py b/tensorlayer/nlp.py index 32c81f969..6532efc77 100755 --- a/tensorlayer/nlp.py +++ b/tensorlayer/nlp.py @@ -13,6 +13,7 @@ import tensorflow as tf from six.moves import urllib, xrange from tensorflow.python.platform import gfile + from . import _logging as logging diff --git a/tensorlayer/ops.py b/tensorlayer/ops.py index 12df8ac18..f677880e1 100644 --- a/tensorlayer/ops.py +++ b/tensorlayer/ops.py @@ -9,6 +9,7 @@ import tensorflow as tf import tensorlayer as tl + from . import _logging as logging diff --git a/tensorlayer/utils.py b/tensorlayer/utils.py index a6e162aa5..84d9b1f4a 100644 --- a/tensorlayer/utils.py +++ b/tensorlayer/utils.py @@ -6,8 +6,8 @@ import tensorflow as tf import tensorlayer as tl -from . import iterate from . import _logging as logging +from . import iterate def fit(sess, diff --git a/tensorlayer/visualize.py b/tensorlayer/visualize.py index 2eb29d53a..a978a2a3a 100644 --- a/tensorlayer/visualize.py +++ b/tensorlayer/visualize.py @@ -7,8 +7,8 @@ # save/read image(s) import scipy.misc -from . import prepro from . import _logging as logging +from . import prepro # Uncomment the following line if you got: _tkinter.TclError: no display name and no $DISPLAY environment variable # matplotlib.use('Agg') From af80bdfc19889f2b0a2130cc69f1cda02ef469e4 Mon Sep 17 00:00:00 2001 From: Luo Mai Date: Sun, 18 Feb 2018 21:21:33 +0800 Subject: [PATCH 3/4] remove unused imports according to PyCharm linter. --- tensorlayer/cost.py | 4 ---- tensorlayer/db.py | 3 --- tensorlayer/distributed.py | 1 + tensorlayer/files.py | 2 +- tensorlayer/layers/core.py | 3 +-- tensorlayer/layers/extend.py | 4 ---- tensorlayer/layers/flow_control.py | 4 ---- tensorlayer/layers/importer.py | 5 ----- tensorlayer/layers/merge.py | 4 ---- tensorlayer/layers/normalization.py | 5 ----- tensorlayer/layers/object_detection.py | 4 ---- tensorlayer/layers/padding.py | 5 ----- tensorlayer/layers/pooling.py | 5 ----- tensorlayer/layers/recurrent.py | 5 ----- tensorlayer/layers/shape.py | 4 ---- tensorlayer/layers/spatial_transformer.py | 3 --- tensorlayer/layers/special_activation.py | 5 ----- tensorlayer/layers/stack.py | 5 ----- tensorlayer/layers/super_resolution.py | 1 + tensorlayer/layers/time_distribution.py | 6 +----- tensorlayer/prepro.py | 1 - 21 files changed, 5 insertions(+), 74 deletions(-) diff --git a/tensorlayer/cost.py b/tensorlayer/cost.py index 3ab232cc3..7e9d14281 100644 --- a/tensorlayer/cost.py +++ b/tensorlayer/cost.py @@ -3,10 +3,6 @@ import logging import tensorflow as tf -from tensorflow.python.framework import ops -from tensorflow.python.ops import standard_ops - -## Cost Functions def cross_entropy(output, target, name=None): diff --git a/tensorlayer/db.py b/tensorlayer/db.py index 9466bf615..98eef0be5 100644 --- a/tensorlayer/db.py +++ b/tensorlayer/db.py @@ -13,11 +13,8 @@ from datetime import datetime import numpy as np -import tensorflow as tf -import tensorlayer as tl import gridfs -import pymongo from pymongo import MongoClient diff --git a/tensorlayer/distributed.py b/tensorlayer/distributed.py index a96a9368b..957704c5a 100644 --- a/tensorlayer/distributed.py +++ b/tensorlayer/distributed.py @@ -1,5 +1,6 @@ #! /usr/bin/python # -*- coding: utf-8 -*- + import json import os import time diff --git a/tensorlayer/files.py b/tensorlayer/files.py index 8b24efed1..ed8463f0d 100644 --- a/tensorlayer/files.py +++ b/tensorlayer/files.py @@ -42,7 +42,7 @@ import numpy as np import tensorflow as tf -from six.moves import cPickle, urllib, zip +from six.moves import cPickle, zip from tensorflow.python.platform import gfile from . import _logging as logging diff --git a/tensorlayer/layers/core.py b/tensorlayer/layers/core.py index 7e89ead15..140408116 100644 --- a/tensorlayer/layers/core.py +++ b/tensorlayer/layers/core.py @@ -4,10 +4,9 @@ import numpy as np import tensorflow as tf -from six.moves import xrange from .. import _logging as logging -from .. import cost, files, iterate, ops, utils, visualize +from .. import cost, files, iterate, utils, visualize # __all__ = [ # "Layer", diff --git a/tensorlayer/layers/extend.py b/tensorlayer/layers/extend.py index bdf21dd21..b226bee9a 100644 --- a/tensorlayer/layers/extend.py +++ b/tensorlayer/layers/extend.py @@ -1,10 +1,6 @@ # -*- coding: utf-8 -*- -import numpy as np -import tensorflow as tf -from six.moves import xrange -from . import cost, files, iterate, ops, utils, visualize from .core import * diff --git a/tensorlayer/layers/flow_control.py b/tensorlayer/layers/flow_control.py index 6d3795e97..11b3d92c2 100644 --- a/tensorlayer/layers/flow_control.py +++ b/tensorlayer/layers/flow_control.py @@ -1,10 +1,6 @@ # -*- coding: utf-8 -*- -import numpy as np -import tensorflow as tf -from six.moves import xrange -from . import cost, files, iterate, ops, utils, visualize from .core import * diff --git a/tensorlayer/layers/importer.py b/tensorlayer/layers/importer.py index d7992a8b2..35ec5fdd9 100644 --- a/tensorlayer/layers/importer.py +++ b/tensorlayer/layers/importer.py @@ -1,10 +1,5 @@ # -*- coding: utf-8 -*- -import numpy as np -import tensorflow as tf -from six.moves import xrange - -from . import cost, files, iterate, ops, utils, visualize from tensorflow.python.util.deprecation import deprecated from .core import * diff --git a/tensorlayer/layers/merge.py b/tensorlayer/layers/merge.py index a7b8694af..27fdf3159 100644 --- a/tensorlayer/layers/merge.py +++ b/tensorlayer/layers/merge.py @@ -1,10 +1,6 @@ # -*- coding: utf-8 -*- -import numpy as np -import tensorflow as tf -from six.moves import xrange -from . import cost, files, iterate, ops, utils, visualize from .core import * diff --git a/tensorlayer/layers/normalization.py b/tensorlayer/layers/normalization.py index 8bee8c720..0c0594d7b 100644 --- a/tensorlayer/layers/normalization.py +++ b/tensorlayer/layers/normalization.py @@ -1,10 +1,5 @@ # -*- coding: utf-8 -*- -import numpy as np -import tensorflow as tf -from six.moves import xrange - -from . import cost, files, iterate, ops, utils, visualize from .core import * diff --git a/tensorlayer/layers/object_detection.py b/tensorlayer/layers/object_detection.py index 2a67ade34..d64dff23c 100644 --- a/tensorlayer/layers/object_detection.py +++ b/tensorlayer/layers/object_detection.py @@ -1,10 +1,6 @@ # -*- coding: utf-8 -*- -import numpy as np -import tensorflow as tf -from six.moves import xrange -from . import cost, files, iterate, ops, utils, visualize from .core import * diff --git a/tensorlayer/layers/padding.py b/tensorlayer/layers/padding.py index 678c9813e..54a8561d3 100644 --- a/tensorlayer/layers/padding.py +++ b/tensorlayer/layers/padding.py @@ -1,10 +1,5 @@ # -*- coding: utf-8 -*- -import numpy as np -import tensorflow as tf -from six.moves import xrange - -from . import cost, files, iterate, ops, utils, visualize from .core import * diff --git a/tensorlayer/layers/pooling.py b/tensorlayer/layers/pooling.py index 4b2765afb..82ceae2bb 100644 --- a/tensorlayer/layers/pooling.py +++ b/tensorlayer/layers/pooling.py @@ -2,11 +2,6 @@ import copy -import numpy as np -import tensorflow as tf -from six.moves import xrange - -from . import cost, files, iterate, ops, utils, visualize from .core import * diff --git a/tensorlayer/layers/recurrent.py b/tensorlayer/layers/recurrent.py index 1a1a1d70b..6401bc85a 100644 --- a/tensorlayer/layers/recurrent.py +++ b/tensorlayer/layers/recurrent.py @@ -2,11 +2,6 @@ import inspect -import numpy as np -import tensorflow as tf -from six.moves import xrange - -from . import cost, files, iterate, ops, utils, visualize from .core import * diff --git a/tensorlayer/layers/shape.py b/tensorlayer/layers/shape.py index 1945c56f3..ad565a812 100644 --- a/tensorlayer/layers/shape.py +++ b/tensorlayer/layers/shape.py @@ -1,10 +1,6 @@ # -*- coding: utf-8 -*- -import numpy as np -import tensorflow as tf -from six.moves import xrange -from . import cost, files, iterate, ops, utils, visualize from .core import * diff --git a/tensorlayer/layers/spatial_transformer.py b/tensorlayer/layers/spatial_transformer.py index c8b15df7b..0f5414fda 100644 --- a/tensorlayer/layers/spatial_transformer.py +++ b/tensorlayer/layers/spatial_transformer.py @@ -1,10 +1,7 @@ # -*- coding: utf-8 -*- -import numpy as np -import tensorflow as tf from six.moves import xrange -from . import cost, files, iterate, ops, utils, visualize from .core import * diff --git a/tensorlayer/layers/special_activation.py b/tensorlayer/layers/special_activation.py index 41c2c4449..1edcfd27a 100644 --- a/tensorlayer/layers/special_activation.py +++ b/tensorlayer/layers/special_activation.py @@ -1,10 +1,5 @@ # -*- coding: utf-8 -*- -import numpy as np -import tensorflow as tf -from six.moves import xrange - -from . import cost, files, iterate, ops, utils, visualize from .core import * diff --git a/tensorlayer/layers/stack.py b/tensorlayer/layers/stack.py index 536094e73..3480bf445 100644 --- a/tensorlayer/layers/stack.py +++ b/tensorlayer/layers/stack.py @@ -1,10 +1,5 @@ # -*- coding: utf-8 -*- -import numpy as np -import tensorflow as tf -from six.moves import xrange - -from . import cost, files, iterate, ops, utils, visualize from .core import * diff --git a/tensorlayer/layers/super_resolution.py b/tensorlayer/layers/super_resolution.py index fa57cc864..2dd914099 100644 --- a/tensorlayer/layers/super_resolution.py +++ b/tensorlayer/layers/super_resolution.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- + from .core import * diff --git a/tensorlayer/layers/time_distribution.py b/tensorlayer/layers/time_distribution.py index 4af1849ce..296ac5249 100644 --- a/tensorlayer/layers/time_distribution.py +++ b/tensorlayer/layers/time_distribution.py @@ -1,10 +1,6 @@ # -*- coding: utf-8 -*- -import numpy as np -import tensorflow as tf -from six.moves import xrange - -from . import cost, files, iterate, ops, utils, visualize +from .. import ops from .core import * diff --git a/tensorlayer/prepro.py b/tensorlayer/prepro.py index 24b915c80..9aa4d81c7 100644 --- a/tensorlayer/prepro.py +++ b/tensorlayer/prepro.py @@ -8,7 +8,6 @@ import scipy import scipy.ndimage as ndi import skimage -import tensorflow as tf import tensorlayer as tl from scipy import linalg from scipy.ndimage.filters import gaussian_filter From 4aa3ab1902fdbb0b53b83af45a871975fe8b2e95 Mon Sep 17 00:00:00 2001 From: Luo Mai Date: Sun, 18 Feb 2018 21:22:40 +0800 Subject: [PATCH 4/4] enforce yapf check --- tensorlayer/layers/extend.py | 1 - tensorlayer/layers/flow_control.py | 1 - tensorlayer/layers/merge.py | 1 - tensorlayer/layers/object_detection.py | 1 - tensorlayer/layers/shape.py | 1 - 5 files changed, 5 deletions(-) diff --git a/tensorlayer/layers/extend.py b/tensorlayer/layers/extend.py index b226bee9a..f05852912 100644 --- a/tensorlayer/layers/extend.py +++ b/tensorlayer/layers/extend.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- - from .core import * diff --git a/tensorlayer/layers/flow_control.py b/tensorlayer/layers/flow_control.py index 11b3d92c2..b32d1cc71 100644 --- a/tensorlayer/layers/flow_control.py +++ b/tensorlayer/layers/flow_control.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- - from .core import * diff --git a/tensorlayer/layers/merge.py b/tensorlayer/layers/merge.py index 27fdf3159..bf13ac6f2 100644 --- a/tensorlayer/layers/merge.py +++ b/tensorlayer/layers/merge.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- - from .core import * diff --git a/tensorlayer/layers/object_detection.py b/tensorlayer/layers/object_detection.py index d64dff23c..88d58f203 100644 --- a/tensorlayer/layers/object_detection.py +++ b/tensorlayer/layers/object_detection.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- - from .core import * diff --git a/tensorlayer/layers/shape.py b/tensorlayer/layers/shape.py index ad565a812..bc83889a9 100644 --- a/tensorlayer/layers/shape.py +++ b/tensorlayer/layers/shape.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- - from .core import *