Internal change

PiperOrigin-RevId: 432100332

official/projects/video_ssl/configs/video_ssl.py

@@ -20,8 +20,8 @@ import dataclasses
 
 from official.core import config_definitions as cfg
 from official.core import exp_factory
-from official.vision.beta.configs import common
-from official.vision.beta.configs import video_classification
+from official.vision.configs import common
+from official.vision.configs import video_classification
 
 
 Losses = video_classification.Losses

official/projects/video_ssl/configs/video_ssl_test.py

@@ -18,10 +18,10 @@
 from absl.testing import parameterized
 import tensorflow as tf
 
+from official import vision
 from official.core import config_definitions as cfg
 from official.core import exp_factory
 from official.projects.video_ssl.configs import video_ssl as exp_cfg
-from official.vision import beta
 
 
 class VideoClassificationConfigTest(tf.test.TestCase, parameterized.TestCase):

official/projects/video_ssl/dataloaders/video_ssl_input.py

@@ -21,8 +21,8 @@ from absl import logging
 import tensorflow as tf
 from official.projects.video_ssl.configs import video_ssl as exp_cfg
 from official.projects.video_ssl.ops import video_ssl_preprocess_ops
-from official.vision.beta.dataloaders import video_input
-from official.vision.beta.ops import preprocess_ops_3d
+from official.vision.dataloaders import video_input
+from official.vision.ops import preprocess_ops_3d
 
 IMAGE_KEY = 'image/encoded'
 LABEL_KEY = 'clip/label/index'

official/projects/video_ssl/modeling/video_ssl_model.py

@@ -21,8 +21,8 @@ import tensorflow as tf
 
 from official.modeling import tf_utils
 from official.projects.video_ssl.configs import video_ssl as video_ssl_cfg
-from official.vision.beta.modeling import backbones
-from official.vision.beta.modeling import factory_3d as model_factory
+from official.vision.modeling import backbones
+from official.vision.modeling import factory_3d as model_factory
 
 layers = tf.keras.layers
 

official/projects/video_ssl/ops/video_ssl_preprocess_ops_test.py

@@ -14,7 +14,7 @@
 
 import tensorflow as tf
 from official.projects.video_ssl.ops import video_ssl_preprocess_ops
-from official.vision.beta.ops import preprocess_ops_3d
+from official.vision.ops import preprocess_ops_3d
 
 
 class VideoSslPreprocessOpsTest(tf.test.TestCase):

official/projects/video_ssl/tasks/linear_eval.py

@@ -22,7 +22,7 @@ import tensorflow as tf
 from official.core import task_factory
 from official.projects.video_ssl.configs.google import video_ssl as exp_cfg
 from official.projects.video_ssl.modeling import video_ssl_model
-from official.vision.beta.tasks.google import video_classification
+from official.vision.tasks import video_classification
 
 
 @task_factory.register_task_cls(exp_cfg.VideoSSLEvalTask)

official/projects/video_ssl/tasks/pretrain.py

@@ -24,9 +24,9 @@ from official.projects.video_ssl.configs import video_ssl as exp_cfg
 from official.projects.video_ssl.dataloaders import video_ssl_input
 from official.projects.video_ssl.losses import losses
 from official.projects.video_ssl.modeling import video_ssl_model
-from official.vision.beta.modeling import factory_3d
-from official.vision.beta.tasks import video_classification
-# pylint: disable=unused-import
+from official.vision.modeling import factory_3d
+from official.vision.tasks import video_classification
+# pylint: enable=unused-import
 
 
 @task_factory.register_task_cls(exp_cfg.VideoSSLPretrainTask)

official/projects/video_ssl/tasks/pretrain_test.py

@@ -22,13 +22,13 @@ import orbit
 import tensorflow as tf
 
 # pylint: disable=unused-import
+from official import vision
 from official.core import exp_factory
 from official.core import task_factory
 from official.modeling import optimization
 from official.projects.video_ssl.tasks import pretrain
-from official.vision import beta
-from official.vision.beta.dataloaders import tfexample_utils
-# pylint: disable=unused-import
+from official.vision.dataloaders import tfexample_utils
+# pylint: enable=unused-import
 
 
 class VideoClassificationTaskTest(tf.test.TestCase):

official/projects/video_ssl/train.py

@@ -20,7 +20,6 @@ from absl import flags
 import gin
 
 # pylint: disable=unused-import
-from official.common import registry_imports
 from official.common import distribute_utils
 from official.common import flags as tfm_flags
 from official.core import task_factory
@@ -30,6 +29,7 @@ from official.modeling import performance
 from official.projects.video_ssl.modeling import video_ssl_model
 from official.projects.video_ssl.tasks import linear_eval
 from official.projects.video_ssl.tasks.google import pretrain
+from official.vision import registry_imports
 # pylint: disable=unused-import
 
 FLAGS = flags.FLAGS