From 642c3e849899739682e7fc637bfbd4c7a0f2fdd7 Mon Sep 17 00:00:00 2001 From: Reed Wanderman-Milne Date: Wed, 21 Oct 2020 14:51:14 -0700 Subject: [PATCH] Move mixed precision files out of experimental/ directory. This is a purely mechanical change. All that is done is: * Deleted python/keras/mixed_precision/experimental/__init__.py * All other files in python/keras/mixed_precision/experimental/ are moved one directly up, out of the experimental/ folder * All Python imports, BUILD dependencies, and other references to the old experimental files are adjusted to refer to the new location This changes the API golden files, but there is no API change. The golden files referred to the full paths of the classes in "is_instance" sections, and the full paths have changed. PiperOrigin-RevId: 338345459 Change-Id: I9eefc2bea49b71f26ef7ec3563364a3f1d54abe6 --- tensorflow/python/keras/BUILD | 2 +- tensorflow/python/keras/api/BUILD | 6 +++--- tensorflow/python/keras/distribute/BUILD | 8 ++++---- .../collective_all_reduce_strategy_test.py | 4 ++-- .../distribute/distribute_strategy_test.py | 2 +- .../distribute/keras_correctness_test_base.py | 2 +- .../keras_rnn_model_correctness_test.py | 2 +- tensorflow/python/keras/engine/BUILD | 14 +++++++------- tensorflow/python/keras/engine/base_layer.py | 6 +++--- .../python/keras/engine/base_layer_test.py | 2 +- tensorflow/python/keras/engine/base_layer_v1.py | 6 +++--- tensorflow/python/keras/engine/training.py | 4 ++-- .../python/keras/engine/training_eager_v1.py | 2 +- tensorflow/python/keras/engine/training_v1.py | 4 ++-- tensorflow/python/keras/layers/core_test.py | 2 +- .../python/keras/layers/embeddings_test.py | 2 +- .../python/keras/layers/normalization_test.py | 2 +- tensorflow/python/keras/legacy_tf_layers/BUILD | 2 +- .../python/keras/legacy_tf_layers/base.py | 2 +- .../mixed_precision/{experimental => }/BUILD | 6 +++--- .../{experimental => }/autocast_variable.py | 0 .../autocast_variable_test.py | 2 +- .../device_compatibility_check.py | 0 .../device_compatibility_check_test.py | 2 +- .../mixed_precision/experimental/__init__.py | 0 .../{experimental => }/get_layer_policy.py | 0 .../{experimental => }/get_layer_policy_test.py | 4 ++-- .../{experimental => }/keras_test.py | 16 ++++++++-------- .../layer_correctness_test.py | 2 +- .../{experimental => }/loss_scale.py | 0 .../{experimental => }/loss_scale_benchmark.py | 2 +- .../{experimental => }/loss_scale_optimizer.py | 2 +- .../loss_scale_optimizer_test.py | 4 ++-- .../mixed_precision_graph_rewrite_test.py | 4 ++-- .../{experimental => }/policy.py | 4 ++-- .../{experimental => }/policy_test.py | 4 ++-- .../{experimental => }/test_util.py | 0 .../{experimental => }/testdata/BUILD | 0 .../testdata/lso_ckpt_tf2.2/checkpoint | 0 .../lso_ckpt_tf2.2/ckpt.data-00000-of-00002 | 0 .../lso_ckpt_tf2.2/ckpt.data-00001-of-00002 | Bin .../testdata/lso_ckpt_tf2.2/ckpt.index | Bin .../lso_savedmodel_tf2.2/saved_model.pb | Bin .../variables/variables.data-00000-of-00002 | Bin .../variables/variables.data-00001-of-00002 | Bin .../variables/variables.index | Bin tensorflow/python/keras/optimizers.py | 2 +- tensorflow/python/keras/saving/BUILD | 2 +- .../saving/saved_model/layer_serialization.py | 2 +- .../keras/saving/saved_model/save_impl.py | 2 +- ....mixed_precision.-loss-scale-optimizer.pbtxt | 4 ++-- ...ion.experimental.-loss-scale-optimizer.pbtxt | 6 +++--- ....mixed_precision.-loss-scale-optimizer.pbtxt | 4 ++-- ...nsorflow.keras.mixed_precision.-policy.pbtxt | 2 +- ...ion.experimental.-loss-scale-optimizer.pbtxt | 6 +++--- ...s.mixed_precision.experimental.-policy.pbtxt | 4 ++-- tensorflow/tools/pip_package/BUILD | 2 +- 57 files changed, 81 insertions(+), 81 deletions(-) rename tensorflow/python/keras/mixed_precision/{experimental => }/BUILD (96%) rename tensorflow/python/keras/mixed_precision/{experimental => }/autocast_variable.py (100%) rename tensorflow/python/keras/mixed_precision/{experimental => }/autocast_variable_test.py (99%) rename tensorflow/python/keras/mixed_precision/{experimental => }/device_compatibility_check.py (100%) rename tensorflow/python/keras/mixed_precision/{experimental => }/device_compatibility_check_test.py (98%) delete mode 100644 tensorflow/python/keras/mixed_precision/experimental/__init__.py rename tensorflow/python/keras/mixed_precision/{experimental => }/get_layer_policy.py (100%) rename tensorflow/python/keras/mixed_precision/{experimental => }/get_layer_policy_test.py (91%) rename tensorflow/python/keras/mixed_precision/{experimental => }/keras_test.py (98%) rename tensorflow/python/keras/mixed_precision/{experimental => }/layer_correctness_test.py (99%) rename tensorflow/python/keras/mixed_precision/{experimental => }/loss_scale.py (100%) rename tensorflow/python/keras/mixed_precision/{experimental => }/loss_scale_benchmark.py (98%) rename tensorflow/python/keras/mixed_precision/{experimental => }/loss_scale_optimizer.py (99%) rename tensorflow/python/keras/mixed_precision/{experimental => }/loss_scale_optimizer_test.py (99%) rename tensorflow/python/keras/mixed_precision/{experimental => }/mixed_precision_graph_rewrite_test.py (95%) rename tensorflow/python/keras/mixed_precision/{experimental => }/policy.py (99%) rename tensorflow/python/keras/mixed_precision/{experimental => }/policy_test.py (98%) rename tensorflow/python/keras/mixed_precision/{experimental => }/test_util.py (100%) rename tensorflow/python/keras/mixed_precision/{experimental => }/testdata/BUILD (100%) rename tensorflow/python/keras/mixed_precision/{experimental => }/testdata/lso_ckpt_tf2.2/checkpoint (100%) rename tensorflow/python/keras/mixed_precision/{experimental => }/testdata/lso_ckpt_tf2.2/ckpt.data-00000-of-00002 (100%) rename tensorflow/python/keras/mixed_precision/{experimental => }/testdata/lso_ckpt_tf2.2/ckpt.data-00001-of-00002 (100%) rename tensorflow/python/keras/mixed_precision/{experimental => }/testdata/lso_ckpt_tf2.2/ckpt.index (100%) rename tensorflow/python/keras/mixed_precision/{experimental => }/testdata/lso_savedmodel_tf2.2/saved_model.pb (100%) rename tensorflow/python/keras/mixed_precision/{experimental => }/testdata/lso_savedmodel_tf2.2/variables/variables.data-00000-of-00002 (100%) rename tensorflow/python/keras/mixed_precision/{experimental => }/testdata/lso_savedmodel_tf2.2/variables/variables.data-00001-of-00002 (100%) rename tensorflow/python/keras/mixed_precision/{experimental => }/testdata/lso_savedmodel_tf2.2/variables/variables.index (100%) diff --git a/tensorflow/python/keras/BUILD b/tensorflow/python/keras/BUILD index 7c8492a5f48..4d55a758ed8 100755 --- a/tensorflow/python/keras/BUILD +++ b/tensorflow/python/keras/BUILD @@ -38,7 +38,7 @@ py_library( "//tensorflow/python/keras/datasets", "//tensorflow/python/keras/feature_column", "//tensorflow/python/keras/layers", - "//tensorflow/python/keras/mixed_precision/experimental:mixed_precision_experimental", + "//tensorflow/python/keras/mixed_precision:mixed_precision_experimental", "//tensorflow/python/keras/optimizer_v2", "//tensorflow/python/keras/premade", "//tensorflow/python/keras/preprocessing", diff --git a/tensorflow/python/keras/api/BUILD b/tensorflow/python/keras/api/BUILD index d69930b7455..fba0cf557bc 100644 --- a/tensorflow/python/keras/api/BUILD +++ b/tensorflow/python/keras/api/BUILD @@ -73,9 +73,9 @@ keras_packages = [ "tensorflow.python.keras.layers.wrappers", "tensorflow.python.keras.losses", "tensorflow.python.keras.metrics", - "tensorflow.python.keras.mixed_precision.experimental.get_layer_policy", - "tensorflow.python.keras.mixed_precision.experimental.loss_scale_optimizer", - "tensorflow.python.keras.mixed_precision.experimental.policy", + "tensorflow.python.keras.mixed_precision.get_layer_policy", + "tensorflow.python.keras.mixed_precision.loss_scale_optimizer", + "tensorflow.python.keras.mixed_precision.policy", "tensorflow.python.keras.models", "tensorflow.python.keras.optimizer_v2.adadelta", "tensorflow.python.keras.optimizer_v2.adagrad", diff --git a/tensorflow/python/keras/distribute/BUILD b/tensorflow/python/keras/distribute/BUILD index 440e4cbf564..00d8dd93ed5 100644 --- a/tensorflow/python/keras/distribute/BUILD +++ b/tensorflow/python/keras/distribute/BUILD @@ -49,8 +49,8 @@ py_library( "//tensorflow/python/keras:losses", "//tensorflow/python/keras:optimizers", "//tensorflow/python/keras:regularizers", - "//tensorflow/python/keras/mixed_precision/experimental:autocast_variable", - "//tensorflow/python/keras/mixed_precision/experimental:policy", + "//tensorflow/python/keras/mixed_precision:autocast_variable", + "//tensorflow/python/keras/mixed_precision:policy", "//tensorflow/python/keras/saving", "//tensorflow/python/keras/utils:engine_utils", "//tensorflow/python/keras/utils:mode_keys", @@ -197,8 +197,8 @@ cuda_py_test( "//tensorflow/python/keras:testing_utils", "//tensorflow/python/keras/engine", "//tensorflow/python/keras/layers", - "//tensorflow/python/keras/mixed_precision/experimental:policy", - "//tensorflow/python/keras/mixed_precision/experimental:test_util", + "//tensorflow/python/keras/mixed_precision:policy", + "//tensorflow/python/keras/mixed_precision:test_util", "//tensorflow/python/ops/losses", "@absl_py//absl/testing:parameterized", ], diff --git a/tensorflow/python/keras/distribute/collective_all_reduce_strategy_test.py b/tensorflow/python/keras/distribute/collective_all_reduce_strategy_test.py index 313cb14c78b..71830f4d83a 100644 --- a/tensorflow/python/keras/distribute/collective_all_reduce_strategy_test.py +++ b/tensorflow/python/keras/distribute/collective_all_reduce_strategy_test.py @@ -42,8 +42,8 @@ from tensorflow.python.keras import layers from tensorflow.python.keras import testing_utils from tensorflow.python.keras.engine import sequential from tensorflow.python.keras.engine import training -from tensorflow.python.keras.mixed_precision.experimental import policy -from tensorflow.python.keras.mixed_precision.experimental import test_util as mp_test_util +from tensorflow.python.keras.mixed_precision import policy +from tensorflow.python.keras.mixed_precision import test_util as mp_test_util from tensorflow.python.keras.optimizer_v2 import gradient_descent as gradient_descent_keras from tensorflow.python.ops import array_ops from tensorflow.python.ops import nn diff --git a/tensorflow/python/keras/distribute/distribute_strategy_test.py b/tensorflow/python/keras/distribute/distribute_strategy_test.py index 2094d73ae13..e18eba3ae5a 100644 --- a/tensorflow/python/keras/distribute/distribute_strategy_test.py +++ b/tensorflow/python/keras/distribute/distribute_strategy_test.py @@ -51,7 +51,7 @@ from tensorflow.python.keras.distribute import distributed_training_utils from tensorflow.python.keras.distribute import distributed_training_utils_v1 from tensorflow.python.keras.distribute import optimizer_combinations from tensorflow.python.keras.engine import base_layer_utils -from tensorflow.python.keras.mixed_precision.experimental import policy +from tensorflow.python.keras.mixed_precision import policy from tensorflow.python.keras.optimizer_v2 import gradient_descent as gradient_descent_keras from tensorflow.python.keras.utils import np_utils from tensorflow.python.ops import array_ops diff --git a/tensorflow/python/keras/distribute/keras_correctness_test_base.py b/tensorflow/python/keras/distribute/keras_correctness_test_base.py index 77a5f290439..f40f45cccbb 100644 --- a/tensorflow/python/keras/distribute/keras_correctness_test_base.py +++ b/tensorflow/python/keras/distribute/keras_correctness_test_base.py @@ -32,7 +32,7 @@ from tensorflow.python.eager import context from tensorflow.python.framework import random_seed from tensorflow.python.framework import test_combinations as combinations from tensorflow.python.keras.distribute import distributed_training_utils -from tensorflow.python.keras.mixed_precision.experimental import policy +from tensorflow.python.keras.mixed_precision import policy from tensorflow.python.keras.preprocessing import sequence from tensorflow.python.platform import test from tensorflow.python.util import nest diff --git a/tensorflow/python/keras/distribute/keras_rnn_model_correctness_test.py b/tensorflow/python/keras/distribute/keras_rnn_model_correctness_test.py index 7e00ff5ec7f..43092fc2191 100644 --- a/tensorflow/python/keras/distribute/keras_rnn_model_correctness_test.py +++ b/tensorflow/python/keras/distribute/keras_rnn_model_correctness_test.py @@ -28,7 +28,7 @@ from tensorflow.python.keras import testing_utils from tensorflow.python.keras.distribute import keras_correctness_test_base from tensorflow.python.keras.layers import recurrent as rnn_v1 from tensorflow.python.keras.layers import recurrent_v2 as rnn_v2 -from tensorflow.python.keras.mixed_precision.experimental import policy +from tensorflow.python.keras.mixed_precision import policy from tensorflow.python.keras.optimizer_v2 import gradient_descent as gradient_descent_keras diff --git a/tensorflow/python/keras/engine/BUILD b/tensorflow/python/keras/engine/BUILD index 144e8ac6d78..e848097940a 100644 --- a/tensorflow/python/keras/engine/BUILD +++ b/tensorflow/python/keras/engine/BUILD @@ -67,9 +67,9 @@ py_library( "//tensorflow/python/keras:optimizers", "//tensorflow/python/keras:regularizers", "//tensorflow/python/keras/distribute", - "//tensorflow/python/keras/mixed_precision/experimental:autocast_variable", - "//tensorflow/python/keras/mixed_precision/experimental:loss_scale_optimizer", - "//tensorflow/python/keras/mixed_precision/experimental:policy", + "//tensorflow/python/keras/mixed_precision:autocast_variable", + "//tensorflow/python/keras/mixed_precision:loss_scale_optimizer", + "//tensorflow/python/keras/mixed_precision:policy", "//tensorflow/python/keras/saving", "//tensorflow/python/keras/utils:engine_utils", "//tensorflow/python/keras/utils:metrics_utils", @@ -152,9 +152,9 @@ py_library( # TODO(keras-team): Fix the cyclar deps between layer and metrics. # "//tensorflow/python/keras:metrics", "//tensorflow/python/keras:regularizers", - "//tensorflow/python/keras/mixed_precision/experimental:autocast_variable", - "//tensorflow/python/keras/mixed_precision/experimental:loss_scale_optimizer", - "//tensorflow/python/keras/mixed_precision/experimental:policy", + "//tensorflow/python/keras/mixed_precision:autocast_variable", + "//tensorflow/python/keras/mixed_precision:loss_scale_optimizer", + "//tensorflow/python/keras/mixed_precision:policy", "//tensorflow/python/keras/saving", "//tensorflow/python/keras/utils:generic_utils", "//tensorflow/python/keras/utils:layer_utils", @@ -691,7 +691,7 @@ tf_py_test( "//tensorflow/python/keras:testing_utils", "//tensorflow/python/keras/layers", "//tensorflow/python/keras/legacy_tf_layers:core", - "//tensorflow/python/keras/mixed_precision/experimental:policy", + "//tensorflow/python/keras/mixed_precision:policy", "//tensorflow/python/keras/optimizer_v2", "//tensorflow/python/keras/utils:tf_utils", "//tensorflow/python/ops/ragged:ragged_tensor", diff --git a/tensorflow/python/keras/engine/base_layer.py b/tensorflow/python/keras/engine/base_layer.py index 64bd517417f..558d6a71732 100644 --- a/tensorflow/python/keras/engine/base_layer.py +++ b/tensorflow/python/keras/engine/base_layer.py @@ -56,9 +56,9 @@ from tensorflow.python.keras.engine import base_layer_utils from tensorflow.python.keras.engine import input_spec from tensorflow.python.keras.engine import keras_tensor from tensorflow.python.keras.engine import node as node_module -from tensorflow.python.keras.mixed_precision.experimental import autocast_variable -from tensorflow.python.keras.mixed_precision.experimental import loss_scale_optimizer -from tensorflow.python.keras.mixed_precision.experimental import policy +from tensorflow.python.keras.mixed_precision import autocast_variable +from tensorflow.python.keras.mixed_precision import loss_scale_optimizer +from tensorflow.python.keras.mixed_precision import policy from tensorflow.python.keras.saving.saved_model import layer_serialization from tensorflow.python.keras.utils import generic_utils from tensorflow.python.keras.utils import layer_utils diff --git a/tensorflow/python/keras/engine/base_layer_test.py b/tensorflow/python/keras/engine/base_layer_test.py index 029447b3cba..19ccb92a554 100644 --- a/tensorflow/python/keras/engine/base_layer_test.py +++ b/tensorflow/python/keras/engine/base_layer_test.py @@ -1502,7 +1502,7 @@ class IdentityLayer(base_layer.Layer): class DTypeTest(keras_parameterized.TestCase): # This class only have tests relating to layer.dtype. Tests for dtype policies - # are in mixed_precision/experimental/keras_test.py + # are in mixed_precision/keras_test.py # TODO(reedwm): Maybe have a separate test file for input casting tests. diff --git a/tensorflow/python/keras/engine/base_layer_v1.py b/tensorflow/python/keras/engine/base_layer_v1.py index 059cd0148cc..17c7faf37ff 100644 --- a/tensorflow/python/keras/engine/base_layer_v1.py +++ b/tensorflow/python/keras/engine/base_layer_v1.py @@ -46,9 +46,9 @@ from tensorflow.python.keras import regularizers from tensorflow.python.keras.engine import base_layer from tensorflow.python.keras.engine import base_layer_utils from tensorflow.python.keras.engine import input_spec -from tensorflow.python.keras.mixed_precision.experimental import autocast_variable -from tensorflow.python.keras.mixed_precision.experimental import loss_scale_optimizer -from tensorflow.python.keras.mixed_precision.experimental import policy +from tensorflow.python.keras.mixed_precision import autocast_variable +from tensorflow.python.keras.mixed_precision import loss_scale_optimizer +from tensorflow.python.keras.mixed_precision import policy from tensorflow.python.keras.saving.saved_model import layer_serialization from tensorflow.python.keras.utils import generic_utils from tensorflow.python.keras.utils import layer_utils diff --git a/tensorflow/python/keras/engine/training.py b/tensorflow/python/keras/engine/training.py index f89723b641b..e0d53deebee 100644 --- a/tensorflow/python/keras/engine/training.py +++ b/tensorflow/python/keras/engine/training.py @@ -51,8 +51,8 @@ from tensorflow.python.keras.engine import base_layer_utils from tensorflow.python.keras.engine import compile_utils from tensorflow.python.keras.engine import data_adapter from tensorflow.python.keras.engine import training_utils -from tensorflow.python.keras.mixed_precision.experimental import loss_scale_optimizer as lso -from tensorflow.python.keras.mixed_precision.experimental import policy +from tensorflow.python.keras.mixed_precision import loss_scale_optimizer as lso +from tensorflow.python.keras.mixed_precision import policy from tensorflow.python.keras.saving import hdf5_format from tensorflow.python.keras.saving import save from tensorflow.python.keras.saving.saved_model import json_utils diff --git a/tensorflow/python/keras/engine/training_eager_v1.py b/tensorflow/python/keras/engine/training_eager_v1.py index 2acd7493cb0..a52b20c5aa0 100644 --- a/tensorflow/python/keras/engine/training_eager_v1.py +++ b/tensorflow/python/keras/engine/training_eager_v1.py @@ -26,7 +26,7 @@ from tensorflow.python.framework import ops from tensorflow.python.keras import backend from tensorflow.python.keras.engine import training_utils from tensorflow.python.keras.engine import training_utils_v1 -from tensorflow.python.keras.mixed_precision.experimental import loss_scale_optimizer +from tensorflow.python.keras.mixed_precision import loss_scale_optimizer from tensorflow.python.keras.utils import losses_utils from tensorflow.python.ops import math_ops from tensorflow.python.platform import tf_logging as logging diff --git a/tensorflow/python/keras/engine/training_v1.py b/tensorflow/python/keras/engine/training_v1.py index dee211a7efa..7d4eb1325df 100644 --- a/tensorflow/python/keras/engine/training_v1.py +++ b/tensorflow/python/keras/engine/training_v1.py @@ -52,8 +52,8 @@ from tensorflow.python.keras.engine import training_eager_v1 from tensorflow.python.keras.engine import training_generator_v1 from tensorflow.python.keras.engine import training_utils from tensorflow.python.keras.engine import training_utils_v1 -from tensorflow.python.keras.mixed_precision.experimental import loss_scale_optimizer -from tensorflow.python.keras.mixed_precision.experimental import policy +from tensorflow.python.keras.mixed_precision import loss_scale_optimizer +from tensorflow.python.keras.mixed_precision import policy from tensorflow.python.keras.optimizer_v2 import optimizer_v2 from tensorflow.python.keras.saving.saved_model import model_serialization from tensorflow.python.keras.utils import data_utils diff --git a/tensorflow/python/keras/layers/core_test.py b/tensorflow/python/keras/layers/core_test.py index 3f113bf8cbb..ff346737edc 100644 --- a/tensorflow/python/keras/layers/core_test.py +++ b/tensorflow/python/keras/layers/core_test.py @@ -30,7 +30,7 @@ from tensorflow.python.framework import tensor_spec from tensorflow.python.keras import keras_parameterized from tensorflow.python.keras import testing_utils from tensorflow.python.keras.layers import core -from tensorflow.python.keras.mixed_precision.experimental import policy +from tensorflow.python.keras.mixed_precision import policy from tensorflow.python.ops import array_ops from tensorflow.python.ops import math_ops from tensorflow.python.ops import variables diff --git a/tensorflow/python/keras/layers/embeddings_test.py b/tensorflow/python/keras/layers/embeddings_test.py index fd468bd15b1..50ea36d1c8a 100644 --- a/tensorflow/python/keras/layers/embeddings_test.py +++ b/tensorflow/python/keras/layers/embeddings_test.py @@ -28,7 +28,7 @@ from tensorflow.python.framework import test_util as tf_test_util from tensorflow.python.keras import combinations from tensorflow.python.keras import keras_parameterized from tensorflow.python.keras import testing_utils -from tensorflow.python.keras.mixed_precision.experimental import policy +from tensorflow.python.keras.mixed_precision import policy from tensorflow.python.ops import variables from tensorflow.python.ops.ragged import ragged_factory_ops from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/layers/normalization_test.py b/tensorflow/python/keras/layers/normalization_test.py index 79ecc3c3fe1..a98db36ceea 100644 --- a/tensorflow/python/keras/layers/normalization_test.py +++ b/tensorflow/python/keras/layers/normalization_test.py @@ -31,7 +31,7 @@ from tensorflow.python.keras import keras_parameterized from tensorflow.python.keras import testing_utils from tensorflow.python.keras.layers import normalization from tensorflow.python.keras.layers import normalization_v2 -from tensorflow.python.keras.mixed_precision.experimental import policy +from tensorflow.python.keras.mixed_precision import policy from tensorflow.python.ops import array_ops from tensorflow.python.ops import gradient_checker_v2 from tensorflow.python.ops import math_ops diff --git a/tensorflow/python/keras/legacy_tf_layers/BUILD b/tensorflow/python/keras/legacy_tf_layers/BUILD index 45ccd958db0..6df9a258994 100644 --- a/tensorflow/python/keras/legacy_tf_layers/BUILD +++ b/tensorflow/python/keras/legacy_tf_layers/BUILD @@ -34,7 +34,7 @@ py_library( "//tensorflow/python/eager:context", "//tensorflow/python/keras:backend", "//tensorflow/python/keras/engine:base_layer", - "//tensorflow/python/keras/mixed_precision/experimental:policy", + "//tensorflow/python/keras/mixed_precision:policy", "//tensorflow/python/training/tracking:base", ], ) diff --git a/tensorflow/python/keras/legacy_tf_layers/base.py b/tensorflow/python/keras/legacy_tf_layers/base.py index 1e2a7e7861c..2a3f477456f 100644 --- a/tensorflow/python/keras/legacy_tf_layers/base.py +++ b/tensorflow/python/keras/legacy_tf_layers/base.py @@ -26,7 +26,7 @@ from tensorflow.python.framework import ops from tensorflow.python.keras import backend from tensorflow.python.keras.engine import base_layer from tensorflow.python.keras.engine import base_layer_utils -from tensorflow.python.keras.mixed_precision.experimental import policy +from tensorflow.python.keras.mixed_precision import policy from tensorflow.python.keras.utils import tf_contextlib from tensorflow.python.ops import variable_scope as vs from tensorflow.python.ops import variables as tf_variables diff --git a/tensorflow/python/keras/mixed_precision/experimental/BUILD b/tensorflow/python/keras/mixed_precision/BUILD similarity index 96% rename from tensorflow/python/keras/mixed_precision/experimental/BUILD rename to tensorflow/python/keras/mixed_precision/BUILD index e7e5287e20d..b12ce250eef 100644 --- a/tensorflow/python/keras/mixed_precision/experimental/BUILD +++ b/tensorflow/python/keras/mixed_precision/BUILD @@ -76,7 +76,7 @@ py_test( "//tensorflow/python:platform_test", "//tensorflow/python/keras", "//tensorflow/python/keras:combinations", - "//tensorflow/python/keras/mixed_precision/experimental:loss_scale_optimizer", + "//tensorflow/python/keras/mixed_precision:loss_scale_optimizer", "//tensorflow/python/keras/optimizer_v2", ], ) @@ -257,8 +257,8 @@ cuda_py_test( size = "medium", srcs = ["keras_test.py"], data = [ - "//tensorflow/python/keras/mixed_precision/experimental/testdata:lso_ckpt_tf2.2", - "//tensorflow/python/keras/mixed_precision/experimental/testdata:lso_savedmodel_tf2.2", + "//tensorflow/python/keras/mixed_precision/testdata:lso_ckpt_tf2.2", + "//tensorflow/python/keras/mixed_precision/testdata:lso_savedmodel_tf2.2", ], python_version = "PY3", shard_count = 10, diff --git a/tensorflow/python/keras/mixed_precision/experimental/autocast_variable.py b/tensorflow/python/keras/mixed_precision/autocast_variable.py similarity index 100% rename from tensorflow/python/keras/mixed_precision/experimental/autocast_variable.py rename to tensorflow/python/keras/mixed_precision/autocast_variable.py diff --git a/tensorflow/python/keras/mixed_precision/experimental/autocast_variable_test.py b/tensorflow/python/keras/mixed_precision/autocast_variable_test.py similarity index 99% rename from tensorflow/python/keras/mixed_precision/experimental/autocast_variable_test.py rename to tensorflow/python/keras/mixed_precision/autocast_variable_test.py index 4df584c1d6b..c21ff865205 100644 --- a/tensorflow/python/keras/mixed_precision/experimental/autocast_variable_test.py +++ b/tensorflow/python/keras/mixed_precision/autocast_variable_test.py @@ -36,7 +36,7 @@ from tensorflow.python.framework import dtypes from tensorflow.python.framework import indexed_slices from tensorflow.python.framework import ops from tensorflow.python.framework import test_combinations as combinations -from tensorflow.python.keras.mixed_precision.experimental import autocast_variable +from tensorflow.python.keras.mixed_precision import autocast_variable from tensorflow.python.keras.optimizer_v2 import gradient_descent as gradient_descent_v2 from tensorflow.python.ops import array_ops from tensorflow.python.ops import state_ops diff --git a/tensorflow/python/keras/mixed_precision/experimental/device_compatibility_check.py b/tensorflow/python/keras/mixed_precision/device_compatibility_check.py similarity index 100% rename from tensorflow/python/keras/mixed_precision/experimental/device_compatibility_check.py rename to tensorflow/python/keras/mixed_precision/device_compatibility_check.py diff --git a/tensorflow/python/keras/mixed_precision/experimental/device_compatibility_check_test.py b/tensorflow/python/keras/mixed_precision/device_compatibility_check_test.py similarity index 98% rename from tensorflow/python/keras/mixed_precision/experimental/device_compatibility_check_test.py rename to tensorflow/python/keras/mixed_precision/device_compatibility_check_test.py index ccefa250d2d..381b054fa58 100644 --- a/tensorflow/python/keras/mixed_precision/experimental/device_compatibility_check_test.py +++ b/tensorflow/python/keras/mixed_precision/device_compatibility_check_test.py @@ -21,7 +21,7 @@ from __future__ import print_function import re from tensorflow.python.keras import combinations -from tensorflow.python.keras.mixed_precision.experimental import device_compatibility_check +from tensorflow.python.keras.mixed_precision import device_compatibility_check from tensorflow.python.platform import test from tensorflow.python.platform import tf_logging diff --git a/tensorflow/python/keras/mixed_precision/experimental/__init__.py b/tensorflow/python/keras/mixed_precision/experimental/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tensorflow/python/keras/mixed_precision/experimental/get_layer_policy.py b/tensorflow/python/keras/mixed_precision/get_layer_policy.py similarity index 100% rename from tensorflow/python/keras/mixed_precision/experimental/get_layer_policy.py rename to tensorflow/python/keras/mixed_precision/get_layer_policy.py diff --git a/tensorflow/python/keras/mixed_precision/experimental/get_layer_policy_test.py b/tensorflow/python/keras/mixed_precision/get_layer_policy_test.py similarity index 91% rename from tensorflow/python/keras/mixed_precision/experimental/get_layer_policy_test.py rename to tensorflow/python/keras/mixed_precision/get_layer_policy_test.py index f38bdfaf482..ae1ac94055c 100644 --- a/tensorflow/python/keras/mixed_precision/experimental/get_layer_policy_test.py +++ b/tensorflow/python/keras/mixed_precision/get_layer_policy_test.py @@ -20,8 +20,8 @@ from __future__ import print_function from tensorflow.python.keras.engine import base_layer_utils from tensorflow.python.keras.layers import core -from tensorflow.python.keras.mixed_precision.experimental import get_layer_policy -from tensorflow.python.keras.mixed_precision.experimental import policy +from tensorflow.python.keras.mixed_precision import get_layer_policy +from tensorflow.python.keras.mixed_precision import policy from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/mixed_precision/experimental/keras_test.py b/tensorflow/python/keras/mixed_precision/keras_test.py similarity index 98% rename from tensorflow/python/keras/mixed_precision/experimental/keras_test.py rename to tensorflow/python/keras/mixed_precision/keras_test.py index 70ebd85de0f..d788f0005b0 100644 --- a/tensorflow/python/keras/mixed_precision/experimental/keras_test.py +++ b/tensorflow/python/keras/mixed_precision/keras_test.py @@ -44,10 +44,10 @@ from tensorflow.python.keras.engine import base_layer_utils from tensorflow.python.keras.engine import input_spec from tensorflow.python.keras.engine import sequential from tensorflow.python.keras.layers import core -from tensorflow.python.keras.mixed_precision.experimental import get_layer_policy -from tensorflow.python.keras.mixed_precision.experimental import loss_scale_optimizer -from tensorflow.python.keras.mixed_precision.experimental import policy -from tensorflow.python.keras.mixed_precision.experimental import test_util as mp_test_util +from tensorflow.python.keras.mixed_precision import get_layer_policy +from tensorflow.python.keras.mixed_precision import loss_scale_optimizer +from tensorflow.python.keras.mixed_precision import policy +from tensorflow.python.keras.mixed_precision import test_util as mp_test_util from tensorflow.python.keras.optimizer_v2 import gradient_descent from tensorflow.python.keras.saving import save from tensorflow.python.keras.utils import generic_utils @@ -1091,9 +1091,9 @@ class KerasModelTest(keras_parameterized.TestCase): ckpt_dir = os.path.join( flags.FLAGS['test_srcdir'].value, 'org_tensorflow/tensorflow/python/keras', - 'mixed_precision/experimental/testdata/lso_ckpt_tf2.2') + 'mixed_precision/testdata/lso_ckpt_tf2.2') # ckpt_dir = test.test_src_dir_path( - # 'python/keras/mixed_precision/experimental/testdata/lso_ckpt_tf2.2') + # 'python/keras/mixed_precision/testdata/lso_ckpt_tf2.2') model.load_weights(os.path.join(ckpt_dir, 'ckpt')) model.compile(opt, 'mse', run_eagerly=testing_utils.should_run_eagerly()) model(np.zeros((2, 2))) # Create model weights @@ -1126,9 +1126,9 @@ class KerasModelTest(keras_parameterized.TestCase): saved_model_dir = os.path.join( flags.FLAGS['test_srcdir'].value, 'org_tensorflow/tensorflow/python/keras', - 'mixed_precision/experimental/testdata/lso_savedmodel_tf2.2') + 'mixed_precision/testdata/lso_savedmodel_tf2.2') # saved_model_dir = test.test_src_dir_path( - # 'python/keras/mixed_precision/experimental/testdata/' + # 'python/keras/mixed_precision/testdata/' # 'lso_savedmodel_tf2.2') model = save.load_model(saved_model_dir) expected_kernel = np.array([[9.229685, 10.901115], [10.370763, 9.757362]]) diff --git a/tensorflow/python/keras/mixed_precision/experimental/layer_correctness_test.py b/tensorflow/python/keras/mixed_precision/layer_correctness_test.py similarity index 99% rename from tensorflow/python/keras/mixed_precision/experimental/layer_correctness_test.py rename to tensorflow/python/keras/mixed_precision/layer_correctness_test.py index 6a5354cba67..bbccc8721cd 100644 --- a/tensorflow/python/keras/mixed_precision/experimental/layer_correctness_test.py +++ b/tensorflow/python/keras/mixed_precision/layer_correctness_test.py @@ -42,7 +42,7 @@ from tensorflow.python.keras.layers import pooling from tensorflow.python.keras.layers import recurrent from tensorflow.python.keras.layers import recurrent_v2 from tensorflow.python.keras.layers import wrappers -from tensorflow.python.keras.mixed_precision.experimental import policy +from tensorflow.python.keras.mixed_precision import policy from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/mixed_precision/experimental/loss_scale.py b/tensorflow/python/keras/mixed_precision/loss_scale.py similarity index 100% rename from tensorflow/python/keras/mixed_precision/experimental/loss_scale.py rename to tensorflow/python/keras/mixed_precision/loss_scale.py diff --git a/tensorflow/python/keras/mixed_precision/experimental/loss_scale_benchmark.py b/tensorflow/python/keras/mixed_precision/loss_scale_benchmark.py similarity index 98% rename from tensorflow/python/keras/mixed_precision/experimental/loss_scale_benchmark.py rename to tensorflow/python/keras/mixed_precision/loss_scale_benchmark.py index 95fcd1168d1..d468326e1ad 100644 --- a/tensorflow/python/keras/mixed_precision/experimental/loss_scale_benchmark.py +++ b/tensorflow/python/keras/mixed_precision/loss_scale_benchmark.py @@ -25,7 +25,7 @@ from tensorflow.python.eager import backprop from tensorflow.python.eager import context from tensorflow.python.eager import def_function from tensorflow.python.framework import config -from tensorflow.python.keras.mixed_precision.experimental import loss_scale_optimizer +from tensorflow.python.keras.mixed_precision import loss_scale_optimizer from tensorflow.python.keras.optimizer_v2 import adam from tensorflow.python.ops import math_ops from tensorflow.python.ops import variables diff --git a/tensorflow/python/keras/mixed_precision/experimental/loss_scale_optimizer.py b/tensorflow/python/keras/mixed_precision/loss_scale_optimizer.py similarity index 99% rename from tensorflow/python/keras/mixed_precision/experimental/loss_scale_optimizer.py rename to tensorflow/python/keras/mixed_precision/loss_scale_optimizer.py index 2dcce3b46c9..f1ca255133e 100644 --- a/tensorflow/python/keras/mixed_precision/experimental/loss_scale_optimizer.py +++ b/tensorflow/python/keras/mixed_precision/loss_scale_optimizer.py @@ -30,7 +30,7 @@ from tensorflow.python.framework import ops from tensorflow.python.framework import smart_cond from tensorflow.python.keras import backend from tensorflow.python.keras import optimizers -from tensorflow.python.keras.mixed_precision.experimental import loss_scale as keras_loss_scale_module +from tensorflow.python.keras.mixed_precision import loss_scale as keras_loss_scale_module from tensorflow.python.keras.optimizer_v2 import optimizer_v2 from tensorflow.python.ops import control_flow_ops from tensorflow.python.ops import math_ops diff --git a/tensorflow/python/keras/mixed_precision/experimental/loss_scale_optimizer_test.py b/tensorflow/python/keras/mixed_precision/loss_scale_optimizer_test.py similarity index 99% rename from tensorflow/python/keras/mixed_precision/experimental/loss_scale_optimizer_test.py rename to tensorflow/python/keras/mixed_precision/loss_scale_optimizer_test.py index 1e16e2e8c1b..e9f375303a6 100644 --- a/tensorflow/python/keras/mixed_precision/experimental/loss_scale_optimizer_test.py +++ b/tensorflow/python/keras/mixed_precision/loss_scale_optimizer_test.py @@ -32,8 +32,8 @@ from tensorflow.python.framework import ops from tensorflow.python.framework import test_util from tensorflow.python.keras import combinations from tensorflow.python.keras import optimizers -from tensorflow.python.keras.mixed_precision.experimental import loss_scale_optimizer -from tensorflow.python.keras.mixed_precision.experimental import test_util as mp_test_util +from tensorflow.python.keras.mixed_precision import loss_scale_optimizer +from tensorflow.python.keras.mixed_precision import test_util as mp_test_util from tensorflow.python.keras.optimizer_v2 import adam from tensorflow.python.keras.optimizer_v2 import gradient_descent from tensorflow.python.ops import control_flow_v2_toggles diff --git a/tensorflow/python/keras/mixed_precision/experimental/mixed_precision_graph_rewrite_test.py b/tensorflow/python/keras/mixed_precision/mixed_precision_graph_rewrite_test.py similarity index 95% rename from tensorflow/python/keras/mixed_precision/experimental/mixed_precision_graph_rewrite_test.py rename to tensorflow/python/keras/mixed_precision/mixed_precision_graph_rewrite_test.py index a70620e4d6d..3fc9b9c455b 100644 --- a/tensorflow/python/keras/mixed_precision/experimental/mixed_precision_graph_rewrite_test.py +++ b/tensorflow/python/keras/mixed_precision/mixed_precision_graph_rewrite_test.py @@ -24,8 +24,8 @@ from tensorflow.python.framework import config from tensorflow.python.keras import combinations from tensorflow.python.keras import keras_parameterized from tensorflow.python.keras import testing_utils -from tensorflow.python.keras.mixed_precision.experimental import loss_scale_optimizer as loss_scale_optimizer_v2 -from tensorflow.python.keras.mixed_precision.experimental import policy +from tensorflow.python.keras.mixed_precision import loss_scale_optimizer as loss_scale_optimizer_v2 +from tensorflow.python.keras.mixed_precision import policy from tensorflow.python.keras.optimizer_v2 import gradient_descent as gradient_descent_v2 from tensorflow.python.platform import test from tensorflow.python.training.experimental import mixed_precision diff --git a/tensorflow/python/keras/mixed_precision/experimental/policy.py b/tensorflow/python/keras/mixed_precision/policy.py similarity index 99% rename from tensorflow/python/keras/mixed_precision/experimental/policy.py rename to tensorflow/python/keras/mixed_precision/policy.py index 40626073a1a..dec172932d2 100644 --- a/tensorflow/python/keras/mixed_precision/experimental/policy.py +++ b/tensorflow/python/keras/mixed_precision/policy.py @@ -24,8 +24,8 @@ import six from tensorflow.python.framework import dtypes from tensorflow.python.keras import backend from tensorflow.python.keras.engine import base_layer_utils -from tensorflow.python.keras.mixed_precision.experimental import device_compatibility_check -from tensorflow.python.keras.mixed_precision.experimental import loss_scale as keras_loss_scale_module +from tensorflow.python.keras.mixed_precision import device_compatibility_check +from tensorflow.python.keras.mixed_precision import loss_scale as keras_loss_scale_module from tensorflow.python.keras.utils import generic_utils from tensorflow.python.platform import tf_logging from tensorflow.python.training.experimental import mixed_precision_global_state diff --git a/tensorflow/python/keras/mixed_precision/experimental/policy_test.py b/tensorflow/python/keras/mixed_precision/policy_test.py similarity index 98% rename from tensorflow/python/keras/mixed_precision/experimental/policy_test.py rename to tensorflow/python/keras/mixed_precision/policy_test.py index 07096d64e6e..85c41a2adeb 100644 --- a/tensorflow/python/keras/mixed_precision/experimental/policy_test.py +++ b/tensorflow/python/keras/mixed_precision/policy_test.py @@ -27,8 +27,8 @@ from tensorflow.python.framework import ops from tensorflow.python.keras import combinations from tensorflow.python.keras import testing_utils from tensorflow.python.keras.engine import base_layer_utils -from tensorflow.python.keras.mixed_precision.experimental import device_compatibility_check -from tensorflow.python.keras.mixed_precision.experimental import policy as mp_policy +from tensorflow.python.keras.mixed_precision import device_compatibility_check +from tensorflow.python.keras.mixed_precision import policy as mp_policy from tensorflow.python.keras.optimizer_v2 import gradient_descent from tensorflow.python.platform import test from tensorflow.python.platform import tf_logging diff --git a/tensorflow/python/keras/mixed_precision/experimental/test_util.py b/tensorflow/python/keras/mixed_precision/test_util.py similarity index 100% rename from tensorflow/python/keras/mixed_precision/experimental/test_util.py rename to tensorflow/python/keras/mixed_precision/test_util.py diff --git a/tensorflow/python/keras/mixed_precision/experimental/testdata/BUILD b/tensorflow/python/keras/mixed_precision/testdata/BUILD similarity index 100% rename from tensorflow/python/keras/mixed_precision/experimental/testdata/BUILD rename to tensorflow/python/keras/mixed_precision/testdata/BUILD diff --git a/tensorflow/python/keras/mixed_precision/experimental/testdata/lso_ckpt_tf2.2/checkpoint b/tensorflow/python/keras/mixed_precision/testdata/lso_ckpt_tf2.2/checkpoint similarity index 100% rename from tensorflow/python/keras/mixed_precision/experimental/testdata/lso_ckpt_tf2.2/checkpoint rename to tensorflow/python/keras/mixed_precision/testdata/lso_ckpt_tf2.2/checkpoint diff --git a/tensorflow/python/keras/mixed_precision/experimental/testdata/lso_ckpt_tf2.2/ckpt.data-00000-of-00002 b/tensorflow/python/keras/mixed_precision/testdata/lso_ckpt_tf2.2/ckpt.data-00000-of-00002 similarity index 100% rename from tensorflow/python/keras/mixed_precision/experimental/testdata/lso_ckpt_tf2.2/ckpt.data-00000-of-00002 rename to tensorflow/python/keras/mixed_precision/testdata/lso_ckpt_tf2.2/ckpt.data-00000-of-00002 diff --git a/tensorflow/python/keras/mixed_precision/experimental/testdata/lso_ckpt_tf2.2/ckpt.data-00001-of-00002 b/tensorflow/python/keras/mixed_precision/testdata/lso_ckpt_tf2.2/ckpt.data-00001-of-00002 similarity index 100% rename from tensorflow/python/keras/mixed_precision/experimental/testdata/lso_ckpt_tf2.2/ckpt.data-00001-of-00002 rename to tensorflow/python/keras/mixed_precision/testdata/lso_ckpt_tf2.2/ckpt.data-00001-of-00002 diff --git a/tensorflow/python/keras/mixed_precision/experimental/testdata/lso_ckpt_tf2.2/ckpt.index b/tensorflow/python/keras/mixed_precision/testdata/lso_ckpt_tf2.2/ckpt.index similarity index 100% rename from tensorflow/python/keras/mixed_precision/experimental/testdata/lso_ckpt_tf2.2/ckpt.index rename to tensorflow/python/keras/mixed_precision/testdata/lso_ckpt_tf2.2/ckpt.index diff --git a/tensorflow/python/keras/mixed_precision/experimental/testdata/lso_savedmodel_tf2.2/saved_model.pb b/tensorflow/python/keras/mixed_precision/testdata/lso_savedmodel_tf2.2/saved_model.pb similarity index 100% rename from tensorflow/python/keras/mixed_precision/experimental/testdata/lso_savedmodel_tf2.2/saved_model.pb rename to tensorflow/python/keras/mixed_precision/testdata/lso_savedmodel_tf2.2/saved_model.pb diff --git a/tensorflow/python/keras/mixed_precision/experimental/testdata/lso_savedmodel_tf2.2/variables/variables.data-00000-of-00002 b/tensorflow/python/keras/mixed_precision/testdata/lso_savedmodel_tf2.2/variables/variables.data-00000-of-00002 similarity index 100% rename from tensorflow/python/keras/mixed_precision/experimental/testdata/lso_savedmodel_tf2.2/variables/variables.data-00000-of-00002 rename to tensorflow/python/keras/mixed_precision/testdata/lso_savedmodel_tf2.2/variables/variables.data-00000-of-00002 diff --git a/tensorflow/python/keras/mixed_precision/experimental/testdata/lso_savedmodel_tf2.2/variables/variables.data-00001-of-00002 b/tensorflow/python/keras/mixed_precision/testdata/lso_savedmodel_tf2.2/variables/variables.data-00001-of-00002 similarity index 100% rename from tensorflow/python/keras/mixed_precision/experimental/testdata/lso_savedmodel_tf2.2/variables/variables.data-00001-of-00002 rename to tensorflow/python/keras/mixed_precision/testdata/lso_savedmodel_tf2.2/variables/variables.data-00001-of-00002 diff --git a/tensorflow/python/keras/mixed_precision/experimental/testdata/lso_savedmodel_tf2.2/variables/variables.index b/tensorflow/python/keras/mixed_precision/testdata/lso_savedmodel_tf2.2/variables/variables.index similarity index 100% rename from tensorflow/python/keras/mixed_precision/experimental/testdata/lso_savedmodel_tf2.2/variables/variables.index rename to tensorflow/python/keras/mixed_precision/testdata/lso_savedmodel_tf2.2/variables/variables.index diff --git a/tensorflow/python/keras/optimizers.py b/tensorflow/python/keras/optimizers.py index 961baa3ea7a..ab779b161de 100644 --- a/tensorflow/python/keras/optimizers.py +++ b/tensorflow/python/keras/optimizers.py @@ -60,7 +60,7 @@ def deserialize(config, custom_objects=None): """ # loss_scale_optimizer has a direct dependency of optimizer, import here # rather than top to avoid the cyclic dependency. - from tensorflow.python.keras.mixed_precision.experimental import loss_scale_optimizer # pylint: disable=g-import-not-at-top + from tensorflow.python.keras.mixed_precision import loss_scale_optimizer # pylint: disable=g-import-not-at-top all_classes = { 'adadelta': adadelta_v2.Adadelta, 'adagrad': adagrad_v2.Adagrad, diff --git a/tensorflow/python/keras/saving/BUILD b/tensorflow/python/keras/saving/BUILD index 5ffe7afdddf..51095c1c75f 100644 --- a/tensorflow/python/keras/saving/BUILD +++ b/tensorflow/python/keras/saving/BUILD @@ -57,7 +57,7 @@ py_library( "//tensorflow/python/keras:optimizers", "//tensorflow/python/keras:regularizers", "//tensorflow/python/keras/engine:input_spec", - "//tensorflow/python/keras/mixed_precision/experimental:autocast_variable", + "//tensorflow/python/keras/mixed_precision:autocast_variable", "//tensorflow/python/keras/protobuf:saved_metadata_proto_py", "//tensorflow/python/keras/utils:engine_utils", "//tensorflow/python/keras/utils:metrics_utils", diff --git a/tensorflow/python/keras/saving/saved_model/layer_serialization.py b/tensorflow/python/keras/saving/saved_model/layer_serialization.py index 4216457bf28..73f3ba250a4 100644 --- a/tensorflow/python/keras/saving/saved_model/layer_serialization.py +++ b/tensorflow/python/keras/saving/saved_model/layer_serialization.py @@ -18,7 +18,7 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras.mixed_precision.experimental import policy +from tensorflow.python.keras.mixed_precision import policy from tensorflow.python.keras.saving.saved_model import base_serialization from tensorflow.python.keras.saving.saved_model import constants from tensorflow.python.keras.saving.saved_model import save_impl diff --git a/tensorflow/python/keras/saving/saved_model/save_impl.py b/tensorflow/python/keras/saving/saved_model/save_impl.py index f448daad322..a2e74deaaeb 100644 --- a/tensorflow/python/keras/saving/saved_model/save_impl.py +++ b/tensorflow/python/keras/saving/saved_model/save_impl.py @@ -31,7 +31,7 @@ from tensorflow.python.framework import tensor_spec from tensorflow.python.keras import backend as K from tensorflow.python.keras.engine import base_layer_utils from tensorflow.python.keras.engine import input_spec -from tensorflow.python.keras.mixed_precision.experimental import autocast_variable +from tensorflow.python.keras.mixed_precision import autocast_variable from tensorflow.python.keras.saving import saving_utils from tensorflow.python.keras.saving.saved_model import constants from tensorflow.python.keras.saving.saved_model import load as keras_load diff --git a/tensorflow/tools/api/golden/v1/tensorflow.keras.mixed_precision.-loss-scale-optimizer.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.keras.mixed_precision.-loss-scale-optimizer.pbtxt index 4eb76cf58cf..3bea3a9f8fe 100644 --- a/tensorflow/tools/api/golden/v1/tensorflow.keras.mixed_precision.-loss-scale-optimizer.pbtxt +++ b/tensorflow/tools/api/golden/v1/tensorflow.keras.mixed_precision.-loss-scale-optimizer.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.mixed_precision.LossScaleOptimizer" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" is_instance: "" diff --git a/tensorflow/tools/api/golden/v1/tensorflow.keras.mixed_precision.experimental.-loss-scale-optimizer.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.keras.mixed_precision.experimental.-loss-scale-optimizer.pbtxt index d60cbd974a7..a68c17e8f24 100644 --- a/tensorflow/tools/api/golden/v1/tensorflow.keras.mixed_precision.experimental.-loss-scale-optimizer.pbtxt +++ b/tensorflow/tools/api/golden/v1/tensorflow.keras.mixed_precision.experimental.-loss-scale-optimizer.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.mixed_precision.experimental.LossScaleOptimizer" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" is_instance: "" diff --git a/tensorflow/tools/api/golden/v2/tensorflow.keras.mixed_precision.-loss-scale-optimizer.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.keras.mixed_precision.-loss-scale-optimizer.pbtxt index 4eb76cf58cf..3bea3a9f8fe 100644 --- a/tensorflow/tools/api/golden/v2/tensorflow.keras.mixed_precision.-loss-scale-optimizer.pbtxt +++ b/tensorflow/tools/api/golden/v2/tensorflow.keras.mixed_precision.-loss-scale-optimizer.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.mixed_precision.LossScaleOptimizer" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" is_instance: "" diff --git a/tensorflow/tools/api/golden/v2/tensorflow.keras.mixed_precision.-policy.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.keras.mixed_precision.-policy.pbtxt index 004c1467e28..278d4fe120e 100644 --- a/tensorflow/tools/api/golden/v2/tensorflow.keras.mixed_precision.-policy.pbtxt +++ b/tensorflow/tools/api/golden/v2/tensorflow.keras.mixed_precision.-policy.pbtxt @@ -1,6 +1,6 @@ path: "tensorflow.keras.mixed_precision.Policy" tf_class { - is_instance: "" + is_instance: "" is_instance: "" member { name: "compute_dtype" diff --git a/tensorflow/tools/api/golden/v2/tensorflow.keras.mixed_precision.experimental.-loss-scale-optimizer.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.keras.mixed_precision.experimental.-loss-scale-optimizer.pbtxt index d60cbd974a7..a68c17e8f24 100644 --- a/tensorflow/tools/api/golden/v2/tensorflow.keras.mixed_precision.experimental.-loss-scale-optimizer.pbtxt +++ b/tensorflow/tools/api/golden/v2/tensorflow.keras.mixed_precision.experimental.-loss-scale-optimizer.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.mixed_precision.experimental.LossScaleOptimizer" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" is_instance: "" diff --git a/tensorflow/tools/api/golden/v2/tensorflow.keras.mixed_precision.experimental.-policy.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.keras.mixed_precision.experimental.-policy.pbtxt index 717742543fb..74b342efdb4 100644 --- a/tensorflow/tools/api/golden/v2/tensorflow.keras.mixed_precision.experimental.-policy.pbtxt +++ b/tensorflow/tools/api/golden/v2/tensorflow.keras.mixed_precision.experimental.-policy.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.mixed_precision.experimental.Policy" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" member { name: "compute_dtype" diff --git a/tensorflow/tools/pip_package/BUILD b/tensorflow/tools/pip_package/BUILD index 402bcc642a7..f25a6446813 100644 --- a/tensorflow/tools/pip_package/BUILD +++ b/tensorflow/tools/pip_package/BUILD @@ -133,7 +133,7 @@ COMMON_PIP_DEPS = [ "//tensorflow/python/keras:combinations", "//tensorflow/python/keras/layers/preprocessing:preprocessing_test_utils", "//tensorflow/python/keras/distribute:distribute_test_lib_pip", - "//tensorflow/python/keras/mixed_precision/experimental:test_util", + "//tensorflow/python/keras/mixed_precision:test_util", "//tensorflow/python/keras/tests:model_subclassing_test_util", "//tensorflow/python/keras/tests:model_architectures", "//tensorflow/python/keras/benchmarks:keras_benchmark_lib_pip",