update Pipfile and import sorting

Pipfile

@@ -5,7 +5,6 @@ name = "pypi"
 
 [packages]
 "e1839a8" = {path = ".", editable = true}
-setuptools = "==39.1.0"
 
 [dev-packages]
 pylint = "*"

tests/deep_cnn/cifar/_cifar.py

@@ -1,15 +1,16 @@
 # -*- coding: utf8 -*-
-from __future__ import print_function
-from __future__ import absolute_import
+from __future__ import absolute_import, print_function
+
 import os
 import tarfile
 
 import numpy as np
-from tensorflow.python.platform import gfile
-from tensorflow.python.framework import dtypes
 from tensorflow.contrib.learn.python.learn.datasets import base
-from .dataset import DataSet, dense_to_one_hot
+from tensorflow.python.framework import dtypes
+from tensorflow.python.platform import gfile
+
 from .cs231n.data_utils import load_CIFAR10
+from .dataset import DataSet, dense_to_one_hot
 
 __all__ = ["read_data_sets", "get_class_names", "onehot_to_names"]
 

tests/deep_cnn/cifar/cs231n/data_utils.py

@@ -1,11 +1,13 @@
 from __future__ import print_function
 
-from six.moves import cPickle as pickle
-import numpy as np
 import os
-from scipy.misc import imread
 import platform
 
+import numpy as np
+from scipy.misc import imread
+from six.moves import cPickle as pickle
+
+
 def load_pickle(f):
     version = platform.python_version_tuple()
     if version[0] == '2':

tests/deep_cnn/cifar/dataset.py

@@ -1,10 +1,12 @@
 # -*- coding: utf8 -*-
 # this file is (mostly) adapt from Tensorflow source code
 from __future__ import print_function
+
 from functools import reduce
+
 import numpy
-from tensorflow.python.framework import dtypes
-from tensorflow.python.framework import random_seed
+from tensorflow.python.framework import dtypes, random_seed
+
 
 def dense_to_one_hot(labels_dense, num_classes):
   """Convert class labels from scalars to one-hot vectors."""

tests/test_ir/test_AttrListValueConverter/conftest.py

@@ -1,5 +1,5 @@
-from tensorflow.core.framework.attr_value_pb2 import AttrValue
 import pytest
+from tensorflow.core.framework.attr_value_pb2 import AttrValue
 
 
 @pytest.fixture(scope='session')

tests/test_ir/test_AttrValueConverter/conftest.py

@@ -1,6 +1,7 @@
 import pytest
 from tensorflow import AttrValue, NameAttrList
 
+
 @pytest.fixture(scope='session')
 def int_attr_value():
     return AttrValue(i=3333)
@@ -28,4 +29,4 @@ def func_attr_value():
 
 @pytest.fixture(scope='session')
 def placeholder_attr_value():
-    return AttrValue(placeholder='placeholder')
+    return AttrValue(placeholder='placeholder')

tests/test_ir/test_DataTypeConverter/test_converter.py

@@ -1,7 +1,9 @@
-from utensor_cgen.ir.converter import DataTypeConverter
-from tensorflow import as_dtype
 import numpy as np
 import tensorflow as tf
+from tensorflow import as_dtype
+
+from utensor_cgen.ir.converter import DataTypeConverter
+
 
 def test_float32():
     tf_float = as_dtype(np.float32).as_datatype_enum

tests/test_ir/test_NameAttrListConverter/conftest.py

@@ -1,5 +1,5 @@
-from tensorflow.core.framework.attr_value_pb2 import NameAttrList, AttrValue
 import pytest
+from tensorflow.core.framework.attr_value_pb2 import AttrValue, NameAttrList
 
 
 @pytest.fixture(scope='session')

tests/test_ir/test_TensorProtoConverter/conftest.py

@@ -1,7 +1,8 @@
-import pytest
 import numpy as np
-from tensorflow.core.framework import types_pb2
+import pytest
 from tensorflow import make_tensor_proto
+from tensorflow.core.framework import types_pb2
+
 from utensor_cgen.ir.converter import TensorProtoConverter
 
 
@@ -19,4 +20,4 @@ def tf_qint8_tensor():
 @pytest.fixture(scope='session')
 def tf_quint8_tensor():
     return make_tensor_proto(255*np.random.rand(3, 3),
-                             types_pb2.DT_QUINT8)
+                             types_pb2.DT_QUINT8)

tests/test_ir/test_TensorProtoConverter/test_converter.py

@@ -1,6 +1,8 @@
-from utensor_cgen.ir.converter import TensorProtoConverter
 import numpy as np
 
+from utensor_cgen.ir.converter import TensorProtoConverter
+
+
 def test_generic_array(generic_array):
     tf_value = TensorProtoConverter.get_tf_value(generic_array)
     assert isinstance(tf_value, TensorProtoConverter.__tfproto_type__)

tests/test_ir/test_uTensorGraph/conftest.py

@@ -1,6 +1,6 @@
+import numpy as np
 import pytest
 import tensorflow as tf
-import numpy as np
 
 
 @pytest.fixture(scope='session', name='graph_tuple')

tests/test_transformer/test_dropout/conftest.py

@@ -1,6 +1,7 @@
-import tensorflow as tf
 import numpy as np
 import pytest
+import tensorflow as tf
+
 
 @pytest.fixture(scope='session', name='droput_graph_tuple')
 def dropout_graph_tuple():

tests/test_transformer/test_dropout/test_dropout_transormer.py

@@ -3,6 +3,7 @@
 from utensor_cgen.ir import uTensorGraph
 from utensor_cgen.transformer.ns_transformer import DropoutTransformer
 
+
 def test_dropout_trans(droput_graph_tuple):
     (graph_def,
      (keep_prob_name, dropout_output_name),
@@ -35,4 +36,3 @@ def test_dropout_trans(droput_graph_tuple):
         output_2 = output.eval()
     # expecting the same outputs with keep_prob == 1.0
     assert (output_1 == output_2).all()
-

tests/test_transformer/test_inline/conftest.py

@@ -1,5 +1,6 @@
-import tensorflow as tf
 import pytest
+import tensorflow as tf
+
 
 @pytest.fixture(scope='session', name='inlinegraph_tuple')
 def refgraph():

tests/test_transformer/test_inline/test_inline_optimizer.py

@@ -1,5 +1,6 @@
-from utensor_cgen.transformer import InlineTransformer
 from utensor_cgen.ir import uTensorGraph
+from utensor_cgen.transformer import InlineTransformer
+
 
 def test_inline_optimizer(inlinegraph_tuple):
     (graph_def, inline_ans, output_nodes)=  inlinegraph_tuple
@@ -11,4 +12,4 @@ def test_inline_optimizer(inlinegraph_tuple):
     for node_name in ugraph.topo_order:
         if node_name in inline_ans:
             op_type = ugraph.ops_info[node_name].op_type
-            assert op_type == 'Inline'
+            assert op_type == 'Inline'

tests/test_transformer/test_pipeline/conftest.py

@@ -1,7 +1,10 @@
-import pytest
 from random import shuffle
-from utensor_cgen.transformer import (RefCntOptimizer, DropoutTransformer,
-                                      BatchNormTransformer, QuantizeTransformer)
+
+import pytest
+
+from utensor_cgen.transformer import (BatchNormTransformer, DropoutTransformer,
+                                      QuantizeTransformer, RefCntOptimizer)
+
 
 @pytest.fixture(scope='function', name='methods')
 def pipeline_methods():

tests/test_transformer/test_refcnt/conftest.py

@@ -1,5 +1,6 @@
-import tensorflow as tf
 import pytest
+import tensorflow as tf
+
 
 @pytest.fixture(scope='session', name='refgraph_tuple')
 def refgraph():

tests/test_transformer/test_refcnt/test_refcnt_optimizer.py

@@ -1,5 +1,6 @@
-from utensor_cgen.transformer import RefCntOptimizer
 from utensor_cgen.ir import uTensorGraph
+from utensor_cgen.transformer import RefCntOptimizer
+
 
 def test_refcnt_optimizer(refgraph_tuple):
     (graph_def, refcnt_ans, output_nodes)= refgraph_tuple

tests/test_utils/test_kwparser.py

@@ -1,5 +1,6 @@
 from utensor_cgen.utils import NamescopedKWArgsParser
 
+
 def test_kwarg_parser():
     op_attr = {
         'global': 10,
@@ -13,4 +14,4 @@ def test_kwarg_parser():
     try:
         parser['no_such_thing']
     except KeyError:
-        pass
+        pass

utensor_cgen/cli.py

@@ -1,9 +1,10 @@
 #-*- coding:utf8 -*-
-import os, sys
+import os
+import sys
 
+import click
 import pkg_resources
 
-import click
 from .utils import NArgsParam
 
 

utensor_cgen/code_generator.py

@@ -1,22 +1,22 @@
 # -*- coding:utf8 -*-
-import os
-from tempfile import NamedTemporaryFile
 import logging
+import os
 import pickle
+from tempfile import NamedTemporaryFile
 
 import numpy as np
 import tensorflow as tf
 from tensorflow.core.framework.graph_pb2 import GraphDef
 from tensorflow.tools.graph_transforms import TransformGraph
 
-from .operators import OperatorFactory
-from .transformer.pipline import TransformerPipeline
-from .transformer.optimizer import RefCntOptimizer
 from .ir import uTensorGraph
-from .snippets import (CommentSnippet, ContextHeaderSnippet,
-                       ContextSnippetsContainer, CreateTensorIdxSnippet,
-                      CreateTensorBinarySnippet, ContextGlobalArrayContainer)
+from .operators import OperatorFactory
+from .snippets import (CommentSnippet, ContextGlobalArrayContainer,
+                       ContextHeaderSnippet, ContextSnippetsContainer,
+                       CreateTensorBinarySnippet, CreateTensorIdxSnippet)
 from .snippets.composer import Composer
+from .transformer.optimizer import RefCntOptimizer
+from .transformer.pipline import TransformerPipeline
 from .utils import NamescopedKWArgsParser
 
 __all__ = ["CodeGenerator"]

utensor_cgen/ir/converter.py

@@ -14,11 +14,11 @@
 from tensorflow import as_dtype as _tf_as_dtype
 from tensorflow import make_ndarray, make_tensor_proto
 from tensorflow.core.framework.attr_value_pb2 import AttrValue as _AttrValue
-from tensorflow.core.framework.attr_value_pb2 import (
-    NameAttrList as _NameAttrList)
+from tensorflow.core.framework.attr_value_pb2 import \
+    NameAttrList as _NameAttrList
 from tensorflow.core.framework.tensor_pb2 import TensorProto as _TensorProto
-from tensorflow.core.framework.tensor_shape_pb2 import (
-    TensorShapeProto as _TensorShapeProto)
+from tensorflow.core.framework.tensor_shape_pb2 import \
+    TensorShapeProto as _TensorShapeProto
 from tensorflow.core.framework.types_pb2 import DataType as _DataType
 from tensorflow.python.framework import tensor_shape
 

utensor_cgen/logger.py

@@ -1,6 +1,6 @@
 #-*- coding: utf8 -*-
-import sys
 import logging
+import sys
 
 __all__ = ['logger']
 

utensor_cgen/operators.py

@@ -4,10 +4,12 @@
 import idx2numpy as idx2np
 import numpy as np
 
-from .snippets import *  # pylint: disable=W0401,W0614
-from utensor_cgen.utils import NamescopedKWArgsParser
-from utensor_cgen.transformer.optimizer import RefCntOptimizer
 from utensor_cgen.logger import logger
+from utensor_cgen.transformer.optimizer import RefCntOptimizer
+from utensor_cgen.utils import NamescopedKWArgsParser
+
+from .snippets import *  # pylint: disable=W0401,W0614
+
 
 class _Operator(object):
   def __init__(self):

utensor_cgen/snippets/_types.py

@@ -1,8 +1,8 @@
 # -*- coding:utf8 -*-
 from collections import namedtuple
 
-import tensorflow as tf
 import numpy as np
+import tensorflow as tf
 
 _TYPE_MAP_VALUE = namedtuple("_TYPE_MAP_VALUE", ["importer_type_str", "tensor_type_str"])
 

utensor_cgen/transformer/base.py

@@ -1,6 +1,6 @@
 from abc import ABCMeta, abstractmethod
-from functools import wraps
 from copy import deepcopy
+from functools import wraps
 
 from utensor_cgen.utils import parse_tensor_name
 

utensor_cgen/transformer/optimizer.py

@@ -4,7 +4,6 @@
 
 from .base import Transformer
 
-
 __all__ = ['RefCntOptimizer']
 
 

utensor_cgen/transformer/pipline.py

@@ -1,9 +1,11 @@
+from utensor_cgen.utils import NamescopedKWArgsParser
+
+from .base import Transformer
+from .ns_transformer import (BatchNormTransformer, DropoutTransformer,
+                             InlineTransformer)
 from .optimizer import RefCntOptimizer
-from .ns_transformer import DropoutTransformer, BatchNormTransformer
-from .ns_transformer import InlineTransformer
 from .quantize import QuantizeTransformer
-from .base import Transformer
-from utensor_cgen.utils import NamescopedKWArgsParser
+
 
 class TransformerPipeline(object):
 
@@ -57,4 +59,4 @@ def register_transformer(cls, method, trans_cls, overwrite=False):
       "expecting Transformer type, get %s" % trans_cls
     assert method not in cls._TRANSFORMER_MAP or overwrite, \
       "Registering existing transformer without overwriting"
-    cls._TRANSFORMER_MAP[name] = trans_cls
+    cls._TRANSFORMER_MAP[name] = trans_cls

utensor_cgen/transformer/quantize.py

@@ -1,6 +1,7 @@
 from tensorflow.tools.graph_transforms import TransformGraph
 
 from utensor_cgen.ir.base import uTensorGraph
+
 from .base import Transformer
 
 __all__ = ['QuantizeTransformer']

utensor_cgen/utils.py

@@ -3,10 +3,10 @@
 import re
 from copy import deepcopy
 
-from click.types import ParamType
-import numpy as np
 import idx2numpy as idx2np
+import numpy as np
 import tensorflow as tf
+from click.types import ParamType
 from tensorflow.python.framework import graph_util
 from tensorflow.tools.graph_transforms import TransformGraph