Rollback compat.v1 change.

END_PUBLIC

BEGIN_PUBLIC
Automated g4 rollback of changelist 270757162

PiperOrigin-RevId: 270773384

Author: Revan Sopher

models/common/inference_warmup.py

@@ -22,7 +22,7 @@
 import io
 import os
 import numpy as np
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 
 
 def _encode_image(image_array, fmt):

models/common/tpu_profiler_hook.py

@@ -21,7 +21,7 @@
 
 import subprocess
 
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 
 
 class TPUProfilerHook(tf.train.SessionRunHook):

models/experimental/cifar_keras/cifar_keras.py

@@ -21,7 +21,7 @@
 from absl import app
 from absl import flags
 import absl.logging as _logging  # pylint: disable=unused-import
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 
 
 # Cloud TPU Cluster Resolvers

models/experimental/dcgan/cifar_input.py

@@ -22,7 +22,7 @@
 from absl import flags
 import numpy as np
 from PIL import Image
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 
 FLAGS = flags.FLAGS
 

models/experimental/dcgan/cifar_model.py

@@ -23,7 +23,7 @@
 from __future__ import division
 from __future__ import print_function
 
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 
 
 def _leaky_relu(x):
@@ -93,3 +93,4 @@ def generator(x, is_training=True, scope='Generator'):
     x = tf.tanh(x)
 
     return x
+

models/experimental/dcgan/dcgan_main.py

@@ -26,7 +26,7 @@
 from absl import flags
 import absl.logging as _logging  # pylint: disable=unused-import
 import numpy as np
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 import tensorflow_gan as tfgan
 
 import cifar_input

models/experimental/dcgan/mnist_input.py

@@ -21,7 +21,7 @@
 from absl import flags
 import numpy as np
 from PIL import Image
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 
 FLAGS = flags.FLAGS
 

models/experimental/dcgan/mnist_model.py

@@ -23,7 +23,7 @@
 from __future__ import division
 from __future__ import print_function
 
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 
 
 def _leaky_relu(x):
@@ -97,3 +97,4 @@ def generator(x, is_training=True, scope='Generator'):
     return x
 
 # TODO(chrisying): objective score (e.g. MNIST score)
+

models/experimental/densenet_keras/densenet_keras_imagenet.py

@@ -26,7 +26,7 @@
 from absl import flags
 from absl import logging
 import numpy as np
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 
 import densenet_keras_model
 import vgg_preprocessing

models/experimental/densenet_keras/densenet_keras_model.py

@@ -21,8 +21,8 @@
 from __future__ import division
 from __future__ import print_function
 
-import tensorflow.compat.v1 as tf
-from tensorflow.compat.v1 import keras
+import tensorflow as tf
+from tensorflow import keras
 
 # Learning hyperaparmeters
 _BATCH_NORM_DECAY = 0.997

models/experimental/densenet_keras/vgg_preprocessing.py

@@ -32,7 +32,7 @@
 from __future__ import division
 from __future__ import print_function
 
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 
 _R_MEAN = 123.68 / 255
 _G_MEAN = 116.78 / 255

models/experimental/distribution_strategy/imagenet_input.py

@@ -22,7 +22,7 @@
 from collections import namedtuple
 import functools
 import os
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 import resnet_preprocessing
 
 

models/experimental/distribution_strategy/resnet_estimator.py

@@ -25,7 +25,7 @@
 import json
 import os
 from absl import app
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 
 import imagenet_input
 import resnet_model

models/experimental/distribution_strategy/resnet_model.py

@@ -23,7 +23,7 @@
 from __future__ import division
 from __future__ import print_function
 
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 
 BATCH_NORM_DECAY = 0.9
 BATCH_NORM_EPSILON = 1e-5

models/experimental/distribution_strategy/resnet_preprocessing.py

@@ -17,7 +17,7 @@
 from __future__ import division
 from __future__ import print_function
 
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 
 IMAGE_SIZE = 224
 CROP_PADDING = 32

models/experimental/inception/imagenet.py

@@ -34,7 +34,7 @@
 from __future__ import print_function
 
 import os
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 
 slim = tf.contrib.slim
 

models/experimental/inception/inception_preprocessing.py

@@ -20,7 +20,7 @@
 
 # Standard Imports
 from absl import flags
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import random_ops

models/experimental/inception/inception_v2.py

@@ -24,7 +24,7 @@
 from absl import app
 from absl import flags
 import absl.logging as _logging  # pylint: disable=unused-import
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 
 import inception_preprocessing
 import inception_v2_tpu_model as inception

models/experimental/inception/inception_v3.py

@@ -24,7 +24,7 @@
 from absl import app
 from absl import flags
 import absl.logging as _logging  # pylint: disable=unused-import
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 
 import inception_preprocessing
 import vgg_preprocessing

models/experimental/inception/inception_v3_old.py

@@ -23,7 +23,7 @@
 
 from absl import app
 from absl import flags
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 
 from tensorflow.contrib import slim
 

models/experimental/inception/inception_v4.py

@@ -24,7 +24,7 @@
 from absl import app
 from absl import flags
 import absl.logging as _logging  # pylint: disable=unused-import
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 
 import inception_preprocessing
 import inception_v4_model as inception

models/experimental/inception/vgg_preprocessing.py

@@ -32,7 +32,7 @@
 from __future__ import division
 from __future__ import print_function
 
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 
 _R_MEAN = 123.68
 _G_MEAN = 116.78

models/experimental/inference/load_test_client.py

@@ -29,7 +29,7 @@
 from PIL import Image
 from ratelimiter import RateLimiter
 import requests
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 
 from tensorflow_serving.apis import predict_pb2
 from tensorflow_serving.apis import prediction_service_pb2_grpc

models/experimental/inference/object_detection.ipynb

@@ -69,7 +69,7 @@
         "from matplotlib.pylab import plt\n",
         "\n",
         "from PIL import Image,ImageDraw\n",
-        "import tensorflow.compat.v1 as tf\n",
+        "import tensorflow as tf\n",
         "import matplotlib.pyplot\n",
         "\n",
         "from tensorflow_serving.apis import predict_pb2\n",

models/experimental/keras_application/application_model.py

@@ -21,7 +21,7 @@
 from absl import flags
 
 import numpy as np
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 
 
 # Define a dictionary that maps model names to their model classes inside Keras

models/experimental/keras_colab/shakespeare_lstm.py

@@ -27,7 +27,7 @@
 from absl import flags
 import numpy as np
 import six
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 
 flags.DEFINE_bool('use_tpu', True, 'Use TPU model instead of CPU.')
 flags.DEFINE_string('tpu', None, 'Name of the TPU to use.')

models/experimental/mnist_keras/mnist.py

@@ -29,7 +29,7 @@
 from absl import app
 from absl import flags
 import numpy as np
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 
 # TODO(sourabhbajaj): Remove the need for this flag.
 flags.DEFINE_bool('use_tpu', True,

models/experimental/ncf/ncf_main.py

@@ -23,7 +23,7 @@
 from absl import app as absl_app
 from absl import flags
 import numpy as np
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 
 from official.recommendation import constants as rconst
 from official.recommendation import movielens

models/experimental/qanet/data.py

@@ -21,7 +21,7 @@
 import string
 # Standard Imports
 import numpy as np
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 
 
 def build_dataset(cfg, is_tpu):

models/experimental/qanet/model.py

@@ -18,7 +18,7 @@
 import numpy as np
 from tensor2tensor.layers import common_attention
 from tensor2tensor.layers import common_layers
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 import data
 import utils
 

models/experimental/qanet/preprocess.py

@@ -30,7 +30,7 @@
 
 from six import string_types
 from six import text_type
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 
 import data
 

models/experimental/qanet/run_lib.py

@@ -22,7 +22,7 @@
 import os
 import pprint
 from absl import flags
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 
 import data
 import model

models/experimental/resnet50_keras/model_saving_utils.py

@@ -21,7 +21,7 @@
 
 import os
 
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 
 try:
   import h5py as _  # pylint: disable=g-import-not-at-top
@@ -45,3 +45,4 @@ def save_model(model, model_dir, weights_file):
                   weights_file_path)
   tf.logging.info('This might take a while...')
   model.save(weights_file_path, overwrite=True, include_optimizer=True)
+

models/experimental/resnet50_keras/resnet50.py

@@ -30,7 +30,7 @@
 from absl import flags
 from absl import logging
 import numpy as np
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 
 import imagenet_input
 import model_saving_utils

models/experimental/resnet50_keras/resnet50_test.py

@@ -23,7 +23,7 @@
 from absl.testing import absltest
 
 import numpy as np
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 
 import resnet_model
 from tensorflow.python.keras import backend as K  # pylint: disable=g-direct-tensorflow-import

models/experimental/show_and_tell/image_embedding.py

@@ -19,7 +19,7 @@
 from __future__ import division
 from __future__ import print_function
 
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 
 from tensorflow.contrib.slim.python.slim.nets.inception_v3 import inception_v3_base
 

models/experimental/show_and_tell/image_processing.py

@@ -20,7 +20,7 @@
 from __future__ import print_function
 
 # Standard Imports
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 
 
 def distort_image(images, seed):

models/experimental/show_and_tell/inputs.py

@@ -20,7 +20,7 @@
 from __future__ import print_function
 
 # Standard Imports
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 
 
 def parse_example(serialized, image_feature, caption_feature):

models/experimental/show_and_tell/show_and_tell_model.py

@@ -23,7 +23,7 @@
 from __future__ import print_function
 
 # Standard Imports
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 
 import image_embedding
 import image_processing

models/experimental/show_and_tell/train.py

@@ -22,7 +22,7 @@
 
 # Standard Imports
 from absl import app
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 
 import configuration
 import show_and_tell_model

models/hyperparameters/flags_to_params.py

@@ -14,7 +14,7 @@
 # ==============================================================================
 """Functions to override model parameters from command-line flags."""
 
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 from hyperparameters import params_dict
 
 ESSENTIAL_FLAGS = ['tpu', 'data_dir', 'model_dir']

models/hyperparameters/params_dict.py

@@ -22,7 +22,7 @@
 import copy
 import re
 import six
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 import yaml
 
 # regex pattern that matches on key-value pairs in a comma-separated