Internal change

PiperOrigin-RevId: 437263145

official/vision/beta/projects/yolo/common/registry_imports.py

@@ -16,7 +16,7 @@
 
 # pylint: disable=unused-import
 # pylint: disable=g-bad-import-order
-from official.common import registry_imports
+from official.vision import registry_imports
 
 # import configs
 from official.vision.beta.projects.yolo.configs import darknet_classification

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

@@ -15,7 +15,7 @@
 """Backbones configurations."""
 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/yolo/configs/darknet_classification.py

@@ -20,9 +20,9 @@ from typing import List, Optional
 from official.core import config_definitions as cfg
 from official.core import exp_factory
 from official.modeling import hyperparams
-from official.vision.beta.configs import common
-from official.vision.beta.configs import image_classification as imc
 from official.vision.beta.projects.yolo.configs import backbones
+from official.vision.configs import common
+from official.vision.configs import image_classification as imc
 
 
 @dataclasses.dataclass

official/vision/beta/projects/yolo/configs/decoders.py

@@ -16,7 +16,7 @@
 import dataclasses
 from typing import Optional
 from official.modeling import hyperparams
-from official.vision.beta.configs import decoders
+from official.vision.configs import decoders
 
 
 @dataclasses.dataclass

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

@@ -22,10 +22,10 @@ import numpy as np
 from official.core import config_definitions as cfg
 from official.core import exp_factory
 from official.modeling import hyperparams
-from official.vision.beta.configs import common
 from official.vision.beta.projects.yolo import optimization
 from official.vision.beta.projects.yolo.configs import backbones
 from official.vision.beta.projects.yolo.configs import decoders
+from official.vision.configs import common
 
 
 # pytype: disable=annotation-type-mismatch

official/vision/beta/projects/yolo/dataloaders/classification_input.py

@@ -14,8 +14,8 @@
 
 """Classification decoder and parser."""
 import tensorflow as tf
-from official.vision.beta.dataloaders import classification_input
-from official.vision.beta.ops import preprocess_ops
+from official.vision.dataloaders import classification_input
+from official.vision.ops import preprocess_ops
 
 
 class Parser(classification_input.Parser):

official/vision/beta/projects/yolo/dataloaders/tf_example_decoder.py

@@ -19,7 +19,7 @@ protos for object detection.
 """
 import tensorflow as tf
 
-from official.vision.beta.dataloaders import tf_example_decoder
+from official.vision.dataloaders import tf_example_decoder
 
 
 def _coco91_to_80(classif, box, areas, iscrowds):

official/vision/beta/projects/yolo/dataloaders/yolo_input.py

@@ -15,12 +15,12 @@
 """Detection Data parser and processing for YOLO."""
 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 as bbox_ops
-from official.vision.beta.ops import preprocess_ops
 from official.vision.beta.projects.yolo.ops import anchor
 from official.vision.beta.projects.yolo.ops import preprocessing_ops
+from official.vision.dataloaders import parser
+from official.vision.dataloaders import utils
+from official.vision.ops import box_ops as bbox_ops
+from official.vision.ops import preprocess_ops
 
 
 class Parser(parser.Parser):

official/vision/beta/projects/yolo/modeling/backbones/darknet.py

@@ -36,11 +36,12 @@ Darknets are used mainly for object detection in:
 """
 
 import collections
+
 import tensorflow as tf
 
 from official.modeling import hyperparams
-from official.vision.beta.modeling.backbones import factory
 from official.vision.beta.projects.yolo.modeling.layers import nn_blocks
+from official.vision.modeling.backbones import factory
 
 
 class BlockConfig:

official/vision/beta/projects/yolo/modeling/decoders/yolo_decoder.py

@@ -13,13 +13,13 @@
 # limitations under the License.
 
 """Feature Pyramid Network and Path Aggregation variants used in YOLO."""
-from typing import Mapping, Union, Optional
+from typing import Mapping, Optional, Union
 
 import tensorflow as tf
 
 from official.modeling import hyperparams
-from official.vision.beta.modeling.decoders import factory
 from official.vision.beta.projects.yolo.modeling.layers import nn_blocks
+from official.vision.modeling.decoders import factory
 
 # model configurations
 # the structure is as follows. model version, {v3, v4, v#, ... etc}

official/vision/beta/projects/yolo/modeling/factory.py

@@ -15,13 +15,13 @@
 """Contains common factory functions yolo neural networks."""
 
 from absl import logging
-from official.vision.beta.modeling.backbones import factory as backbone_factory
-from official.vision.beta.modeling.decoders import factory as decoder_factory
 
 from official.vision.beta.projects.yolo.configs import yolo
 from official.vision.beta.projects.yolo.modeling import yolo_model
 from official.vision.beta.projects.yolo.modeling.heads import yolo_head
 from official.vision.beta.projects.yolo.modeling.layers import detection_generator
+from official.vision.modeling.backbones import factory as backbone_factory
+from official.vision.modeling.decoders import factory as decoder_factory
 
 
 def build_yolo_detection_generator(model_config: yolo.Yolo, anchor_boxes):

official/vision/beta/projects/yolo/modeling/layers/detection_generator.py

@@ -15,10 +15,10 @@
 """Contains common building blocks for yolo layer (detection layer)."""
 import tensorflow as tf
 
-from official.vision.beta.modeling.layers import detection_generator
 from official.vision.beta.projects.yolo.losses import yolo_loss
 from official.vision.beta.projects.yolo.ops import box_ops
 from official.vision.beta.projects.yolo.ops import loss_utils
+from official.vision.modeling.layers import detection_generator
 
 
 class YoloLayer(tf.keras.Model):

official/vision/beta/projects/yolo/modeling/layers/nn_blocks.py

@@ -18,7 +18,7 @@ from typing import Callable, List, Tuple
 import tensorflow as tf
 
 from official.modeling import tf_utils
-from official.vision.beta.ops import spatial_transform_ops
+from official.vision.ops import spatial_transform_ops
 
 
 class Identity(tf.keras.layers.Layer):

official/vision/beta/projects/yolo/ops/mosaic.py

@@ -14,12 +14,13 @@
 
 """Mosaic op."""
 import random
+
 import tensorflow as tf
 import tensorflow_addons as tfa
 
-from official.vision.beta.ops import box_ops
-from official.vision.beta.ops import preprocess_ops
 from official.vision.beta.projects.yolo.ops import preprocessing_ops
+from official.vision.ops import box_ops
+from official.vision.ops import preprocess_ops
 
 
 class Mosaic:

official/vision/beta/projects/yolo/ops/preprocessing_ops.py

@@ -19,7 +19,7 @@ import numpy as np
 import tensorflow as tf
 import tensorflow_addons as tfa
 
-from official.vision.beta.ops import box_ops as bbox_ops
+from official.vision.ops import box_ops as bbox_ops
 
 PAD_VALUE = 114
 GLOBAL_SEED_SET = False

official/vision/beta/projects/yolo/ops/preprocessing_ops_test.py

@@ -17,8 +17,8 @@ from absl.testing import parameterized
 import numpy as np
 import tensorflow as tf
 
-from official.vision.beta.ops import box_ops as bbox_ops
 from official.vision.beta.projects.yolo.ops import preprocessing_ops
+from official.vision.ops import box_ops as bbox_ops
 
 
 class InputUtilsTest(parameterized.TestCase, tf.test.TestCase):

official/vision/beta/projects/yolo/tasks/image_classification.py

@@ -15,12 +15,12 @@
 """Image classification task definition."""
 from official.common import dataset_fn
 from official.core import task_factory
-from official.vision.beta.dataloaders import classification_input as classification_input_base
-from official.vision.beta.dataloaders import input_reader_factory
-from official.vision.beta.dataloaders import tfds_factory
 from official.vision.beta.projects.yolo.configs import darknet_classification as exp_cfg
 from official.vision.beta.projects.yolo.dataloaders import classification_input
-from official.vision.beta.tasks import image_classification
+from official.vision.dataloaders import classification_input as classification_input_base
+from official.vision.dataloaders import input_reader_factory
+from official.vision.dataloaders import tfds_factory
+from official.vision.tasks import image_classification
 
 
 @task_factory.register_task_cls(exp_cfg.ImageClassificationTask)

official/vision/beta/projects/yolo/tasks/yolo.py

@@ -26,10 +26,6 @@ from official.core import config_definitions
 from official.core import input_reader
 from official.core import task_factory
 from official.modeling import performance
-from official.vision.beta.dataloaders import tfds_factory
-from official.vision.beta.dataloaders import tf_example_label_map_decoder
-from official.vision.beta.evaluation import coco_evaluator
-from official.vision.beta.ops import box_ops
 from official.vision.beta.projects.yolo import optimization
 from official.vision.beta.projects.yolo.configs import yolo as exp_cfg
 from official.vision.beta.projects.yolo.dataloaders import tf_example_decoder
@@ -39,6 +35,10 @@ from official.vision.beta.projects.yolo.ops import kmeans_anchors
 from official.vision.beta.projects.yolo.ops import mosaic
 from official.vision.beta.projects.yolo.ops import preprocessing_ops
 from official.vision.beta.projects.yolo.tasks import task_utils
+from official.vision.dataloaders import tfds_factory
+from official.vision.dataloaders.google import tf_example_label_map_decoder
+from official.vision.evaluation import coco_evaluator
+from official.vision.ops import box_ops
 
 OptimizationConfig = optimization.OptimizationConfig
 RuntimeConfig = config_definitions.RuntimeConfig