tensorflow.compat.v2 is no longer needed.

PiperOrigin-RevId: 310289012

official/vision/detection/dataloader/anchor.py

@@ -19,7 +19,7 @@ from __future__ import division
 from __future__ import print_function
 
 import collections
-import tensorflow.compat.v2 as tf
+import tensorflow as tf
 from official.vision.detection.utils.object_detection import argmax_matcher
 from official.vision.detection.utils.object_detection import balanced_positive_negative_sampler
 from official.vision.detection.utils.object_detection import box_list

official/vision/detection/dataloader/input_reader.py

@@ -19,7 +19,7 @@ from __future__ import division
 # from __future__ import google_type_annotations
 from __future__ import print_function
 
-import tensorflow.compat.v2 as tf
+import tensorflow as tf
 
 from typing import Text, Optional
 from official.modeling.hyperparams import params_dict

official/vision/detection/dataloader/maskrcnn_parser.py

@@ -14,7 +14,7 @@
 # ==============================================================================
 """Data parser and processing for Mask R-CNN."""
 
-import tensorflow.compat.v2 as tf
+import tensorflow as tf
 
 from official.vision.detection.dataloader import anchor
 from official.vision.detection.dataloader import mode_keys as ModeKeys

official/vision/detection/dataloader/retinanet_parser.py

@@ -21,12 +21,11 @@ T.-Y. Lin, P. Goyal, R. Girshick, K. He,  and P. Dollar
 Focal Loss for Dense Object Detection. arXiv:1708.02002
 """
 
-import tensorflow.compat.v2 as tf
+import tensorflow as tf
 
 from official.vision.detection.dataloader import anchor
 from official.vision.detection.dataloader import mode_keys as ModeKeys
 from official.vision.detection.dataloader import tf_example_decoder
-from official.vision.detection.utils import autoaugment_utils
 from official.vision.detection.utils import box_utils
 from official.vision.detection.utils import input_utils
 
@@ -217,12 +216,6 @@ class Parser(object):
     # Gets original image and its size.
     image = data['image']
 
-    # NOTE: The autoaugment method works best when used alongside the standard
-    # horizontal flipping of images along with size jittering and normalization.
-    if self._use_autoaugment:
-      image, boxes = autoaugment_utils.distort_image_with_autoaugment(
-          image, boxes, self._autoaugment_policy_name)
-
     image_shape = tf.shape(input=image)[0:2]
 
     # Normalizes image with mean and std pixel values.

official/vision/detection/dataloader/tf_example_decoder.py

@@ -18,7 +18,7 @@
 A decoder to decode string tensors containing serialized tensorflow.Example
 protos for object detection.
 """
-import tensorflow.compat.v2 as tf
+import tensorflow as tf
 
 
 class TfExampleDecoder(object):

official/vision/detection/evaluation/coco_evaluator.py

@@ -36,7 +36,7 @@ import numpy as np
 from absl import logging
 from pycocotools import cocoeval
 import six
-import tensorflow.compat.v2 as tf
+import tensorflow as tf
 
 from official.vision.detection.evaluation import coco_utils
 from official.vision.detection.utils import class_utils

official/vision/detection/evaluation/coco_utils.py

@@ -27,7 +27,7 @@ from PIL import Image
 from pycocotools import coco
 from pycocotools import mask as mask_api
 import six
-import tensorflow.compat.v2 as tf
+import tensorflow as tf
 
 from official.vision.detection.dataloader import tf_example_decoder
 from official.vision.detection.utils import box_utils

official/vision/detection/executor/detection_executor.py

@@ -21,7 +21,7 @@ from __future__ import print_function
 
 from absl import logging
 
-import tensorflow.compat.v2 as tf
+import tensorflow as tf
 from official.modeling.training import distributed_executor as executor
 from official.vision.detection.utils.object_detection import visualization_utils
 

official/vision/detection/main.py

@@ -25,7 +25,7 @@ from absl import logging
 import functools
 import os
 import pprint
-import tensorflow.compat.v2 as tf
+import tensorflow as tf
 
 from official.modeling.hyperparams import params_dict
 from official.modeling.training import distributed_executor as executor

official/vision/detection/modeling/architecture/fpn.py

@@ -26,7 +26,7 @@ from __future__ import print_function
 
 import functools
 
-import tensorflow.compat.v2 as tf
+import tensorflow as tf
 
 from tensorflow.python.keras import backend
 from official.vision.detection.modeling.architecture import nn_ops

official/vision/detection/modeling/architecture/heads.py

@@ -23,7 +23,7 @@ import pickle
 
 from absl import logging
 import numpy as np
-import tensorflow.compat.v2 as tf
+import tensorflow as tf
 from tensorflow.python.keras import backend
 from official.vision.detection.modeling.architecture import nn_ops
 from official.vision.detection.ops import spatial_transform_ops

official/vision/detection/modeling/architecture/nn_ops.py

@@ -20,7 +20,7 @@ from __future__ import print_function
 
 import functools
 from absl import logging
-import tensorflow.compat.v2 as tf
+import tensorflow as tf
 
 
 class NormActivation(tf.keras.layers.Layer):

official/vision/detection/modeling/architecture/resnet.py

@@ -24,7 +24,7 @@ from __future__ import division
 from __future__ import print_function
 
 from absl import logging
-import tensorflow.compat.v2 as tf
+import tensorflow as tf
 from tensorflow.python.keras import backend
 from official.vision.detection.modeling.architecture import nn_ops
 

official/vision/detection/modeling/base_model.py

@@ -21,7 +21,7 @@ from __future__ import print_function
 import abc
 import functools
 import re
-import tensorflow.compat.v2 as tf
+import tensorflow as tf
 from official.vision.detection.modeling import checkpoint_utils
 from official.vision.detection.modeling import learning_rates
 from official.vision.detection.modeling import optimizers

official/vision/detection/modeling/checkpoint_utils.py

@@ -24,7 +24,7 @@ from __future__ import print_function
 import re
 from absl import logging
 
-import tensorflow.compat.v2 as tf
+import tensorflow as tf
 
 
 def _build_assignment_map(keras_model,

official/vision/detection/modeling/learning_rates.py

@@ -21,7 +21,7 @@ from __future__ import print_function
 import functools
 
 import numpy as np
-import tensorflow.compat.v2 as tf
+import tensorflow as tf
 from official.modeling.hyperparams import params_dict
 
 

official/vision/detection/modeling/losses.py

@@ -19,7 +19,7 @@ from __future__ import division
 from __future__ import print_function
 
 from absl import logging
-import tensorflow.compat.v2 as tf
+import tensorflow as tf
 
 
 def focal_loss(logits, targets, alpha, gamma, normalizer):

official/vision/detection/modeling/maskrcnn_model.py

@@ -18,7 +18,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import tensorflow.compat.v2 as tf
+import tensorflow as tf
 
 from tensorflow.python.keras import backend
 from official.vision.detection.dataloader import anchor

official/vision/detection/modeling/optimizers.py

@@ -21,7 +21,7 @@ from __future__ import print_function
 import functools
 
 import numpy as np
-import tensorflow.compat.v2 as tf
+import tensorflow as tf
 
 
 class OptimizerFactory(object):

official/vision/detection/modeling/retinanet_model.py

@@ -21,7 +21,7 @@ from __future__ import print_function
 import collections
 import numpy as np
 from absl import logging
-import tensorflow.compat.v2 as tf
+import tensorflow as tf
 
 from tensorflow.python.keras import backend
 from official.vision.detection.dataloader import mode_keys