Merge branch 'tensorflow:master' into panoptic-deeplab-dataloader

official/projects/qat/vision/modeling/factory.py

@@ -22,12 +22,12 @@ from official.projects.qat.vision.configs import common
 from official.projects.qat.vision.modeling import segmentation_model as qat_segmentation_model
 from official.projects.qat.vision.n_bit import schemes as n_bit_schemes
 from official.projects.qat.vision.quantization import schemes
-from official.vision.beta import configs
-from official.vision.beta.modeling import classification_model
-from official.vision.beta.modeling import retinanet_model
-from official.vision.beta.modeling.decoders import aspp
-from official.vision.beta.modeling.heads import segmentation_heads
-from official.vision.beta.modeling.layers import nn_layers
+from official.vision import configs
+from official.vision.modeling import classification_model
+from official.vision.modeling import retinanet_model
+from official.vision.modeling.decoders import aspp
+from official.vision.modeling.heads import segmentation_heads
+from official.vision.modeling.layers import nn_layers
 
 
 def build_qat_classification_model(

official/projects/qat/vision/modeling/factory_test.py

@@ -21,12 +21,12 @@ import tensorflow as tf
 
 from official.projects.qat.vision.configs import common
 from official.projects.qat.vision.modeling import factory as qat_factory
-from official.vision.beta.configs import backbones
-from official.vision.beta.configs import decoders
-from official.vision.beta.configs import image_classification as classification_cfg
-from official.vision.beta.configs import retinanet as retinanet_cfg
-from official.vision.beta.configs import semantic_segmentation as semantic_segmentation_cfg
-from official.vision.beta.modeling import factory
+from official.vision.configs import backbones
+from official.vision.configs import decoders
+from official.vision.configs import image_classification as classification_cfg
+from official.vision.configs import retinanet as retinanet_cfg
+from official.vision.configs import semantic_segmentation as semantic_segmentation_cfg
+from official.vision.modeling import factory
 
 
 class ClassificationModelBuilderTest(parameterized.TestCase, tf.test.TestCase):

official/projects/qat/vision/modeling/layers/nn_blocks.py

@@ -24,7 +24,7 @@ import tensorflow_model_optimization as tfmot
 from official.modeling import tf_utils
 from official.projects.qat.vision.modeling.layers import nn_layers as qat_nn_layers
 from official.projects.qat.vision.quantization import configs
-from official.vision.beta.modeling.layers import nn_layers
+from official.vision.modeling.layers import nn_layers
 
 
 class NoOpActivation:

official/projects/qat/vision/modeling/layers/nn_layers.py

@@ -22,8 +22,8 @@ import tensorflow_model_optimization as tfmot
 from official.modeling import tf_utils
 from official.projects.qat.vision.quantization import configs
 from official.projects.qat.vision.quantization import helper
-from official.vision.beta.modeling.decoders import aspp
-from official.vision.beta.modeling.layers import nn_layers
+from official.vision.modeling.decoders import aspp
+from official.vision.modeling.layers import nn_layers
 
 
 # Type annotations.

official/projects/qat/vision/n_bit/nn_blocks.py

@@ -24,7 +24,7 @@ import tensorflow_model_optimization as tfmot
 from official.modeling import tf_utils
 from official.projects.qat.vision.n_bit import configs
 from official.projects.qat.vision.n_bit import nn_layers as qat_nn_layers
-from official.vision.beta.modeling.layers import nn_layers
+from official.vision.modeling.layers import nn_layers
 
 
 class NoOpActivation:

official/projects/qat/vision/n_bit/nn_layers.py

@@ -21,7 +21,7 @@ import tensorflow_model_optimization as tfmot
 
 from official.modeling import tf_utils
 from official.projects.qat.vision.n_bit import configs
-from official.vision.beta.modeling.layers import nn_layers
+from official.vision.modeling.layers import nn_layers
 
 # Type annotations.
 States = Dict[str, tf.Tensor]

official/projects/qat/vision/tasks/image_classification.py

@@ -19,7 +19,7 @@ import tensorflow as tf
 from official.core import task_factory
 from official.projects.qat.vision.configs import image_classification as exp_cfg
 from official.projects.qat.vision.modeling import factory
-from official.vision.beta.tasks import image_classification
+from official.vision.tasks import image_classification
 
 
 @task_factory.register_task_cls(exp_cfg.ImageClassificationTask)

official/projects/qat/vision/tasks/retinanet.py

@@ -18,7 +18,7 @@ import tensorflow as tf
 from official.core import task_factory
 from official.projects.qat.vision.configs import retinanet as exp_cfg
 from official.projects.qat.vision.modeling import factory
-from official.vision.beta.tasks import retinanet
+from official.vision.tasks import retinanet
 
 
 @task_factory.register_task_cls(exp_cfg.RetinaNetTask)

official/projects/qat/vision/tasks/retinanet_test.py

@@ -23,7 +23,7 @@ from official.core import exp_factory
 from official.modeling import optimization
 from official.projects.qat.vision.tasks import retinanet
 from official.vision import beta
-from official.vision.beta.configs import retinanet as exp_cfg
+from official.vision.configs import retinanet as exp_cfg
 
 
 class RetinaNetTaskTest(parameterized.TestCase, tf.test.TestCase):

official/projects/qat/vision/tasks/semantic_segmentation.py

@@ -18,7 +18,7 @@ import tensorflow as tf
 from official.core import task_factory
 from official.projects.qat.vision.configs import semantic_segmentation as exp_cfg
 from official.projects.qat.vision.modeling import factory
-from official.vision.beta.tasks import semantic_segmentation
+from official.vision.tasks import semantic_segmentation
 
 
 @task_factory.register_task_cls(exp_cfg.SemanticSegmentationTask)

official/projects/qat/vision/train.py

@@ -18,7 +18,7 @@ from absl import app
 
 from official.common import flags as tfm_flags
 from official.projects.qat.vision import registry_imports  # pylint: disable=unused-import
-from official.vision.beta import train
+from official.vision import train
 
 
 if __name__ == '__main__':

official/projects/vit/configs/image_classification.py

@@ -24,10 +24,10 @@ from official.core import exp_factory
 from official.core import task_factory
 from official.modeling import hyperparams
 from official.modeling import optimization
-from official.vision.beta.configs import common
-from official.vision.beta.configs import image_classification as img_cls_cfg
+from official.vision.configs import common
+from official.vision.configs import image_classification as img_cls_cfg
 from official.projects.vit.configs import backbones
-from official.vision.beta.tasks import image_classification
+from official.vision.tasks import image_classification
 
 DataConfig = img_cls_cfg.DataConfig
 

official/projects/vit/modeling/nn_blocks.py

@@ -16,7 +16,7 @@
 import tensorflow as tf
 
 from official.nlp import modeling
-from official.vision.beta.modeling.layers.nn_layers import StochasticDepth
+from official.vision.modeling.layers.nn_layers import StochasticDepth
 
 
 class TransformerEncoderBlock(modeling.layers.TransformerEncoderBlock):

official/projects/vit/modeling/vit.py

@@ -18,8 +18,8 @@ import tensorflow as tf
 
 from official.modeling import activations
 from official.projects.vit.modeling import nn_blocks
-from official.vision.beta.modeling.backbones import factory
-from official.vision.beta.modeling.layers import nn_layers
+from official.vision.modeling.backbones import factory
+from official.vision.modeling.layers import nn_layers
 
 
 layers = tf.keras.layers

official/projects/vit/train.py

@@ -20,7 +20,7 @@ from absl import app
 from official.common import flags as tfm_flags
 from official.projects.vit import configs  # pylint: disable=unused-import
 from official.projects.vit.modeling import vit  # pylint: disable=unused-import
-from official.vision.beta import train
+from official.vision import train
 
 
 if __name__ == '__main__':

official/projects/volumetric_models/registry_imports.py

@@ -15,8 +15,8 @@
 """All necessary imports for registration."""
 
 # pylint: disable=unused-import
-from official.common import registry_imports
 from official.projects.volumetric_models.configs import semantic_segmentation_3d as semantic_segmentation_3d_cfg
 from official.projects.volumetric_models.modeling import backbones
 from official.projects.volumetric_models.modeling import decoders
 from official.projects.volumetric_models.tasks import semantic_segmentation_3d
+from official.vision import registry_imports

official/vision/beta/projects/centernet/configs/backbones.py

@@ -17,7 +17,7 @@
 import dataclasses
 
 from official.modeling import hyperparams
-from official.vision.beta.configs import backbones
+from official.vision.configs import backbones
 
 
 @dataclasses.dataclass

official/vision/beta/projects/centernet/configs/centernet.py

@@ -17,12 +17,13 @@
 import dataclasses
 import os
 from typing import List, Optional, Tuple
+
 from official.core import config_definitions as cfg
 from official.core import exp_factory
 from official.modeling import hyperparams
 from official.modeling import optimization
-from official.vision.beta.configs import common
 from official.vision.beta.projects.centernet.configs import backbones
+from official.vision.configs import common
 
 
 TfExampleDecoderLabelMap = common.TfExampleDecoderLabelMap

official/vision/beta/projects/centernet/dataloaders/centernet_input.py

@@ -18,13 +18,13 @@ from typing import Tuple
 
 import tensorflow as tf
 
-from official.vision.beta.dataloaders import parser
-from official.vision.beta.dataloaders import utils
-from official.vision.beta.ops import box_ops
-from official.vision.beta.ops import preprocess_ops
 from official.vision.beta.projects.centernet.ops import box_list
 from official.vision.beta.projects.centernet.ops import box_list_ops
 from official.vision.beta.projects.centernet.ops import preprocess_ops as cn_prep_ops
+from official.vision.dataloaders import parser
+from official.vision.dataloaders import utils
+from official.vision.ops import box_ops
+from official.vision.ops import preprocess_ops
 
 
 CHANNEL_MEANS = (104.01362025, 114.03422265, 119.9165958)

official/vision/beta/projects/centernet/modeling/backbones/hourglass.py

@@ -19,10 +19,10 @@ from typing import Optional
 import tensorflow as tf
 
 from official.modeling import hyperparams
-from official.vision.beta.modeling.backbones import factory
-from official.vision.beta.modeling.backbones import mobilenet
-from official.vision.beta.modeling.layers import nn_blocks
 from official.vision.beta.projects.centernet.modeling.layers import cn_nn_blocks
+from official.vision.modeling.backbones import factory
+from official.vision.modeling.backbones import mobilenet
+from official.vision.modeling.layers import nn_blocks
 
 HOURGLASS_SPECS = {
     10: {