Explicitly replace "import tensorflow" with "tensorflow.compat.v1"

cweill · cweill · commit ee94c727b94c · 2020-01-27T22:46:42.000-05:00
PiperOrigin-RevId: 291845687
diff --git a/adanet/BUILD b/adanet/BUILD
@@ -37,7 +37,6 @@ py_test(
 py_strict_test(
     name = "modelflow_test",
     srcs = ["modelflow_test.py"],
-    python_version = "PY3",
     srcs_version = "PY3",
     deps = [
         ":adanet",
diff --git a/adanet/adanet_test.py b/adanet/adanet_test.py
@@ -21,7 +21,7 @@
 
 import adanet
 from adanet.examples import simple_dnn
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 
 
 class AdaNetTest(tf.test.TestCase):
diff --git a/adanet/autoensemble/common.py b/adanet/autoensemble/common.py
@@ -26,7 +26,6 @@
 from adanet import tf_compat
 
 import tensorflow as tf
-tf = tf.compat.v2
 
 
 def _default_logits(estimator_spec):
diff --git a/adanet/autoensemble/estimator.py b/adanet/autoensemble/estimator.py
@@ -23,7 +23,6 @@
 from adanet.autoensemble.common import _GeneratorFromCandidatePool
 
 import tensorflow as tf
-tf = tf.compat.v2
 
 
 class AutoEnsembleEstimator(core.Estimator):  # pylint: disable=g-classes-have-attributes
diff --git a/adanet/autoensemble/estimator_test.py b/adanet/autoensemble/estimator_test.py
@@ -31,7 +31,7 @@
 from adanet.autoensemble.common import AutoEnsembleSubestimator
 from adanet.autoensemble.estimator import _GeneratorFromCandidatePool
 from adanet.autoensemble.estimator import AutoEnsembleEstimator
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 
 # pylint: disable=g-direct-tensorflow-import
 from tensorflow.python.estimator.export import export
diff --git a/adanet/core/BUILD b/adanet/core/BUILD
@@ -103,7 +103,6 @@ py_binary(
     name = "estimator_distributed_test_runner",
     testonly = 1,
     srcs = ["estimator_distributed_test_runner.py"],
-    python_version = "PY3",
     srcs_version = "PY2AND3",
     deps = [
         ":estimator",
diff --git a/adanet/core/architecture_test.py b/adanet/core/architecture_test.py
@@ -21,7 +21,7 @@
 
 from absl.testing import parameterized
 from adanet.core.architecture import _Architecture
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 
 
 class ArchitectureTest(parameterized.TestCase, tf.test.TestCase):
diff --git a/adanet/core/candidate.py b/adanet/core/candidate.py
@@ -23,7 +23,6 @@
 
 from adanet import tf_compat
 import tensorflow as tf
-tf = tf.compat.v2
 
 
 class _Candidate(
diff --git a/adanet/core/ensemble_builder.py b/adanet/core/ensemble_builder.py
@@ -34,9 +34,8 @@
 from adanet.core.eval_metrics import _EnsembleMetrics
 from adanet.core.eval_metrics import _SubnetworkMetrics
 from adanet.core.summary import monkey_patched_summaries
-import tensorflow as tf_v1
-
-tf = tf_v1.compat.v2
+import tensorflow.compat.v1 as tf_v1
+import tensorflow as tf
 
 _VALID_METRIC_FN_ARGS = {"features", "labels", "predictions"}
 
diff --git a/adanet/core/ensemble_builder_test.py b/adanet/core/ensemble_builder_test.py
@@ -34,7 +34,7 @@
 from adanet.ensemble import MixtureWeightType
 from adanet.subnetwork import Builder
 from adanet.subnetwork import Subnetwork
-import tensorflow as tf_v1
+import tensorflow.compat.v1 as tf_v1
 import tensorflow as tf
 # pylint: disable=g-direct-tensorflow-import
 from tensorflow.python.eager import context
diff --git a/adanet/core/estimator.py b/adanet/core/estimator.py
@@ -46,8 +46,6 @@
 import tensorflow as tf
 from typing import Any, Callable, Dict, Optional, Sequence, Text  # (b/144172555) pylint:disable=unused-import
 
-tf = tf.compat.v2
-
 
 class _StopAfterTrainingHook(tf_compat.SessionRunHook):
   """Hook that requests stop once iteration is over."""
diff --git a/adanet/core/estimator_distributed_test_runner.py b/adanet/core/estimator_distributed_test_runner.py
@@ -48,7 +48,7 @@
 from adanet.subnetwork import SimpleGenerator
 from adanet.subnetwork import Subnetwork
 # TODO: Switch back to TF 2.0 once the distribution bug is fixed.
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 
 # pylint: disable=g-direct-tensorflow-import
 
diff --git a/adanet/core/eval_metrics.py b/adanet/core/eval_metrics.py
@@ -26,7 +26,6 @@
 from adanet import tf_compat
 import six
 import tensorflow as tf
-tf = tf.compat.v2
 
 
 def _call_eval_metrics(eval_metrics):
diff --git a/adanet/core/evaluator.py b/adanet/core/evaluator.py
@@ -26,8 +26,6 @@
 import numpy as np
 import tensorflow as tf
 
-tf = tf.compat.v2
-
 
 # TODO: Remove uses of Evaluator once AdaNet Ranker is implemented.
 class Evaluator(object):
diff --git a/adanet/core/iteration.py b/adanet/core/iteration.py
@@ -36,8 +36,6 @@
 import tensorflow as tf
 from typing import Any
 
-tf = tf.compat.v2
-
 
 class _TrainManager(object):
   """Manages the training of SubnetworkSpecs and EnsembleSpecs.
diff --git a/adanet/core/report_accessor.py b/adanet/core/report_accessor.py
@@ -28,7 +28,6 @@
 import numpy as np
 import six
 import tensorflow as tf
-tf = tf.compat.v2
 
 
 # TODO: Encapsulate conversion and serialization of a
diff --git a/adanet/core/report_materializer.py b/adanet/core/report_materializer.py
@@ -25,7 +25,6 @@
 from adanet import subnetwork
 from adanet import tf_compat
 import tensorflow as tf
-tf = tf.compat.v2
 
 
 class ReportMaterializer(object):
diff --git a/adanet/core/summary.py b/adanet/core/summary.py
@@ -26,16 +26,15 @@
 from absl import logging
 from adanet import tf_compat
 import six
-import tensorflow as tf_v1
+import tensorflow.compat.v1 as tf_v1
+import tensorflow as tf
 
 # pylint: disable=g-direct-tensorflow-import
 from tensorboard import compat
 from tensorflow.python.ops import summary_op_util
 from tensorflow.python.summary import summary as summary_lib
 # pylint: enable=g-direct-tensorflow-import
 
-tf = tf_v1.compat.v2
-
 _DEFAULT_SCOPE = "default"
 
 
diff --git a/adanet/core/summary_test.py b/adanet/core/summary_test.py
@@ -29,7 +29,7 @@
 from adanet.core.summary import _TPUScopedSummary
 from adanet.core.summary import monkey_patched_summaries
 from six.moves import range
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 
 # pylint: disable=g-direct-tensorflow-import
 from tensorflow.python.ops import summary_ops_v2
diff --git a/adanet/core/testing_utils.py b/adanet/core/testing_utils.py
@@ -38,8 +38,6 @@
 from adanet.core.eval_metrics import _SubnetworkMetrics
 import tensorflow as tf
 
-tf = tf.compat.v2
-
 
 def dummy_tensor(shape=(), random_seed=42):
   """Returns a randomly initialized tensor."""
diff --git a/adanet/core/timer_test.py b/adanet/core/timer_test.py
@@ -22,7 +22,7 @@
 import time
 
 from adanet.core.timer import _CountDownTimer
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 
 
 class CountDownTimerTest(tf.test.TestCase):
diff --git a/adanet/core/tpu_estimator.py b/adanet/core/tpu_estimator.py
@@ -28,8 +28,6 @@
 from adanet.core.estimator import Estimator
 import tensorflow as tf
 
-tf = tf.compat.v2
-
 
 # pylint: disable=g-classes-have-attributes
 class TPUEstimator(Estimator, tf.compat.v1.estimator.tpu.TPUEstimator):
diff --git a/adanet/ensemble/mean.py b/adanet/ensemble/mean.py
@@ -22,7 +22,6 @@
 from adanet.ensemble.ensembler import Ensemble
 from adanet.ensemble.ensembler import Ensembler
 import tensorflow as tf
-tf = tf.compat.v2
 
 
 class MeanEnsemble(
diff --git a/adanet/ensemble/weighted.py b/adanet/ensemble/weighted.py
@@ -24,7 +24,6 @@
 from adanet.ensemble.ensembler import Ensemble
 from adanet.ensemble.ensembler import Ensembler
 import tensorflow as tf
-tf = tf.compat.v2
 
 
 def _stringify(key):
diff --git a/adanet/examples/simple_dnn.py b/adanet/examples/simple_dnn.py
@@ -24,7 +24,6 @@
 import adanet
 from six.moves import range
 import tensorflow as tf
-tf = tf.compat.v2
 
 _NUM_LAYERS_KEY = "num_layers"
 
diff --git a/adanet/examples/tutorials/adanet_objective.ipynb b/adanet/examples/tutorials/adanet_objective.ipynb
@@ -185,7 +185,7 @@
         "import shutil\n",
         "\n",
         "import adanet\n",
-        "import tensorflow as tf\n",
+        "import tensorflow.compat.v1 as tf\n",
         "\n",
         "# The random seed to use.\n",
         "RANDOM_SEED = 42\n",
diff --git a/adanet/examples/tutorials/adanet_tpu.ipynb b/adanet/examples/tutorials/adanet_tpu.ipynb
@@ -143,7 +143,7 @@
         "\n",
         "import adanet\n",
         "from google.colab import auth\n",
-        "import tensorflow as tf\n",
+        "import tensorflow.compat.v1 as tf\n",
         "\n",
         "BUCKET = ''  #@param {type: 'string'}\n",
         "MODEL_DIR = 'gs://{}/{}'.format(\n",
diff --git a/adanet/examples/tutorials/customizing_adanet.ipynb b/adanet/examples/tutorials/customizing_adanet.ipynb
@@ -132,7 +132,7 @@
         "import adanet\n",
         "from adanet.examples import simple_dnn\n",
         "import matplotlib.pyplot as plt\n",
-        "import tensorflow as tf\n",
+        "import tensorflow.compat.v1 as tf\n",
         "\n",
         "\n",
         "# The random seed to use.\n",
diff --git a/adanet/examples/tutorials/customizing_adanet_with_tfhub.ipynb b/adanet/examples/tutorials/customizing_adanet_with_tfhub.ipynb
@@ -108,7 +108,7 @@
         "import numpy as np \n",
         "import pandas as pd \n",
         "\n",
-        "import tensorflow as tf\n",
+        "import tensorflow.compat.v1 as tf\n",
         "import tensorflow_hub as hub\n",
         "\n",
         "import adanet\n",
diff --git a/adanet/experimental/adanet_modelflow_tutorial.ipynb b/adanet/experimental/adanet_modelflow_tutorial.ipynb
@@ -104,7 +104,7 @@
         "\n",
         "import adanet.experimental as adanet\n",
         "import numpy as np\n",
-        "import tensorflow as tf\n",
+        "import tensorflow.compat.v1 as tf\n",
         "\n",
         "RANDOM_SEED = 42"
       ]
diff --git a/adanet/experimental/keras/BUILD b/adanet/experimental/keras/BUILD
@@ -39,7 +39,6 @@ py_strict_test(
     name = "model_search_test",
     size = "large",
     srcs = ["model_search_test.py"],
-    python_version = "PY3",
     srcs_version = "PY3",
     deps = [
         ":ensemble_model",
@@ -68,7 +67,6 @@ py_library(
 py_strict_test(
     name = "ensemble_model_test",
     srcs = ["ensemble_model_test.py"],
-    python_version = "PY3",
     srcs_version = "PY3",
     deps = [
         ":ensemble_model",
diff --git a/adanet/keras/model.py b/adanet/keras/model.py
@@ -23,7 +23,6 @@
 from adanet import core
 
 import tensorflow as tf
-tf = tf.compat.v2
 
 
 class _KerasHead(object):
diff --git a/adanet/replay/__init__.py b/adanet/replay/__init__.py
@@ -22,7 +22,7 @@
 import json
 import os
 
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 
 
 class Config(object):  # pylint: disable=g-classes-have-attributes
diff --git a/adanet/subnetwork/report.py b/adanet/subnetwork/report.py
@@ -23,7 +23,7 @@
 
 from adanet import tf_compat
 import six
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 
 
 class Report(
diff --git a/adanet/tf_compat/__init__.py b/adanet/tf_compat/__init__.py
@@ -18,7 +18,7 @@
 from __future__ import print_function
 
 from distutils.version import LooseVersion
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 import tensorflow as tf_v2
 # pylint: disable=unused-import
 # pylint: disable=g-direct-tensorflow-import
diff --git a/research/improve_nas/trainer/BUILD b/research/improve_nas/trainer/BUILD
@@ -3,7 +3,6 @@ licenses(["notice"])  # Apache 2.0
 py_binary(
     name = "trainer",
     srcs = ["trainer.py"],
-    python_version = "PY3",
     srcs_version = "PY3",
     deps = [
         ":adanet_improve_nas",
@@ -27,7 +26,6 @@ py_library(
 py_test(
     name = "improve_nas_test",
     srcs = ["improve_nas_test.py"],
-    python_version = "PY3",
     srcs_version = "PY3",
     deps = [
         ":fake_data",
@@ -51,7 +49,6 @@ py_library(
 py_test(
     name = "adanet_improve_nas_test",
     srcs = ["adanet_improve_nas_test.py"],
-    python_version = "PY3",
     srcs_version = "PY3",
     deps = [
         ":adanet_improve_nas",
@@ -85,7 +82,6 @@ py_library(
 py_test(
     name = "cifar10_test",
     srcs = ["cifar10_test.py"],
-    python_version = "PY3",
     srcs_version = "PY3",
     deps = [
         ":cifar10",
@@ -104,7 +100,6 @@ py_library(
 py_test(
     name = "cifar100_test",
     srcs = ["cifar100_test.py"],
-    python_version = "PY3",
     srcs_version = "PY3",
     deps = [
         ":cifar100",
diff --git a/research/improve_nas/trainer/adanet_improve_nas.py b/research/improve_nas/trainer/adanet_improve_nas.py
@@ -20,7 +20,7 @@
 from __future__ import print_function
 
 import adanet
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 
 # pylint: disable=g-import-not-at-top
 try:
diff --git a/research/improve_nas/trainer/adanet_improve_nas_test.py b/research/improve_nas/trainer/adanet_improve_nas_test.py
@@ -25,7 +25,7 @@
 from absl.testing import parameterized
 from adanet.research.improve_nas.trainer import adanet_improve_nas
 from adanet.research.improve_nas.trainer import fake_data
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 
 
 class AdaNetQuetzalBuilderTest(parameterized.TestCase, tf.test.TestCase):
diff --git a/research/improve_nas/trainer/cifar10.py b/research/improve_nas/trainer/cifar10.py
@@ -21,7 +21,7 @@
 
 import functools
 import numpy as np
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 from tensorflow.keras.datasets import cifar10
 
 # pylint: disable=g-import-not-at-top
diff --git a/research/improve_nas/trainer/cifar100.py b/research/improve_nas/trainer/cifar100.py
@@ -22,7 +22,7 @@
 
 import functools
 import numpy as np
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 from tensorflow.keras.datasets import cifar100
 
 # pylint: disable=g-import-not-at-top
diff --git a/research/improve_nas/trainer/cifar100_test.py b/research/improve_nas/trainer/cifar100_test.py
diff --git a/research/improve_nas/trainer/cifar10_test.py b/research/improve_nas/trainer/cifar10_test.py
diff --git a/research/improve_nas/trainer/fake_data.py b/research/improve_nas/trainer/fake_data.py
diff --git a/research/improve_nas/trainer/image_processing.py b/research/improve_nas/trainer/image_processing.py
diff --git a/research/improve_nas/trainer/improve_nas.py b/research/improve_nas/trainer/improve_nas.py
diff --git a/research/improve_nas/trainer/improve_nas_test.py b/research/improve_nas/trainer/improve_nas_test.py
diff --git a/research/improve_nas/trainer/nasnet.py b/research/improve_nas/trainer/nasnet.py
diff --git a/research/improve_nas/trainer/nasnet_utils.py b/research/improve_nas/trainer/nasnet_utils.py
diff --git a/research/improve_nas/trainer/optimizer.py b/research/improve_nas/trainer/optimizer.py
diff --git a/research/improve_nas/trainer/subnetwork_utils.py b/research/improve_nas/trainer/subnetwork_utils.py
diff --git a/research/improve_nas/trainer/trainer.py b/research/improve_nas/trainer/trainer.py
