diff --git a/keras/__init__.py b/keras/__init__.py index dcf5d9411..a964bb237 100644 --- a/keras/__init__.py +++ b/keras/__init__.py @@ -17,16 +17,17 @@ Detailed documentation and user guides are available at [keras.io](https://keras.io). """ -# pylint: disable=unused-import -from tensorflow.python import tf2 -from tensorflow.python.util.tf_export import keras_export - from keras import distribute from keras import models from keras.engine.input_layer import Input from keras.engine.sequential import Sequential from keras.engine.training import Model +# isort: off +# pylint: disable=unused-import +from tensorflow.python import tf2 +from tensorflow.python.util.tf_export import keras_export + __version__ = "2.10.0" keras_export("keras.__version__").export_constant(__name__, "__version__") diff --git a/keras/activations.py b/keras/activations.py index 85f9eb246..b8732b627 100644 --- a/keras/activations.py +++ b/keras/activations.py @@ -17,12 +17,14 @@ import sys import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export import keras.layers.activation as activation_layers from keras import backend from keras.utils import generic_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + # b/123041942 # In TF 2.x, if the `tf.nn.softmax` is used as an activation function in Keras # layers, it gets serialized as 'softmax_v2' instead of 'softmax' as the diff --git a/keras/api/create_python_api_wrapper.py b/keras/api/create_python_api_wrapper.py index 5d80ecbd5..8f069c8e8 100644 --- a/keras/api/create_python_api_wrapper.py +++ b/keras/api/create_python_api_wrapper.py @@ -23,11 +23,12 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function +import keras # pylint: disable=unused-import + +# isort: off from tensorflow.python.tools.api.generator import ( create_python_api, ) -import keras # pylint: disable=unused-import - if __name__ == "__main__": create_python_api.main() diff --git a/keras/api/tests/api_compatibility_test.py b/keras/api/tests/api_compatibility_test.py index bccb40984..5cb8ff3ab 100644 --- a/keras/api/tests/api_compatibility_test.py +++ b/keras/api/tests/api_compatibility_test.py @@ -34,6 +34,8 @@ import sys import six import tensorflow as tf + +# isort: off from google.protobuf import message from google.protobuf import text_format from tensorflow.python.lib.io import file_io diff --git a/keras/applications/convnext.py b/keras/applications/convnext.py index 508f6aecd..f10a1e239 100644 --- a/keras/applications/convnext.py +++ b/keras/applications/convnext.py @@ -26,7 +26,6 @@ References: import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras import layers @@ -35,6 +34,9 @@ from keras.applications import imagenet_utils from keras.engine import sequential from keras.engine import training as training_lib +# isort: off +from tensorflow.python.util.tf_export import keras_export + BASE_WEIGHTS_PATH = ( "https://storage.googleapis.com/tensorflow/keras-applications/convnext/" ) diff --git a/keras/applications/densenet.py b/keras/applications/densenet.py index 9a549e3b9..24cf4f5f9 100644 --- a/keras/applications/densenet.py +++ b/keras/applications/densenet.py @@ -21,7 +21,6 @@ Reference: """ import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.applications import imagenet_utils @@ -30,6 +29,9 @@ from keras.layers import VersionAwareLayers from keras.utils import data_utils from keras.utils import layer_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + BASE_WEIGHTS_PATH = ( "https://storage.googleapis.com/tensorflow/" "keras-applications/densenet/" ) diff --git a/keras/applications/efficientnet.py b/keras/applications/efficientnet.py index 658af2a71..de6ab6b25 100644 --- a/keras/applications/efficientnet.py +++ b/keras/applications/efficientnet.py @@ -25,7 +25,6 @@ import copy import math import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.applications import imagenet_utils @@ -34,6 +33,9 @@ from keras.layers import VersionAwareLayers from keras.utils import data_utils from keras.utils import layer_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + BASE_WEIGHTS_PATH = "https://storage.googleapis.com/keras-applications/" WEIGHTS_HASHES = { diff --git a/keras/applications/efficientnet_v2.py b/keras/applications/efficientnet_v2.py index aafd71169..010389c69 100644 --- a/keras/applications/efficientnet_v2.py +++ b/keras/applications/efficientnet_v2.py @@ -25,7 +25,6 @@ import copy import math import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras import layers @@ -34,6 +33,9 @@ from keras.engine import training from keras.utils import data_utils from keras.utils import layer_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + BASE_WEIGHTS_PATH = "https://storage.googleapis.com/tensorflow/keras-applications/efficientnet_v2/" # noqa: E501 WEIGHTS_HASHES = { diff --git a/keras/applications/imagenet_utils.py b/keras/applications/imagenet_utils.py index bfd68e478..cc58b47c7 100644 --- a/keras/applications/imagenet_utils.py +++ b/keras/applications/imagenet_utils.py @@ -18,12 +18,14 @@ import json import warnings import numpy as np -from tensorflow.python.util.tf_export import keras_export from keras import activations from keras import backend from keras.utils import data_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + CLASS_INDEX = None CLASS_INDEX_PATH = ( "https://storage.googleapis.com/download.tensorflow.org/" diff --git a/keras/applications/inception_resnet_v2.py b/keras/applications/inception_resnet_v2.py index cbf15536b..d9c3abad5 100644 --- a/keras/applications/inception_resnet_v2.py +++ b/keras/applications/inception_resnet_v2.py @@ -22,7 +22,6 @@ Reference: """ import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.applications import imagenet_utils @@ -31,6 +30,9 @@ from keras.layers import VersionAwareLayers from keras.utils import data_utils from keras.utils import layer_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + BASE_WEIGHT_URL = ( "https://storage.googleapis.com/tensorflow/" "keras-applications/inception_resnet_v2/" diff --git a/keras/applications/inception_v3.py b/keras/applications/inception_v3.py index a8a1e1c05..0329a1bb5 100644 --- a/keras/applications/inception_v3.py +++ b/keras/applications/inception_v3.py @@ -21,7 +21,6 @@ Reference: """ import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.applications import imagenet_utils @@ -30,6 +29,9 @@ from keras.layers import VersionAwareLayers from keras.utils import data_utils from keras.utils import layer_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + WEIGHTS_PATH = ( "https://storage.googleapis.com/tensorflow/keras-applications/" "inception_v3/inception_v3_weights_tf_dim_ordering_tf_kernels.h5" diff --git a/keras/applications/mobilenet.py b/keras/applications/mobilenet.py index a210f75c0..78fccf0a0 100644 --- a/keras/applications/mobilenet.py +++ b/keras/applications/mobilenet.py @@ -62,8 +62,6 @@ Reference: """ import tensorflow.compat.v2 as tf -from tensorflow.python.platform import tf_logging as logging -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.applications import imagenet_utils @@ -72,6 +70,10 @@ from keras.layers import VersionAwareLayers from keras.utils import data_utils from keras.utils import layer_utils +# isort: off +from tensorflow.python.platform import tf_logging as logging +from tensorflow.python.util.tf_export import keras_export + BASE_WEIGHT_PATH = ( "https://storage.googleapis.com/tensorflow/" "keras-applications/mobilenet/" ) diff --git a/keras/applications/mobilenet_v2.py b/keras/applications/mobilenet_v2.py index 3e219f34f..d38efa36d 100644 --- a/keras/applications/mobilenet_v2.py +++ b/keras/applications/mobilenet_v2.py @@ -75,8 +75,6 @@ MACs stands for Multiply Adds """ import tensorflow.compat.v2 as tf -from tensorflow.python.platform import tf_logging as logging -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.applications import imagenet_utils @@ -85,6 +83,10 @@ from keras.layers import VersionAwareLayers from keras.utils import data_utils from keras.utils import layer_utils +# isort: off +from tensorflow.python.platform import tf_logging as logging +from tensorflow.python.util.tf_export import keras_export + BASE_WEIGHT_PATH = ( "https://storage.googleapis.com/tensorflow/" "keras-applications/mobilenet_v2/" diff --git a/keras/applications/mobilenet_v3.py b/keras/applications/mobilenet_v3.py index c3728c0bb..781c700ae 100644 --- a/keras/applications/mobilenet_v3.py +++ b/keras/applications/mobilenet_v3.py @@ -17,8 +17,6 @@ """MobileNet v3 models for Keras.""" import tensorflow.compat.v2 as tf -from tensorflow.python.platform import tf_logging as logging -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras import models @@ -27,6 +25,10 @@ from keras.layers import VersionAwareLayers from keras.utils import data_utils from keras.utils import layer_utils +# isort: off +from tensorflow.python.platform import tf_logging as logging +from tensorflow.python.util.tf_export import keras_export + # TODO(scottzhu): Change this to the GCS path. BASE_WEIGHT_PATH = ( "https://storage.googleapis.com/tensorflow/" diff --git a/keras/applications/nasnet.py b/keras/applications/nasnet.py index 8406e11d2..38d3c9c6b 100644 --- a/keras/applications/nasnet.py +++ b/keras/applications/nasnet.py @@ -39,8 +39,6 @@ Reference: """ import tensorflow.compat.v2 as tf -from tensorflow.python.platform import tf_logging as logging -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.applications import imagenet_utils @@ -49,6 +47,10 @@ from keras.layers import VersionAwareLayers from keras.utils import data_utils from keras.utils import layer_utils +# isort: off +from tensorflow.python.platform import tf_logging as logging +from tensorflow.python.util.tf_export import keras_export + BASE_WEIGHTS_PATH = ( "https://storage.googleapis.com/tensorflow/" "keras-applications/nasnet/" ) diff --git a/keras/applications/regnet.py b/keras/applications/regnet.py index 8da1ce6ae..923a23e92 100644 --- a/keras/applications/regnet.py +++ b/keras/applications/regnet.py @@ -27,7 +27,6 @@ References: """ import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras import layers @@ -36,6 +35,9 @@ from keras.engine import training from keras.utils import data_utils from keras.utils import layer_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + BASE_WEIGHTS_PATH = ( "https://storage.googleapis.com/tensorflow/keras-applications/regnet/" ) diff --git a/keras/applications/resnet.py b/keras/applications/resnet.py index 8ab598942..041f9aee0 100644 --- a/keras/applications/resnet.py +++ b/keras/applications/resnet.py @@ -21,7 +21,6 @@ Reference: """ import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.applications import imagenet_utils @@ -30,6 +29,9 @@ from keras.layers import VersionAwareLayers from keras.utils import data_utils from keras.utils import layer_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + BASE_WEIGHTS_PATH = ( "https://storage.googleapis.com/tensorflow/keras-applications/resnet/" ) diff --git a/keras/applications/resnet_rs.py b/keras/applications/resnet_rs.py index c0d1d296e..976626a81 100644 --- a/keras/applications/resnet_rs.py +++ b/keras/applications/resnet_rs.py @@ -27,7 +27,6 @@ from typing import List from typing import Union import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras import layers @@ -36,6 +35,9 @@ from keras.engine import training from keras.utils import data_utils from keras.utils import layer_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + BASE_WEIGHTS_URL = ( "https://storage.googleapis.com/tensorflow/" "keras-applications/resnet_rs/" ) diff --git a/keras/applications/resnet_v2.py b/keras/applications/resnet_v2.py index f7d1739e9..59c5dc634 100644 --- a/keras/applications/resnet_v2.py +++ b/keras/applications/resnet_v2.py @@ -20,11 +20,12 @@ Reference: (https://arxiv.org/abs/1603.05027) (CVPR 2016) """ -from tensorflow.python.util.tf_export import keras_export - from keras.applications import imagenet_utils from keras.applications import resnet +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export( "keras.applications.resnet_v2.ResNet50V2", "keras.applications.ResNet50V2" diff --git a/keras/applications/vgg16.py b/keras/applications/vgg16.py index 512fc577f..a265c2d3e 100644 --- a/keras/applications/vgg16.py +++ b/keras/applications/vgg16.py @@ -21,7 +21,6 @@ Reference: """ import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.applications import imagenet_utils @@ -30,6 +29,9 @@ from keras.layers import VersionAwareLayers from keras.utils import data_utils from keras.utils import layer_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + WEIGHTS_PATH = ( "https://storage.googleapis.com/tensorflow/keras-applications/" "vgg16/vgg16_weights_tf_dim_ordering_tf_kernels.h5" diff --git a/keras/applications/vgg19.py b/keras/applications/vgg19.py index 322b59f12..fdba3e5da 100644 --- a/keras/applications/vgg19.py +++ b/keras/applications/vgg19.py @@ -21,7 +21,6 @@ Reference: """ import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.applications import imagenet_utils @@ -30,6 +29,9 @@ from keras.layers import VersionAwareLayers from keras.utils import data_utils from keras.utils import layer_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + WEIGHTS_PATH = ( "https://storage.googleapis.com/tensorflow/keras-applications/" "vgg19/vgg19_weights_tf_dim_ordering_tf_kernels.h5" diff --git a/keras/applications/xception.py b/keras/applications/xception.py index 3cd069265..84d24312f 100644 --- a/keras/applications/xception.py +++ b/keras/applications/xception.py @@ -24,7 +24,6 @@ Reference: """ import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.applications import imagenet_utils @@ -33,6 +32,9 @@ from keras.layers import VersionAwareLayers from keras.utils import data_utils from keras.utils import layer_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + TF_WEIGHTS_PATH = ( "https://storage.googleapis.com/tensorflow/keras-applications/" "xception/xception_weights_tf_dim_ordering_tf_kernels.h5" diff --git a/keras/backend.py b/keras/backend.py index 80092b2ef..401f535ac 100644 --- a/keras/backend.py +++ b/keras/backend.py @@ -32,13 +32,6 @@ import weakref import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.core.protobuf import config_pb2 -from tensorflow.python.eager import context -from tensorflow.python.eager.context import get_config -from tensorflow.python.framework import config -from tensorflow.python.platform import tf_logging as logging -from tensorflow.python.util.tf_export import keras_export -from tensorflow.tools.docs import doc_controls from keras import backend_config from keras.distribute import distribute_coordinator_utils as dc @@ -48,6 +41,15 @@ from keras.utils import object_identity from keras.utils import tf_contextlib from keras.utils import tf_inspect +# isort: off +from tensorflow.core.protobuf import config_pb2 +from tensorflow.python.eager import context +from tensorflow.python.eager.context import get_config +from tensorflow.python.framework import config +from tensorflow.python.platform import tf_logging as logging +from tensorflow.python.util.tf_export import keras_export +from tensorflow.tools.docs import doc_controls + py_all = all py_sum = sum py_any = any diff --git a/keras/backend_config.py b/keras/backend_config.py index 6e9e13997..948cec331 100644 --- a/keras/backend_config.py +++ b/keras/backend_config.py @@ -15,6 +15,8 @@ """Keras backend config API.""" import tensorflow.compat.v2 as tf + +# isort: off from tensorflow.python.util.tf_export import keras_export # The type of float to use throughout a session. diff --git a/keras/backend_test.py b/keras/backend_test.py index a6b04b9ef..c9a6fb3e4 100644 --- a/keras/backend_test.py +++ b/keras/backend_test.py @@ -21,11 +21,6 @@ import numpy as np import scipy.sparse import tensorflow.compat.v2 as tf from absl.testing import parameterized -from tensorflow.python.eager import context -from tensorflow.python.eager.context import get_config -from tensorflow.python.framework import ( - test_util as tf_test_utils, -) from keras import activations from keras import backend @@ -36,6 +31,13 @@ from keras.testing_infra import test_combinations from keras.utils import tf_inspect from keras.utils import tf_utils +# isort: off +from tensorflow.python.eager import context +from tensorflow.python.eager.context import get_config +from tensorflow.python.framework import ( + test_util as tf_test_utils, +) + def compare_single_input_op_to_numpy( keras_op, diff --git a/keras/benchmarks/eager_microbenchmarks_test.py b/keras/benchmarks/eager_microbenchmarks_test.py index 07943bbb3..98fb9c170 100644 --- a/keras/benchmarks/eager_microbenchmarks_test.py +++ b/keras/benchmarks/eager_microbenchmarks_test.py @@ -17,11 +17,13 @@ import time import tensorflow.compat.v2 as tf -from tensorflow.python.eager import context -from tensorflow.python.eager.context import get_executor from keras.utils import tf_inspect +# isort: off +from tensorflow.python.eager import context +from tensorflow.python.eager.context import get_executor + def _run_benchmark(func, num_iters, execution_mode=None): with context.execution_mode(execution_mode): diff --git a/keras/benchmarks/model_components_benchmarks_test.py b/keras/benchmarks/model_components_benchmarks_test.py index 7baa5fe97..ecba4b6e9 100644 --- a/keras/benchmarks/model_components_benchmarks_test.py +++ b/keras/benchmarks/model_components_benchmarks_test.py @@ -18,6 +18,8 @@ import time import numpy as np import tensorflow.compat.v2 as tf + +# isort: off from tensorflow.python.eager import context from tensorflow.python.eager.context import get_executor diff --git a/keras/benchmarks/optimizer_benchmarks_test.py b/keras/benchmarks/optimizer_benchmarks_test.py index 30848c01d..5138f6e38 100644 --- a/keras/benchmarks/optimizer_benchmarks_test.py +++ b/keras/benchmarks/optimizer_benchmarks_test.py @@ -15,13 +15,15 @@ """Benchmark tests for Keras optimizers.""" import tensorflow.compat.v2 as tf -from tensorflow.python.platform.benchmark import ( - ParameterizedBenchmark, -) from keras.benchmarks import benchmark_util from keras.optimizers.optimizer_v2 import adam +# isort: off +from tensorflow.python.platform.benchmark import ( + ParameterizedBenchmark, +) + def bidirect_imdb_lstm_config(): """Bidirectional LSTM model and IMDB data.""" diff --git a/keras/callbacks.py b/keras/callbacks.py index 3c0e9aaf8..7b21c375d 100644 --- a/keras/callbacks.py +++ b/keras/callbacks.py @@ -27,10 +27,6 @@ import time import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.platform import tf_logging as logging -from tensorflow.python.util import deprecation -from tensorflow.python.util.tf_export import keras_export -from tensorflow.tools.docs import doc_controls from keras import backend from keras.distribute import distributed_file_utils @@ -44,6 +40,12 @@ from keras.utils.data_utils import Sequence from keras.utils.generic_utils import Progbar from keras.utils.mode_keys import ModeKeys +# isort: off +from tensorflow.python.platform import tf_logging as logging +from tensorflow.python.util import deprecation +from tensorflow.python.util.tf_export import keras_export +from tensorflow.tools.docs import doc_controls + try: import requests except ImportError: @@ -2523,11 +2525,12 @@ class TensorBoard(Callback, version_utils.TensorBoardVersionSelector): def _configure_embeddings(self): """Configure the Projector for embeddings.""" # TODO(omalleyt): Add integration tests. - from google.protobuf import text_format - from keras.layers import core from keras.protobuf import projector_config_pb2 + # isort: off + from google.protobuf import text_format + config = projector_config_pb2.ProjectorConfig() for layer in self.model.layers: if isinstance(layer, core.Embedding): diff --git a/keras/callbacks_test.py b/keras/callbacks_test.py index a9cee284c..12210283b 100644 --- a/keras/callbacks_test.py +++ b/keras/callbacks_test.py @@ -30,7 +30,6 @@ from unittest import mock import numpy as np import tensorflow.compat.v2 as tf from absl.testing import parameterized -from tensorflow.python.platform import tf_logging as logging import keras from keras.callbacks import BackupAndRestore @@ -45,6 +44,9 @@ from keras.testing_infra import test_utils from keras.utils import io_utils from keras.utils import np_utils +# isort: off +from tensorflow.python.platform import tf_logging as logging + try: import h5py # pylint:disable=g-import-not-at-top except ImportError: diff --git a/keras/callbacks_v1.py b/keras/callbacks_v1.py index 2bfdf4800..dce480688 100644 --- a/keras/callbacks_v1.py +++ b/keras/callbacks_v1.py @@ -20,12 +20,14 @@ import os import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.platform import tf_logging as logging -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras import callbacks +# isort: off +from tensorflow.python.platform import tf_logging as logging +from tensorflow.python.util.tf_export import keras_export + @keras_export(v1=["keras.callbacks.TensorBoard"]) class TensorBoard(callbacks.TensorBoard): @@ -315,6 +317,7 @@ class TensorBoard(callbacks.TensorBoard): embeddings_metadata = self.embeddings_metadata try: + # isort: off from tensorboard.plugins import projector except ImportError: raise ImportError( diff --git a/keras/constraints.py b/keras/constraints.py index 35dc0ba1a..0750f3b96 100644 --- a/keras/constraints.py +++ b/keras/constraints.py @@ -17,13 +17,15 @@ """Constraints: functions that impose constraints on weight values.""" import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export -from tensorflow.tools.docs import doc_controls from keras import backend from keras.utils.generic_utils import deserialize_keras_object from keras.utils.generic_utils import serialize_keras_object +# isort: off +from tensorflow.python.util.tf_export import keras_export +from tensorflow.tools.docs import doc_controls + @keras_export("keras.constraints.Constraint") class Constraint: diff --git a/keras/datasets/boston_housing.py b/keras/datasets/boston_housing.py index 22c806f47..caeed268a 100644 --- a/keras/datasets/boston_housing.py +++ b/keras/datasets/boston_housing.py @@ -15,10 +15,12 @@ """Boston housing price regression dataset.""" import numpy as np -from tensorflow.python.util.tf_export import keras_export from keras.utils.data_utils import get_file +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.datasets.boston_housing.load_data") def load_data(path="boston_housing.npz", test_split=0.2, seed=113): diff --git a/keras/datasets/cifar10.py b/keras/datasets/cifar10.py index 5e5d1cd7e..6ae34938c 100644 --- a/keras/datasets/cifar10.py +++ b/keras/datasets/cifar10.py @@ -17,12 +17,14 @@ import os import numpy as np -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.datasets.cifar import load_batch from keras.utils.data_utils import get_file +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.datasets.cifar10.load_data") def load_data(): diff --git a/keras/datasets/cifar100.py b/keras/datasets/cifar100.py index 1eb5039c8..7b6c6728e 100644 --- a/keras/datasets/cifar100.py +++ b/keras/datasets/cifar100.py @@ -17,12 +17,14 @@ import os import numpy as np -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.datasets.cifar import load_batch from keras.utils.data_utils import get_file +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.datasets.cifar100.load_data") def load_data(label_mode="fine"): diff --git a/keras/datasets/fashion_mnist.py b/keras/datasets/fashion_mnist.py index bb8915a33..e7d64ebef 100644 --- a/keras/datasets/fashion_mnist.py +++ b/keras/datasets/fashion_mnist.py @@ -18,10 +18,12 @@ import gzip import os import numpy as np -from tensorflow.python.util.tf_export import keras_export from keras.utils.data_utils import get_file +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.datasets.fashion_mnist.load_data") def load_data(): diff --git a/keras/datasets/imdb.py b/keras/datasets/imdb.py index 9dae15010..dd12aba38 100644 --- a/keras/datasets/imdb.py +++ b/keras/datasets/imdb.py @@ -17,12 +17,14 @@ import json import numpy as np -from tensorflow.python.platform import tf_logging as logging -from tensorflow.python.util.tf_export import keras_export from keras.preprocessing.sequence import _remove_long_seq from keras.utils.data_utils import get_file +# isort: off +from tensorflow.python.platform import tf_logging as logging +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.datasets.imdb.load_data") def load_data( diff --git a/keras/datasets/mnist.py b/keras/datasets/mnist.py index 8d22076bd..6d061c325 100644 --- a/keras/datasets/mnist.py +++ b/keras/datasets/mnist.py @@ -15,10 +15,12 @@ """MNIST handwritten digits dataset.""" import numpy as np -from tensorflow.python.util.tf_export import keras_export from keras.utils.data_utils import get_file +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.datasets.mnist.load_data") def load_data(path="mnist.npz"): diff --git a/keras/datasets/reuters.py b/keras/datasets/reuters.py index 3e3558361..665ea7df0 100644 --- a/keras/datasets/reuters.py +++ b/keras/datasets/reuters.py @@ -17,12 +17,14 @@ import json import numpy as np -from tensorflow.python.platform import tf_logging as logging -from tensorflow.python.util.tf_export import keras_export from keras.preprocessing.sequence import _remove_long_seq from keras.utils.data_utils import get_file +# isort: off +from tensorflow.python.platform import tf_logging as logging +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.datasets.reuters.load_data") def load_data( diff --git a/keras/distribute/ctl_correctness_test.py b/keras/distribute/ctl_correctness_test.py index 10dbc19b8..311a60fc0 100644 --- a/keras/distribute/ctl_correctness_test.py +++ b/keras/distribute/ctl_correctness_test.py @@ -17,7 +17,6 @@ import numpy as np import tensorflow.compat.v2 as tf from absl.testing import parameterized -from tensorflow.python.ops.losses import losses_impl import keras from keras import optimizers @@ -27,6 +26,9 @@ from keras.distribute import optimizer_combinations from keras.distribute import strategy_combinations from keras.testing_infra import test_utils +# isort: off +from tensorflow.python.ops.losses import losses_impl + _NUM_SAMPLES = 66 _BATCH_SIZE = 32 _RANDOM_SEED = 1337 diff --git a/keras/distribute/custom_training_loop_metrics_test.py b/keras/distribute/custom_training_loop_metrics_test.py index 90526421a..a48a7d6b1 100644 --- a/keras/distribute/custom_training_loop_metrics_test.py +++ b/keras/distribute/custom_training_loop_metrics_test.py @@ -17,13 +17,15 @@ import numpy as np import tensorflow.compat.v2 as tf from absl.testing import parameterized -from tensorflow.python.framework import ( - test_util as tf_test_utils, -) from keras import metrics from keras.distribute import strategy_combinations +# isort: off +from tensorflow.python.framework import ( + test_util as tf_test_utils, +) + class KerasMetricsTest(tf.test.TestCase, parameterized.TestCase): @tf.__internal__.distribute.combinations.generate( diff --git a/keras/distribute/custom_training_loop_optimizer_test.py b/keras/distribute/custom_training_loop_optimizer_test.py index 2b8a90815..7d608f462 100644 --- a/keras/distribute/custom_training_loop_optimizer_test.py +++ b/keras/distribute/custom_training_loop_optimizer_test.py @@ -16,13 +16,15 @@ import tensorflow.compat.v2 as tf from absl.testing import parameterized -from tensorflow.python.distribute import values from keras.distribute import ( strategy_combinations as keras_strategy_combinations, ) from keras.optimizers.optimizer_v2 import gradient_descent +# isort: off +from tensorflow.python.distribute import values + class OptimizerTest(tf.test.TestCase, parameterized.TestCase): @tf.__internal__.distribute.combinations.generate( diff --git a/keras/distribute/dataset_creator_model_fit_test.py b/keras/distribute/dataset_creator_model_fit_test.py index f483988b6..d417eb1fa 100644 --- a/keras/distribute/dataset_creator_model_fit_test.py +++ b/keras/distribute/dataset_creator_model_fit_test.py @@ -16,15 +16,17 @@ import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.framework import ( - test_util as tf_test_utils, -) from keras.distribute import dataset_creator_model_fit_test_base as test_base from keras.distribute import strategy_combinations from keras.testing_infra import test_utils from keras.utils import dataset_creator +# isort: off +from tensorflow.python.framework import ( + test_util as tf_test_utils, +) + # TODO(rchao): Investigate why there cannot be single worker and multi worker # PS strategies running in the same shard. diff --git a/keras/distribute/dataset_creator_model_fit_test_base.py b/keras/distribute/dataset_creator_model_fit_test_base.py index 75958d37c..0baf6ec94 100644 --- a/keras/distribute/dataset_creator_model_fit_test_base.py +++ b/keras/distribute/dataset_creator_model_fit_test_base.py @@ -19,7 +19,6 @@ import os import numpy as np import tensorflow.compat.v2 as tf from absl.testing import parameterized -from tensorflow.python.platform import tf_logging as logging import keras from keras import callbacks as callbacks_lib @@ -29,6 +28,9 @@ from keras.layers.preprocessing import string_lookup from keras.optimizers.optimizer_v2 import gradient_descent from keras.utils import dataset_creator +# isort: off +from tensorflow.python.platform import tf_logging as logging + class DatasetCreatorModelFitTestBase(tf.test.TestCase, parameterized.TestCase): """The base class for DatasetCreator with Model.fit tests.""" diff --git a/keras/distribute/distribute_coordinator_utils.py b/keras/distribute/distribute_coordinator_utils.py index 5fac42af3..6d22c890c 100644 --- a/keras/distribute/distribute_coordinator_utils.py +++ b/keras/distribute/distribute_coordinator_utils.py @@ -32,6 +32,8 @@ import threading import time import tensorflow.compat.v2 as tf + +# isort: off from tensorflow.core.protobuf import cluster_pb2 from tensorflow.python.platform import tf_logging as logging diff --git a/keras/distribute/distribute_strategy_test.py b/keras/distribute/distribute_strategy_test.py index 4ba617eed..bd820c53b 100644 --- a/keras/distribute/distribute_strategy_test.py +++ b/keras/distribute/distribute_strategy_test.py @@ -19,9 +19,6 @@ import os import numpy as np import tensorflow.compat.v2 as tf from absl.testing import parameterized -from tensorflow.python.distribute.cluster_resolver import ( - SimpleClusterResolver, -) import keras from keras import backend @@ -47,6 +44,11 @@ from keras.testing_infra import test_utils from keras.utils import losses_utils from keras.utils import np_utils +# isort: off +from tensorflow.python.distribute.cluster_resolver import ( + SimpleClusterResolver, +) + _RANDOM_SEED = 1337 _TRAIN_SIZE = 200 _INPUT_SIZE = (10,) diff --git a/keras/distribute/distributed_training_utils_v1.py b/keras/distribute/distributed_training_utils_v1.py index b63e0cf1f..cca1b0de2 100644 --- a/keras/distribute/distributed_training_utils_v1.py +++ b/keras/distribute/distributed_training_utils_v1.py @@ -18,7 +18,6 @@ import functools import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.platform import tf_logging as logging from keras import backend from keras import callbacks @@ -31,6 +30,9 @@ from keras.optimizers.optimizer_v2 import optimizer_v2 from keras.utils import tf_contextlib from keras.utils.mode_keys import ModeKeys +# isort: off +from tensorflow.python.platform import tf_logging as logging + # pylint:disable=protected-access diff --git a/keras/distribute/mirrored_strategy_test.py b/keras/distribute/mirrored_strategy_test.py index f4476c309..22f7b6005 100644 --- a/keras/distribute/mirrored_strategy_test.py +++ b/keras/distribute/mirrored_strategy_test.py @@ -17,10 +17,6 @@ import numpy as np import tensorflow.compat.v2 as tf from absl.testing import parameterized -from tensorflow.python.eager import backprop -from tensorflow.python.training import ( - optimizer as optimizer_lib, -) import keras from keras.engine import training as keras_training @@ -28,6 +24,12 @@ from keras.layers import core as keras_core from keras.optimizers.optimizer_v2 import rmsprop from keras.utils import kpl_test_utils +# isort: off +from tensorflow.python.eager import backprop +from tensorflow.python.training import ( + optimizer as optimizer_lib, +) + class MiniModel(keras_training.Model): """Minimal model for mnist. diff --git a/keras/distribute/multi_worker_testing_utils.py b/keras/distribute/multi_worker_testing_utils.py index 9b81adbce..a34d08d8d 100644 --- a/keras/distribute/multi_worker_testing_utils.py +++ b/keras/distribute/multi_worker_testing_utils.py @@ -18,6 +18,11 @@ import threading import unittest import tensorflow.compat.v2 as tf + +import keras +from keras.optimizers.optimizer_v2 import gradient_descent + +# isort: off from tensorflow.python.distribute.cluster_resolver import ( SimpleClusterResolver, ) @@ -26,9 +31,6 @@ from tensorflow.python.training.server_lib import ( ClusterSpec, ) -import keras -from keras.optimizers.optimizer_v2 import gradient_descent - _portpicker_import_error = None try: import portpicker # pylint: disable=g-import-not-at-top diff --git a/keras/distribute/parameter_server_evaluation_test.py b/keras/distribute/parameter_server_evaluation_test.py index 37e52084a..647d35d85 100644 --- a/keras/distribute/parameter_server_evaluation_test.py +++ b/keras/distribute/parameter_server_evaluation_test.py @@ -17,6 +17,11 @@ import time import tensorflow.compat.v2 as tf + +import keras +from keras.testing_infra import test_utils + +# isort: off from tensorflow.python.distribute import ( multi_worker_test_base, ) @@ -25,9 +30,6 @@ from tensorflow.python.distribute.cluster_resolver import ( ) from tensorflow.python.ops import resource_variable_ops -import keras -from keras.testing_infra import test_utils - # TODO(yuefengz): move the following implementation to Keras core. class MeanMetricSpec(tf.TypeSpec): diff --git a/keras/distribute/sidecar_evaluator.py b/keras/distribute/sidecar_evaluator.py index acea8579b..e2b84ec05 100644 --- a/keras/distribute/sidecar_evaluator.py +++ b/keras/distribute/sidecar_evaluator.py @@ -15,6 +15,8 @@ """Python module for evaluation loop.""" import tensorflow.compat.v2 as tf + +# isort: off from tensorflow.python.platform import tf_logging as logging from tensorflow.python.util import deprecation from tensorflow.python.util.tf_export import keras_export diff --git a/keras/distribute/sidecar_evaluator_test.py b/keras/distribute/sidecar_evaluator_test.py index 623ca6ebd..bc89ad90b 100644 --- a/keras/distribute/sidecar_evaluator_test.py +++ b/keras/distribute/sidecar_evaluator_test.py @@ -22,13 +22,15 @@ import time import numpy as np import tensorflow.compat.v2 as tf from absl.testing import parameterized -from tensorflow.python.platform import tf_logging as logging import keras from keras.distribute import sidecar_evaluator as sidecar_evaluator_lib from keras.optimizers.optimizer_v2 import gradient_descent from keras.testing_infra import test_utils +# isort: off +from tensorflow.python.platform import tf_logging as logging + _BATCH_SIZE = 32 diff --git a/keras/dtensor/layout_map.py b/keras/dtensor/layout_map.py index 660110cab..5d79060ee 100644 --- a/keras/dtensor/layout_map.py +++ b/keras/dtensor/layout_map.py @@ -19,13 +19,14 @@ import contextlib import re import threading -from tensorflow.python.util.tf_export import keras_export - from keras.dtensor import dtensor_api as dtensor from keras.dtensor import lazy_variable from keras.dtensor import utils from keras.engine import base_layer +# isort: off +from tensorflow.python.util.tf_export import keras_export + # pylint: disable=missing-class-docstring # We will skip the path for certain attributes when mapping the layout, e.g. diff --git a/keras/dtensor/lazy_variable.py b/keras/dtensor/lazy_variable.py index 58bd8436d..a230d41aa 100644 --- a/keras/dtensor/lazy_variable.py +++ b/keras/dtensor/lazy_variable.py @@ -16,6 +16,7 @@ import threading +# isort: off from tensorflow.core.framework import attr_value_pb2 from tensorflow.python.eager import context from tensorflow.python.framework import ops diff --git a/keras/dtensor/optimizers.py b/keras/dtensor/optimizers.py index a6af0f7c8..3b36a3bc2 100644 --- a/keras/dtensor/optimizers.py +++ b/keras/dtensor/optimizers.py @@ -15,8 +15,6 @@ """DTensor specific Keras optimizers.""" import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export -from tensorflow.tools.docs import doc_controls from keras.dtensor import dtensor_api as dtensor from keras.optimizers.optimizer_experimental import adadelta @@ -27,6 +25,10 @@ from keras.optimizers.optimizer_experimental import rmsprop from keras.optimizers.optimizer_experimental import sgd from keras.optimizers.schedules import learning_rate_schedule +# isort: off +from tensorflow.python.util.tf_export import keras_export +from tensorflow.tools.docs import doc_controls + # pylint: disable=protected-access,missing-class-docstring class Optimizer(optimizer_lib._BaseOptimizer): diff --git a/keras/dtensor/test_util.py b/keras/dtensor/test_util.py index 74919d872..089baf20e 100644 --- a/keras/dtensor/test_util.py +++ b/keras/dtensor/test_util.py @@ -17,6 +17,8 @@ import numpy as np import tensorflow.compat.v2 as tf from absl.testing import parameterized + +# isort: off from tensorflow.dtensor.python import api as dtensor_api from tensorflow.python.eager import context diff --git a/keras/engine/base_layer.py b/keras/engine/base_layer.py index b6702b382..599d78f32 100644 --- a/keras/engine/base_layer.py +++ b/keras/engine/base_layer.py @@ -28,13 +28,6 @@ import weakref import numpy as np import tensorflow.compat.v2 as tf -from google.protobuf import json_format -from tensorflow.python.platform import tf_logging -from tensorflow.python.util.tf_export import ( - get_canonical_name_for_symbol, -) -from tensorflow.python.util.tf_export import keras_export -from tensorflow.tools.docs import doc_controls from keras import backend from keras import constraints @@ -65,6 +58,15 @@ from keras.utils.tf_utils import ( is_tensor_or_tensor_list, # pylint: disable=unused-import ) +# isort: off +from google.protobuf import json_format +from tensorflow.python.platform import tf_logging +from tensorflow.python.util.tf_export import ( + get_canonical_name_for_symbol, +) +from tensorflow.python.util.tf_export import keras_export +from tensorflow.tools.docs import doc_controls + # pylint: disable=g-inconsistent-quotes metrics_mod = generic_utils.LazyLoader( "metrics_mod", globals(), "keras.metrics" diff --git a/keras/engine/base_layer_utils.py b/keras/engine/base_layer_utils.py index 9480ffd53..25658d8b5 100644 --- a/keras/engine/base_layer_utils.py +++ b/keras/engine/base_layer_utils.py @@ -14,14 +14,11 @@ # ============================================================================== """Contains private utilities used mainly by the base Layer class.""" -import tensorflow.compat.v2 as tf -import tensorflow.compat.v1 as tf1 - import functools import threading +import tensorflow.compat.v1 as tf1 import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.dtensor import dtensor_api as dtensor @@ -29,6 +26,9 @@ from keras.utils import control_flow_util from keras.utils import tf_inspect from keras.utils import tf_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + _call_context = threading.local() diff --git a/keras/engine/base_layer_v1.py b/keras/engine/base_layer_v1.py index 3f34238ce..02b6d1131 100644 --- a/keras/engine/base_layer_v1.py +++ b/keras/engine/base_layer_v1.py @@ -22,8 +22,6 @@ import threading import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.platform import tf_logging -from tensorflow.tools.docs import doc_controls from keras import backend from keras import constraints @@ -50,6 +48,10 @@ from keras.utils.tf_utils import ( is_tensor_or_tensor_list, # pylint: disable=unused-import ) +# isort: off +from tensorflow.python.platform import tf_logging +from tensorflow.tools.docs import doc_controls + # pylint: disable=g-classes-have-attributes class Layer(base_layer.Layer): diff --git a/keras/engine/base_preprocessing_layer.py b/keras/engine/base_preprocessing_layer.py index b62c19f0c..db180d1b3 100644 --- a/keras/engine/base_preprocessing_layer.py +++ b/keras/engine/base_preprocessing_layer.py @@ -17,14 +17,16 @@ import abc import tensorflow.compat.v2 as tf -from tensorflow.python.eager import context -from tensorflow.python.util.tf_export import keras_export -from tensorflow.tools.docs import doc_controls from keras.engine import data_adapter from keras.engine.base_layer import Layer from keras.utils import version_utils +# isort: off +from tensorflow.python.eager import context +from tensorflow.python.util.tf_export import keras_export +from tensorflow.tools.docs import doc_controls + keras_kpl_gauge = tf.__internal__.monitoring.BoolGauge( "/tensorflow/api/keras/layers/preprocessing", "keras preprocessing layers usage", diff --git a/keras/engine/data_adapter.py b/keras/engine/data_adapter.py index 8300b8f1b..e58b6fef8 100644 --- a/keras/engine/data_adapter.py +++ b/keras/engine/data_adapter.py @@ -23,6 +23,14 @@ import random import numpy as np import tensorflow.compat.v2 as tf + +from keras import backend +from keras.engine import training_utils +from keras.utils import data_utils +from keras.utils import dataset_creator +from keras.utils import tf_utils + +# isort: off from tensorflow.python.distribute.input_lib import ( DistributedDataset, ) @@ -31,12 +39,6 @@ from tensorflow.python.framework import type_spec from tensorflow.python.platform import tf_logging as logging from tensorflow.python.util.tf_export import keras_export -from keras import backend -from keras.engine import training_utils -from keras.utils import data_utils -from keras.utils import dataset_creator -from keras.utils import tf_utils - try: import pandas as pd # pylint: disable=g-import-not-at-top except ImportError: diff --git a/keras/engine/data_adapter_test.py b/keras/engine/data_adapter_test.py index 7acf2c689..447d202ed 100644 --- a/keras/engine/data_adapter_test.py +++ b/keras/engine/data_adapter_test.py @@ -19,7 +19,6 @@ import math import numpy as np import tensorflow.compat.v2 as tf from absl.testing import parameterized -from tensorflow.python.eager import context import keras from keras.engine import data_adapter @@ -27,6 +26,9 @@ from keras.testing_infra import test_combinations from keras.testing_infra import test_utils from keras.utils import data_utils +# isort: off +from tensorflow.python.eager import context + class DummyArrayLike: """Dummy array-like object.""" diff --git a/keras/engine/functional.py b/keras/engine/functional.py index 778393b53..ca4d6c677 100644 --- a/keras/engine/functional.py +++ b/keras/engine/functional.py @@ -22,8 +22,6 @@ import itertools import warnings import tensorflow.compat.v2 as tf -from tensorflow.python.platform import tf_logging as logging -from tensorflow.tools.docs import doc_controls from keras import backend from keras.dtensor import layout_map as layout_map_lib @@ -41,6 +39,10 @@ from keras.utils import generic_utils from keras.utils import tf_inspect from keras.utils import tf_utils +# isort: off +from tensorflow.python.platform import tf_logging as logging +from tensorflow.tools.docs import doc_controls + # pylint: disable=g-classes-have-attributes class Functional(training_lib.Model): diff --git a/keras/engine/functional_test.py b/keras/engine/functional_test.py index 9f675d388..c7a323628 100644 --- a/keras/engine/functional_test.py +++ b/keras/engine/functional_test.py @@ -18,10 +18,6 @@ import warnings import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.framework import extension_type -from tensorflow.python.training.tracking.util import ( - Checkpoint, -) from keras import backend from keras import layers @@ -37,6 +33,12 @@ from keras.testing_infra import test_utils from keras.utils import layer_utils from keras.utils import tf_utils +# isort: off +from tensorflow.python.framework import extension_type +from tensorflow.python.training.tracking.util import ( + Checkpoint, +) + class NetworkConstructionTest(test_combinations.TestCase): def test_default_model_name(self): diff --git a/keras/engine/input_layer.py b/keras/engine/input_layer.py index 22bf19418..9023c745d 100644 --- a/keras/engine/input_layer.py +++ b/keras/engine/input_layer.py @@ -16,7 +16,6 @@ """Input layer code (`Input` and `InputLayer`).""" import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.distribute import distributed_training_utils @@ -27,6 +26,9 @@ from keras.saving.saved_model import layer_serialization from keras.utils import tf_utils from keras.utils import traceback_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + def _assert_other_arg_none(arg_name, arg): if arg is not None: diff --git a/keras/engine/input_layer_test.py b/keras/engine/input_layer_test.py index 55eb9cc7a..ff410e522 100644 --- a/keras/engine/input_layer_test.py +++ b/keras/engine/input_layer_test.py @@ -15,7 +15,6 @@ """Tests for InputLayer construction.""" import tensorflow.compat.v2 as tf -from tensorflow.python.framework import type_spec from keras import backend from keras.engine import functional @@ -24,6 +23,9 @@ from keras.layers import core from keras.saving import model_config from keras.testing_infra import test_combinations +# isort: off +from tensorflow.python.framework import type_spec + class TwoTensors(tf.__internal__.CompositeTensor): """A simple value type to test TypeSpec. diff --git a/keras/engine/input_spec.py b/keras/engine/input_spec.py index 26fe1b987..28d901b14 100644 --- a/keras/engine/input_spec.py +++ b/keras/engine/input_spec.py @@ -17,11 +17,13 @@ """Contains the InputSpec class.""" import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export -from tensorflow.python.util.tf_export import tf_export from keras import backend +# isort: off +from tensorflow.python.util.tf_export import keras_export +from tensorflow.python.util.tf_export import tf_export + @keras_export( "keras.layers.InputSpec", diff --git a/keras/engine/keras_tensor.py b/keras/engine/keras_tensor.py index 369b4fc96..da1d42b23 100644 --- a/keras/engine/keras_tensor.py +++ b/keras/engine/keras_tensor.py @@ -15,10 +15,12 @@ """Keras Input Tensor used to track functional API Topology.""" import tensorflow.compat.v2 as tf -from tensorflow.python.data.util import structure from keras.utils import object_identity +# isort: off +from tensorflow.python.data.util import structure + # pylint: disable=g-classes-have-attributes diff --git a/keras/engine/sequential.py b/keras/engine/sequential.py index 7ebfc23bc..b005d1cc5 100644 --- a/keras/engine/sequential.py +++ b/keras/engine/sequential.py @@ -18,8 +18,6 @@ import copy import tensorflow.compat.v2 as tf -from tensorflow.python.platform import tf_logging as logging -from tensorflow.python.util.tf_export import keras_export from keras import layers as layer_module from keras.engine import base_layer @@ -33,6 +31,10 @@ from keras.utils import tf_inspect from keras.utils import tf_utils from keras.utils import traceback_utils +# isort: off +from tensorflow.python.platform import tf_logging as logging +from tensorflow.python.util.tf_export import keras_export + SINGLE_LAYER_OUTPUT_ERROR_MSG = ( "All layers in a Sequential model should have " "a single output tensor. For multi-output " diff --git a/keras/engine/sequential_test.py b/keras/engine/sequential_test.py index fa6f5bd02..24c5a9095 100644 --- a/keras/engine/sequential_test.py +++ b/keras/engine/sequential_test.py @@ -17,14 +17,16 @@ import numpy as np import tensorflow.compat.v2 as tf from absl.testing import parameterized -from tensorflow.python.framework import ( - test_util as tf_test_utils, -) import keras from keras.testing_infra import test_combinations from keras.testing_infra import test_utils +# isort: off +from tensorflow.python.framework import ( + test_util as tf_test_utils, +) + class TestSequential(test_combinations.TestCase): """Most Sequential model API tests are covered in `training_test.py`.""" diff --git a/keras/engine/training.py b/keras/engine/training.py index b627d0eaf..5776f2748 100644 --- a/keras/engine/training.py +++ b/keras/engine/training.py @@ -23,10 +23,6 @@ import weakref import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.eager import context -from tensorflow.python.platform import tf_logging as logging -from tensorflow.python.util.tf_export import keras_export -from tensorflow.tools.docs import doc_controls from keras import backend from keras import callbacks as callbacks_module @@ -58,6 +54,12 @@ from keras.utils import traceback_utils from keras.utils import version_utils from keras.utils.mode_keys import ModeKeys +# isort: off +from tensorflow.python.eager import context +from tensorflow.python.platform import tf_logging as logging +from tensorflow.python.util.tf_export import keras_export +from tensorflow.tools.docs import doc_controls + try: import h5py except ImportError: diff --git a/keras/engine/training_arrays_test.py b/keras/engine/training_arrays_test.py index 05ff0825e..cf85bafc3 100644 --- a/keras/engine/training_arrays_test.py +++ b/keras/engine/training_arrays_test.py @@ -21,9 +21,6 @@ from unittest import mock import numpy as np import tensorflow.compat.v2 as tf from absl.testing import parameterized -from tensorflow.python.framework import ( - test_util as tf_test_utils, -) import keras from keras.engine import data_adapter @@ -32,6 +29,11 @@ from keras.testing_infra import test_combinations from keras.testing_infra import test_utils from keras.utils import io_utils +# isort: off +from tensorflow.python.framework import ( + test_util as tf_test_utils, +) + def _create_dataset(num_samples, batch_size): input_data = np.random.rand(num_samples, 1) diff --git a/keras/engine/training_arrays_v1.py b/keras/engine/training_arrays_v1.py index f44bdc483..9bfb908bc 100644 --- a/keras/engine/training_arrays_v1.py +++ b/keras/engine/training_arrays_v1.py @@ -18,7 +18,6 @@ import functools import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.platform import tf_logging as logging from keras import backend from keras import callbacks as cbks @@ -29,6 +28,9 @@ from keras.utils.generic_utils import make_batches from keras.utils.generic_utils import slice_arrays from keras.utils.mode_keys import ModeKeys +# isort: off +from tensorflow.python.platform import tf_logging as logging + # pylint: disable=protected-access diff --git a/keras/engine/training_dataset_test.py b/keras/engine/training_dataset_test.py index 500c48d58..07d5d839c 100644 --- a/keras/engine/training_dataset_test.py +++ b/keras/engine/training_dataset_test.py @@ -19,7 +19,6 @@ import sys import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.platform import tf_logging as logging import keras from keras import callbacks @@ -28,6 +27,9 @@ from keras.testing_infra import test_combinations from keras.testing_infra import test_utils from keras.utils import io_utils +# isort: off +from tensorflow.python.platform import tf_logging as logging + class BatchCounterCallback(callbacks.Callback): def __init__(self): diff --git a/keras/engine/training_distributed_v1.py b/keras/engine/training_distributed_v1.py index e1dc966c6..8f51b2d64 100644 --- a/keras/engine/training_distributed_v1.py +++ b/keras/engine/training_distributed_v1.py @@ -16,8 +16,6 @@ import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.distribute import input_lib -from tensorflow.python.platform import tf_logging as logging from keras import backend from keras import callbacks as cbks @@ -29,6 +27,10 @@ from keras.engine import training_utils_v1 from keras.utils.generic_utils import Progbar from keras.utils.mode_keys import ModeKeys +# isort: off +from tensorflow.python.distribute import input_lib +from tensorflow.python.platform import tf_logging as logging + # pylint: disable=protected-access diff --git a/keras/engine/training_eager_v1.py b/keras/engine/training_eager_v1.py index 2a12d734e..65de11ee7 100644 --- a/keras/engine/training_eager_v1.py +++ b/keras/engine/training_eager_v1.py @@ -16,8 +16,6 @@ import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.eager.backprop import GradientTape -from tensorflow.python.platform import tf_logging as logging from keras import backend from keras.engine import training_utils @@ -25,6 +23,10 @@ from keras.engine import training_utils_v1 from keras.mixed_precision import loss_scale_optimizer from keras.utils import losses_utils +# isort: off +from tensorflow.python.eager.backprop import GradientTape +from tensorflow.python.platform import tf_logging as logging + # pylint: disable=protected-access diff --git a/keras/engine/training_generator_v1.py b/keras/engine/training_generator_v1.py index f016ce706..a17b54ecf 100644 --- a/keras/engine/training_generator_v1.py +++ b/keras/engine/training_generator_v1.py @@ -20,7 +20,6 @@ import math import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.platform import tf_logging as logging from keras import backend from keras import callbacks as cbks @@ -30,6 +29,9 @@ from keras.utils import data_utils from keras.utils import generic_utils from keras.utils.mode_keys import ModeKeys +# isort: off +from tensorflow.python.platform import tf_logging as logging + # pylint: disable=protected-access diff --git a/keras/engine/training_test.py b/keras/engine/training_test.py index b12e9e6af..5d4723b17 100644 --- a/keras/engine/training_test.py +++ b/keras/engine/training_test.py @@ -23,13 +23,6 @@ import tempfile import numpy as np import tensorflow.compat.v2 as tf from absl.testing import parameterized -from tensorflow.python.framework import ( - test_util as tf_test_utils, -) -from tensorflow.python.platform import tf_logging as logging -from tensorflow.python.training.rmsprop import ( - RMSPropOptimizer, -) import keras from keras import backend @@ -51,6 +44,15 @@ from keras.utils import data_utils from keras.utils import io_utils from keras.utils import np_utils +# isort: off +from tensorflow.python.framework import ( + test_util as tf_test_utils, +) +from tensorflow.python.platform import tf_logging as logging +from tensorflow.python.training.rmsprop import ( + RMSPropOptimizer, +) + try: import scipy.sparse as scipy_sparse # pylint: disable=g-import-not-at-top except ImportError: diff --git a/keras/engine/training_utils_v1.py b/keras/engine/training_utils_v1.py index 251d646b3..8ebc25227 100644 --- a/keras/engine/training_utils_v1.py +++ b/keras/engine/training_utils_v1.py @@ -24,7 +24,6 @@ import time import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.platform import tf_logging as logging from keras import backend from keras import callbacks as cbks @@ -35,6 +34,9 @@ from keras.utils import generic_utils from keras.utils import losses_utils from keras.utils import tf_inspect +# isort: off +from tensorflow.python.platform import tf_logging as logging + def is_composite_or_composite_value(tensor): """Returns true if 'tensor' is a CompositeTensor or a CT Value object.""" diff --git a/keras/engine/training_utils_v1_test.py b/keras/engine/training_utils_v1_test.py index a6dc99efb..6adafc998 100644 --- a/keras/engine/training_utils_v1_test.py +++ b/keras/engine/training_utils_v1_test.py @@ -21,7 +21,6 @@ import time import numpy as np import tensorflow.compat.v2 as tf from absl.testing import parameterized -from tensorflow.python.platform import tf_logging as logging from keras import backend from keras.engine import keras_tensor @@ -29,6 +28,9 @@ from keras.engine import training_utils_v1 from keras.testing_infra import test_combinations from keras.testing_infra import test_utils +# isort: off +from tensorflow.python.platform import tf_logging as logging + class ModelInputsTest(tf.test.TestCase): def test_single_thing(self): diff --git a/keras/engine/training_v1.py b/keras/engine/training_v1.py index 918a8829e..f11d37f0c 100644 --- a/keras/engine/training_v1.py +++ b/keras/engine/training_v1.py @@ -20,7 +20,6 @@ import numpy as np # pylint: disable=g-classes-have-attributes import tensorflow.compat.v2 as tf -from tensorflow.python.platform import tf_logging as logging from keras import backend from keras import losses @@ -48,6 +47,9 @@ from keras.utils import tf_inspect from keras.utils import tf_utils from keras.utils.mode_keys import ModeKeys +# isort: off +from tensorflow.python.platform import tf_logging as logging + try: from scipy.sparse import issparse # pylint: disable=g-import-not-at-top except ImportError: diff --git a/keras/estimator/__init__.py b/keras/estimator/__init__.py index 7b7110d4a..e453511d5 100644 --- a/keras/estimator/__init__.py +++ b/keras/estimator/__init__.py @@ -15,6 +15,8 @@ """Keras estimator API.""" import tensorflow.compat.v2 as tf + +# isort: off from tensorflow.python.util.tf_export import keras_export # Keras has undeclared dependency on tensorflow/estimator:estimator_py. @@ -164,6 +166,7 @@ def model_to_estimator( """ try: + # isort: off from tensorflow_estimator.python.estimator import ( keras_lib, # pylint: disable=g-import-not-at-top ) @@ -362,6 +365,7 @@ def model_to_estimator_v2( """ try: + # isort: off from tensorflow_estimator.python.estimator import ( keras_lib, # pylint: disable=g-import-not-at-top ) diff --git a/keras/feature_column/dense_features.py b/keras/feature_column/dense_features.py index 4d4d77a5d..1f9788dfb 100644 --- a/keras/feature_column/dense_features.py +++ b/keras/feature_column/dense_features.py @@ -21,12 +21,14 @@ from __future__ import print_function import json import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.feature_column import base_feature_layer as kfc from keras.saving.saved_model import json_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export(v1=["keras.layers.DenseFeatures"]) class DenseFeatures(kfc._BaseFeaturesLayer): # pylint: disable=protected-access diff --git a/keras/feature_column/dense_features_test.py b/keras/feature_column/dense_features_test.py index 7e024d9b7..4f286db09 100644 --- a/keras/feature_column/dense_features_test.py +++ b/keras/feature_column/dense_features_test.py @@ -21,14 +21,16 @@ from __future__ import print_function import numpy as np import tensorflow.compat.v2 as tf from absl.testing import parameterized + +from keras.feature_column import dense_features as df +from keras.testing_infra import test_combinations + +# isort: off from tensorflow.python.eager import backprop from tensorflow.python.framework import ( test_util as tf_test_utils, ) -from keras.feature_column import dense_features as df -from keras.testing_infra import test_combinations - def _initialized_session(config=None): sess = tf.compat.v1.Session(config=config) diff --git a/keras/feature_column/dense_features_v2.py b/keras/feature_column/dense_features_v2.py index 8435e261c..a5f49055c 100644 --- a/keras/feature_column/dense_features_v2.py +++ b/keras/feature_column/dense_features_v2.py @@ -19,12 +19,14 @@ from __future__ import division from __future__ import print_function import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.feature_column import base_feature_layer as kfc from keras.feature_column import dense_features from keras.utils import tf_contextlib +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.DenseFeatures", v1=[]) class DenseFeatures(dense_features.DenseFeatures): diff --git a/keras/feature_column/dense_features_v2_test.py b/keras/feature_column/dense_features_v2_test.py index d5f53a1a1..ce05249c5 100644 --- a/keras/feature_column/dense_features_v2_test.py +++ b/keras/feature_column/dense_features_v2_test.py @@ -20,11 +20,13 @@ from __future__ import print_function import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.eager import backprop from keras.feature_column import dense_features_v2 as df from keras.testing_infra import test_combinations +# isort: off +from tensorflow.python.eager import backprop + def _initialized_session(config=None): sess = tf.compat.v1.Session(config=config) diff --git a/keras/feature_column/sequence_feature_column.py b/keras/feature_column/sequence_feature_column.py index cc9b96959..7202c818a 100644 --- a/keras/feature_column/sequence_feature_column.py +++ b/keras/feature_column/sequence_feature_column.py @@ -22,11 +22,13 @@ from __future__ import division from __future__ import print_function import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.feature_column import base_feature_layer as kfc +# isort: off +from tensorflow.python.util.tf_export import keras_export + # pylint: disable=protected-access diff --git a/keras/feature_column/sequence_feature_column_integration_test.py b/keras/feature_column/sequence_feature_column_integration_test.py index 2fb8c3ede..b76c04d1f 100644 --- a/keras/feature_column/sequence_feature_column_integration_test.py +++ b/keras/feature_column/sequence_feature_column_integration_test.py @@ -19,12 +19,6 @@ from __future__ import division from __future__ import print_function import tensorflow.compat.v2 as tf -from google.protobuf import text_format -from tensorflow.core.example import example_pb2 -from tensorflow.core.example import feature_pb2 -from tensorflow.python.framework import ( - test_util as tf_test_utils, -) from keras import backend from keras.feature_column import dense_features @@ -33,6 +27,14 @@ from keras.layers import merging from keras.layers.rnn import base_rnn from keras.layers.rnn import simple_rnn +# isort: off +from google.protobuf import text_format +from tensorflow.core.example import example_pb2 +from tensorflow.core.example import feature_pb2 +from tensorflow.python.framework import ( + test_util as tf_test_utils, +) + class SequenceFeatureColumnIntegrationTest(tf.test.TestCase): def _make_sequence_example(self): diff --git a/keras/initializers/__init__.py b/keras/initializers/__init__.py index 8968dbf18..d0c2d53c4 100644 --- a/keras/initializers/__init__.py +++ b/keras/initializers/__init__.py @@ -17,15 +17,17 @@ import threading import tensorflow.compat.v2 as tf -from tensorflow.python import tf2 -from tensorflow.python.ops import init_ops -from tensorflow.python.util.tf_export import keras_export from keras.initializers import initializers_v1 from keras.initializers import initializers_v2 from keras.utils import generic_utils from keras.utils import tf_inspect as inspect +# isort: off +from tensorflow.python import tf2 +from tensorflow.python.ops import init_ops +from tensorflow.python.util.tf_export import keras_export + # LOCAL.ALL_OBJECTS is meant to be a global mutable. Hence we need to make it # thread-local to avoid concurrent mutations. LOCAL = threading.local() diff --git a/keras/initializers/initializers_v1.py b/keras/initializers/initializers_v1.py index 068e2e31f..7c570d2f5 100644 --- a/keras/initializers/initializers_v1.py +++ b/keras/initializers/initializers_v1.py @@ -16,6 +16,8 @@ # pylint:disable=g-classes-have-attributes import tensorflow.compat.v2 as tf + +# isort: off from tensorflow.python.util.tf_export import keras_export _v1_zeros_initializer = tf.compat.v1.zeros_initializer diff --git a/keras/initializers/initializers_v2.py b/keras/initializers/initializers_v2.py index 368b5987d..28cb4498d 100644 --- a/keras/initializers/initializers_v2.py +++ b/keras/initializers/initializers_v2.py @@ -17,11 +17,13 @@ import math import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.dtensor import utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + _PARTITION_SHAPE = "partition_shape" _PARTITION_OFFSET = "partition_offset" _LAYOUT = "layout" diff --git a/keras/integration_test/central_storage_strategy_test.py b/keras/integration_test/central_storage_strategy_test.py index 57d753a51..6e5abddf3 100644 --- a/keras/integration_test/central_storage_strategy_test.py +++ b/keras/integration_test/central_storage_strategy_test.py @@ -16,6 +16,8 @@ import tensorflow.compat.v2 as tf from absl.testing import parameterized + +# isort: off from tensorflow.python.distribute import ( combinations as ds_combinations, ) diff --git a/keras/integration_test/gradient_checkpoint_test.py b/keras/integration_test/gradient_checkpoint_test.py index c8844dc45..71450f7e9 100644 --- a/keras/integration_test/gradient_checkpoint_test.py +++ b/keras/integration_test/gradient_checkpoint_test.py @@ -16,6 +16,8 @@ import gc import tensorflow.compat.v2 as tf + +# isort: off from tensorflow.python.framework import ( test_util as tf_test_utils, ) diff --git a/keras/integration_test/tpu_strategy_test.py b/keras/integration_test/tpu_strategy_test.py index 3144cf777..421f18996 100644 --- a/keras/integration_test/tpu_strategy_test.py +++ b/keras/integration_test/tpu_strategy_test.py @@ -19,6 +19,8 @@ import tempfile import tensorflow.compat.v2 as tf from absl import flags + +# isort: off from tensorflow.python.framework import ( test_util as tf_test_utils, ) diff --git a/keras/layers/__init__.py b/keras/layers/__init__.py index a6e95586d..d8b9f3011 100644 --- a/keras/layers/__init__.py +++ b/keras/layers/__init__.py @@ -16,8 +16,6 @@ import tensorflow.compat.v2 as tf -from tensorflow.python import tf2 - from keras.engine.base_layer import Layer from keras.engine.base_preprocessing_layer import PreprocessingLayer @@ -157,6 +155,9 @@ from keras.layers.reshaping.zero_padding1d import ZeroPadding1D from keras.layers.reshaping.zero_padding2d import ZeroPadding2D from keras.layers.reshaping.zero_padding3d import ZeroPadding3D +# isort: off +from tensorflow.python import tf2 + if tf.__internal__.tf2.enabled(): from keras.layers.normalization.batch_normalization import ( BatchNormalization, diff --git a/keras/layers/activation/elu.py b/keras/layers/activation/elu.py index 263cfd852..e6fb88e95 100644 --- a/keras/layers/activation/elu.py +++ b/keras/layers/activation/elu.py @@ -15,12 +15,13 @@ """Exponential Linear Unit activation layer.""" # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import -from tensorflow.python.util.tf_export import keras_export - from keras import backend from keras.engine.base_layer import Layer from keras.utils import tf_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.ELU") class ELU(Layer): diff --git a/keras/layers/activation/leaky_relu.py b/keras/layers/activation/leaky_relu.py index 6f093a226..f833262d9 100644 --- a/keras/layers/activation/leaky_relu.py +++ b/keras/layers/activation/leaky_relu.py @@ -15,12 +15,13 @@ """Leaky version of a Rectified Linear Unit activation layer.""" # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import -from tensorflow.python.util.tf_export import keras_export - from keras import backend from keras.engine.base_layer import Layer from keras.utils import tf_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.LeakyReLU") class LeakyReLU(Layer): diff --git a/keras/layers/activation/prelu.py b/keras/layers/activation/prelu.py index a57aa6eb6..67914358c 100644 --- a/keras/layers/activation/prelu.py +++ b/keras/layers/activation/prelu.py @@ -15,8 +15,6 @@ """Parametric Rectified Linear Unit activation layer.""" # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import -from tensorflow.python.util.tf_export import keras_export - from keras import backend from keras import constraints from keras import initializers @@ -25,6 +23,9 @@ from keras.engine.base_layer import Layer from keras.engine.input_spec import InputSpec from keras.utils import tf_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.PReLU") class PReLU(Layer): diff --git a/keras/layers/activation/relu.py b/keras/layers/activation/relu.py index 5f4ae1b28..25b45ed6d 100644 --- a/keras/layers/activation/relu.py +++ b/keras/layers/activation/relu.py @@ -15,12 +15,13 @@ """Rectified Linear Unit activation layer.""" # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import -from tensorflow.python.util.tf_export import keras_export - from keras import backend from keras.engine.base_layer import Layer from keras.utils import tf_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.ReLU") class ReLU(Layer): diff --git a/keras/layers/activation/softmax.py b/keras/layers/activation/softmax.py index 2be3ee501..770b444ab 100644 --- a/keras/layers/activation/softmax.py +++ b/keras/layers/activation/softmax.py @@ -16,12 +16,14 @@ # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.engine.base_layer import Layer from keras.utils import tf_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + def _large_compatible_negative(tensor_type): """Large negative number as Tensor. diff --git a/keras/layers/activation/thresholded_relu.py b/keras/layers/activation/thresholded_relu.py index 2a6e63b52..8366ecba6 100644 --- a/keras/layers/activation/thresholded_relu.py +++ b/keras/layers/activation/thresholded_relu.py @@ -16,12 +16,14 @@ # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.engine.base_layer import Layer from keras.utils import tf_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.ThresholdedReLU") class ThresholdedReLU(Layer): diff --git a/keras/layers/attention/additive_attention.py b/keras/layers/attention/additive_attention.py index 2c626c824..471014dc9 100644 --- a/keras/layers/attention/additive_attention.py +++ b/keras/layers/attention/additive_attention.py @@ -20,10 +20,12 @@ Attention is formed by three tensors: Query, Key and Value. # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.layers.attention.base_dense_attention import BaseDenseAttention +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.AdditiveAttention") class AdditiveAttention(BaseDenseAttention): diff --git a/keras/layers/attention/attention.py b/keras/layers/attention/attention.py index 449fd4e78..e2246058d 100644 --- a/keras/layers/attention/attention.py +++ b/keras/layers/attention/attention.py @@ -20,10 +20,12 @@ Attention is formed by three tensors: Query, Key and Value. # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.layers.attention.base_dense_attention import BaseDenseAttention +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.Attention") class Attention(BaseDenseAttention): diff --git a/keras/layers/attention/multi_head_attention.py b/keras/layers/attention/multi_head_attention.py index 9391c44cc..69d0031d1 100644 --- a/keras/layers/attention/multi_head_attention.py +++ b/keras/layers/attention/multi_head_attention.py @@ -21,8 +21,6 @@ import string import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.platform import tf_logging as logging -from tensorflow.python.util.tf_export import keras_export from keras import constraints from keras import initializers @@ -33,6 +31,10 @@ from keras.layers import core from keras.layers import regularization from keras.utils import tf_utils +# isort: off +from tensorflow.python.platform import tf_logging as logging +from tensorflow.python.util.tf_export import keras_export + _CHR_IDX = string.ascii_lowercase diff --git a/keras/layers/convolutional/conv1d.py b/keras/layers/convolutional/conv1d.py index 685755ccb..bdb5820d9 100644 --- a/keras/layers/convolutional/conv1d.py +++ b/keras/layers/convolutional/conv1d.py @@ -15,8 +15,6 @@ """Keras 1D convolution layer.""" # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import -from tensorflow.python.util.tf_export import keras_export - from keras import activations from keras import constraints from keras import initializers @@ -24,6 +22,9 @@ from keras import regularizers from keras.dtensor import utils from keras.layers.convolutional.base_conv import Conv +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.Conv1D", "keras.layers.Convolution1D") class Conv1D(Conv): diff --git a/keras/layers/convolutional/conv1d_transpose.py b/keras/layers/convolutional/conv1d_transpose.py index 408aeef13..8315fb0de 100644 --- a/keras/layers/convolutional/conv1d_transpose.py +++ b/keras/layers/convolutional/conv1d_transpose.py @@ -16,7 +16,6 @@ # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import activations from keras import constraints @@ -27,6 +26,9 @@ from keras.engine.input_spec import InputSpec from keras.layers.convolutional.conv1d import Conv1D from keras.utils import conv_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export( "keras.layers.Conv1DTranspose", "keras.layers.Convolution1DTranspose" diff --git a/keras/layers/convolutional/conv2d.py b/keras/layers/convolutional/conv2d.py index 0c2d74a4c..e081d46c7 100644 --- a/keras/layers/convolutional/conv2d.py +++ b/keras/layers/convolutional/conv2d.py @@ -15,8 +15,6 @@ """Keras 2D convolution layer.""" # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import -from tensorflow.python.util.tf_export import keras_export - from keras import activations from keras import constraints from keras import initializers @@ -24,6 +22,9 @@ from keras import regularizers from keras.dtensor import utils from keras.layers.convolutional.base_conv import Conv +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.Conv2D", "keras.layers.Convolution2D") class Conv2D(Conv): diff --git a/keras/layers/convolutional/conv2d_transpose.py b/keras/layers/convolutional/conv2d_transpose.py index eb50ea995..24f0732cf 100644 --- a/keras/layers/convolutional/conv2d_transpose.py +++ b/keras/layers/convolutional/conv2d_transpose.py @@ -16,7 +16,6 @@ # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import activations from keras import backend @@ -28,6 +27,9 @@ from keras.engine.input_spec import InputSpec from keras.layers.convolutional.conv2d import Conv2D from keras.utils import conv_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export( "keras.layers.Conv2DTranspose", "keras.layers.Convolution2DTranspose" diff --git a/keras/layers/convolutional/conv3d.py b/keras/layers/convolutional/conv3d.py index af79ab263..15c02d43e 100644 --- a/keras/layers/convolutional/conv3d.py +++ b/keras/layers/convolutional/conv3d.py @@ -15,8 +15,6 @@ """Keras 3D convolution layer.""" # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import -from tensorflow.python.util.tf_export import keras_export - from keras import activations from keras import constraints from keras import initializers @@ -24,6 +22,9 @@ from keras import regularizers from keras.dtensor import utils from keras.layers.convolutional.base_conv import Conv +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.Conv3D", "keras.layers.Convolution3D") class Conv3D(Conv): diff --git a/keras/layers/convolutional/conv3d_transpose.py b/keras/layers/convolutional/conv3d_transpose.py index 10363d838..eca5d60c4 100644 --- a/keras/layers/convolutional/conv3d_transpose.py +++ b/keras/layers/convolutional/conv3d_transpose.py @@ -16,7 +16,6 @@ # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import activations from keras import constraints @@ -27,6 +26,9 @@ from keras.engine.input_spec import InputSpec from keras.layers.convolutional.conv3d import Conv3D from keras.utils import conv_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export( "keras.layers.Conv3DTranspose", "keras.layers.Convolution3DTranspose" diff --git a/keras/layers/convolutional/conv_test.py b/keras/layers/convolutional/conv_test.py index 71c96944b..fa0a04441 100644 --- a/keras/layers/convolutional/conv_test.py +++ b/keras/layers/convolutional/conv_test.py @@ -18,14 +18,16 @@ import numpy as np import tensorflow.compat.v2 as tf from absl.testing import parameterized -from tensorflow.python.framework import ( - test_util as tf_test_utils, -) import keras from keras.testing_infra import test_combinations from keras.testing_infra import test_utils +# isort: off +from tensorflow.python.framework import ( + test_util as tf_test_utils, +) + @test_combinations.run_all_keras_modes class Conv1DTest(test_combinations.TestCase): diff --git a/keras/layers/convolutional/depthwise_conv1d.py b/keras/layers/convolutional/depthwise_conv1d.py index 4f4b385d2..0d66f2448 100644 --- a/keras/layers/convolutional/depthwise_conv1d.py +++ b/keras/layers/convolutional/depthwise_conv1d.py @@ -16,12 +16,14 @@ # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.layers.convolutional.base_depthwise_conv import DepthwiseConv from keras.utils import conv_utils from keras.utils import tf_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.DepthwiseConv1D") class DepthwiseConv1D(DepthwiseConv): diff --git a/keras/layers/convolutional/depthwise_conv2d.py b/keras/layers/convolutional/depthwise_conv2d.py index aa9a42ea3..9d1a5ec55 100644 --- a/keras/layers/convolutional/depthwise_conv2d.py +++ b/keras/layers/convolutional/depthwise_conv2d.py @@ -15,13 +15,14 @@ """Keras depthwise 2D convolution.""" # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import -from tensorflow.python.util.tf_export import keras_export - from keras import backend from keras.layers.convolutional.base_depthwise_conv import DepthwiseConv from keras.utils import conv_utils from keras.utils import tf_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.DepthwiseConv2D") class DepthwiseConv2D(DepthwiseConv): diff --git a/keras/layers/convolutional/separable_conv1d.py b/keras/layers/convolutional/separable_conv1d.py index 2f5b53435..d36ebcb72 100644 --- a/keras/layers/convolutional/separable_conv1d.py +++ b/keras/layers/convolutional/separable_conv1d.py @@ -16,7 +16,6 @@ # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import activations from keras import constraints @@ -25,6 +24,9 @@ from keras import regularizers from keras.layers.convolutional.base_separable_conv import SeparableConv from keras.utils import conv_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export( "keras.layers.SeparableConv1D", "keras.layers.SeparableConvolution1D" diff --git a/keras/layers/convolutional/separable_conv2d.py b/keras/layers/convolutional/separable_conv2d.py index 39442bc76..a6d21edbd 100644 --- a/keras/layers/convolutional/separable_conv2d.py +++ b/keras/layers/convolutional/separable_conv2d.py @@ -16,7 +16,6 @@ # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import activations from keras import constraints @@ -25,6 +24,9 @@ from keras import regularizers from keras.layers.convolutional.base_separable_conv import SeparableConv from keras.utils import conv_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export( "keras.layers.SeparableConv2D", "keras.layers.SeparableConvolution2D" diff --git a/keras/layers/core/activation.py b/keras/layers/core/activation.py index d92b01569..16cf21a11 100644 --- a/keras/layers/core/activation.py +++ b/keras/layers/core/activation.py @@ -15,11 +15,12 @@ """Contains the Activation layer.""" # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import -from tensorflow.python.util.tf_export import keras_export - from keras import activations from keras.engine.base_layer import Layer +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.Activation") class Activation(Layer): diff --git a/keras/layers/core/dense.py b/keras/layers/core/dense.py index 17eb48fa3..2ff2517f4 100644 --- a/keras/layers/core/dense.py +++ b/keras/layers/core/dense.py @@ -16,7 +16,6 @@ # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import activations from keras import backend @@ -27,6 +26,9 @@ from keras.dtensor import utils from keras.engine.base_layer import Layer from keras.engine.input_spec import InputSpec +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.Dense") class Dense(Layer): diff --git a/keras/layers/core/einsum_dense.py b/keras/layers/core/einsum_dense.py index a07398417..160664e68 100644 --- a/keras/layers/core/einsum_dense.py +++ b/keras/layers/core/einsum_dense.py @@ -18,7 +18,6 @@ import re import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import activations from keras import constraints @@ -26,6 +25,9 @@ from keras import initializers from keras import regularizers from keras.engine.base_layer import Layer +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export( "keras.layers.EinsumDense", "keras.layers.experimental.EinsumDense" diff --git a/keras/layers/core/embedding.py b/keras/layers/core/embedding.py index 2d6e1643a..dee766002 100644 --- a/keras/layers/core/embedding.py +++ b/keras/layers/core/embedding.py @@ -16,7 +16,6 @@ # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras import constraints @@ -27,6 +26,9 @@ from keras.engine import base_layer_utils from keras.engine.base_layer import Layer from keras.utils import tf_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.Embedding") class Embedding(Layer): diff --git a/keras/layers/core/lambda_layer.py b/keras/layers/core/lambda_layer.py index a72b998e9..1c1e80acb 100644 --- a/keras/layers/core/lambda_layer.py +++ b/keras/layers/core/lambda_layer.py @@ -21,14 +21,16 @@ import warnings import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.platform import tf_logging -from tensorflow.python.util.tf_export import keras_export from keras.engine.base_layer import Layer from keras.utils import generic_utils from keras.utils import tf_inspect from keras.utils import tf_utils +# isort: off +from tensorflow.python.platform import tf_logging +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.Lambda") class Lambda(Layer): diff --git a/keras/layers/core/masking.py b/keras/layers/core/masking.py index a37a6f778..081b4dedf 100644 --- a/keras/layers/core/masking.py +++ b/keras/layers/core/masking.py @@ -16,10 +16,12 @@ # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.engine.base_layer import Layer +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.Masking") class Masking(Layer): diff --git a/keras/layers/core/tf_op_layer.py b/keras/layers/core/tf_op_layer.py index 1b3ed2917..70511912b 100644 --- a/keras/layers/core/tf_op_layer.py +++ b/keras/layers/core/tf_op_layer.py @@ -14,6 +14,12 @@ # ============================================================================== """Contains the TFOpLambda layer.""" import tensorflow.compat.v2 as tf + +from keras import backend +from keras.engine import keras_tensor +from keras.engine.base_layer import Layer + +# isort: off from tensorflow.python.platform import tf_logging from tensorflow.python.util.tf_export import ( get_canonical_name_for_symbol, @@ -22,10 +28,6 @@ from tensorflow.python.util.tf_export import ( get_symbol_from_name, ) -from keras import backend -from keras.engine import keras_tensor -from keras.engine.base_layer import Layer - # pylint: enable=g-bad-import-order diff --git a/keras/layers/kernelized.py b/keras/layers/kernelized.py index 3ce9f38c7..3a4603492 100644 --- a/keras/layers/kernelized.py +++ b/keras/layers/kernelized.py @@ -17,12 +17,14 @@ import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import initializers from keras.engine import base_layer from keras.engine import input_spec +# isort: off +from tensorflow.python.util.tf_export import keras_export + _SUPPORTED_RBF_KERNEL_TYPES = ["gaussian", "laplacian"] diff --git a/keras/layers/kernelized_test.py b/keras/layers/kernelized_test.py index 0cf61c893..aaae5efe5 100644 --- a/keras/layers/kernelized_test.py +++ b/keras/layers/kernelized_test.py @@ -22,9 +22,6 @@ import shutil import numpy as np import tensorflow.compat.v2 as tf from absl.testing import parameterized -from tensorflow.python.framework import ( - test_util as tf_test_utils, -) from keras import backend as keras_backend from keras import initializers @@ -37,6 +34,11 @@ from keras.testing_infra import test_combinations from keras.testing_infra import test_utils from keras.utils import kernelized_utils +# isort: off +from tensorflow.python.framework import ( + test_util as tf_test_utils, +) + def _exact_gaussian(stddev): return functools.partial( diff --git a/keras/layers/locally_connected/locally_connected1d.py b/keras/layers/locally_connected/locally_connected1d.py index 35ccb5fa5..a27e206fa 100644 --- a/keras/layers/locally_connected/locally_connected1d.py +++ b/keras/layers/locally_connected/locally_connected1d.py @@ -15,8 +15,6 @@ # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import """Locally-connected layer for 1D input.""" -from tensorflow.python.util.tf_export import keras_export - from keras import activations from keras import backend from keras import constraints @@ -28,6 +26,9 @@ from keras.layers.locally_connected import locally_connected_utils from keras.utils import conv_utils from keras.utils import tf_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.LocallyConnected1D") class LocallyConnected1D(Layer): diff --git a/keras/layers/locally_connected/locally_connected2d.py b/keras/layers/locally_connected/locally_connected2d.py index e39f5a8a3..9760cf293 100644 --- a/keras/layers/locally_connected/locally_connected2d.py +++ b/keras/layers/locally_connected/locally_connected2d.py @@ -15,8 +15,6 @@ # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import """Locally-connected layer for 2D input.""" -from tensorflow.python.util.tf_export import keras_export - from keras import activations from keras import backend from keras import constraints @@ -28,6 +26,9 @@ from keras.layers.locally_connected import locally_connected_utils from keras.utils import conv_utils from keras.utils import tf_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.LocallyConnected2D") class LocallyConnected2D(Layer): diff --git a/keras/layers/locally_connected/locally_connected_test.py b/keras/layers/locally_connected/locally_connected_test.py index ffb89dc48..f2bff0d9f 100644 --- a/keras/layers/locally_connected/locally_connected_test.py +++ b/keras/layers/locally_connected/locally_connected_test.py @@ -20,12 +20,6 @@ import os import numpy as np import tensorflow.compat.v2 as tf from absl.testing import parameterized -from tensorflow.python.framework import ( - test_util as tf_test_util, -) -from tensorflow.python.training.rmsprop import ( - RMSPropOptimizer, -) import keras from keras.layers.locally_connected import locally_connected_utils @@ -33,6 +27,14 @@ from keras.optimizers.optimizer_v2 import rmsprop from keras.testing_infra import test_combinations from keras.testing_infra import test_utils +# isort: off +from tensorflow.python.framework import ( + test_util as tf_test_util, +) +from tensorflow.python.training.rmsprop import ( + RMSPropOptimizer, +) + _DATA_FORMAT_PADDING_IMPLEMENTATION = [ {"data_format": "channels_first", "padding": "valid", "implementation": 1}, {"data_format": "channels_first", "padding": "same", "implementation": 1}, diff --git a/keras/layers/merging/add.py b/keras/layers/merging/add.py index 076515a03..3df77c3ef 100644 --- a/keras/layers/merging/add.py +++ b/keras/layers/merging/add.py @@ -15,10 +15,11 @@ """Layer that adds several inputs.""" -from tensorflow.python.util.tf_export import keras_export - from keras.layers.merging.base_merge import _Merge +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.Add") class Add(_Merge): diff --git a/keras/layers/merging/average.py b/keras/layers/merging/average.py index 6d72bcc67..87261c167 100644 --- a/keras/layers/merging/average.py +++ b/keras/layers/merging/average.py @@ -15,10 +15,11 @@ """Layer that averages several inputs.""" -from tensorflow.python.util.tf_export import keras_export - from keras.layers.merging.base_merge import _Merge +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.Average") class Average(_Merge): diff --git a/keras/layers/merging/concatenate.py b/keras/layers/merging/concatenate.py index d11d2bc1b..3818e332d 100644 --- a/keras/layers/merging/concatenate.py +++ b/keras/layers/merging/concatenate.py @@ -16,12 +16,14 @@ import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.layers.merging.base_merge import _Merge from keras.utils import tf_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.Concatenate") class Concatenate(_Merge): diff --git a/keras/layers/merging/dot.py b/keras/layers/merging/dot.py index c1a401d39..27fb48350 100644 --- a/keras/layers/merging/dot.py +++ b/keras/layers/merging/dot.py @@ -16,13 +16,15 @@ import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.engine import base_layer_utils from keras.layers.merging.base_merge import _Merge from keras.utils import tf_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.Dot") class Dot(_Merge): diff --git a/keras/layers/merging/maximum.py b/keras/layers/merging/maximum.py index a3fde8222..de939d285 100644 --- a/keras/layers/merging/maximum.py +++ b/keras/layers/merging/maximum.py @@ -16,10 +16,12 @@ import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.layers.merging.base_merge import _Merge +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.Maximum") class Maximum(_Merge): diff --git a/keras/layers/merging/minimum.py b/keras/layers/merging/minimum.py index 9bdee0bcd..4bfbd784e 100644 --- a/keras/layers/merging/minimum.py +++ b/keras/layers/merging/minimum.py @@ -16,10 +16,12 @@ import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.layers.merging.base_merge import _Merge +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.Minimum") class Minimum(_Merge): diff --git a/keras/layers/merging/multiply.py b/keras/layers/merging/multiply.py index 76fbc696d..caae29c79 100644 --- a/keras/layers/merging/multiply.py +++ b/keras/layers/merging/multiply.py @@ -15,10 +15,11 @@ """Layer that multiplies (element-wise) several inputs.""" -from tensorflow.python.util.tf_export import keras_export - from keras.layers.merging.base_merge import _Merge +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.Multiply") class Multiply(_Merge): diff --git a/keras/layers/merging/subtract.py b/keras/layers/merging/subtract.py index c5f602121..de55fa516 100644 --- a/keras/layers/merging/subtract.py +++ b/keras/layers/merging/subtract.py @@ -15,11 +15,12 @@ """Layer that subtracts two inputs.""" -from tensorflow.python.util.tf_export import keras_export - from keras.layers.merging.base_merge import _Merge from keras.utils import tf_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.Subtract") class Subtract(_Merge): diff --git a/keras/layers/normalization/batch_normalization.py b/keras/layers/normalization/batch_normalization.py index 391d07ff7..a0878030f 100644 --- a/keras/layers/normalization/batch_normalization.py +++ b/keras/layers/normalization/batch_normalization.py @@ -15,11 +15,6 @@ """The V2 implementation of Normalization layers.""" import tensorflow.compat.v2 as tf -from tensorflow.python.ops.control_flow_ops import ( - get_enclosing_xla_context, -) -from tensorflow.python.platform import tf_logging as logging -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras import constraints @@ -31,6 +26,13 @@ from keras.engine.input_spec import InputSpec from keras.utils import control_flow_util from keras.utils import tf_utils +# isort: off +from tensorflow.python.ops.control_flow_ops import ( + get_enclosing_xla_context, +) +from tensorflow.python.platform import tf_logging as logging +from tensorflow.python.util.tf_export import keras_export + class BatchNormalizationBase(Layer): r"""Layer that normalizes its inputs. diff --git a/keras/layers/normalization/batch_normalization_v1.py b/keras/layers/normalization/batch_normalization_v1.py index 520dec7a8..034b87611 100644 --- a/keras/layers/normalization/batch_normalization_v1.py +++ b/keras/layers/normalization/batch_normalization_v1.py @@ -15,10 +15,11 @@ """Batch Normalization V1 layer.""" # pylint: disable=g-classes-have-attributes -from tensorflow.python.util.tf_export import keras_export - from keras.layers.normalization import batch_normalization +# isort: off +from tensorflow.python.util.tf_export import keras_export + # pylint: disable=missing-docstring @keras_export(v1=["keras.layers.BatchNormalization"]) diff --git a/keras/layers/normalization/layer_normalization.py b/keras/layers/normalization/layer_normalization.py index 091fe5e47..9e160ced1 100644 --- a/keras/layers/normalization/layer_normalization.py +++ b/keras/layers/normalization/layer_normalization.py @@ -15,7 +15,6 @@ """Layer Normalization layer.""" import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import constraints from keras import initializers @@ -24,6 +23,9 @@ from keras.dtensor import utils from keras.engine.base_layer import Layer from keras.utils import tf_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + # pylint: disable=g-classes-have-attributes diff --git a/keras/layers/normalization/unit_normalization.py b/keras/layers/normalization/unit_normalization.py index 85bc40ef2..9f29905a3 100644 --- a/keras/layers/normalization/unit_normalization.py +++ b/keras/layers/normalization/unit_normalization.py @@ -18,11 +18,13 @@ # pylint: disable=g-classes-have-attributes import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.engine import base_layer from keras.utils import tf_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.UnitNormalization", v1=[]) class UnitNormalization(base_layer.Layer): diff --git a/keras/layers/pooling/average_pooling1d.py b/keras/layers/pooling/average_pooling1d.py index 0cc0ae519..2a1dcbf0b 100644 --- a/keras/layers/pooling/average_pooling1d.py +++ b/keras/layers/pooling/average_pooling1d.py @@ -17,11 +17,12 @@ import functools -from tensorflow.python.util.tf_export import keras_export - from keras import backend from keras.layers.pooling.base_pooling1d import Pooling1D +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.AveragePooling1D", "keras.layers.AvgPool1D") class AveragePooling1D(Pooling1D): diff --git a/keras/layers/pooling/average_pooling2d.py b/keras/layers/pooling/average_pooling2d.py index 08a08b3fe..844bd9f51 100644 --- a/keras/layers/pooling/average_pooling2d.py +++ b/keras/layers/pooling/average_pooling2d.py @@ -16,10 +16,12 @@ # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.layers.pooling.base_pooling2d import Pooling2D +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.AveragePooling2D", "keras.layers.AvgPool2D") class AveragePooling2D(Pooling2D): diff --git a/keras/layers/pooling/average_pooling3d.py b/keras/layers/pooling/average_pooling3d.py index cdd76926c..df71128cd 100644 --- a/keras/layers/pooling/average_pooling3d.py +++ b/keras/layers/pooling/average_pooling3d.py @@ -16,10 +16,12 @@ # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.layers.pooling.base_pooling3d import Pooling3D +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.AveragePooling3D", "keras.layers.AvgPool3D") class AveragePooling3D(Pooling3D): diff --git a/keras/layers/pooling/global_average_pooling1d.py b/keras/layers/pooling/global_average_pooling1d.py index b8cc4058a..eb3cb4444 100644 --- a/keras/layers/pooling/global_average_pooling1d.py +++ b/keras/layers/pooling/global_average_pooling1d.py @@ -16,11 +16,13 @@ # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.layers.pooling.base_global_pooling1d import GlobalPooling1D +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export( "keras.layers.GlobalAveragePooling1D", "keras.layers.GlobalAvgPool1D" diff --git a/keras/layers/pooling/global_average_pooling2d.py b/keras/layers/pooling/global_average_pooling2d.py index 3d221c3a3..eaf2a5066 100644 --- a/keras/layers/pooling/global_average_pooling2d.py +++ b/keras/layers/pooling/global_average_pooling2d.py @@ -15,11 +15,12 @@ """Global average pooling 2D layer.""" # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import -from tensorflow.python.util.tf_export import keras_export - from keras import backend from keras.layers.pooling.base_global_pooling2d import GlobalPooling2D +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export( "keras.layers.GlobalAveragePooling2D", "keras.layers.GlobalAvgPool2D" diff --git a/keras/layers/pooling/global_average_pooling3d.py b/keras/layers/pooling/global_average_pooling3d.py index 36a50366d..4c76c7524 100644 --- a/keras/layers/pooling/global_average_pooling3d.py +++ b/keras/layers/pooling/global_average_pooling3d.py @@ -15,11 +15,12 @@ """Global average pooling 3D layer.""" # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import -from tensorflow.python.util.tf_export import keras_export - from keras import backend from keras.layers.pooling.base_global_pooling3d import GlobalPooling3D +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export( "keras.layers.GlobalAveragePooling3D", "keras.layers.GlobalAvgPool3D" diff --git a/keras/layers/pooling/global_max_pooling1d.py b/keras/layers/pooling/global_max_pooling1d.py index 26557a814..47dbd52ff 100644 --- a/keras/layers/pooling/global_max_pooling1d.py +++ b/keras/layers/pooling/global_max_pooling1d.py @@ -15,11 +15,12 @@ """Global max pooling 1D layer.""" # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import -from tensorflow.python.util.tf_export import keras_export - from keras import backend from keras.layers.pooling.base_global_pooling1d import GlobalPooling1D +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.GlobalMaxPool1D", "keras.layers.GlobalMaxPooling1D") class GlobalMaxPooling1D(GlobalPooling1D): diff --git a/keras/layers/pooling/global_max_pooling2d.py b/keras/layers/pooling/global_max_pooling2d.py index 8cfc7b9b7..42cec4ac7 100644 --- a/keras/layers/pooling/global_max_pooling2d.py +++ b/keras/layers/pooling/global_max_pooling2d.py @@ -15,11 +15,12 @@ """Global max pooling 2D layer.""" # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import -from tensorflow.python.util.tf_export import keras_export - from keras import backend from keras.layers.pooling.base_global_pooling2d import GlobalPooling2D +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.GlobalMaxPool2D", "keras.layers.GlobalMaxPooling2D") class GlobalMaxPooling2D(GlobalPooling2D): diff --git a/keras/layers/pooling/global_max_pooling3d.py b/keras/layers/pooling/global_max_pooling3d.py index 9c0db7784..9ef1f3576 100644 --- a/keras/layers/pooling/global_max_pooling3d.py +++ b/keras/layers/pooling/global_max_pooling3d.py @@ -15,11 +15,12 @@ """Global max pooling 3D layer.""" # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import -from tensorflow.python.util.tf_export import keras_export - from keras import backend from keras.layers.pooling.base_global_pooling3d import GlobalPooling3D +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.GlobalMaxPool3D", "keras.layers.GlobalMaxPooling3D") class GlobalMaxPooling3D(GlobalPooling3D): diff --git a/keras/layers/pooling/max_pooling1d.py b/keras/layers/pooling/max_pooling1d.py index 642cb5376..20647e9d0 100644 --- a/keras/layers/pooling/max_pooling1d.py +++ b/keras/layers/pooling/max_pooling1d.py @@ -17,11 +17,12 @@ import functools -from tensorflow.python.util.tf_export import keras_export - from keras import backend from keras.layers.pooling.base_pooling1d import Pooling1D +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.MaxPool1D", "keras.layers.MaxPooling1D") class MaxPooling1D(Pooling1D): diff --git a/keras/layers/pooling/max_pooling2d.py b/keras/layers/pooling/max_pooling2d.py index 8e335670a..99867f1fb 100644 --- a/keras/layers/pooling/max_pooling2d.py +++ b/keras/layers/pooling/max_pooling2d.py @@ -16,10 +16,12 @@ # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.layers.pooling.base_pooling2d import Pooling2D +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.MaxPool2D", "keras.layers.MaxPooling2D") class MaxPooling2D(Pooling2D): diff --git a/keras/layers/pooling/max_pooling3d.py b/keras/layers/pooling/max_pooling3d.py index cfeee79cd..e71b0c3fb 100644 --- a/keras/layers/pooling/max_pooling3d.py +++ b/keras/layers/pooling/max_pooling3d.py @@ -16,10 +16,12 @@ # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.layers.pooling.base_pooling3d import Pooling3D +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.MaxPool3D", "keras.layers.MaxPooling3D") class MaxPooling3D(Pooling3D): diff --git a/keras/layers/preprocessing/benchmarks/bucketized_column_dense_benchmark.py b/keras/layers/preprocessing/benchmarks/bucketized_column_dense_benchmark.py index 9176268d4..e13d5d971 100644 --- a/keras/layers/preprocessing/benchmarks/bucketized_column_dense_benchmark.py +++ b/keras/layers/preprocessing/benchmarks/bucketized_column_dense_benchmark.py @@ -16,9 +16,6 @@ import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.eager.def_function import ( - function as tf_function, -) import keras from keras.layers.preprocessing import discretization @@ -26,6 +23,11 @@ from keras.layers.preprocessing.benchmarks import ( feature_column_benchmark as fc_bm, ) +# isort: off +from tensorflow.python.eager.def_function import ( + function as tf_function, +) + NUM_REPEATS = 10 # The number of times to run each benchmark. BATCH_SIZES = [32, 256] diff --git a/keras/layers/preprocessing/benchmarks/category_hash_dense_benchmark.py b/keras/layers/preprocessing/benchmarks/category_hash_dense_benchmark.py index 16f4b7b79..19d6fb455 100644 --- a/keras/layers/preprocessing/benchmarks/category_hash_dense_benchmark.py +++ b/keras/layers/preprocessing/benchmarks/category_hash_dense_benchmark.py @@ -16,9 +16,6 @@ inputs.""" import tensorflow.compat.v2 as tf -from tensorflow.python.eager.def_function import ( - function as tf_function, -) import keras from keras.layers.preprocessing import hashing @@ -26,6 +23,11 @@ from keras.layers.preprocessing.benchmarks import ( feature_column_benchmark as fc_bm, ) +# isort: off +from tensorflow.python.eager.def_function import ( + function as tf_function, +) + NUM_REPEATS = 10 BATCH_SIZES = [32, 256] diff --git a/keras/layers/preprocessing/benchmarks/category_hash_varlen_benchmark.py b/keras/layers/preprocessing/benchmarks/category_hash_varlen_benchmark.py index c82726c3a..d0c06c391 100644 --- a/keras/layers/preprocessing/benchmarks/category_hash_varlen_benchmark.py +++ b/keras/layers/preprocessing/benchmarks/category_hash_varlen_benchmark.py @@ -16,9 +16,6 @@ varying-length inputs.""" import tensorflow.compat.v2 as tf -from tensorflow.python.eager.def_function import ( - function as tf_function, -) import keras from keras.layers.preprocessing import hashing @@ -26,6 +23,11 @@ from keras.layers.preprocessing.benchmarks import ( feature_column_benchmark as fc_bm, ) +# isort: off +from tensorflow.python.eager.def_function import ( + function as tf_function, +) + NUM_REPEATS = 10 BATCH_SIZES = [32, 256] diff --git a/keras/layers/preprocessing/benchmarks/category_vocab_file_dense_benchmark.py b/keras/layers/preprocessing/benchmarks/category_vocab_file_dense_benchmark.py index c65d9a91d..ccdb3227b 100644 --- a/keras/layers/preprocessing/benchmarks/category_vocab_file_dense_benchmark.py +++ b/keras/layers/preprocessing/benchmarks/category_vocab_file_dense_benchmark.py @@ -18,9 +18,6 @@ inputs.""" import os import tensorflow.compat.v2 as tf -from tensorflow.python.eager.def_function import ( - function as tf_function, -) import keras from keras.layers.preprocessing import string_lookup @@ -28,6 +25,11 @@ from keras.layers.preprocessing.benchmarks import ( feature_column_benchmark as fc_bm, ) +# isort: off +from tensorflow.python.eager.def_function import ( + function as tf_function, +) + NUM_REPEATS = 10 BATCH_SIZES = [32, 256] diff --git a/keras/layers/preprocessing/benchmarks/category_vocab_file_varlen_benchmark.py b/keras/layers/preprocessing/benchmarks/category_vocab_file_varlen_benchmark.py index 5ce50d299..ea93ced0b 100644 --- a/keras/layers/preprocessing/benchmarks/category_vocab_file_varlen_benchmark.py +++ b/keras/layers/preprocessing/benchmarks/category_vocab_file_varlen_benchmark.py @@ -18,9 +18,6 @@ varying-length inputs.""" import os import tensorflow.compat.v2 as tf -from tensorflow.python.eager.def_function import ( - function as tf_function, -) import keras from keras.layers.preprocessing import string_lookup @@ -28,6 +25,11 @@ from keras.layers.preprocessing.benchmarks import ( feature_column_benchmark as fc_bm, ) +# isort: off +from tensorflow.python.eager.def_function import ( + function as tf_function, +) + NUM_REPEATS = 10 BATCH_SIZES = [32, 256] diff --git a/keras/layers/preprocessing/benchmarks/category_vocab_list_dense_benchmark.py b/keras/layers/preprocessing/benchmarks/category_vocab_list_dense_benchmark.py index 3d92903e9..cf03d9fd9 100644 --- a/keras/layers/preprocessing/benchmarks/category_vocab_list_dense_benchmark.py +++ b/keras/layers/preprocessing/benchmarks/category_vocab_list_dense_benchmark.py @@ -16,9 +16,6 @@ inputs.""" import tensorflow.compat.v2 as tf -from tensorflow.python.eager.def_function import ( - function as tf_function, -) import keras from keras.layers.preprocessing import string_lookup @@ -26,6 +23,11 @@ from keras.layers.preprocessing.benchmarks import ( feature_column_benchmark as fc_bm, ) +# isort: off +from tensorflow.python.eager.def_function import ( + function as tf_function, +) + NUM_REPEATS = 10 BATCH_SIZES = [32, 256] diff --git a/keras/layers/preprocessing/benchmarks/category_vocab_list_indicator_dense_benchmark.py b/keras/layers/preprocessing/benchmarks/category_vocab_list_indicator_dense_benchmark.py index c3057f7b6..c73530f78 100644 --- a/keras/layers/preprocessing/benchmarks/category_vocab_list_indicator_dense_benchmark.py +++ b/keras/layers/preprocessing/benchmarks/category_vocab_list_indicator_dense_benchmark.py @@ -16,9 +16,6 @@ with dense inputs.""" import tensorflow.compat.v2 as tf -from tensorflow.python.eager.def_function import ( - function as tf_function, -) import keras from keras.layers.preprocessing import category_encoding @@ -27,6 +24,11 @@ from keras.layers.preprocessing.benchmarks import ( feature_column_benchmark as fc_bm, ) +# isort: off +from tensorflow.python.eager.def_function import ( + function as tf_function, +) + NUM_REPEATS = 10 BATCH_SIZES = [32, 256] diff --git a/keras/layers/preprocessing/benchmarks/category_vocab_list_indicator_varlen_benchmark.py b/keras/layers/preprocessing/benchmarks/category_vocab_list_indicator_varlen_benchmark.py index 3a566b531..77288d617 100644 --- a/keras/layers/preprocessing/benchmarks/category_vocab_list_indicator_varlen_benchmark.py +++ b/keras/layers/preprocessing/benchmarks/category_vocab_list_indicator_varlen_benchmark.py @@ -16,9 +16,6 @@ with varying-length inputs.""" import tensorflow.compat.v2 as tf -from tensorflow.python.eager.def_function import ( - function as tf_function, -) import keras from keras.layers.preprocessing import category_encoding @@ -27,6 +24,11 @@ from keras.layers.preprocessing.benchmarks import ( feature_column_benchmark as fc_bm, ) +# isort: off +from tensorflow.python.eager.def_function import ( + function as tf_function, +) + NUM_REPEATS = 10 BATCH_SIZES = [32, 256] diff --git a/keras/layers/preprocessing/benchmarks/category_vocab_list_varlen_benchmark.py b/keras/layers/preprocessing/benchmarks/category_vocab_list_varlen_benchmark.py index 31bd24770..7f846b3f5 100644 --- a/keras/layers/preprocessing/benchmarks/category_vocab_list_varlen_benchmark.py +++ b/keras/layers/preprocessing/benchmarks/category_vocab_list_varlen_benchmark.py @@ -16,9 +16,6 @@ varying-length inputs.""" import tensorflow.compat.v2 as tf -from tensorflow.python.eager.def_function import ( - function as tf_function, -) import keras from keras.layers.preprocessing import string_lookup @@ -26,6 +23,11 @@ from keras.layers.preprocessing.benchmarks import ( feature_column_benchmark as fc_bm, ) +# isort: off +from tensorflow.python.eager.def_function import ( + function as tf_function, +) + NUM_REPEATS = 10 BATCH_SIZES = [32, 256] diff --git a/keras/layers/preprocessing/benchmarks/embedding_dense_benchmark.py b/keras/layers/preprocessing/benchmarks/embedding_dense_benchmark.py index a0cec80bd..855466043 100644 --- a/keras/layers/preprocessing/benchmarks/embedding_dense_benchmark.py +++ b/keras/layers/preprocessing/benchmarks/embedding_dense_benchmark.py @@ -15,15 +15,17 @@ """Benchmark for KPL implementation of embedding column with dense inputs.""" import tensorflow.compat.v2 as tf -from tensorflow.python.eager.def_function import ( - function as tf_function, -) import keras from keras.layers.preprocessing.benchmarks import ( feature_column_benchmark as fc_bm, ) +# isort: off +from tensorflow.python.eager.def_function import ( + function as tf_function, +) + NUM_REPEATS = 10 BATCH_SIZES = [32, 256] diff --git a/keras/layers/preprocessing/benchmarks/embedding_varlen_benchmark.py b/keras/layers/preprocessing/benchmarks/embedding_varlen_benchmark.py index a876411b5..608f71630 100644 --- a/keras/layers/preprocessing/benchmarks/embedding_varlen_benchmark.py +++ b/keras/layers/preprocessing/benchmarks/embedding_varlen_benchmark.py @@ -16,15 +16,17 @@ inputs.""" import tensorflow.compat.v2 as tf -from tensorflow.python.eager.def_function import ( - function as tf_function, -) import keras from keras.layers.preprocessing.benchmarks import ( feature_column_benchmark as fc_bm, ) +# isort: off +from tensorflow.python.eager.def_function import ( + function as tf_function, +) + NUM_REPEATS = 10 BATCH_SIZES = [32, 256] diff --git a/keras/layers/preprocessing/benchmarks/hashed_crossing_benchmark.py b/keras/layers/preprocessing/benchmarks/hashed_crossing_benchmark.py index d5682c2fb..7ad385852 100644 --- a/keras/layers/preprocessing/benchmarks/hashed_crossing_benchmark.py +++ b/keras/layers/preprocessing/benchmarks/hashed_crossing_benchmark.py @@ -17,9 +17,6 @@ inputs.""" import tensorflow.compat.v2 as tf -from tensorflow.python.eager.def_function import ( - function as tf_function, -) import keras from keras.layers.preprocessing import hashed_crossing @@ -27,6 +24,11 @@ from keras.layers.preprocessing.benchmarks import ( feature_column_benchmark as fc_bm, ) +# isort: off +from tensorflow.python.eager.def_function import ( + function as tf_function, +) + NUM_REPEATS = 10 BATCH_SIZES = [32, 256] diff --git a/keras/layers/preprocessing/benchmarks/weighted_embedding_varlen_benchmark.py b/keras/layers/preprocessing/benchmarks/weighted_embedding_varlen_benchmark.py index 05da3deb9..0b4f74816 100644 --- a/keras/layers/preprocessing/benchmarks/weighted_embedding_varlen_benchmark.py +++ b/keras/layers/preprocessing/benchmarks/weighted_embedding_varlen_benchmark.py @@ -16,15 +16,17 @@ varying-length inputs.""" import tensorflow.compat.v2 as tf -from tensorflow.python.eager.def_function import ( - function as tf_function, -) import keras from keras.layers.preprocessing.benchmarks import ( feature_column_benchmark as fc_bm, ) +# isort: off +from tensorflow.python.eager.def_function import ( + function as tf_function, +) + NUM_REPEATS = 10 BATCH_SIZES = [32, 256] diff --git a/keras/layers/preprocessing/category_encoding.py b/keras/layers/preprocessing/category_encoding.py index 067fbb538..54014e6d1 100644 --- a/keras/layers/preprocessing/category_encoding.py +++ b/keras/layers/preprocessing/category_encoding.py @@ -18,8 +18,6 @@ import tensorflow.compat.v2 as tf -from tensorflow.python.platform import tf_logging as logging -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.engine import base_layer @@ -27,6 +25,10 @@ from keras.engine import base_preprocessing_layer from keras.layers.preprocessing import preprocessing_utils as utils from keras.utils import layer_utils +# isort: off +from tensorflow.python.platform import tf_logging as logging +from tensorflow.python.util.tf_export import keras_export + INT = utils.INT ONE_HOT = utils.ONE_HOT MULTI_HOT = utils.MULTI_HOT diff --git a/keras/layers/preprocessing/category_encoding_distribution_test.py b/keras/layers/preprocessing/category_encoding_distribution_test.py index b13c1970b..8be4b5cc5 100644 --- a/keras/layers/preprocessing/category_encoding_distribution_test.py +++ b/keras/layers/preprocessing/category_encoding_distribution_test.py @@ -17,9 +17,6 @@ import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.framework import ( - test_util as tf_test_utils, -) import keras from keras import backend @@ -29,6 +26,11 @@ from keras.layers.preprocessing import preprocessing_test_utils from keras.testing_infra import test_combinations from keras.testing_infra import test_utils +# isort: off +from tensorflow.python.framework import ( + test_util as tf_test_utils, +) + def batch_wrapper(dataset, batch_size, strategy, repeat=None): if repeat: diff --git a/keras/layers/preprocessing/discretization.py b/keras/layers/preprocessing/discretization.py index 7e969f695..901b189fc 100644 --- a/keras/layers/preprocessing/discretization.py +++ b/keras/layers/preprocessing/discretization.py @@ -19,8 +19,6 @@ import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.platform import tf_logging as logging -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.engine import base_preprocessing_layer @@ -28,6 +26,10 @@ from keras.layers.preprocessing import preprocessing_utils as utils from keras.utils import layer_utils from keras.utils import tf_utils +# isort: off +from tensorflow.python.platform import tf_logging as logging +from tensorflow.python.util.tf_export import keras_export + INT = utils.INT MULTI_HOT = utils.MULTI_HOT ONE_HOT = utils.ONE_HOT diff --git a/keras/layers/preprocessing/hashed_crossing.py b/keras/layers/preprocessing/hashed_crossing.py index 745a6f49d..7d65fd6c9 100644 --- a/keras/layers/preprocessing/hashed_crossing.py +++ b/keras/layers/preprocessing/hashed_crossing.py @@ -18,7 +18,6 @@ import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.engine import base_layer @@ -26,6 +25,9 @@ from keras.engine import base_preprocessing_layer from keras.layers.preprocessing import preprocessing_utils as utils from keras.utils import layer_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + INT = utils.INT ONE_HOT = utils.ONE_HOT diff --git a/keras/layers/preprocessing/hashing.py b/keras/layers/preprocessing/hashing.py index a1d8671c8..79e6f2ca0 100644 --- a/keras/layers/preprocessing/hashing.py +++ b/keras/layers/preprocessing/hashing.py @@ -18,7 +18,6 @@ import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.engine import base_layer @@ -26,6 +25,9 @@ from keras.engine import base_preprocessing_layer from keras.layers.preprocessing import preprocessing_utils as utils from keras.utils import layer_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + INT = utils.INT MULTI_HOT = utils.MULTI_HOT ONE_HOT = utils.ONE_HOT diff --git a/keras/layers/preprocessing/hashing_distribution_test.py b/keras/layers/preprocessing/hashing_distribution_test.py index 043f5383e..af6a1fab4 100644 --- a/keras/layers/preprocessing/hashing_distribution_test.py +++ b/keras/layers/preprocessing/hashing_distribution_test.py @@ -17,9 +17,6 @@ import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.framework import ( - test_util as tf_test_utils, -) import keras from keras import backend @@ -29,6 +26,11 @@ from keras.layers.preprocessing import preprocessing_test_utils from keras.testing_infra import test_combinations from keras.testing_infra import test_utils +# isort: off +from tensorflow.python.framework import ( + test_util as tf_test_utils, +) + @test_utils.run_v2_only @tf.__internal__.distribute.combinations.generate( diff --git a/keras/layers/preprocessing/image_preprocessing.py b/keras/layers/preprocessing/image_preprocessing.py index 8113829fa..ab8dda9be 100644 --- a/keras/layers/preprocessing/image_preprocessing.py +++ b/keras/layers/preprocessing/image_preprocessing.py @@ -19,9 +19,6 @@ import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.ops import stateless_random_ops -from tensorflow.python.util.tf_export import keras_export -from tensorflow.tools.docs import doc_controls from keras import backend from keras.engine import base_layer @@ -30,6 +27,11 @@ from keras.layers.preprocessing import preprocessing_utils as utils from keras.utils import image_utils from keras.utils import tf_utils +# isort: off +from tensorflow.python.ops import stateless_random_ops +from tensorflow.python.util.tf_export import keras_export +from tensorflow.tools.docs import doc_controls + H_AXIS = -3 W_AXIS = -2 diff --git a/keras/layers/preprocessing/image_preprocessing_test.py b/keras/layers/preprocessing/image_preprocessing_test.py index 4cdcc20b0..30994cc2c 100644 --- a/keras/layers/preprocessing/image_preprocessing_test.py +++ b/keras/layers/preprocessing/image_preprocessing_test.py @@ -19,7 +19,6 @@ import functools import numpy as np import tensorflow.compat.v2 as tf from absl.testing import parameterized -from tensorflow.python.ops import stateless_random_ops import keras from keras.engine import sequential @@ -27,6 +26,9 @@ from keras.layers.preprocessing import image_preprocessing from keras.testing_infra import test_combinations from keras.testing_infra import test_utils +# isort: off +from tensorflow.python.ops import stateless_random_ops + @test_combinations.run_all_keras_modes(always_skip_v1=True) class ResizingTest(test_combinations.TestCase): diff --git a/keras/layers/preprocessing/index_lookup.py b/keras/layers/preprocessing/index_lookup.py index 66c4a5e2d..b4a13fd06 100644 --- a/keras/layers/preprocessing/index_lookup.py +++ b/keras/layers/preprocessing/index_lookup.py @@ -21,7 +21,6 @@ import collections import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.platform import tf_logging as logging from keras import backend from keras.engine import base_layer_utils @@ -31,6 +30,9 @@ from keras.saving.saved_model import layer_serialization from keras.utils import layer_utils from keras.utils import tf_utils +# isort: off +from tensorflow.python.platform import tf_logging as logging + INT = utils.INT MULTI_HOT = utils.MULTI_HOT ONE_HOT = utils.ONE_HOT diff --git a/keras/layers/preprocessing/index_lookup_distribution_test.py b/keras/layers/preprocessing/index_lookup_distribution_test.py index 11358857c..eb9790b75 100644 --- a/keras/layers/preprocessing/index_lookup_distribution_test.py +++ b/keras/layers/preprocessing/index_lookup_distribution_test.py @@ -19,9 +19,6 @@ import os import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.framework import ( - test_util as tf_test_utils, -) import keras from keras import backend @@ -31,6 +28,11 @@ from keras.layers.preprocessing import preprocessing_test_utils from keras.testing_infra import test_combinations from keras.testing_infra import test_utils +# isort: off +from tensorflow.python.framework import ( + test_util as tf_test_utils, +) + @test_utils.run_v2_only @tf.__internal__.distribute.combinations.generate( diff --git a/keras/layers/preprocessing/integer_lookup.py b/keras/layers/preprocessing/integer_lookup.py index ff23a32b4..7ff31ddc2 100644 --- a/keras/layers/preprocessing/integer_lookup.py +++ b/keras/layers/preprocessing/integer_lookup.py @@ -19,12 +19,14 @@ import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.platform import tf_logging as logging -from tensorflow.python.util.tf_export import keras_export from keras.engine import base_preprocessing_layer from keras.layers.preprocessing import index_lookup +# isort: off +from tensorflow.python.platform import tf_logging as logging +from tensorflow.python.util.tf_export import keras_export + @keras_export( "keras.layers.IntegerLookup", @@ -432,7 +434,7 @@ class IntegerLookup(index_lookup.IndexLookup): time, any models using the layer should be re-compiled. For more information see `tf.keras.layers.experimental.preprocessing.PreprocessingLayer.adapt`. - + `adapt()` is meant only as a single machine utility to compute layer state. To analyze a dataset that cannot fit on a single machine, see [Tensorflow Transform]( diff --git a/keras/layers/preprocessing/normalization.py b/keras/layers/preprocessing/normalization.py index d3a20e1d6..c405c23cf 100644 --- a/keras/layers/preprocessing/normalization.py +++ b/keras/layers/preprocessing/normalization.py @@ -19,12 +19,14 @@ import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.engine import base_preprocessing_layer from keras.layers.preprocessing import preprocessing_utils as utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export( "keras.layers.Normalization", diff --git a/keras/layers/preprocessing/string_lookup.py b/keras/layers/preprocessing/string_lookup.py index 01f50f126..eafadf09f 100644 --- a/keras/layers/preprocessing/string_lookup.py +++ b/keras/layers/preprocessing/string_lookup.py @@ -16,11 +16,13 @@ import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.engine import base_preprocessing_layer from keras.layers.preprocessing import index_lookup +# isort: off +from tensorflow.python.util.tf_export import keras_export + # pylint: disable=g-classes-have-attributes diff --git a/keras/layers/preprocessing/text_vectorization.py b/keras/layers/preprocessing/text_vectorization.py index fd36b68a5..6e8251b33 100644 --- a/keras/layers/preprocessing/text_vectorization.py +++ b/keras/layers/preprocessing/text_vectorization.py @@ -19,7 +19,6 @@ import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.engine import base_preprocessing_layer @@ -29,6 +28,9 @@ from keras.saving.saved_model import layer_serialization from keras.utils import layer_utils from keras.utils import tf_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + LOWER_AND_STRIP_PUNCTUATION = "lower_and_strip_punctuation" STRIP_PUNCTUATION = "strip_punctuation" LOWER = "lower" diff --git a/keras/layers/preprocessing/text_vectorization_distribution_test.py b/keras/layers/preprocessing/text_vectorization_distribution_test.py index 80ff3b9d2..94087acac 100644 --- a/keras/layers/preprocessing/text_vectorization_distribution_test.py +++ b/keras/layers/preprocessing/text_vectorization_distribution_test.py @@ -17,9 +17,6 @@ import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.framework import ( - test_util as tf_test_utils, -) import keras from keras import backend @@ -29,6 +26,11 @@ from keras.layers.preprocessing import text_vectorization from keras.testing_infra import test_combinations from keras.testing_infra import test_utils +# isort: off +from tensorflow.python.framework import ( + test_util as tf_test_utils, +) + @test_utils.run_v2_only @tf.__internal__.distribute.combinations.generate( diff --git a/keras/layers/regularization/activity_regularization.py b/keras/layers/regularization/activity_regularization.py index c4a3ebc31..1e95c2ec4 100644 --- a/keras/layers/regularization/activity_regularization.py +++ b/keras/layers/regularization/activity_regularization.py @@ -15,11 +15,12 @@ """Contains the ActivityRegularization layer.""" # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import -from tensorflow.python.util.tf_export import keras_export - from keras import regularizers from keras.engine.base_layer import Layer +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.ActivityRegularization") class ActivityRegularization(Layer): diff --git a/keras/layers/regularization/alpha_dropout.py b/keras/layers/regularization/alpha_dropout.py index 67cb351ca..0089814b6 100644 --- a/keras/layers/regularization/alpha_dropout.py +++ b/keras/layers/regularization/alpha_dropout.py @@ -16,12 +16,14 @@ # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.engine import base_layer from keras.utils import tf_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.AlphaDropout") class AlphaDropout(base_layer.BaseRandomLayer): diff --git a/keras/layers/regularization/dropout.py b/keras/layers/regularization/dropout.py index 3ad5de47c..b86b9b43e 100644 --- a/keras/layers/regularization/dropout.py +++ b/keras/layers/regularization/dropout.py @@ -16,12 +16,14 @@ # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.engine import base_layer from keras.utils import control_flow_util +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.Dropout") class Dropout(base_layer.BaseRandomLayer): diff --git a/keras/layers/regularization/gaussian_dropout.py b/keras/layers/regularization/gaussian_dropout.py index 07bd6b5c1..380f5fc22 100644 --- a/keras/layers/regularization/gaussian_dropout.py +++ b/keras/layers/regularization/gaussian_dropout.py @@ -17,12 +17,14 @@ import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.engine import base_layer from keras.utils import tf_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.GaussianDropout") class GaussianDropout(base_layer.BaseRandomLayer): diff --git a/keras/layers/regularization/gaussian_noise.py b/keras/layers/regularization/gaussian_noise.py index 3298d0a0c..3f1c75f13 100644 --- a/keras/layers/regularization/gaussian_noise.py +++ b/keras/layers/regularization/gaussian_noise.py @@ -16,12 +16,14 @@ # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.engine import base_layer from keras.utils import tf_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.GaussianNoise") class GaussianNoise(base_layer.BaseRandomLayer): diff --git a/keras/layers/regularization/spatial_dropout1d.py b/keras/layers/regularization/spatial_dropout1d.py index 473d352b5..b58d5ef4b 100644 --- a/keras/layers/regularization/spatial_dropout1d.py +++ b/keras/layers/regularization/spatial_dropout1d.py @@ -16,11 +16,13 @@ # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.engine.input_spec import InputSpec from keras.layers.regularization.dropout import Dropout +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.SpatialDropout1D") class SpatialDropout1D(Dropout): diff --git a/keras/layers/regularization/spatial_dropout2d.py b/keras/layers/regularization/spatial_dropout2d.py index 40acc1968..1e901b016 100644 --- a/keras/layers/regularization/spatial_dropout2d.py +++ b/keras/layers/regularization/spatial_dropout2d.py @@ -16,12 +16,14 @@ # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.engine.input_spec import InputSpec from keras.layers.regularization.dropout import Dropout +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.SpatialDropout2D") class SpatialDropout2D(Dropout): diff --git a/keras/layers/regularization/spatial_dropout3d.py b/keras/layers/regularization/spatial_dropout3d.py index 71c981228..ae899bad4 100644 --- a/keras/layers/regularization/spatial_dropout3d.py +++ b/keras/layers/regularization/spatial_dropout3d.py @@ -16,12 +16,14 @@ # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.engine.input_spec import InputSpec from keras.layers.regularization.dropout import Dropout +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.SpatialDropout3D") class SpatialDropout3D(Dropout): diff --git a/keras/layers/reshaping/cropping1d.py b/keras/layers/reshaping/cropping1d.py index 95293c478..853bf3eec 100644 --- a/keras/layers/reshaping/cropping1d.py +++ b/keras/layers/reshaping/cropping1d.py @@ -16,12 +16,14 @@ # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.engine.base_layer import Layer from keras.engine.input_spec import InputSpec from keras.utils import conv_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.Cropping1D") class Cropping1D(Layer): diff --git a/keras/layers/reshaping/cropping2d.py b/keras/layers/reshaping/cropping2d.py index 939393cce..ff7e9cd45 100644 --- a/keras/layers/reshaping/cropping2d.py +++ b/keras/layers/reshaping/cropping2d.py @@ -16,12 +16,14 @@ # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.engine.base_layer import Layer from keras.engine.input_spec import InputSpec from keras.utils import conv_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.Cropping2D") class Cropping2D(Layer): diff --git a/keras/layers/reshaping/cropping3d.py b/keras/layers/reshaping/cropping3d.py index b21e97c87..f859facc2 100644 --- a/keras/layers/reshaping/cropping3d.py +++ b/keras/layers/reshaping/cropping3d.py @@ -16,12 +16,14 @@ # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.engine.base_layer import Layer from keras.engine.input_spec import InputSpec from keras.utils import conv_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.Cropping3D") class Cropping3D(Layer): diff --git a/keras/layers/reshaping/flatten.py b/keras/layers/reshaping/flatten.py index 8978d6cd2..70d7bc1bc 100644 --- a/keras/layers/reshaping/flatten.py +++ b/keras/layers/reshaping/flatten.py @@ -20,12 +20,14 @@ import operator import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.engine.base_layer import Layer from keras.engine.input_spec import InputSpec from keras.utils import conv_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.Flatten") class Flatten(Layer): diff --git a/keras/layers/reshaping/permute.py b/keras/layers/reshaping/permute.py index 82f233df4..63417e7de 100644 --- a/keras/layers/reshaping/permute.py +++ b/keras/layers/reshaping/permute.py @@ -18,11 +18,13 @@ import copy import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.engine.base_layer import Layer from keras.engine.input_spec import InputSpec +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.Permute") class Permute(Layer): diff --git a/keras/layers/reshaping/repeat_vector.py b/keras/layers/reshaping/repeat_vector.py index ee3282791..5c78c78f5 100644 --- a/keras/layers/reshaping/repeat_vector.py +++ b/keras/layers/reshaping/repeat_vector.py @@ -16,12 +16,14 @@ # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.engine.base_layer import Layer from keras.engine.input_spec import InputSpec +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.RepeatVector") class RepeatVector(Layer): diff --git a/keras/layers/reshaping/reshape.py b/keras/layers/reshaping/reshape.py index 33e06814a..05cc1f1d2 100644 --- a/keras/layers/reshaping/reshape.py +++ b/keras/layers/reshaping/reshape.py @@ -17,10 +17,12 @@ import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.engine.base_layer import Layer +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.Reshape") class Reshape(Layer): diff --git a/keras/layers/reshaping/up_sampling1d.py b/keras/layers/reshaping/up_sampling1d.py index 145b17363..4076669a1 100644 --- a/keras/layers/reshaping/up_sampling1d.py +++ b/keras/layers/reshaping/up_sampling1d.py @@ -16,12 +16,14 @@ # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.engine.base_layer import Layer from keras.engine.input_spec import InputSpec +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.UpSampling1D") class UpSampling1D(Layer): diff --git a/keras/layers/reshaping/up_sampling2d.py b/keras/layers/reshaping/up_sampling2d.py index a0e5b0817..c05cfc478 100644 --- a/keras/layers/reshaping/up_sampling2d.py +++ b/keras/layers/reshaping/up_sampling2d.py @@ -16,13 +16,15 @@ # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.engine.base_layer import Layer from keras.engine.input_spec import InputSpec from keras.utils import conv_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.UpSampling2D") class UpSampling2D(Layer): diff --git a/keras/layers/reshaping/up_sampling3d.py b/keras/layers/reshaping/up_sampling3d.py index d567900f8..b206bd3c4 100644 --- a/keras/layers/reshaping/up_sampling3d.py +++ b/keras/layers/reshaping/up_sampling3d.py @@ -16,13 +16,15 @@ # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.engine.base_layer import Layer from keras.engine.input_spec import InputSpec from keras.utils import conv_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.UpSampling3D") class UpSampling3D(Layer): diff --git a/keras/layers/reshaping/up_sampling_test.py b/keras/layers/reshaping/up_sampling_test.py index c768bf4d5..70ed79e63 100644 --- a/keras/layers/reshaping/up_sampling_test.py +++ b/keras/layers/reshaping/up_sampling_test.py @@ -17,14 +17,16 @@ import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.framework import ( - test_util as tf_test_utils, -) import keras from keras.testing_infra import test_combinations from keras.testing_infra import test_utils +# isort: off +from tensorflow.python.framework import ( + test_util as tf_test_utils, +) + @tf_test_utils.for_all_test_methods( tf_test_utils.disable_xla, "align_corners=False not supported by XLA" diff --git a/keras/layers/reshaping/zero_padding1d.py b/keras/layers/reshaping/zero_padding1d.py index edbaea406..1178337e9 100644 --- a/keras/layers/reshaping/zero_padding1d.py +++ b/keras/layers/reshaping/zero_padding1d.py @@ -16,13 +16,15 @@ # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.engine.base_layer import Layer from keras.engine.input_spec import InputSpec from keras.utils import conv_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.ZeroPadding1D") class ZeroPadding1D(Layer): diff --git a/keras/layers/reshaping/zero_padding2d.py b/keras/layers/reshaping/zero_padding2d.py index bb3d757d6..c7d3a2f49 100644 --- a/keras/layers/reshaping/zero_padding2d.py +++ b/keras/layers/reshaping/zero_padding2d.py @@ -16,13 +16,15 @@ # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.engine.base_layer import Layer from keras.engine.input_spec import InputSpec from keras.utils import conv_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.ZeroPadding2D") class ZeroPadding2D(Layer): diff --git a/keras/layers/reshaping/zero_padding3d.py b/keras/layers/reshaping/zero_padding3d.py index 9db4974c4..3e2ba318a 100644 --- a/keras/layers/reshaping/zero_padding3d.py +++ b/keras/layers/reshaping/zero_padding3d.py @@ -16,13 +16,15 @@ # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.engine.base_layer import Layer from keras.engine.input_spec import InputSpec from keras.utils import conv_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.ZeroPadding3D") class ZeroPadding3D(Layer): diff --git a/keras/layers/rnn/abstract_rnn_cell.py b/keras/layers/rnn/abstract_rnn_cell.py index 83617080f..14da640a3 100644 --- a/keras/layers/rnn/abstract_rnn_cell.py +++ b/keras/layers/rnn/abstract_rnn_cell.py @@ -15,11 +15,12 @@ """Base class for RNN cells.""" # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import -from tensorflow.python.util.tf_export import keras_export - from keras.engine import base_layer from keras.layers.rnn import rnn_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.AbstractRNNCell") class AbstractRNNCell(base_layer.Layer): diff --git a/keras/layers/rnn/base_rnn.py b/keras/layers/rnn/base_rnn.py index f0a4a3107..e58f14919 100644 --- a/keras/layers/rnn/base_rnn.py +++ b/keras/layers/rnn/base_rnn.py @@ -19,8 +19,6 @@ import collections import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export -from tensorflow.tools.docs import doc_controls from keras import backend from keras.engine import base_layer @@ -31,6 +29,10 @@ from keras.layers.rnn.stacked_rnn_cells import StackedRNNCells from keras.saving.saved_model import layer_serialization from keras.utils import generic_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export +from tensorflow.tools.docs import doc_controls + @keras_export("keras.layers.RNN") class RNN(base_layer.Layer): diff --git a/keras/layers/rnn/base_rnn_test.py b/keras/layers/rnn/base_rnn_test.py index c909fa115..864345c07 100644 --- a/keras/layers/rnn/base_rnn_test.py +++ b/keras/layers/rnn/base_rnn_test.py @@ -23,9 +23,6 @@ import collections import numpy as np import tensorflow.compat.v2 as tf from absl.testing import parameterized -from tensorflow.python.training.tracking import ( - util as trackable_util, -) import keras from keras.engine import base_layer_utils @@ -37,6 +34,11 @@ from keras.testing_infra import test_combinations from keras.testing_infra import test_utils from keras.utils import generic_utils +# isort: off +from tensorflow.python.training.tracking import ( + util as trackable_util, +) + # Used for nested input/output/state RNN test. NestedInput = collections.namedtuple("NestedInput", ["t1", "t2"]) NestedState = collections.namedtuple("NestedState", ["s1", "s2"]) diff --git a/keras/layers/rnn/base_wrapper.py b/keras/layers/rnn/base_wrapper.py index ba9ba0f4a..d31fa1d5f 100644 --- a/keras/layers/rnn/base_wrapper.py +++ b/keras/layers/rnn/base_wrapper.py @@ -20,11 +20,12 @@ Wrappers are layers that augment the functionality of another layer. import copy -from tensorflow.python.util.tf_export import keras_export - from keras.engine.base_layer import Layer from keras.utils import generic_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.Wrapper") class Wrapper(Layer): diff --git a/keras/layers/rnn/bidirectional.py b/keras/layers/rnn/bidirectional.py index 18ef8d11e..201c384a0 100644 --- a/keras/layers/rnn/bidirectional.py +++ b/keras/layers/rnn/bidirectional.py @@ -18,7 +18,6 @@ import copy import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.engine.base_layer import Layer @@ -29,6 +28,9 @@ from keras.utils import generic_utils from keras.utils import tf_inspect from keras.utils import tf_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.Bidirectional") class Bidirectional(Wrapper): diff --git a/keras/layers/rnn/bidirectional_test.py b/keras/layers/rnn/bidirectional_test.py index 04d7610f8..3dd43f401 100644 --- a/keras/layers/rnn/bidirectional_test.py +++ b/keras/layers/rnn/bidirectional_test.py @@ -20,12 +20,6 @@ import copy import numpy as np import tensorflow.compat.v2 as tf from absl.testing import parameterized -from tensorflow.python.framework import ( - test_util as tf_test_util, -) -from tensorflow.python.training.tracking import ( - util as trackable_util, -) import keras from keras.engine import base_layer_utils @@ -35,6 +29,14 @@ from keras.testing_infra import test_combinations from keras.testing_infra import test_utils from keras.utils import generic_utils +# isort: off +from tensorflow.python.framework import ( + test_util as tf_test_util, +) +from tensorflow.python.training.tracking import ( + util as trackable_util, +) + class _RNNCellWithConstants(keras.layers.Layer): def __init__(self, units, constant_size, **kwargs): diff --git a/keras/layers/rnn/cell_wrappers.py b/keras/layers/rnn/cell_wrappers.py index 751f9ab8f..d21908c4f 100644 --- a/keras/layers/rnn/cell_wrappers.py +++ b/keras/layers/rnn/cell_wrappers.py @@ -28,13 +28,15 @@ import types as python_types import warnings import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import tf_export from keras.layers.rnn import lstm from keras.layers.rnn.abstract_rnn_cell import AbstractRNNCell from keras.utils import generic_utils from keras.utils import tf_inspect +# isort: off +from tensorflow.python.util.tf_export import tf_export + class _RNNCellWrapper(AbstractRNNCell): """Base class for cells wrappers V2 compatibility. diff --git a/keras/layers/rnn/conv_lstm1d.py b/keras/layers/rnn/conv_lstm1d.py index d251ad8c5..1f19a7981 100644 --- a/keras/layers/rnn/conv_lstm1d.py +++ b/keras/layers/rnn/conv_lstm1d.py @@ -15,10 +15,11 @@ """1D Convolutional LSTM layer.""" # pylint: disable=g-classes-have-attributes,disable=g-direct-tensorflow-import -from tensorflow.python.util.tf_export import keras_export - from keras.layers.rnn.base_conv_lstm import ConvLSTM +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.ConvLSTM1D") class ConvLSTM1D(ConvLSTM): diff --git a/keras/layers/rnn/conv_lstm2d.py b/keras/layers/rnn/conv_lstm2d.py index 9324ed51d..bf457a1c7 100644 --- a/keras/layers/rnn/conv_lstm2d.py +++ b/keras/layers/rnn/conv_lstm2d.py @@ -15,10 +15,11 @@ """2D Convolutional LSTM layer.""" # pylint: disable=g-classes-have-attributes,disable=g-direct-tensorflow-import -from tensorflow.python.util.tf_export import keras_export - from keras.layers.rnn.base_conv_lstm import ConvLSTM +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.ConvLSTM2D") class ConvLSTM2D(ConvLSTM): diff --git a/keras/layers/rnn/conv_lstm3d.py b/keras/layers/rnn/conv_lstm3d.py index 2e49a3eb4..bb93bbff5 100644 --- a/keras/layers/rnn/conv_lstm3d.py +++ b/keras/layers/rnn/conv_lstm3d.py @@ -15,10 +15,11 @@ """3D Convolutional LSTM layer.""" # pylint: disable=g-classes-have-attributes,disable=g-direct-tensorflow-import -from tensorflow.python.util.tf_export import keras_export - from keras.layers.rnn.base_conv_lstm import ConvLSTM +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.ConvLSTM3D") class ConvLSTM3D(ConvLSTM): diff --git a/keras/layers/rnn/cudnn_gru.py b/keras/layers/rnn/cudnn_gru.py index 0c82aa18e..faf69b08f 100644 --- a/keras/layers/rnn/cudnn_gru.py +++ b/keras/layers/rnn/cudnn_gru.py @@ -18,7 +18,6 @@ import collections import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import constraints from keras import initializers @@ -26,6 +25,9 @@ from keras import regularizers from keras.layers.rnn import gru_lstm_utils from keras.layers.rnn.base_cudnn_rnn import _CuDNNRNN +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export(v1=["keras.layers.CuDNNGRU"]) class CuDNNGRU(_CuDNNRNN): diff --git a/keras/layers/rnn/cudnn_lstm.py b/keras/layers/rnn/cudnn_lstm.py index bbcb0549b..e2446a1b4 100644 --- a/keras/layers/rnn/cudnn_lstm.py +++ b/keras/layers/rnn/cudnn_lstm.py @@ -18,7 +18,6 @@ import collections import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import constraints from keras import initializers @@ -26,6 +25,9 @@ from keras import regularizers from keras.layers.rnn import gru_lstm_utils from keras.layers.rnn.base_cudnn_rnn import _CuDNNRNN +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export(v1=["keras.layers.CuDNNLSTM"]) class CuDNNLSTM(_CuDNNRNN): diff --git a/keras/layers/rnn/cudnn_test.py b/keras/layers/rnn/cudnn_test.py index 348f8c4a3..fb75f77bb 100644 --- a/keras/layers/rnn/cudnn_test.py +++ b/keras/layers/rnn/cudnn_test.py @@ -20,15 +20,17 @@ import tempfile import numpy as np import tensorflow.compat.v2 as tf from absl.testing import parameterized -from tensorflow.python.framework import ( - test_util as tf_test_utils, -) import keras from keras.optimizers.optimizer_v2.rmsprop import RMSprop from keras.testing_infra import test_combinations from keras.testing_infra import test_utils +# isort: off +from tensorflow.python.framework import ( + test_util as tf_test_utils, +) + @test_combinations.run_all_keras_modes class CuDNNTest(test_combinations.TestCase): diff --git a/keras/layers/rnn/gru.py b/keras/layers/rnn/gru.py index bfe0f64aa..dd1ba6ee6 100644 --- a/keras/layers/rnn/gru.py +++ b/keras/layers/rnn/gru.py @@ -18,8 +18,6 @@ import uuid import tensorflow.compat.v2 as tf -from tensorflow.python.platform import tf_logging as logging -from tensorflow.python.util.tf_export import keras_export from keras import activations from keras import backend @@ -34,6 +32,10 @@ from keras.layers.rnn.base_rnn import RNN from keras.layers.rnn.dropout_rnn_cell_mixin import DropoutRNNCellMixin from keras.utils import tf_utils +# isort: off +from tensorflow.python.platform import tf_logging as logging +from tensorflow.python.util.tf_export import keras_export + RECURRENT_DROPOUT_WARNING_MSG = ( "RNN `implementation=2` is not supported when `recurrent_dropout` is set. " "Using `implementation=1`." diff --git a/keras/layers/rnn/gru_lstm_utils.py b/keras/layers/rnn/gru_lstm_utils.py index 9bee2af34..0b25b9fb9 100644 --- a/keras/layers/rnn/gru_lstm_utils.py +++ b/keras/layers/rnn/gru_lstm_utils.py @@ -18,6 +18,8 @@ import uuid import tensorflow.compat.v2 as tf + +# isort: off from tensorflow.python.eager.context import get_device_name # The following string constants are used by Defun approach for unified backend diff --git a/keras/layers/rnn/gru_test.py b/keras/layers/rnn/gru_test.py index 0dfb4af5a..4584a7ed4 100644 --- a/keras/layers/rnn/gru_test.py +++ b/keras/layers/rnn/gru_test.py @@ -22,10 +22,6 @@ import shutil import numpy as np import tensorflow.compat.v2 as tf from absl.testing import parameterized -from tensorflow.core.protobuf import rewriter_config_pb2 -from tensorflow.python.framework import ( - test_util as tf_test_util, -) import keras from keras.layers.rnn import gru_lstm_utils @@ -33,6 +29,12 @@ from keras.testing_infra import test_combinations from keras.testing_infra import test_utils from keras.utils import np_utils +# isort: off +from tensorflow.core.protobuf import rewriter_config_pb2 +from tensorflow.python.framework import ( + test_util as tf_test_util, +) + # Global config for grappler setting that is used for graph mode test. _rewrites = rewriter_config_pb2.RewriterConfig() _rewrites.implementation_selector = rewriter_config_pb2.RewriterConfig.ON diff --git a/keras/layers/rnn/gru_v1.py b/keras/layers/rnn/gru_v1.py index 7d0d18c57..d7ca7569b 100644 --- a/keras/layers/rnn/gru_v1.py +++ b/keras/layers/rnn/gru_v1.py @@ -15,9 +15,6 @@ """Gated Recurrent Unit V1 layer.""" # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import -from tensorflow.python.platform import tf_logging as logging -from tensorflow.python.util.tf_export import keras_export - from keras import activations from keras import constraints from keras import initializers @@ -27,6 +24,10 @@ from keras.layers.rnn import gru from keras.layers.rnn import rnn_utils from keras.layers.rnn.base_rnn import RNN +# isort: off +from tensorflow.python.platform import tf_logging as logging +from tensorflow.python.util.tf_export import keras_export + @keras_export(v1=["keras.layers.GRUCell"]) class GRUCell(gru.GRUCell): diff --git a/keras/layers/rnn/legacy_cell_wrappers.py b/keras/layers/rnn/legacy_cell_wrappers.py index 8ca85270d..e0b852c09 100644 --- a/keras/layers/rnn/legacy_cell_wrappers.py +++ b/keras/layers/rnn/legacy_cell_wrappers.py @@ -23,14 +23,16 @@ import hashlib import numbers import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export -from tensorflow.python.util.tf_export import tf_export from keras.layers.rnn.cell_wrappers import _enumerated_map_structure_up_to from keras.layers.rnn.cell_wrappers import _parse_config_to_function from keras.layers.rnn.cell_wrappers import _serialize_function_to_config from keras.layers.rnn.legacy_cells import RNNCell +# isort: off +from tensorflow.python.util.tf_export import keras_export +from tensorflow.python.util.tf_export import tf_export + # This can be used with self.assertRaisesRegexp for assert_like_rnncell. ASSERT_LIKE_RNNCELL_ERROR_REGEXP = "is not an RNNCell" diff --git a/keras/layers/rnn/legacy_cells.py b/keras/layers/rnn/legacy_cells.py index f86739461..6a7f6158d 100644 --- a/keras/layers/rnn/legacy_cells.py +++ b/keras/layers/rnn/legacy_cells.py @@ -30,9 +30,6 @@ import collections import warnings import tensorflow.compat.v2 as tf -from tensorflow.python.platform import tf_logging as logging -from tensorflow.python.util.tf_export import keras_export -from tensorflow.python.util.tf_export import tf_export from keras import activations from keras import backend @@ -42,6 +39,11 @@ from keras.engine import input_spec from keras.legacy_tf_layers import base as base_layer from keras.utils import tf_utils +# isort: off +from tensorflow.python.platform import tf_logging as logging +from tensorflow.python.util.tf_export import keras_export +from tensorflow.python.util.tf_export import tf_export + _BIAS_VARIABLE_NAME = "bias" _WEIGHTS_VARIABLE_NAME = "kernel" diff --git a/keras/layers/rnn/lstm.py b/keras/layers/rnn/lstm.py index a05fc496a..52271426a 100644 --- a/keras/layers/rnn/lstm.py +++ b/keras/layers/rnn/lstm.py @@ -18,8 +18,6 @@ import uuid import tensorflow.compat.v2 as tf -from tensorflow.python.platform import tf_logging as logging -from tensorflow.python.util.tf_export import keras_export from keras import activations from keras import backend @@ -34,6 +32,10 @@ from keras.layers.rnn.base_rnn import RNN from keras.layers.rnn.dropout_rnn_cell_mixin import DropoutRNNCellMixin from keras.utils import tf_utils +# isort: off +from tensorflow.python.platform import tf_logging as logging +from tensorflow.python.util.tf_export import keras_export + RECURRENT_DROPOUT_WARNING_MSG = ( "RNN `implementation=2` is not supported when `recurrent_dropout` is set. " "Using `implementation=1`." diff --git a/keras/layers/rnn/lstm_test.py b/keras/layers/rnn/lstm_test.py index 999e6426a..377033107 100644 --- a/keras/layers/rnn/lstm_test.py +++ b/keras/layers/rnn/lstm_test.py @@ -22,10 +22,6 @@ import shutil import numpy as np import tensorflow.compat.v2 as tf from absl.testing import parameterized -from tensorflow.core.protobuf import rewriter_config_pb2 -from tensorflow.python.framework import ( - test_util as tf_test_util, -) import keras from keras.layers.rnn import gru_lstm_utils @@ -33,6 +29,12 @@ from keras.testing_infra import test_combinations from keras.testing_infra import test_utils from keras.utils import np_utils +# isort: off +from tensorflow.core.protobuf import rewriter_config_pb2 +from tensorflow.python.framework import ( + test_util as tf_test_util, +) + # Global config for grappler setting that is used for graph mode test. _rewrites = rewriter_config_pb2.RewriterConfig() _rewrites.implementation_selector = rewriter_config_pb2.RewriterConfig.ON diff --git a/keras/layers/rnn/lstm_v1.py b/keras/layers/rnn/lstm_v1.py index 8c2fb1df6..61739aafe 100644 --- a/keras/layers/rnn/lstm_v1.py +++ b/keras/layers/rnn/lstm_v1.py @@ -15,9 +15,6 @@ """Long Short-Term Memory V1 layer.""" # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import -from tensorflow.python.platform import tf_logging as logging -from tensorflow.python.util.tf_export import keras_export - from keras import activations from keras import constraints from keras import initializers @@ -27,6 +24,10 @@ from keras.layers.rnn import lstm from keras.layers.rnn import rnn_utils from keras.layers.rnn.base_rnn import RNN +# isort: off +from tensorflow.python.platform import tf_logging as logging +from tensorflow.python.util.tf_export import keras_export + @keras_export(v1=["keras.layers.LSTMCell"]) class LSTMCell(lstm.LSTMCell): diff --git a/keras/layers/rnn/lstm_v1_test.py b/keras/layers/rnn/lstm_v1_test.py index 8952927e3..fb4b9baf7 100644 --- a/keras/layers/rnn/lstm_v1_test.py +++ b/keras/layers/rnn/lstm_v1_test.py @@ -20,8 +20,6 @@ import time import numpy as np import tensorflow.compat.v2 as tf from absl.testing import parameterized -from tensorflow.core.protobuf import rewriter_config_pb2 -from tensorflow.python.platform import tf_logging as logging import keras from keras.layers.rnn import lstm @@ -30,6 +28,10 @@ from keras.testing_infra import test_combinations from keras.testing_infra import test_utils from keras.utils import np_utils +# isort: off +from tensorflow.core.protobuf import rewriter_config_pb2 +from tensorflow.python.platform import tf_logging as logging + # Global config for grappler setting that is used for graph mode test. _rewrites = rewriter_config_pb2.RewriterConfig() _rewrites.implementation_selector = rewriter_config_pb2.RewriterConfig.ON diff --git a/keras/layers/rnn/rnn_utils.py b/keras/layers/rnn/rnn_utils.py index 529d25df3..166944c02 100644 --- a/keras/layers/rnn/rnn_utils.py +++ b/keras/layers/rnn/rnn_utils.py @@ -16,10 +16,12 @@ # pylint: disable=protected-access import tensorflow.compat.v2 as tf -from tensorflow.python.platform import tf_logging as logging from keras.utils import control_flow_util +# isort: off +from tensorflow.python.platform import tf_logging as logging + def standardize_args(inputs, initial_state, constants, num_constants): """Standardizes `__call__` to a single list of tensor inputs. diff --git a/keras/layers/rnn/simple_rnn.py b/keras/layers/rnn/simple_rnn.py index 62bef3c91..0d6563917 100644 --- a/keras/layers/rnn/simple_rnn.py +++ b/keras/layers/rnn/simple_rnn.py @@ -16,8 +16,6 @@ # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.platform import tf_logging as logging -from tensorflow.python.util.tf_export import keras_export from keras import activations from keras import backend @@ -31,6 +29,10 @@ from keras.layers.rnn.base_rnn import RNN from keras.layers.rnn.dropout_rnn_cell_mixin import DropoutRNNCellMixin from keras.utils import tf_utils +# isort: off +from tensorflow.python.platform import tf_logging as logging +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.SimpleRNNCell") class SimpleRNNCell(DropoutRNNCellMixin, base_layer.BaseRandomLayer): diff --git a/keras/layers/rnn/stacked_rnn_cells.py b/keras/layers/rnn/stacked_rnn_cells.py index ae45aea36..c86e77adb 100644 --- a/keras/layers/rnn/stacked_rnn_cells.py +++ b/keras/layers/rnn/stacked_rnn_cells.py @@ -18,8 +18,6 @@ import functools import tensorflow.compat.v2 as tf -from tensorflow.python.platform import tf_logging as logging -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.engine import base_layer @@ -27,6 +25,10 @@ from keras.layers.rnn import rnn_utils from keras.utils import generic_utils from keras.utils import tf_utils +# isort: off +from tensorflow.python.platform import tf_logging as logging +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.StackedRNNCells") class StackedRNNCells(base_layer.Layer): diff --git a/keras/layers/rnn/time_distributed.py b/keras/layers/rnn/time_distributed.py index 4f4cb34d5..304f8d623 100644 --- a/keras/layers/rnn/time_distributed.py +++ b/keras/layers/rnn/time_distributed.py @@ -16,7 +16,6 @@ # pylint: disable=g-classes-have-attributes,g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.engine.base_layer import Layer @@ -26,6 +25,9 @@ from keras.utils import generic_utils from keras.utils import layer_utils from keras.utils import tf_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.layers.TimeDistributed") class TimeDistributed(Wrapper): diff --git a/keras/layers/rnn/time_distributed_test.py b/keras/layers/rnn/time_distributed_test.py index d4f7e0696..2fdf88cd8 100644 --- a/keras/layers/rnn/time_distributed_test.py +++ b/keras/layers/rnn/time_distributed_test.py @@ -18,14 +18,16 @@ import numpy as np import tensorflow.compat.v2 as tf from absl.testing import parameterized -from tensorflow.python.training.tracking import ( - util as trackable_util, -) import keras from keras.testing_infra import test_combinations from keras.testing_infra import test_utils +# isort: off +from tensorflow.python.training.tracking import ( + util as trackable_util, +) + class TimeDistributedTest(test_combinations.TestCase): @test_combinations.generate( diff --git a/keras/layers/serialization.py b/keras/layers/serialization.py index ebbc1a621..8f25202e1 100644 --- a/keras/layers/serialization.py +++ b/keras/layers/serialization.py @@ -17,9 +17,7 @@ import threading import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export -import threading from keras.engine import base_layer from keras.engine import input_layer from keras.engine import input_spec @@ -56,6 +54,9 @@ from keras.saving.saved_model import json_utils from keras.utils import generic_utils from keras.utils import tf_inspect as inspect +# isort: off +from tensorflow.python.util.tf_export import keras_export + ALL_MODULES = ( base_layer, input_layer, diff --git a/keras/legacy_tf_layers/base.py b/keras/legacy_tf_layers/base.py index afb299d5e..c8b881005 100644 --- a/keras/legacy_tf_layers/base.py +++ b/keras/legacy_tf_layers/base.py @@ -22,9 +22,6 @@ import copy import warnings import tensorflow.compat.v2 as tf -from tensorflow.python.ops import variable_scope as vs -from tensorflow.python.util.tf_export import keras_export -from tensorflow.python.util.tf_export import tf_export from keras import backend from keras.engine import base_layer_utils @@ -33,6 +30,11 @@ from keras.legacy_tf_layers import variable_scope_shim from keras.mixed_precision import policy from keras.utils import tf_contextlib +# isort: off +from tensorflow.python.ops import variable_scope as vs +from tensorflow.python.util.tf_export import keras_export +from tensorflow.python.util.tf_export import tf_export + _KERAS_STYLE_SCOPE = False diff --git a/keras/legacy_tf_layers/convolutional.py b/keras/legacy_tf_layers/convolutional.py index b77904fbf..ec5940fea 100644 --- a/keras/legacy_tf_layers/convolutional.py +++ b/keras/legacy_tf_layers/convolutional.py @@ -21,12 +21,14 @@ from __future__ import print_function import warnings import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export -from tensorflow.python.util.tf_export import tf_export from keras import layers as keras_layers from keras.legacy_tf_layers import base +# isort: off +from tensorflow.python.util.tf_export import keras_export +from tensorflow.python.util.tf_export import tf_export + @keras_export(v1=["keras.__internal__.legacy.layers.Conv1D"]) @tf_export(v1=["layers.Conv1D"]) diff --git a/keras/legacy_tf_layers/core.py b/keras/legacy_tf_layers/core.py index 944626042..f2bab9655 100644 --- a/keras/legacy_tf_layers/core.py +++ b/keras/legacy_tf_layers/core.py @@ -24,12 +24,14 @@ from __future__ import print_function import warnings import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export -from tensorflow.python.util.tf_export import tf_export from keras import layers as keras_layers from keras.legacy_tf_layers import base +# isort: off +from tensorflow.python.util.tf_export import keras_export +from tensorflow.python.util.tf_export import tf_export + @keras_export(v1=["keras.__internal__.legacy.layers.Dense"]) @tf_export(v1=["layers.Dense"]) diff --git a/keras/legacy_tf_layers/core_test.py b/keras/legacy_tf_layers/core_test.py index ad575119a..6237ca053 100644 --- a/keras/legacy_tf_layers/core_test.py +++ b/keras/legacy_tf_layers/core_test.py @@ -24,14 +24,16 @@ import platform import numpy as np import tensorflow.compat.v2 as tf from absl.testing import parameterized + +from keras.legacy_tf_layers import core as core_layers +from keras.testing_infra import test_combinations + +# isort: off from tensorflow.python.framework import ( test_util as tf_test_utils, ) from tensorflow.python.ops import variable_scope -from keras.legacy_tf_layers import core as core_layers -from keras.testing_infra import test_combinations - class DenseTest(tf.test.TestCase, parameterized.TestCase): @test_combinations.generate( diff --git a/keras/legacy_tf_layers/migration_utils.py b/keras/legacy_tf_layers/migration_utils.py index 0f6ecdb13..242f6a8fc 100644 --- a/keras/legacy_tf_layers/migration_utils.py +++ b/keras/legacy_tf_layers/migration_utils.py @@ -8,6 +8,8 @@ eager execution. import sys import tensorflow.compat.v2 as tf + +# isort: off from tensorflow.python.util.tf_export import keras_export diff --git a/keras/legacy_tf_layers/normalization.py b/keras/legacy_tf_layers/normalization.py index 5a1201253..e94b5d2fa 100644 --- a/keras/legacy_tf_layers/normalization.py +++ b/keras/legacy_tf_layers/normalization.py @@ -21,12 +21,14 @@ from __future__ import print_function import warnings import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export -from tensorflow.python.util.tf_export import tf_export from keras.layers.normalization import batch_normalization_v1 from keras.legacy_tf_layers import base +# isort: off +from tensorflow.python.util.tf_export import keras_export +from tensorflow.python.util.tf_export import tf_export + @keras_export(v1=["keras.__internal__.legacy.layers.BatchNormalization"]) @tf_export(v1=["layers.BatchNormalization"]) diff --git a/keras/legacy_tf_layers/normalization_test.py b/keras/legacy_tf_layers/normalization_test.py index 6ab2edaa8..81db03859 100644 --- a/keras/legacy_tf_layers/normalization_test.py +++ b/keras/legacy_tf_layers/normalization_test.py @@ -22,14 +22,16 @@ import os import numpy as np import tensorflow.compat.v2 as tf + +from keras.legacy_tf_layers import convolutional as conv_layers +from keras.legacy_tf_layers import normalization as normalization_layers + +# isort: off from tensorflow.core.protobuf import saver_pb2 from tensorflow.python.framework import ( test_util as tf_test_utils, ) -from keras.legacy_tf_layers import convolutional as conv_layers -from keras.legacy_tf_layers import normalization as normalization_layers - @tf_test_utils.run_v1_only("b/120545219") class BNTest(tf.test.TestCase): diff --git a/keras/legacy_tf_layers/pooling.py b/keras/legacy_tf_layers/pooling.py index f2d1c14f1..0fb3c1f54 100644 --- a/keras/legacy_tf_layers/pooling.py +++ b/keras/legacy_tf_layers/pooling.py @@ -20,12 +20,13 @@ from __future__ import print_function import warnings -from tensorflow.python.util.tf_export import keras_export -from tensorflow.python.util.tf_export import tf_export - from keras import layers as keras_layers from keras.legacy_tf_layers import base +# isort: off +from tensorflow.python.util.tf_export import keras_export +from tensorflow.python.util.tf_export import tf_export + @keras_export(v1=["keras.__internal__.legacy.layers.AveragePooling1D"]) @tf_export(v1=["layers.AveragePooling1D"]) diff --git a/keras/legacy_tf_layers/pooling_test.py b/keras/legacy_tf_layers/pooling_test.py index 77b3fd6fd..a60049897 100644 --- a/keras/legacy_tf_layers/pooling_test.py +++ b/keras/legacy_tf_layers/pooling_test.py @@ -19,12 +19,14 @@ from __future__ import division from __future__ import print_function import tensorflow.compat.v2 as tf + +from keras.legacy_tf_layers import pooling as pooling_layers + +# isort: off from tensorflow.python.framework import ( test_util as tf_test_utils, ) -from keras.legacy_tf_layers import pooling as pooling_layers - class PoolingTest(tf.test.TestCase): def testInvalidDataFormat(self): diff --git a/keras/legacy_tf_layers/variable_scope_shim.py b/keras/legacy_tf_layers/variable_scope_shim.py index a935060c9..844500a40 100644 --- a/keras/legacy_tf_layers/variable_scope_shim.py +++ b/keras/legacy_tf_layers/variable_scope_shim.py @@ -22,14 +22,16 @@ import contextlib import functools import tensorflow.compat.v2 as tf -from tensorflow.python.ops import variable_scope as vs -from tensorflow.python.platform import tf_logging as logging -from tensorflow.python.util.tf_export import keras_export from keras.engine import base_layer from keras.utils import layer_utils from keras.utils import tf_inspect +# isort: off +from tensorflow.python.ops import variable_scope as vs +from tensorflow.python.platform import tf_logging as logging +from tensorflow.python.util.tf_export import keras_export + def as_shape(shape): """Converts the given object to a TensorShape.""" diff --git a/keras/legacy_tf_layers/variable_scope_shim_test.py b/keras/legacy_tf_layers/variable_scope_shim_test.py index 0f38ca7de..c77052f23 100644 --- a/keras/legacy_tf_layers/variable_scope_shim_test.py +++ b/keras/legacy_tf_layers/variable_scope_shim_test.py @@ -24,10 +24,6 @@ import threading import numpy import tensorflow as tf from absl.testing import parameterized -from tensorflow.python.framework import ( - test_util as tf_test_utils, -) -from tensorflow.python.ops import variable_scope from keras import models from keras import regularizers @@ -39,6 +35,12 @@ from keras.legacy_tf_layers import core as core_layers from keras.legacy_tf_layers import variable_scope_shim from keras.testing_infra import test_combinations +# isort: off +from tensorflow.python.framework import ( + test_util as tf_test_utils, +) +from tensorflow.python.ops import variable_scope + def run_inside_wrap_function_in_eager_mode(graph_function): """Decorator to execute the same graph code in eager and graph modes. diff --git a/keras/losses.py b/keras/losses.py index 905308eb5..3bf98d2ce 100644 --- a/keras/losses.py +++ b/keras/losses.py @@ -20,11 +20,6 @@ import abc import functools import tensorflow.compat.v2 as tf -from tensorflow.python.ops.ragged import ragged_map_ops -from tensorflow.python.ops.ragged import ragged_util -from tensorflow.python.util import dispatch -from tensorflow.python.util.tf_export import keras_export -from tensorflow.tools.docs import doc_controls from keras import backend from keras.saving.experimental import saving_lib @@ -34,6 +29,13 @@ from keras.utils import tf_utils from keras.utils.generic_utils import deserialize_keras_object from keras.utils.generic_utils import serialize_keras_object +# isort: off +from tensorflow.python.ops.ragged import ragged_map_ops +from tensorflow.python.ops.ragged import ragged_util +from tensorflow.python.util import dispatch +from tensorflow.python.util.tf_export import keras_export +from tensorflow.tools.docs import doc_controls + @keras_export("keras.losses.Loss") class Loss: diff --git a/keras/losses_test.py b/keras/losses_test.py index 7ebf5c73e..c8980c89a 100644 --- a/keras/losses_test.py +++ b/keras/losses_test.py @@ -17,9 +17,6 @@ import numpy as np import tensorflow.compat.v2 as tf from absl.testing import parameterized -from tensorflow.python.autograph.impl import ( - api as autograph, -) from keras import activations from keras import backend @@ -27,6 +24,11 @@ from keras import losses from keras.testing_infra import test_combinations from keras.utils import losses_utils +# isort: off +from tensorflow.python.autograph.impl import ( + api as autograph, +) + ALL_LOSSES = [ losses.mean_squared_error, losses.mean_absolute_error, diff --git a/keras/metrics/__init__.py b/keras/metrics/__init__.py index 1eb994a9f..1133c0562 100644 --- a/keras/metrics/__init__.py +++ b/keras/metrics/__init__.py @@ -15,8 +15,6 @@ """All Keras metrics.""" # pylint: disable=g-bad-import-order -from tensorflow.python.util.tf_export import keras_export - # Utilities # Base classes from keras.metrics.base_metric import Mean @@ -96,6 +94,9 @@ from keras.metrics.metrics import top_k_categorical_accuracy from keras.utils.generic_utils import deserialize_keras_object from keras.utils.generic_utils import serialize_keras_object +# isort: off +from tensorflow.python.util.tf_export import keras_export + # Aliases acc = ACC = accuracy bce = BCE = binary_crossentropy diff --git a/keras/metrics/base_metric.py b/keras/metrics/base_metric.py index 0aeeab32d..af8914e91 100644 --- a/keras/metrics/base_metric.py +++ b/keras/metrics/base_metric.py @@ -23,8 +23,6 @@ import warnings import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export -from tensorflow.tools.docs import doc_controls from keras import backend from keras.dtensor import dtensor_api as dtensor @@ -38,6 +36,10 @@ from keras.utils import losses_utils from keras.utils import metrics_utils from keras.utils.tf_utils import is_tensor_or_variable +# isort: off +from tensorflow.python.util.tf_export import keras_export +from tensorflow.tools.docs import doc_controls + @keras_export("keras.metrics.Metric") class Metric(base_layer.Layer, metaclass=abc.ABCMeta): diff --git a/keras/metrics/confusion_matrix_test.py b/keras/metrics/confusion_matrix_test.py index b9be92b92..ea0bd2224 100644 --- a/keras/metrics/confusion_matrix_test.py +++ b/keras/metrics/confusion_matrix_test.py @@ -19,7 +19,6 @@ import json import numpy as np import tensorflow.compat.v2 as tf from absl.testing import parameterized -from tensorflow.python.platform import tf_logging from keras import layers from keras import metrics @@ -27,6 +26,9 @@ from keras import models from keras.testing_infra import test_combinations from keras.utils import metrics_utils +# isort: off +from tensorflow.python.platform import tf_logging + @test_combinations.generate(test_combinations.combine(mode=["graph", "eager"])) class FalsePositivesTest(tf.test.TestCase, parameterized.TestCase): diff --git a/keras/metrics/metrics.py b/keras/metrics/metrics.py index 5f3f63291..ccb25725d 100644 --- a/keras/metrics/metrics.py +++ b/keras/metrics/metrics.py @@ -23,7 +23,6 @@ from typing import Union import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import activations from keras import backend @@ -47,6 +46,9 @@ from keras.utils import metrics_utils from keras.utils.generic_utils import to_list from keras.utils.tf_utils import is_tensor_or_variable +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.metrics.MeanRelativeError") class MeanRelativeError(base_metric.Mean): diff --git a/keras/mixed_precision/device_compatibility_check.py b/keras/mixed_precision/device_compatibility_check.py index bbe08263e..d45254489 100644 --- a/keras/mixed_precision/device_compatibility_check.py +++ b/keras/mixed_precision/device_compatibility_check.py @@ -17,6 +17,8 @@ import itertools import tensorflow.compat.v2 as tf + +# isort: off from tensorflow.python.platform import tf_logging _COMPAT_CHECK_PREFIX = "Mixed precision compatibility check (mixed_float16): " diff --git a/keras/mixed_precision/device_compatibility_check_test.py b/keras/mixed_precision/device_compatibility_check_test.py index f37395043..9b355e09b 100644 --- a/keras/mixed_precision/device_compatibility_check_test.py +++ b/keras/mixed_precision/device_compatibility_check_test.py @@ -17,11 +17,13 @@ import re import tensorflow.compat.v2 as tf -from tensorflow.python.platform import tf_logging from keras.mixed_precision import device_compatibility_check from keras.testing_infra import test_combinations +# isort: off +from tensorflow.python.platform import tf_logging + def device_details(device_name, compute_capability=None): details = {} diff --git a/keras/mixed_precision/loss_scale_optimizer.py b/keras/mixed_precision/loss_scale_optimizer.py index 3d79b1db8..63313d93f 100644 --- a/keras/mixed_precision/loss_scale_optimizer.py +++ b/keras/mixed_precision/loss_scale_optimizer.py @@ -15,11 +15,6 @@ """Contains the loss scaling optimizer class.""" import tensorflow.compat.v2 as tf -from tensorflow.python.keras.optimizer_v2 import ( - optimizer_v2 as legacy_optimizer, -) -from tensorflow.python.platform import tf_logging -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras import optimizers @@ -30,6 +25,13 @@ from keras.optimizers.optimizer_v2 import optimizer_v2 from keras.optimizers.optimizer_v2 import utils as optimizer_utils from keras.utils import generic_utils +# isort: off +from tensorflow.python.keras.optimizer_v2 import ( + optimizer_v2 as legacy_optimizer, +) +from tensorflow.python.platform import tf_logging +from tensorflow.python.util.tf_export import keras_export + class _UnwrapPreventer: """Wrapper that DistributionStrategy will not unwrap. diff --git a/keras/mixed_precision/loss_scale_optimizer_test.py b/keras/mixed_precision/loss_scale_optimizer_test.py index e0d92252e..473dc2984 100644 --- a/keras/mixed_precision/loss_scale_optimizer_test.py +++ b/keras/mixed_precision/loss_scale_optimizer_test.py @@ -20,13 +20,6 @@ from unittest import mock import numpy as np import tensorflow.compat.v2 as tf from absl.testing import parameterized -from tensorflow.python.framework import ( - test_util as tf_test_utils, -) -from tensorflow.python.keras.optimizer_v2 import ( - gradient_descent as legacy_sgd, -) -from tensorflow.python.platform import tf_logging from keras import optimizers from keras.mixed_precision import loss_scale_optimizer @@ -41,6 +34,15 @@ from keras.optimizers.optimizer_v2 import gradient_descent from keras.optimizers.optimizer_v2 import optimizer_v2 from keras.testing_infra import test_combinations +# isort: off +from tensorflow.python.framework import ( + test_util as tf_test_utils, +) +from tensorflow.python.keras.optimizer_v2 import ( + gradient_descent as legacy_sgd, +) +from tensorflow.python.platform import tf_logging + # If called outside any strategy.scope() calls, this will return the default # strategy. default_strategy_fn = tf.distribute.get_strategy diff --git a/keras/mixed_precision/policy.py b/keras/mixed_precision/policy.py index c419ba561..f127778fa 100644 --- a/keras/mixed_precision/policy.py +++ b/keras/mixed_precision/policy.py @@ -17,13 +17,15 @@ import contextlib import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.engine import base_layer_utils from keras.mixed_precision import device_compatibility_check from keras.utils import generic_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + # pylint: disable=g-classes-have-attributes @keras_export("keras.mixed_precision.Policy", v1=[]) diff --git a/keras/mixed_precision/policy_test.py b/keras/mixed_precision/policy_test.py index 0f92b6c02..773df5688 100644 --- a/keras/mixed_precision/policy_test.py +++ b/keras/mixed_precision/policy_test.py @@ -16,7 +16,6 @@ import tensorflow.compat.v2 as tf from absl.testing import parameterized -from tensorflow.python.platform import tf_logging from keras.engine import base_layer_utils from keras.mixed_precision import device_compatibility_check @@ -25,6 +24,9 @@ from keras.optimizers.optimizer_v2 import gradient_descent from keras.testing_infra import test_combinations from keras.testing_infra import test_utils +# isort: off +from tensorflow.python.platform import tf_logging + @test_combinations.generate(test_combinations.combine(mode=["graph", "eager"])) class PolicyTest(tf.test.TestCase, parameterized.TestCase): diff --git a/keras/models/cloning.py b/keras/models/cloning.py index a1b9d9705..76d8cacc7 100644 --- a/keras/models/cloning.py +++ b/keras/models/cloning.py @@ -16,8 +16,6 @@ """Code for model cloning, plus model-related API entries.""" import tensorflow.compat.v2 as tf -from tensorflow.python.platform import tf_logging as logging -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras import metrics as metrics_module @@ -34,6 +32,10 @@ from keras.utils import generic_utils from keras.utils import version_utils from keras.utils.generic_utils import CustomObjectScope +# isort: off +from tensorflow.python.platform import tf_logging as logging +from tensorflow.python.util.tf_export import keras_export + # API entries importable from `keras.models`: Model = training.Model # pylint: disable=invalid-name Sequential = sequential.Sequential # pylint: disable=invalid-name diff --git a/keras/models/sharpness_aware_minimization.py b/keras/models/sharpness_aware_minimization.py index 861e5e21c..f778c9446 100644 --- a/keras/models/sharpness_aware_minimization.py +++ b/keras/models/sharpness_aware_minimization.py @@ -17,13 +17,15 @@ import copy import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.engine import data_adapter from keras.layers import deserialize as deserialize_layer from keras.models import Model from keras.utils import generic_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + # pylint: disable=g-classes-have-attributes diff --git a/keras/optimizers/__init__.py b/keras/optimizers/__init__.py index 7101c45db..c2da78bde 100644 --- a/keras/optimizers/__init__.py +++ b/keras/optimizers/__init__.py @@ -20,7 +20,6 @@ For more examples see the base class `tf.keras.optimizers.Optimizer`. """ import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export # Imports needed for deserialization. from keras import backend @@ -80,6 +79,9 @@ from keras.optimizers.optimizer_v2.rmsprop import RMSprop from keras.utils.generic_utils import deserialize_keras_object from keras.utils.generic_utils import serialize_keras_object +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.optimizers.serialize") def serialize(optimizer): diff --git a/keras/optimizers/legacy/adadelta.py b/keras/optimizers/legacy/adadelta.py index c6ce13ccb..64b2b8c52 100644 --- a/keras/optimizers/legacy/adadelta.py +++ b/keras/optimizers/legacy/adadelta.py @@ -14,10 +14,11 @@ # ============================================================================== """Legacy Adadelta optimizer implementation.""" -from tensorflow.python.util.tf_export import keras_export - from keras.optimizers.optimizer_v2 import adadelta +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.optimizers.legacy.Adadelta") class Adadelta(adadelta.Adadelta): diff --git a/keras/optimizers/legacy/adagrad.py b/keras/optimizers/legacy/adagrad.py index 37a98c25c..95e69a330 100644 --- a/keras/optimizers/legacy/adagrad.py +++ b/keras/optimizers/legacy/adagrad.py @@ -14,10 +14,11 @@ # ============================================================================== """Legacy Adagrad optimizer implementation.""" -from tensorflow.python.util.tf_export import keras_export - from keras.optimizers.optimizer_v2 import adagrad +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.optimizers.legacy.Adagrad") class Adagrad(adagrad.Adagrad): diff --git a/keras/optimizers/legacy/adam.py b/keras/optimizers/legacy/adam.py index f4b5bbae1..b3c992b63 100644 --- a/keras/optimizers/legacy/adam.py +++ b/keras/optimizers/legacy/adam.py @@ -14,10 +14,11 @@ # ============================================================================== """Legacy Adam optimizer implementation.""" -from tensorflow.python.util.tf_export import keras_export - from keras.optimizers.optimizer_v2 import adam +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.optimizers.legacy.Adam") class Adam(adam.Adam): diff --git a/keras/optimizers/legacy/adamax.py b/keras/optimizers/legacy/adamax.py index b61cceb3d..5bbba19a7 100644 --- a/keras/optimizers/legacy/adamax.py +++ b/keras/optimizers/legacy/adamax.py @@ -14,10 +14,11 @@ # ============================================================================== """Legacy Adamax optimizer implementation.""" -from tensorflow.python.util.tf_export import keras_export - from keras.optimizers.optimizer_v2 import adamax +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.optimizers.legacy.Adamax") class Adamax(adamax.Adamax): diff --git a/keras/optimizers/legacy/ftrl.py b/keras/optimizers/legacy/ftrl.py index 6317881e8..6d93bae10 100644 --- a/keras/optimizers/legacy/ftrl.py +++ b/keras/optimizers/legacy/ftrl.py @@ -14,10 +14,11 @@ # ============================================================================== """Legacy Ftrl optimizer implementation.""" -from tensorflow.python.util.tf_export import keras_export - from keras.optimizers.optimizer_v2 import ftrl +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.optimizers.legacy.Ftrl") class Ftrl(ftrl.Ftrl): diff --git a/keras/optimizers/legacy/nadam.py b/keras/optimizers/legacy/nadam.py index 590cf1bc3..f8f6488de 100644 --- a/keras/optimizers/legacy/nadam.py +++ b/keras/optimizers/legacy/nadam.py @@ -14,10 +14,11 @@ # ============================================================================== """Legacy Nadam optimizer implementation.""" -from tensorflow.python.util.tf_export import keras_export - from keras.optimizers.optimizer_v2 import nadam +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.optimizers.legacy.Nadam") class Nadam(nadam.Nadam): diff --git a/keras/optimizers/legacy/optimizer.py b/keras/optimizers/legacy/optimizer.py index 66bda9783..94aef3f59 100644 --- a/keras/optimizers/legacy/optimizer.py +++ b/keras/optimizers/legacy/optimizer.py @@ -14,10 +14,11 @@ # ============================================================================== """Legacy Adam optimizer implementation.""" -from tensorflow.python.util.tf_export import keras_export - from keras.optimizers.optimizer_v2 import optimizer_v2 +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.optimizers.legacy.Optimizer") class Optimizer(optimizer_v2.OptimizerV2): diff --git a/keras/optimizers/legacy/rmsprop.py b/keras/optimizers/legacy/rmsprop.py index f58ef5098..b4f8a77ad 100644 --- a/keras/optimizers/legacy/rmsprop.py +++ b/keras/optimizers/legacy/rmsprop.py @@ -14,10 +14,11 @@ # ============================================================================== """Legacy RMSprop optimizer implementation.""" -from tensorflow.python.util.tf_export import keras_export - from keras.optimizers.optimizer_v2 import rmsprop +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.optimizers.legacy.RMSprop") class RMSprop(rmsprop.RMSprop): diff --git a/keras/optimizers/legacy/sgd.py b/keras/optimizers/legacy/sgd.py index a18d6ad84..0bd4f73f0 100644 --- a/keras/optimizers/legacy/sgd.py +++ b/keras/optimizers/legacy/sgd.py @@ -14,10 +14,11 @@ # ============================================================================== """Legacy SGD optimizer implementation.""" -from tensorflow.python.util.tf_export import keras_export - from keras.optimizers.optimizer_v2 import gradient_descent +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.optimizers.legacy.SGD") class SGD(gradient_descent.SGD): diff --git a/keras/optimizers/legacy_learning_rate_decay.py b/keras/optimizers/legacy_learning_rate_decay.py index f6a8756dd..e4d6c3382 100644 --- a/keras/optimizers/legacy_learning_rate_decay.py +++ b/keras/optimizers/legacy_learning_rate_decay.py @@ -17,10 +17,12 @@ import functools import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import tf_export from keras.optimizers.schedules import learning_rate_schedule +# isort: off +from tensorflow.python.util.tf_export import tf_export + @tf_export(v1=["train.exponential_decay"]) def exponential_decay( diff --git a/keras/optimizers/optimizer_experimental/adadelta.py b/keras/optimizers/optimizer_experimental/adadelta.py index 7d49511f8..b785cd618 100644 --- a/keras/optimizers/optimizer_experimental/adadelta.py +++ b/keras/optimizers/optimizer_experimental/adadelta.py @@ -15,11 +15,13 @@ """Adadelta optimizer implementation.""" import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.optimizers.optimizer_experimental import optimizer from keras.utils import generic_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + # pylint: disable=g-classes-have-attributes @generic_utils.register_keras_serializable() diff --git a/keras/optimizers/optimizer_experimental/adagrad.py b/keras/optimizers/optimizer_experimental/adagrad.py index 3c0599798..494952389 100644 --- a/keras/optimizers/optimizer_experimental/adagrad.py +++ b/keras/optimizers/optimizer_experimental/adagrad.py @@ -15,12 +15,14 @@ """Adagrad optimizer implementation.""" import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import initializers from keras.optimizers.optimizer_experimental import optimizer from keras.utils import generic_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + # pylint: disable=g-classes-have-attributes @generic_utils.register_keras_serializable() diff --git a/keras/optimizers/optimizer_experimental/adam.py b/keras/optimizers/optimizer_experimental/adam.py index 45a3677d8..67b9a6206 100644 --- a/keras/optimizers/optimizer_experimental/adam.py +++ b/keras/optimizers/optimizer_experimental/adam.py @@ -15,11 +15,13 @@ """Adam optimizer implementation.""" import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.optimizers.optimizer_experimental import optimizer from keras.utils import generic_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + # pylint: disable=g-classes-have-attributes @generic_utils.register_keras_serializable() diff --git a/keras/optimizers/optimizer_experimental/adamax.py b/keras/optimizers/optimizer_experimental/adamax.py index 76a2f81d3..a9810012c 100644 --- a/keras/optimizers/optimizer_experimental/adamax.py +++ b/keras/optimizers/optimizer_experimental/adamax.py @@ -15,11 +15,13 @@ """Adamax optimizer implementation.""" import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.optimizers.optimizer_experimental import optimizer from keras.utils import generic_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + # pylint: disable=g-classes-have-attributes @generic_utils.register_keras_serializable() diff --git a/keras/optimizers/optimizer_experimental/adamw.py b/keras/optimizers/optimizer_experimental/adamw.py index eb470da2f..acc1053a4 100644 --- a/keras/optimizers/optimizer_experimental/adamw.py +++ b/keras/optimizers/optimizer_experimental/adamw.py @@ -15,11 +15,13 @@ """AdamW optimizer implementation.""" import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.optimizers.optimizer_experimental import optimizer from keras.utils import generic_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + # pylint: disable=g-classes-have-attributes @generic_utils.register_keras_serializable() diff --git a/keras/optimizers/optimizer_experimental/ftrl.py b/keras/optimizers/optimizer_experimental/ftrl.py index 04f3cfe14..7f1d40623 100644 --- a/keras/optimizers/optimizer_experimental/ftrl.py +++ b/keras/optimizers/optimizer_experimental/ftrl.py @@ -15,11 +15,13 @@ """FTRL optimizer implementation.""" import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.optimizers.optimizer_experimental import optimizer from keras.utils import generic_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + # pylint: disable=g-classes-have-attributes @generic_utils.register_keras_serializable() diff --git a/keras/optimizers/optimizer_experimental/nadam.py b/keras/optimizers/optimizer_experimental/nadam.py index 9795688d9..85aaf16f5 100644 --- a/keras/optimizers/optimizer_experimental/nadam.py +++ b/keras/optimizers/optimizer_experimental/nadam.py @@ -15,11 +15,13 @@ """Nadam optimizer implementation.""" import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.optimizers.optimizer_experimental import optimizer from keras.utils import generic_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + # pylint: disable=g-classes-have-attributes @generic_utils.register_keras_serializable() diff --git a/keras/optimizers/optimizer_experimental/optimizer.py b/keras/optimizers/optimizer_experimental/optimizer.py index 3cf374f60..b0e39f8a3 100644 --- a/keras/optimizers/optimizer_experimental/optimizer.py +++ b/keras/optimizers/optimizer_experimental/optimizer.py @@ -21,14 +21,16 @@ import abc import tensorflow.compat.v2 as tf from absl import logging -from tensorflow.python.util.tf_export import keras_export -from tensorflow.tools.docs import doc_controls from keras import backend from keras import initializers from keras.optimizers.optimizer_v2 import utils as optimizer_utils from keras.optimizers.schedules import learning_rate_schedule +# isort: off +from tensorflow.python.util.tf_export import keras_export +from tensorflow.tools.docs import doc_controls + class _BaseOptimizer(tf.Module): """Optimizer base class, which only supports non-distribute use case.""" diff --git a/keras/optimizers/optimizer_experimental/rmsprop.py b/keras/optimizers/optimizer_experimental/rmsprop.py index 7999d9521..76a5bab65 100644 --- a/keras/optimizers/optimizer_experimental/rmsprop.py +++ b/keras/optimizers/optimizer_experimental/rmsprop.py @@ -15,11 +15,13 @@ """RMSprop optimizer implementation.""" import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.optimizers.optimizer_experimental import optimizer from keras.utils import generic_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + # pylint: disable=g-classes-have-attributes @generic_utils.register_keras_serializable() diff --git a/keras/optimizers/optimizer_experimental/sgd.py b/keras/optimizers/optimizer_experimental/sgd.py index c503c6e63..dc4c0d009 100644 --- a/keras/optimizers/optimizer_experimental/sgd.py +++ b/keras/optimizers/optimizer_experimental/sgd.py @@ -15,11 +15,13 @@ """SGD optimizer implementation.""" import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.optimizers.optimizer_experimental import optimizer from keras.utils import generic_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + # pylint: disable=g-classes-have-attributes @generic_utils.register_keras_serializable() diff --git a/keras/optimizers/optimizer_v2/adadelta.py b/keras/optimizers/optimizer_v2/adadelta.py index a1c24470e..55a3af839 100644 --- a/keras/optimizers/optimizer_v2/adadelta.py +++ b/keras/optimizers/optimizer_v2/adadelta.py @@ -16,11 +16,13 @@ import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend_config from keras.optimizers.optimizer_v2 import optimizer_v2 +# isort: off +from tensorflow.python.util.tf_export import keras_export + # pylint: disable=g-classes-have-attributes diff --git a/keras/optimizers/optimizer_v2/adagrad.py b/keras/optimizers/optimizer_v2/adagrad.py index 3c358c21e..5ed151175 100644 --- a/keras/optimizers/optimizer_v2/adagrad.py +++ b/keras/optimizers/optimizer_v2/adagrad.py @@ -16,11 +16,13 @@ import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend_config from keras.optimizers.optimizer_v2 import optimizer_v2 +# isort: off +from tensorflow.python.util.tf_export import keras_export + # pylint: disable=g-classes-have-attributes diff --git a/keras/optimizers/optimizer_v2/adam.py b/keras/optimizers/optimizer_v2/adam.py index 6094cda7e..f9ed26636 100644 --- a/keras/optimizers/optimizer_v2/adam.py +++ b/keras/optimizers/optimizer_v2/adam.py @@ -15,11 +15,13 @@ """Adam optimizer implementation.""" import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend_config from keras.optimizers.optimizer_v2 import optimizer_v2 +# isort: off +from tensorflow.python.util.tf_export import keras_export + # pylint: disable=g-classes-have-attributes @keras_export("keras.optimizers.Adam") diff --git a/keras/optimizers/optimizer_v2/adamax.py b/keras/optimizers/optimizer_v2/adamax.py index c6989f39a..5c1f58605 100644 --- a/keras/optimizers/optimizer_v2/adamax.py +++ b/keras/optimizers/optimizer_v2/adamax.py @@ -15,11 +15,13 @@ """Adamax optimizer implementation.""" import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend_config from keras.optimizers.optimizer_v2 import optimizer_v2 +# isort: off +from tensorflow.python.util.tf_export import keras_export + # pylint: disable=g-classes-have-attributes @keras_export("keras.optimizers.Adamax") diff --git a/keras/optimizers/optimizer_v2/ftrl.py b/keras/optimizers/optimizer_v2/ftrl.py index 3192db40d..f84378b0e 100644 --- a/keras/optimizers/optimizer_v2/ftrl.py +++ b/keras/optimizers/optimizer_v2/ftrl.py @@ -17,10 +17,12 @@ # pylint: disable=g-classes-have-attributes import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.optimizers.optimizer_v2 import optimizer_v2 +# isort: off +from tensorflow.python.util.tf_export import keras_export + # pylint: disable=g-classes-have-attributes @keras_export("keras.optimizers.Ftrl") diff --git a/keras/optimizers/optimizer_v2/gradient_descent.py b/keras/optimizers/optimizer_v2/gradient_descent.py index 126e4b18a..eee3d2d5a 100644 --- a/keras/optimizers/optimizer_v2/gradient_descent.py +++ b/keras/optimizers/optimizer_v2/gradient_descent.py @@ -16,10 +16,12 @@ # pylint: disable=g-bad-import-order # pylint: disable=g-classes-have-attributes import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.optimizers.optimizer_v2 import optimizer_v2 +# isort: off +from tensorflow.python.util.tf_export import keras_export + # pylint: disable=g-classes-have-attributes @keras_export("keras.optimizers.SGD") diff --git a/keras/optimizers/optimizer_v2/nadam.py b/keras/optimizers/optimizer_v2/nadam.py index c8969ab8d..6df2d104a 100644 --- a/keras/optimizers/optimizer_v2/nadam.py +++ b/keras/optimizers/optimizer_v2/nadam.py @@ -15,12 +15,14 @@ """Nadam optimizer implementation.""" import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend_config from keras.optimizers.optimizer_v2 import optimizer_v2 from keras.optimizers.schedules import learning_rate_schedule +# isort: off +from tensorflow.python.util.tf_export import keras_export + # pylint: disable=g-classes-have-attributes @keras_export("keras.optimizers.Nadam") diff --git a/keras/optimizers/optimizer_v2/optimizer_v2.py b/keras/optimizers/optimizer_v2/optimizer_v2.py index 83d4c0794..e554d766f 100644 --- a/keras/optimizers/optimizer_v2/optimizer_v2.py +++ b/keras/optimizers/optimizer_v2/optimizer_v2.py @@ -22,7 +22,6 @@ import functools import warnings import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras import initializers @@ -34,6 +33,9 @@ from keras.utils import layer_utils from keras.utils import tf_inspect from keras.utils import tf_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + keras_optimizers_gauge = tf.__internal__.monitoring.BoolGauge( "/tensorflow/api/keras/optimizers", "keras optimizer usage", "method" ) diff --git a/keras/optimizers/optimizer_v2/optimizer_v2_test.py b/keras/optimizers/optimizer_v2/optimizer_v2_test.py index 8ef7f9fab..1ed7433fd 100644 --- a/keras/optimizers/optimizer_v2/optimizer_v2_test.py +++ b/keras/optimizers/optimizer_v2/optimizer_v2_test.py @@ -19,9 +19,6 @@ import collections import numpy as np import tensorflow.compat.v2 as tf from absl.testing import parameterized -from tensorflow.python.framework import ( - test_util as tf_test_utils, -) import keras from keras import backend @@ -47,6 +44,11 @@ from keras.testing_infra import test_combinations from keras.testing_infra import test_utils from keras.utils import np_utils +# isort: off +from tensorflow.python.framework import ( + test_util as tf_test_utils, +) + _DATA_TYPES = [tf.half, tf.float32, tf.float64] # TODO(b/141710709): complex support in NVCC and ROCM. if not tf_test_utils.IsBuiltWithNvcc() and not tf.test.is_built_with_rocm(): diff --git a/keras/optimizers/optimizer_v2/rmsprop.py b/keras/optimizers/optimizer_v2/rmsprop.py index 4813980a2..20b981076 100644 --- a/keras/optimizers/optimizer_v2/rmsprop.py +++ b/keras/optimizers/optimizer_v2/rmsprop.py @@ -16,11 +16,13 @@ import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend_config from keras.optimizers.optimizer_v2 import optimizer_v2 +# isort: off +from tensorflow.python.util.tf_export import keras_export + # pylint: disable=g-classes-have-attributes diff --git a/keras/optimizers/optimizer_v2/rmsprop_test.py b/keras/optimizers/optimizer_v2/rmsprop_test.py index a16a7fcaa..25418046b 100644 --- a/keras/optimizers/optimizer_v2/rmsprop_test.py +++ b/keras/optimizers/optimizer_v2/rmsprop_test.py @@ -21,15 +21,17 @@ import math import numpy as np import tensorflow.compat.v2 as tf from absl.testing import parameterized -from tensorflow.python.framework import ( - test_util as tf_test_utils, -) from keras.optimizers.optimizer_v2 import rmsprop from keras.optimizers.schedules import learning_rate_schedule from keras.testing_infra import test_combinations from keras.testing_infra import test_utils +# isort: off +from tensorflow.python.framework import ( + test_util as tf_test_utils, +) + _DATA_TYPES = [tf.half, tf.float32, tf.float64, tf.complex64, tf.complex128] _TEST_PARAM_VALUES = [ diff --git a/keras/optimizers/optimizer_v2/utils.py b/keras/optimizers/optimizer_v2/utils.py index 5abde9c07..7ec0582cd 100644 --- a/keras/optimizers/optimizer_v2/utils.py +++ b/keras/optimizers/optimizer_v2/utils.py @@ -15,6 +15,8 @@ """Optimizer utilities.""" import tensorflow.compat.v2 as tf + +# isort: off from tensorflow.python.platform import tf_logging as logging diff --git a/keras/optimizers/optimizers_test.py b/keras/optimizers/optimizers_test.py index 0389b3752..9291d612d 100644 --- a/keras/optimizers/optimizers_test.py +++ b/keras/optimizers/optimizers_test.py @@ -19,10 +19,6 @@ import weakref import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.training.adam import AdamOptimizer -from tensorflow.python.training.experimental.loss_scale_optimizer import ( - MixedPrecisionLossScaleOptimizer, -) import keras from keras.optimizers import optimizer_v1 @@ -30,6 +26,12 @@ from keras.testing_infra import test_combinations from keras.testing_infra import test_utils from keras.utils import np_utils +# isort: off +from tensorflow.python.training.adam import AdamOptimizer +from tensorflow.python.training.experimental.loss_scale_optimizer import ( + MixedPrecisionLossScaleOptimizer, +) + def _get_model(input_dim, num_hidden, output_dim): model = keras.models.Sequential() diff --git a/keras/optimizers/schedules/learning_rate_schedule.py b/keras/optimizers/schedules/learning_rate_schedule.py index 161594bb7..f6d2ecc0c 100644 --- a/keras/optimizers/schedules/learning_rate_schedule.py +++ b/keras/optimizers/schedules/learning_rate_schedule.py @@ -18,11 +18,13 @@ import abc import math import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.utils import generic_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.optimizers.schedules.LearningRateSchedule") class LearningRateSchedule: diff --git a/keras/premade_models/linear.py b/keras/premade_models/linear.py index b9f54fac7..874cda96a 100644 --- a/keras/premade_models/linear.py +++ b/keras/premade_models/linear.py @@ -15,8 +15,6 @@ """Built-in linear model classes.""" import tensorflow.compat.v2 as tf -from tensorflow.python.util import deprecation -from tensorflow.python.util.tf_export import keras_export from keras import activations from keras import initializers @@ -26,6 +24,10 @@ from keras.engine import input_spec from keras.engine import training from keras.layers import core +# isort: off +from tensorflow.python.util import deprecation +from tensorflow.python.util.tf_export import keras_export + @keras_export( "keras.experimental.LinearModel", diff --git a/keras/premade_models/wide_deep.py b/keras/premade_models/wide_deep.py index f474dfe47..5da19f259 100644 --- a/keras/premade_models/wide_deep.py +++ b/keras/premade_models/wide_deep.py @@ -15,8 +15,6 @@ """Built-in WideNDeep model classes.""" import tensorflow.compat.v2 as tf -from tensorflow.python.util import deprecation -from tensorflow.python.util.tf_export import keras_export from keras import activations from keras import backend @@ -26,6 +24,10 @@ from keras.engine import data_adapter from keras.engine import training as keras_training from keras.utils import generic_utils +# isort: off +from tensorflow.python.util import deprecation +from tensorflow.python.util.tf_export import keras_export + @keras_export( "keras.experimental.WideDeepModel", diff --git a/keras/preprocessing/image.py b/keras/preprocessing/image.py index c8cb09619..ad587186f 100644 --- a/keras/preprocessing/image.py +++ b/keras/preprocessing/image.py @@ -36,12 +36,14 @@ import threading import warnings import numpy as np -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.utils import data_utils from keras.utils import image_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + try: import scipy from scipy import linalg # pylint: disable=unused-import diff --git a/keras/preprocessing/sequence.py b/keras/preprocessing/sequence.py index a7c22c528..95f0b093a 100644 --- a/keras/preprocessing/sequence.py +++ b/keras/preprocessing/sequence.py @@ -28,10 +28,12 @@ import json import random import numpy as np -from tensorflow.python.util.tf_export import keras_export from keras.utils import data_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + def _remove_long_seq(maxlen, seq, label): """Removes sequences that exceed the maximum length. diff --git a/keras/preprocessing/text.py b/keras/preprocessing/text.py index b9d3d8736..2cf2e4e73 100644 --- a/keras/preprocessing/text.py +++ b/keras/preprocessing/text.py @@ -33,6 +33,8 @@ import json import warnings import numpy as np + +# isort: off from tensorflow.python.util.tf_export import keras_export diff --git a/keras/regularizers.py b/keras/regularizers.py index 525ae41b0..3609d13d1 100644 --- a/keras/regularizers.py +++ b/keras/regularizers.py @@ -19,12 +19,14 @@ import math import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.utils.generic_utils import deserialize_keras_object from keras.utils.generic_utils import serialize_keras_object +# isort: off +from tensorflow.python.util.tf_export import keras_export + def _check_penalty_number(x): """check penalty number availability, raise ValueError if failed.""" diff --git a/keras/saving/experimental/saving_lib.py b/keras/saving/experimental/saving_lib.py index d406b7dc6..5cde46cc2 100644 --- a/keras/saving/experimental/saving_lib.py +++ b/keras/saving/experimental/saving_lib.py @@ -19,11 +19,13 @@ import os import types import tensorflow.compat.v2 as tf -from tensorflow.python.util import tf_export from keras.saving.saved_model import json_utils from keras.utils import generic_utils +# isort: off +from tensorflow.python.util import tf_export + _CONFIG_FILE = "config.keras" # A temporary flag to enable the new idempotent saving framework. diff --git a/keras/saving/hdf5_format.py b/keras/saving/hdf5_format.py index 2ef818423..8b593f9dc 100644 --- a/keras/saving/hdf5_format.py +++ b/keras/saving/hdf5_format.py @@ -20,7 +20,6 @@ import os import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.platform import tf_logging as logging from keras import backend from keras.optimizers import optimizer_v1 @@ -33,6 +32,9 @@ from keras.saving.saved_model import json_utils from keras.utils.generic_utils import LazyLoader from keras.utils.io_utils import ask_to_proceed_with_overwrite +# isort: off +from tensorflow.python.platform import tf_logging as logging + try: import h5py diff --git a/keras/saving/model_config.py b/keras/saving/model_config.py index aeeb7c8c9..9568f7269 100644 --- a/keras/saving/model_config.py +++ b/keras/saving/model_config.py @@ -15,6 +15,7 @@ # pylint: disable=protected-access """Functions that save the model's config into different formats.""" +# isort: off from tensorflow.python.util.tf_export import keras_export diff --git a/keras/saving/save.py b/keras/saving/save.py index 3c8d47243..84aef1d85 100644 --- a/keras/saving/save.py +++ b/keras/saving/save.py @@ -15,7 +15,6 @@ """Keras model saving code.""" import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.saving import hdf5_format from keras.saving import saving_utils @@ -26,6 +25,9 @@ from keras.utils import generic_utils from keras.utils import traceback_utils from keras.utils.io_utils import path_to_string +# isort: off +from tensorflow.python.util.tf_export import keras_export + # pylint: disable=g-import-not-at-top try: import h5py diff --git a/keras/saving/saved_model/json_utils.py b/keras/saving/saved_model/json_utils.py index cd4d836a4..b28a226eb 100644 --- a/keras/saving/saved_model/json_utils.py +++ b/keras/saving/saved_model/json_utils.py @@ -29,10 +29,12 @@ import json import numpy as np import tensorflow.compat.v2 as tf import wrapt -from tensorflow.python.framework import type_spec from keras.utils import generic_utils +# isort: off +from tensorflow.python.framework import type_spec + _EXTENSION_TYPE_SPEC = "_EXTENSION_TYPE_SPEC" diff --git a/keras/saving/saved_model/save.py b/keras/saving/saved_model/save.py index 095ce95d5..6246e5684 100644 --- a/keras/saving/saved_model/save.py +++ b/keras/saving/saved_model/save.py @@ -18,7 +18,6 @@ import os import tensorflow.compat.v2 as tf from absl import logging -from tensorflow.python.saved_model import save as save_lib from keras import backend from keras.layers import serialization @@ -31,6 +30,9 @@ from keras.saving.saved_model import utils from keras.utils.generic_utils import LazyLoader from keras.utils.io_utils import ask_to_proceed_with_overwrite +# isort: off +from tensorflow.python.saved_model import save as save_lib + # To avoid circular dependencies between keras/engine and keras/saving, # code in keras/saving must delay imports. diff --git a/keras/saving/saved_model_experimental.py b/keras/saving/saved_model_experimental.py index 89d0ff9d1..14076f285 100644 --- a/keras/saving/saved_model_experimental.py +++ b/keras/saving/saved_model_experimental.py @@ -17,8 +17,6 @@ import warnings import tensorflow.compat.v2 as tf -from tensorflow.python.platform import tf_logging as logging -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.optimizers import optimizer_v1 @@ -29,6 +27,10 @@ from keras.saving import utils_v1 as model_utils from keras.utils import mode_keys from keras.utils.generic_utils import LazyLoader +# isort: off +from tensorflow.python.platform import tf_logging as logging +from tensorflow.python.util.tf_export import keras_export + # To avoid circular dependencies between keras/engine and keras/saving, # code in keras/saving must delay imports. diff --git a/keras/saving/saving_utils.py b/keras/saving/saving_utils.py index 378bfbef5..08e52389f 100644 --- a/keras/saving/saving_utils.py +++ b/keras/saving/saving_utils.py @@ -19,7 +19,6 @@ import os # pylint: disable=g-bad-import-order, g-direct-tensorflow-import import tensorflow.compat.v2 as tf -from tensorflow.python.platform import tf_logging as logging import keras from keras import backend @@ -31,6 +30,9 @@ from keras.utils import generic_utils from keras.utils import version_utils from keras.utils.io_utils import ask_to_proceed_with_overwrite +# isort: off +from tensorflow.python.platform import tf_logging as logging + # pylint: enable=g-bad-import-order, g-direct-tensorflow-import diff --git a/keras/saving/utils_v1/export_utils.py b/keras/saving/utils_v1/export_utils.py index 5419de463..07bf0ba12 100644 --- a/keras/saving/utils_v1/export_utils.py +++ b/keras/saving/utils_v1/export_utils.py @@ -20,13 +20,15 @@ import os import time import tensorflow.compat.v2 as tf -from tensorflow.python.platform import tf_logging as logging from keras.saving.utils_v1 import export_output as export_output_lib from keras.saving.utils_v1 import mode_keys from keras.saving.utils_v1 import unexported_constants from keras.saving.utils_v1.mode_keys import KerasModeKeys as ModeKeys +# isort: off +from tensorflow.python.platform import tf_logging as logging + # Mapping of the modes to appropriate MetaGraph tags in the SavedModel. EXPORT_TAG_MAP = mode_keys.ModeKeyMap( **{ diff --git a/keras/testing_infra/test_utils.py b/keras/testing_infra/test_utils.py index 38ea387a5..da963537a 100644 --- a/keras/testing_infra/test_utils.py +++ b/keras/testing_infra/test_utils.py @@ -24,10 +24,6 @@ import unittest import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.framework import ( - test_util as tf_test_utils, -) -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras import layers @@ -45,6 +41,12 @@ from keras.optimizers.optimizer_v2 import rmsprop as rmsprop_v2 from keras.utils import tf_contextlib from keras.utils import tf_inspect +# isort: off +from tensorflow.python.framework import ( + test_util as tf_test_utils, +) +from tensorflow.python.util.tf_export import keras_export + def string_test(actual, expected): np.testing.assert_array_equal(actual, expected) diff --git a/keras/tests/add_loss_correctness_test.py b/keras/tests/add_loss_correctness_test.py index b23488e94..4f4f3d1fb 100644 --- a/keras/tests/add_loss_correctness_test.py +++ b/keras/tests/add_loss_correctness_test.py @@ -16,10 +16,6 @@ import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.platform import tf_logging as logging -from tensorflow.python.training.rmsprop import ( - RMSPropOptimizer, -) from keras import Input from keras import Model @@ -30,6 +26,12 @@ from keras.optimizers import optimizer_v2 from keras.testing_infra import test_combinations from keras.testing_infra import test_utils +# isort: off +from tensorflow.python.platform import tf_logging as logging +from tensorflow.python.training.rmsprop import ( + RMSPropOptimizer, +) + MAE = losses.MeanAbsoluteError mae = losses.mean_absolute_error diff --git a/keras/tests/automatic_outside_compilation_test.py b/keras/tests/automatic_outside_compilation_test.py index 7c3ef1e18..254679be8 100644 --- a/keras/tests/automatic_outside_compilation_test.py +++ b/keras/tests/automatic_outside_compilation_test.py @@ -20,6 +20,20 @@ import os import numpy as np import tensorflow.compat.v2 as tf from absl import flags + +from keras import callbacks +from keras.distribute import distribute_strategy_test +from keras.engine import base_layer +from keras.engine import sequential as sequential_model_lib +from keras.engine import training +from keras.layers import convolutional as conv_layer_lib +from keras.layers import core as layer_lib +from keras.layers import pooling as pool_layer_lib +from keras.layers import regularization as regularization_layer_lib +from keras.layers import reshaping as reshaping_layer_lib +from keras.testing_infra import test_utils + +# isort: off from tensorboard.plugins.histogram import ( summary_v2 as histogram_summary_v2, ) @@ -36,18 +50,6 @@ from tensorflow.python.framework import ( test_util as tf_test_utils, ) -from keras import callbacks -from keras.distribute import distribute_strategy_test -from keras.engine import base_layer -from keras.engine import sequential as sequential_model_lib -from keras.engine import training -from keras.layers import convolutional as conv_layer_lib -from keras.layers import core as layer_lib -from keras.layers import pooling as pool_layer_lib -from keras.layers import regularization as regularization_layer_lib -from keras.layers import reshaping as reshaping_layer_lib -from keras.testing_infra import test_utils - NUM_CLASSES = 4 FLAGS = flags.FLAGS diff --git a/keras/tests/convert_to_constants_test.py b/keras/tests/convert_to_constants_test.py index c46c17011..bb743c841 100644 --- a/keras/tests/convert_to_constants_test.py +++ b/keras/tests/convert_to_constants_test.py @@ -18,13 +18,15 @@ import os import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.framework import convert_to_constants -from tensorflow.python.saved_model.load import load -from tensorflow.python.saved_model.save import save import keras from keras.testing_infra import test_utils +# isort: off +from tensorflow.python.framework import convert_to_constants +from tensorflow.python.saved_model.load import load +from tensorflow.python.saved_model.save import save + class VariablesToConstantsTest(tf.test.TestCase): def _freezeModel(self, model): diff --git a/keras/tests/graph_util_test.py b/keras/tests/graph_util_test.py index bed3260f8..40884cf9d 100644 --- a/keras/tests/graph_util_test.py +++ b/keras/tests/graph_util_test.py @@ -16,14 +16,16 @@ import numpy as np import tensorflow.compat.v2 as tf + +import keras + +# isort: off from tensorflow.core.protobuf import meta_graph_pb2 from tensorflow.python.grappler import tf_optimizer from tensorflow.python.training.saver import ( export_meta_graph, ) -import keras - class ConvertVariablesToConstantsTest(tf.test.TestCase): def _get_tensors(self, sess, tensor_list): diff --git a/keras/tests/memory_checker_test.py b/keras/tests/memory_checker_test.py index 9072ca76a..54ff677ec 100644 --- a/keras/tests/memory_checker_test.py +++ b/keras/tests/memory_checker_test.py @@ -14,12 +14,14 @@ # ============================================================================= import tensorflow.compat.v2 as tf + +import keras + +# isort: off from tensorflow.python.framework.memory_checker import ( MemoryChecker, ) -import keras - class MemoryCheckerTest(tf.test.TestCase): def testKerasBasic(self): diff --git a/keras/tests/memory_test.py b/keras/tests/memory_test.py index 760992009..e429e608c 100644 --- a/keras/tests/memory_test.py +++ b/keras/tests/memory_test.py @@ -21,12 +21,14 @@ introspection (test_util decorators). Please be careful adding new tests here. """ import tensorflow.compat.v2 as tf + +import keras + +# isort: off from tensorflow.python.eager.memory_tests import ( memory_test_util, ) -import keras - class SingleLayerNet(keras.Model): """Simple keras model used to ensure that there are no leaks.""" diff --git a/keras/tests/model_subclassing_test.py b/keras/tests/model_subclassing_test.py index 01c9892b9..5dd2a8869 100644 --- a/keras/tests/model_subclassing_test.py +++ b/keras/tests/model_subclassing_test.py @@ -20,6 +20,13 @@ import os import numpy as np import tensorflow.compat.v2 as tf from absl.testing import parameterized + +import keras +from keras.testing_infra import test_combinations +from keras.testing_infra import test_utils +from keras.tests import model_subclassing_test_util as model_util + +# isort: off from tensorflow.python.framework import ( test_util as tf_test_utils, ) @@ -27,11 +34,6 @@ from tensorflow.python.training.tracking import ( data_structures, ) -import keras -from keras.testing_infra import test_combinations -from keras.testing_infra import test_utils -from keras.tests import model_subclassing_test_util as model_util - try: import h5py # pylint:disable=g-import-not-at-top except ImportError: diff --git a/keras/tests/saved_model_test.py b/keras/tests/saved_model_test.py index 005ddfa54..fcf5f776c 100644 --- a/keras/tests/saved_model_test.py +++ b/keras/tests/saved_model_test.py @@ -17,13 +17,15 @@ import os import tensorflow.compat.v2 as tf -from tensorflow.python.framework import ( - test_util as tf_test_utils, -) from keras.layers import core from keras.optimizers.optimizer_v2 import adam +# isort: off +from tensorflow.python.framework import ( + test_util as tf_test_utils, +) + class _ModelWithOptimizerUsingDefun(tf.train.Checkpoint): def __init__(self): diff --git a/keras/tests/saver_test.py b/keras/tests/saver_test.py index 66c4da4fb..d409d196f 100644 --- a/keras/tests/saver_test.py +++ b/keras/tests/saver_test.py @@ -18,13 +18,15 @@ import functools import os import tensorflow.compat.v2 as tf -from tensorflow.python.training.tracking import ( - util as trackable_utils, -) from keras.engine import training from keras.layers import core +# isort: off +from tensorflow.python.training.tracking import ( + util as trackable_utils, +) + class NonLayerTrackable(tf.Module): def __init__(self): diff --git a/keras/tests/tracking_test.py b/keras/tests/tracking_test.py index 4464a2fd6..c1fc8e9a2 100644 --- a/keras/tests/tracking_test.py +++ b/keras/tests/tracking_test.py @@ -18,10 +18,6 @@ import os import numpy import tensorflow.compat.v2 as tf from absl.testing import parameterized -from tensorflow.python.training.tracking import ( - data_structures, -) -from tensorflow.python.training.tracking import util from keras.engine import sequential from keras.engine import training @@ -29,6 +25,12 @@ from keras.layers import core from keras.layers.normalization import batch_normalization_v1 from keras.testing_infra import test_combinations +# isort: off +from tensorflow.python.training.tracking import ( + data_structures, +) +from tensorflow.python.training.tracking import util + class HasList(training.Model): def __init__(self): diff --git a/keras/tests/tracking_util_test.py b/keras/tests/tracking_util_test.py index 5ef8e63d2..2699b5f26 100644 --- a/keras/tests/tracking_util_test.py +++ b/keras/tests/tracking_util_test.py @@ -18,14 +18,6 @@ import os import weakref import tensorflow.compat.v2 as tf -from tensorflow.python.eager import context -from tensorflow.python.framework import ( - test_util as tf_test_utils, -) -from tensorflow.python.platform import tf_logging as logging -from tensorflow.python.training.tracking import ( - util as trackable_utils, -) from keras.engine import input_layer from keras.engine import sequential @@ -36,6 +28,16 @@ from keras.optimizers.optimizer_v2 import adam from keras.testing_infra import test_combinations from keras.testing_infra import test_utils +# isort: off +from tensorflow.python.eager import context +from tensorflow.python.framework import ( + test_util as tf_test_utils, +) +from tensorflow.python.platform import tf_logging as logging +from tensorflow.python.training.tracking import ( + util as trackable_utils, +) + # pylint: disable=not-callable class MyModel(training.Model): diff --git a/keras/tests/tracking_util_with_v1_optimizers_test.py b/keras/tests/tracking_util_with_v1_optimizers_test.py index 2eba187c7..630c9f4a6 100644 --- a/keras/tests/tracking_util_with_v1_optimizers_test.py +++ b/keras/tests/tracking_util_with_v1_optimizers_test.py @@ -18,6 +18,13 @@ import functools import os import tensorflow.compat.v2 as tf + +from keras.engine import training +from keras.layers import core +from keras.testing_infra import test_combinations +from keras.testing_infra import test_utils + +# isort: off from tensorflow.python.eager import context from tensorflow.python.framework import ( test_util as tf_test_utils, @@ -26,11 +33,6 @@ from tensorflow.python.training.tracking import ( util as trackable_utils, ) -from keras.engine import training -from keras.layers import core -from keras.testing_infra import test_combinations -from keras.testing_infra import test_utils - class NonLayerTrackable(tf.Module): def __init__(self): diff --git a/keras/tests/tracking_util_xla_test.py b/keras/tests/tracking_util_xla_test.py index 54e52151e..056affefe 100644 --- a/keras/tests/tracking_util_xla_test.py +++ b/keras/tests/tracking_util_xla_test.py @@ -14,15 +14,17 @@ # ============================================================================== import tensorflow.compat.v2 as tf -from tensorflow.compiler.tests import xla_test -from tensorflow.python.training.tracking import ( - util as trackable_utils, -) from keras.engine import training from keras.layers import core from keras.optimizers.optimizer_v2 import adam +# isort: off +from tensorflow.compiler.tests import xla_test +from tensorflow.python.training.tracking import ( + util as trackable_utils, +) + class NonLayerTrackable(tf.Module): def __init__(self): diff --git a/keras/utils/audio_dataset.py b/keras/utils/audio_dataset.py index 5dfbb67a4..c12b066bf 100644 --- a/keras/utils/audio_dataset.py +++ b/keras/utils/audio_dataset.py @@ -16,10 +16,12 @@ import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.utils import dataset_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + # pylint: disable=g-classes-have-attributes diff --git a/keras/utils/data_utils.py b/keras/utils/data_utils.py index 75648b985..39f23e0a3 100644 --- a/keras/utils/data_utils.py +++ b/keras/utils/data_utils.py @@ -35,7 +35,6 @@ from contextlib import closing import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from six.moves.urllib.parse import urlsplit from six.moves.urllib.request import urlopen @@ -43,6 +42,9 @@ from keras.utils import io_utils from keras.utils import tf_inspect from keras.utils.generic_utils import Progbar +# isort: off +from tensorflow.python.util.tf_export import keras_export + # Required to support google internal urlretrieve if True: # This gets transformed to `if sys.version_info[0] == 2:` in OSS. diff --git a/keras/utils/dataset_creator.py b/keras/utils/dataset_creator.py index 0affcc3d2..2ef335257 100644 --- a/keras/utils/dataset_creator.py +++ b/keras/utils/dataset_creator.py @@ -16,6 +16,8 @@ """Input dataset creator for `model.fit`.""" import tensorflow.compat.v2 as tf + +# isort: off from tensorflow.python.util.tf_export import keras_export diff --git a/keras/utils/dataset_creator_test.py b/keras/utils/dataset_creator_test.py index cd5202951..58f700fee 100644 --- a/keras/utils/dataset_creator_test.py +++ b/keras/utils/dataset_creator_test.py @@ -16,12 +16,6 @@ import tensorflow.compat.v2 as tf from absl.testing import parameterized -from tensorflow.python.distribute.cluster_resolver import ( - SimpleClusterResolver, -) -from tensorflow.python.training.server_lib import ( - ClusterSpec, -) from keras.distribute import multi_worker_testing_utils from keras.engine import data_adapter @@ -32,6 +26,14 @@ from keras.testing_infra import test_combinations from keras.testing_infra import test_utils from keras.utils import dataset_creator +# isort: off +from tensorflow.python.distribute.cluster_resolver import ( + SimpleClusterResolver, +) +from tensorflow.python.training.server_lib import ( + ClusterSpec, +) + @test_utils.run_v2_only class DatasetCreatorTest(tf.test.TestCase, parameterized.TestCase): diff --git a/keras/utils/dataset_utils.py b/keras/utils/dataset_utils.py index 71a08f7d1..02798f8e7 100644 --- a/keras/utils/dataset_utils.py +++ b/keras/utils/dataset_utils.py @@ -22,6 +22,8 @@ import warnings import numpy as np import tensorflow.compat.v2 as tf + +# isort: off from tensorflow.python.util.tf_export import keras_export # pylint: disable=g-classes-have-attributes diff --git a/keras/utils/generic_utils.py b/keras/utils/generic_utils.py index c10f9bdcc..74f117a97 100644 --- a/keras/utils/generic_utils.py +++ b/keras/utils/generic_utils.py @@ -29,12 +29,14 @@ import weakref import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.utils import io_utils from keras.utils import tf_contextlib from keras.utils import tf_inspect +# isort: off +from tensorflow.python.util.tf_export import keras_export + _GLOBAL_CUSTOM_OBJECTS = {} _GLOBAL_CUSTOM_NAMES = {} diff --git a/keras/utils/image_dataset.py b/keras/utils/image_dataset.py index 77c743033..6fd255f3e 100644 --- a/keras/utils/image_dataset.py +++ b/keras/utils/image_dataset.py @@ -16,11 +16,13 @@ import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.utils import dataset_utils from keras.utils import image_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + # pylint: disable=g-classes-have-attributes diff --git a/keras/utils/image_utils.py b/keras/utils/image_utils.py index a7584c19b..775c5d587 100644 --- a/keras/utils/image_utils.py +++ b/keras/utils/image_utils.py @@ -22,10 +22,12 @@ import warnings import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend +# isort: off +from tensorflow.python.util.tf_export import keras_export + try: from PIL import Image as pil_image except ImportError: diff --git a/keras/utils/io_utils.py b/keras/utils/io_utils.py index 474c4a9ba..fe69afe40 100644 --- a/keras/utils/io_utils.py +++ b/keras/utils/io_utils.py @@ -20,10 +20,12 @@ import sys import threading from absl import logging -from tensorflow.python.util.tf_export import keras_export from keras.utils import keras_logging +# isort: off +from tensorflow.python.util.tf_export import keras_export + INTERACTIVE_LOGGING = threading.local() INTERACTIVE_LOGGING.enable = keras_logging.INTERACTIVE_LOGGING_DEFAULT diff --git a/keras/utils/layer_utils.py b/keras/utils/layer_utils.py index af15d7a12..0b9af1338 100644 --- a/keras/utils/layer_utils.py +++ b/keras/utils/layer_utils.py @@ -21,11 +21,13 @@ import weakref import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.utils import io_utils from keras.utils import tf_inspect +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.utils.get_source_inputs") def get_source_inputs(tensor, layer=None, node_index=None): diff --git a/keras/utils/losses_utils.py b/keras/utils/losses_utils.py index fa3fa4782..413f3b002 100644 --- a/keras/utils/losses_utils.py +++ b/keras/utils/losses_utils.py @@ -16,12 +16,14 @@ """Utilities related to loss functions.""" import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.engine import keras_tensor from keras.utils import tf_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.losses.Reduction", v1=[]) class ReductionV2: diff --git a/keras/utils/mode_keys.py b/keras/utils/mode_keys.py index d92c72b93..b0fb9fa12 100644 --- a/keras/utils/mode_keys.py +++ b/keras/utils/mode_keys.py @@ -14,6 +14,7 @@ # ============================================================================== """Keras model mode constants.""" +# isort: off # pylint: disable=unused-import from tensorflow.python.saved_model.model_utils.mode_keys import ( KerasModeKeys as ModeKeys, diff --git a/keras/utils/np_utils.py b/keras/utils/np_utils.py index fd1181cc0..410a7e564 100644 --- a/keras/utils/np_utils.py +++ b/keras/utils/np_utils.py @@ -15,6 +15,8 @@ """Numpy-related utilities.""" import numpy as np + +# isort: off from tensorflow.python.util.tf_export import keras_export diff --git a/keras/utils/text_dataset.py b/keras/utils/text_dataset.py index ec5eaa5c4..b7530dc6e 100644 --- a/keras/utils/text_dataset.py +++ b/keras/utils/text_dataset.py @@ -16,10 +16,12 @@ import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.utils import dataset_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + @keras_export( "keras.utils.text_dataset_from_directory", diff --git a/keras/utils/tf_utils.py b/keras/utils/tf_utils.py index 07d38cdc1..ef439b86e 100644 --- a/keras/utils/tf_utils.py +++ b/keras/utils/tf_utils.py @@ -20,14 +20,16 @@ import random import numpy as np import tensorflow.compat.v2 as tf -from tensorflow.python.framework import ops -from tensorflow.python.util.tf_export import keras_export from keras import backend from keras.engine import keras_tensor from keras.utils import object_identity from keras.utils import tf_contextlib +# isort: off +from tensorflow.python.framework import ops +from tensorflow.python.util.tf_export import keras_export + @keras_export("keras.utils.set_random_seed", v1=[]) def set_random_seed(seed): diff --git a/keras/utils/timeseries_dataset.py b/keras/utils/timeseries_dataset.py index 234dcd3f9..2194dceae 100644 --- a/keras/utils/timeseries_dataset.py +++ b/keras/utils/timeseries_dataset.py @@ -16,6 +16,8 @@ import numpy as np import tensorflow.compat.v2 as tf + +# isort: off from tensorflow.python.util.tf_export import keras_export # pylint: disable=g-classes-have-attributes diff --git a/keras/utils/vis_utils.py b/keras/utils/vis_utils.py index d7b8251f4..cc2685cb3 100644 --- a/keras/utils/vis_utils.py +++ b/keras/utils/vis_utils.py @@ -21,10 +21,12 @@ import re import sys import tensorflow.compat.v2 as tf -from tensorflow.python.util.tf_export import keras_export from keras.utils import io_utils +# isort: off +from tensorflow.python.util.tf_export import keras_export + try: # pydot-ng is a fork of pydot that is better maintained. import pydot_ng as pydot diff --git a/keras/wrappers/scikit_learn.py b/keras/wrappers/scikit_learn.py index f59f79dce..65cd7e037 100644 --- a/keras/wrappers/scikit_learn.py +++ b/keras/wrappers/scikit_learn.py @@ -20,14 +20,16 @@ import types import warnings import numpy as np -from tensorflow.python.util.tf_export import keras_export -from tensorflow.tools.docs import doc_controls from keras import losses from keras.models import Sequential from keras.utils.generic_utils import has_arg from keras.utils.np_utils import to_categorical +# isort: off +from tensorflow.python.util.tf_export import keras_export +from tensorflow.tools.docs import doc_controls + class BaseWrapper: """Base class for the Keras scikit-learn wrapper. diff --git a/setup.cfg b/setup.cfg index dc22eb0e1..81215f22b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,8 +1,7 @@ [isort] -known_first_party = keras -default_section = THIRDPARTY -line_length = 80 -profile = black +known_first_party=keras +line_length=80 +profile=black [flake8] # imported but unused in __init__.py, that's ok.