Skip to content

Commit 7af8465

Browse files
Revan Sopherrevan
Revan Sopher
authored andcommitted
Replace "import tensorflow" with "import tensorflow.compat.v1".
This makes models compatible with the upcoming 2.0 release, avoiding issues due to moving symbols. Existing 2.0 compatible code like resnet50_tf2.py is already using "import tensorflow.compat.v2"; instances of the ambiguous "import tensorflow as" date back to 1.X TensorFlow. PiperOrigin-RevId: 270757162
1 parent 57e3a38 commit 7af8465

File tree

201 files changed

+203
-218
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

201 files changed

+203
-218
lines changed

models/common/inference_warmup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import io
2323
import os
2424
import numpy as np
25-
import tensorflow as tf
25+
import tensorflow.compat.v1 as tf
2626

2727

2828
def _encode_image(image_array, fmt):

models/common/tpu_profiler_hook.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import subprocess
2323

24-
import tensorflow as tf
24+
import tensorflow.compat.v1 as tf
2525

2626

2727
class TPUProfilerHook(tf.train.SessionRunHook):

models/experimental/cifar_keras/cifar_keras.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from absl import app
2222
from absl import flags
2323
import absl.logging as _logging # pylint: disable=unused-import
24-
import tensorflow as tf
24+
import tensorflow.compat.v1 as tf
2525

2626

2727
# Cloud TPU Cluster Resolvers

models/experimental/dcgan/cifar_input.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from absl import flags
2323
import numpy as np
2424
from PIL import Image
25-
import tensorflow as tf
25+
import tensorflow.compat.v1 as tf
2626

2727
FLAGS = flags.FLAGS
2828

models/experimental/dcgan/cifar_model.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from __future__ import division
2424
from __future__ import print_function
2525

26-
import tensorflow as tf
26+
import tensorflow.compat.v1 as tf
2727

2828

2929
def _leaky_relu(x):
@@ -93,4 +93,3 @@ def generator(x, is_training=True, scope='Generator'):
9393
x = tf.tanh(x)
9494

9595
return x
96-

models/experimental/dcgan/dcgan_main.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
from absl import flags
2727
import absl.logging as _logging # pylint: disable=unused-import
2828
import numpy as np
29-
import tensorflow as tf
29+
import tensorflow.compat.v1 as tf
3030
import tensorflow_gan as tfgan
3131

3232
import cifar_input

models/experimental/dcgan/mnist_input.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from absl import flags
2222
import numpy as np
2323
from PIL import Image
24-
import tensorflow as tf
24+
import tensorflow.compat.v1 as tf
2525

2626
FLAGS = flags.FLAGS
2727

models/experimental/dcgan/mnist_model.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from __future__ import division
2424
from __future__ import print_function
2525

26-
import tensorflow as tf
26+
import tensorflow.compat.v1 as tf
2727

2828

2929
def _leaky_relu(x):
@@ -97,4 +97,3 @@ def generator(x, is_training=True, scope='Generator'):
9797
return x
9898

9999
# TODO(chrisying): objective score (e.g. MNIST score)
100-

models/experimental/densenet_keras/densenet_keras_imagenet.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
from absl import flags
2727
from absl import logging
2828
import numpy as np
29-
import tensorflow as tf
29+
import tensorflow.compat.v1 as tf
3030

3131
import densenet_keras_model
3232
import vgg_preprocessing

models/experimental/densenet_keras/densenet_keras_model.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
from __future__ import division
2222
from __future__ import print_function
2323

24-
import tensorflow as tf
25-
from tensorflow import keras
24+
import tensorflow.compat.v1 as tf
25+
from tensorflow.compat.v1 import keras
2626

2727
# Learning hyperaparmeters
2828
_BATCH_NORM_DECAY = 0.997

models/experimental/densenet_keras/vgg_preprocessing.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
from __future__ import division
3333
from __future__ import print_function
3434

35-
import tensorflow as tf
35+
import tensorflow.compat.v1 as tf
3636

3737
_R_MEAN = 123.68 / 255
3838
_G_MEAN = 116.78 / 255

models/experimental/distribution_strategy/imagenet_input.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from collections import namedtuple
2323
import functools
2424
import os
25-
import tensorflow as tf
25+
import tensorflow.compat.v1 as tf
2626
import resnet_preprocessing
2727

2828

models/experimental/distribution_strategy/resnet_estimator.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import json
2626
import os
2727
from absl import app
28-
import tensorflow as tf
28+
import tensorflow.compat.v1 as tf
2929

3030
import imagenet_input
3131
import resnet_model

models/experimental/distribution_strategy/resnet_model.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from __future__ import division
2424
from __future__ import print_function
2525

26-
import tensorflow as tf
26+
import tensorflow.compat.v1 as tf
2727

2828
BATCH_NORM_DECAY = 0.9
2929
BATCH_NORM_EPSILON = 1e-5

models/experimental/distribution_strategy/resnet_preprocessing.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from __future__ import division
1818
from __future__ import print_function
1919

20-
import tensorflow as tf
20+
import tensorflow.compat.v1 as tf
2121

2222
IMAGE_SIZE = 224
2323
CROP_PADDING = 32

models/experimental/inception/imagenet.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
from __future__ import print_function
3535

3636
import os
37-
import tensorflow as tf
37+
import tensorflow.compat.v1 as tf
3838

3939
slim = tf.contrib.slim
4040

models/experimental/inception/inception_preprocessing.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
# Standard Imports
2222
from absl import flags
23-
import tensorflow as tf
23+
import tensorflow.compat.v1 as tf
2424

2525
from tensorflow.python.ops import control_flow_ops
2626
from tensorflow.python.ops import random_ops

models/experimental/inception/inception_v2.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from absl import app
2525
from absl import flags
2626
import absl.logging as _logging # pylint: disable=unused-import
27-
import tensorflow as tf
27+
import tensorflow.compat.v1 as tf
2828

2929
import inception_preprocessing
3030
import inception_v2_tpu_model as inception

models/experimental/inception/inception_v3.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from absl import app
2525
from absl import flags
2626
import absl.logging as _logging # pylint: disable=unused-import
27-
import tensorflow as tf
27+
import tensorflow.compat.v1 as tf
2828

2929
import inception_preprocessing
3030
import vgg_preprocessing

models/experimental/inception/inception_v3_old.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
from absl import app
2525
from absl import flags
26-
import tensorflow as tf
26+
import tensorflow.compat.v1 as tf
2727

2828
from tensorflow.contrib import slim
2929

models/experimental/inception/inception_v4.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from absl import app
2525
from absl import flags
2626
import absl.logging as _logging # pylint: disable=unused-import
27-
import tensorflow as tf
27+
import tensorflow.compat.v1 as tf
2828

2929
import inception_preprocessing
3030
import inception_v4_model as inception

models/experimental/inception/vgg_preprocessing.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
from __future__ import division
3333
from __future__ import print_function
3434

35-
import tensorflow as tf
35+
import tensorflow.compat.v1 as tf
3636

3737
_R_MEAN = 123.68
3838
_G_MEAN = 116.78

models/experimental/inference/load_test_client.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
from PIL import Image
3030
from ratelimiter import RateLimiter
3131
import requests
32-
import tensorflow as tf
32+
import tensorflow.compat.v1 as tf
3333

3434
from tensorflow_serving.apis import predict_pb2
3535
from tensorflow_serving.apis import prediction_service_pb2_grpc

models/experimental/inference/object_detection.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"from matplotlib.pylab import plt\n",
7070
"\n",
7171
"from PIL import Image,ImageDraw\n",
72-
"import tensorflow as tf\n",
72+
"import tensorflow.compat.v1 as tf\n",
7373
"import matplotlib.pyplot\n",
7474
"\n",
7575
"from tensorflow_serving.apis import predict_pb2\n",

models/experimental/keras_application/application_model.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from absl import flags
2222

2323
import numpy as np
24-
import tensorflow as tf
24+
import tensorflow.compat.v1 as tf
2525

2626

2727
# Define a dictionary that maps model names to their model classes inside Keras

models/experimental/keras_colab/shakespeare_lstm.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
from absl import flags
2828
import numpy as np
2929
import six
30-
import tensorflow as tf
30+
import tensorflow.compat.v1 as tf
3131

3232
flags.DEFINE_bool('use_tpu', True, 'Use TPU model instead of CPU.')
3333
flags.DEFINE_string('tpu', None, 'Name of the TPU to use.')

models/experimental/mnist_keras/mnist.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
from absl import app
3030
from absl import flags
3131
import numpy as np
32-
import tensorflow as tf
32+
import tensorflow.compat.v1 as tf
3333

3434
# TODO(sourabhbajaj): Remove the need for this flag.
3535
flags.DEFINE_bool('use_tpu', True,

models/experimental/ncf/ncf_main.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from absl import app as absl_app
2424
from absl import flags
2525
import numpy as np
26-
import tensorflow as tf
26+
import tensorflow.compat.v1 as tf
2727

2828
from official.recommendation import constants as rconst
2929
from official.recommendation import movielens

models/experimental/qanet/data.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import string
2222
# Standard Imports
2323
import numpy as np
24-
import tensorflow as tf
24+
import tensorflow.compat.v1 as tf
2525

2626

2727
def build_dataset(cfg, is_tpu):

models/experimental/qanet/model.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import numpy as np
1919
from tensor2tensor.layers import common_attention
2020
from tensor2tensor.layers import common_layers
21-
import tensorflow as tf
21+
import tensorflow.compat.v1 as tf
2222
import data
2323
import utils
2424

models/experimental/qanet/preprocess.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
from six import string_types
3232
from six import text_type
33-
import tensorflow as tf
33+
import tensorflow.compat.v1 as tf
3434

3535
import data
3636

models/experimental/qanet/run_lib.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import os
2323
import pprint
2424
from absl import flags
25-
import tensorflow as tf
25+
import tensorflow.compat.v1 as tf
2626

2727
import data
2828
import model

models/experimental/resnet50_keras/model_saving_utils.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import os
2323

24-
import tensorflow as tf
24+
import tensorflow.compat.v1 as tf
2525

2626
try:
2727
import h5py as _ # pylint: disable=g-import-not-at-top
@@ -45,4 +45,3 @@ def save_model(model, model_dir, weights_file):
4545
weights_file_path)
4646
tf.logging.info('This might take a while...')
4747
model.save(weights_file_path, overwrite=True, include_optimizer=True)
48-

models/experimental/resnet50_keras/resnet50.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
from absl import flags
3131
from absl import logging
3232
import numpy as np
33-
import tensorflow as tf
33+
import tensorflow.compat.v1 as tf
3434

3535
import imagenet_input
3636
import model_saving_utils

models/experimental/resnet50_keras/resnet50_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from absl.testing import absltest
2424

2525
import numpy as np
26-
import tensorflow as tf
26+
import tensorflow.compat.v1 as tf
2727

2828
import resnet_model
2929
from tensorflow.python.keras import backend as K # pylint: disable=g-direct-tensorflow-import

models/experimental/show_and_tell/image_embedding.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from __future__ import division
2020
from __future__ import print_function
2121

22-
import tensorflow as tf
22+
import tensorflow.compat.v1 as tf
2323

2424
from tensorflow.contrib.slim.python.slim.nets.inception_v3 import inception_v3_base
2525

models/experimental/show_and_tell/image_processing.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from __future__ import print_function
2121

2222
# Standard Imports
23-
import tensorflow as tf
23+
import tensorflow.compat.v1 as tf
2424

2525

2626
def distort_image(images, seed):

models/experimental/show_and_tell/inputs.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from __future__ import print_function
2121

2222
# Standard Imports
23-
import tensorflow as tf
23+
import tensorflow.compat.v1 as tf
2424

2525

2626
def parse_example(serialized, image_feature, caption_feature):

models/experimental/show_and_tell/show_and_tell_model.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from __future__ import print_function
2424

2525
# Standard Imports
26-
import tensorflow as tf
26+
import tensorflow.compat.v1 as tf
2727

2828
import image_embedding
2929
import image_processing

models/experimental/show_and_tell/train.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
# Standard Imports
2424
from absl import app
25-
import tensorflow as tf
25+
import tensorflow.compat.v1 as tf
2626

2727
import configuration
2828
import show_and_tell_model

models/hyperparameters/flags_to_params.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# ==============================================================================
1515
"""Functions to override model parameters from command-line flags."""
1616

17-
import tensorflow as tf
17+
import tensorflow.compat.v1 as tf
1818
from hyperparameters import params_dict
1919

2020
ESSENTIAL_FLAGS = ['tpu', 'data_dir', 'model_dir']

models/hyperparameters/params_dict.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import copy
2323
import re
2424
import six
25-
import tensorflow as tf
25+
import tensorflow.compat.v1 as tf
2626
import yaml
2727

2828
# regex pattern that matches on key-value pairs in a comma-separated

0 commit comments

Comments
 (0)