diff options
| author |  Benoit Steiner <bsteiner@google.com> | 2016-11-09 13:14:03 -0800 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2016-11-09 13:48:22 -0800 |
| commit | a771598ad83ca33eb42594d7e804859371ba4ca9 (patch) | |
| tree | 753237f3b4d22e1760084df1ea37975076d387ea /tensorflow/contrib/quantization | |
| parent | f0e9bd3c55868eb0a1f61f8cfb2b94ce011e47b4 (diff) | |
Merge changes from github.
Change: 138675832
Diffstat (limited to 'tensorflow/contrib/quantization')
5 files changed, 6 insertions, 1 deletions
diff --git a/tensorflow/contrib/quantization/__init__.py b/tensorflow/contrib/quantization/__init__.py index dcb73399b3..bbc7d91e5a 100644 --- a/tensorflow/contrib/quantization/__init__.py +++ b/tensorflow/contrib/quantization/__init__.py @@ -28,3 +28,4 @@ from tensorflow.python.ops import gen_array_ops as quantized_gen_array_ops from tensorflow.python.ops.gen_array_ops import dequantize from tensorflow.python.ops.gen_array_ops import quantize_v2 from tensorflow.python.ops.gen_array_ops import quantized_concat +# pylint: enable=unused-import,wildcard-import,g-bad-import-order diff --git a/tensorflow/contrib/quantization/python/__init__.py b/tensorflow/contrib/quantization/python/__init__.py index 0cc8cf5025..903a53d841 100644 --- a/tensorflow/contrib/quantization/python/__init__.py +++ b/tensorflow/contrib/quantization/python/__init__.py @@ -22,3 +22,4 @@ from __future__ import print_function from tensorflow.contrib.quantization.python.array_ops import * from tensorflow.contrib.quantization.python.math_ops import * from tensorflow.contrib.quantization.python.nn_ops import * +# pylint: enable=unused-import,wildcard-import diff --git a/tensorflow/contrib/quantization/python/array_ops.py b/tensorflow/contrib/quantization/python/array_ops.py index b873d4df14..98ade5defe 100644 --- a/tensorflow/contrib/quantization/python/array_ops.py +++ b/tensorflow/contrib/quantization/python/array_ops.py @@ -18,8 +18,9 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -# pylint: disable=unused-import,wildcard-import +# pylint: disable=unused-import from tensorflow.python.ops import gen_array_ops as quantized_gen_array_ops from tensorflow.python.ops.gen_array_ops import dequantize from tensorflow.python.ops.gen_array_ops import quantize_v2 from tensorflow.python.ops.gen_array_ops import quantized_concat +# pylint: enable=unused-import diff --git a/tensorflow/contrib/quantization/python/math_ops.py b/tensorflow/contrib/quantization/python/math_ops.py index d863cdad26..79aa101396 100644 --- a/tensorflow/contrib/quantization/python/math_ops.py +++ b/tensorflow/contrib/quantization/python/math_ops.py @@ -23,3 +23,4 @@ from tensorflow.python.framework import common_shapes from tensorflow.python.framework import ops from tensorflow.python.ops import gen_math_ops from tensorflow.python.ops.gen_math_ops import * +# pylint: enable=unused-import,wildcard-import diff --git a/tensorflow/contrib/quantization/python/nn_ops.py b/tensorflow/contrib/quantization/python/nn_ops.py index fd28423317..501438e4cc 100644 --- a/tensorflow/contrib/quantization/python/nn_ops.py +++ b/tensorflow/contrib/quantization/python/nn_ops.py @@ -23,3 +23,4 @@ from tensorflow.python.framework import common_shapes from tensorflow.python.framework import ops from tensorflow.python.ops import gen_nn_ops from tensorflow.python.ops.gen_nn_ops import * +# pylint: enable=unused-import,wildcard-import |