diff --git a/tensorlayer/cost.py b/tensorlayer/cost.py index 5539fe0b0..7e9d14281 100644 --- a/tensorlayer/cost.py +++ b/tensorlayer/cost.py @@ -1,13 +1,8 @@ # -*- coding: utf-8 -*- import logging -import numbers 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 16cf7dc44..98eef0be5 100644 --- a/tensorlayer/db.py +++ b/tensorlayer/db.py @@ -7,17 +7,14 @@ """ import inspect -import math import pickle import time import uuid from datetime import datetime -import gridfs import numpy as np -import pymongo -import tensorflow as tf -import tensorlayer as tl + +import gridfs from pymongo import MongoClient diff --git a/tensorlayer/distributed.py b/tensorlayer/distributed.py index ed71058c2..957704c5a 100644 --- a/tensorlayer/distributed.py +++ b/tensorlayer/distributed.py @@ -1,8 +1,8 @@ #! /usr/bin/python # -*- coding: utf-8 -*- + import json import os -import sys import time import tensorflow as tf diff --git a/tensorlayer/files.py b/tensorlayer/files.py index 30e151887..ed8463f0d 100644 --- a/tensorlayer/files.py +++ b/tensorlayer/files.py @@ -42,11 +42,11 @@ 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 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..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 cost, files, iterate, ops, utils, visualize from .. import _logging as logging +from .. import cost, files, iterate, utils, visualize # __all__ = [ # "Layer", diff --git a/tensorlayer/layers/extend.py b/tensorlayer/layers/extend.py index bdf21dd21..f05852912 100644 --- a/tensorlayer/layers/extend.py +++ b/tensorlayer/layers/extend.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/flow_control.py b/tensorlayer/layers/flow_control.py index 977178fe8..b32d1cc71 100644 --- a/tensorlayer/layers/flow_control.py +++ b/tensorlayer/layers/flow_control.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 * @@ -93,4 +88,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/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..bf13ac6f2 100644 --- a/tensorlayer/layers/merge.py +++ b/tensorlayer/layers/merge.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/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..88d58f203 100644 --- a/tensorlayer/layers/object_detection.py +++ b/tensorlayer/layers/object_detection.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/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..bc83889a9 100644 --- a/tensorlayer/layers/shape.py +++ b/tensorlayer/layers/shape.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/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/nlp.py b/tensorlayer/nlp.py index c41e6b156..6532efc77 100755 --- a/tensorlayer/nlp.py +++ b/tensorlayer/nlp.py @@ -8,12 +8,12 @@ import subprocess import tempfile import warnings -from sys import platform as _platform import numpy as np 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/prepro.py b/tensorlayer/prepro.py index 2087b6e9d..9aa4d81c7 100644 --- a/tensorlayer/prepro.py +++ b/tensorlayer/prepro.py @@ -1,19 +1,13 @@ # -*- 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 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 diff --git a/tensorlayer/utils.py b/tensorlayer/utils.py index 6bccd53bc..84d9b1f4a 100644 --- a/tensorlayer/utils.py +++ b/tensorlayer/utils.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -import math import random import time @@ -7,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')