updates

modeling/official/core/config_definitions.py

@@ -17,9 +17,9 @@
 import dataclasses
 from typing import Optional, Sequence, Union
 
-from official.modeling.hyperparams import base_config
-from official.modeling.optimization.configs import optimization_config
-from official.modeling.privacy import configs as dp_configs
+from modeling.official.modeling.hyperparams import base_config
+from modeling.official.modeling.optimization.configs import optimization_config
+from modeling.official.modeling.privacy import configs as dp_configs
 
 OptimizationConfig = optimization_config.OptimizationConfig
 

modeling/official/core/exp_factory.py

@@ -14,8 +14,8 @@
 
 """Experiment factory methods."""
 
-from official.core import config_definitions as cfg
-from official.core import registry
+from modeling.official.core import config_definitions as cfg
+from modeling.official.core import registry
 
 
 _REGISTERED_CONFIGS = {}

modeling/official/modeling/hyperparams/base_config.py

@@ -25,7 +25,7 @@ from absl import logging
 import tensorflow as tf, tf_keras
 import yaml
 
-from official.modeling.hyperparams import params_dict
+from modeling.official.modeling.hyperparams import params_dict
 
 
 _BOUND = set()

modeling/official/modeling/hyperparams/oneof.py

@@ -17,7 +17,7 @@
 from typing import Optional
 
 import dataclasses
-from official.modeling.hyperparams import base_config
+from modeling.official.modeling.hyperparams import base_config
 
 
 @dataclasses.dataclass

modeling/official/modeling/optimization/configs/learning_rate_config.py

@@ -16,7 +16,7 @@
 from typing import List, Optional
 
 import dataclasses
-from official.modeling.hyperparams import base_config
+from modeling.official.modeling.hyperparams import base_config
 
 
 @dataclasses.dataclass

modeling/official/modeling/optimization/configs/optimization_config.py

@@ -22,10 +22,10 @@ from typing import Optional
 
 import dataclasses
 
-from official.modeling.hyperparams import base_config
-from official.modeling.hyperparams import oneof
-from official.modeling.optimization.configs import learning_rate_config as lr_cfg
-from official.modeling.optimization.configs import optimizer_config as opt_cfg
+from modeling.official.modeling.hyperparams import base_config
+from modeling.official.modeling.hyperparams import oneof
+from modeling.official.modeling.optimization.configs import learning_rate_config as lr_cfg
+from modeling.official.modeling.optimization.configs import optimizer_config as opt_cfg
 
 
 @dataclasses.dataclass

modeling/official/modeling/optimization/configs/optimization_config_test.py

@@ -16,9 +16,9 @@
 
 import tensorflow as tf, tf_keras
 
-from official.modeling.optimization.configs import learning_rate_config as lr_cfg
-from official.modeling.optimization.configs import optimization_config
-from official.modeling.optimization.configs import optimizer_config as opt_cfg
+from modeling.official.modeling.optimization.configs import learning_rate_config as lr_cfg
+from modeling.official.modeling.optimization.configs import optimization_config
+from modeling.official.modeling.optimization.configs import optimizer_config as opt_cfg
 
 
 class OptimizerConfigTest(tf.test.TestCase):

modeling/official/modeling/optimization/configs/optimizer_config.py

@@ -16,7 +16,7 @@
 from typing import List, Optional
 
 import dataclasses
-from official.modeling.hyperparams import base_config
+from modeling.official.modeling.hyperparams import base_config
 
 
 @dataclasses.dataclass

modeling/official/modeling/tf_utils.py

@@ -20,7 +20,7 @@ import six
 import tensorflow as tf, tf_keras
 
 from tensorflow.python.util import deprecation
-from official.modeling import activations
+from modeling.official.modeling import activations
 
 
 @deprecation.deprecated(

modeling/official/projects/movinet/configs/movinet.py

@@ -25,12 +25,12 @@ frame-rate associated with them. See the main paper for more details.
 
 import dataclasses
 
-from official.core import config_definitions as cfg
-from official.core import exp_factory
-from official.modeling import hyperparams
-from official.vision.configs import backbones_3d
-from official.vision.configs import common
-from official.vision.configs import video_classification
+from modeling.official.core import config_definitions as cfg
+from modeling.official.core import exp_factory
+from modeling.official.modeling import hyperparams
+from modeling.official.vision.configs import backbones_3d
+from modeling.official.vision.configs import common
+from modeling.official.vision.configs import video_classification
 
 
 @dataclasses.dataclass

modeling/official/projects/movinet/modeling/movinet_layers_a2_modified.py

@@ -21,8 +21,8 @@ from typing import Any, Mapping, Optional, Sequence, Tuple, Union
 
 import tensorflow as tf, tf_keras
 
-from official.modeling import tf_utils
-from official.vision.modeling.layers import nn_layers
+from modeling.official.modeling import tf_utils
+from modeling.official.vision.modeling.layers import nn_layers
 
 # Default kernel weight decay that may be overridden
 KERNEL_WEIGHT_DECAY = 1.5e-5

modeling/official/projects/movinet/modeling/movinet_model_a2_modified.py

@@ -21,10 +21,10 @@ from typing import Any, Dict, Mapping, Optional, Sequence, Tuple, Union
 from absl import logging
 import tensorflow as tf, tf_keras
 
-from official.projects.movinet.configs import movinet as cfg
-from official.projects.movinet.modeling import movinet_layers_a2_modified
-from official.vision.modeling import backbones
-from official.vision.modeling import factory_3d as model_factory
+from modeling.official.projects.movinet.configs import movinet as cfg
+from modeling.official.projects.movinet.modeling import movinet_layers_a2_modified
+from modeling.official.vision.modeling import backbones
+from modeling.official.vision.modeling import factory_3d as model_factory
 
 
 @tf_keras.utils.register_keras_serializable(package='Vision')

modeling/official/vision/configs/backbones_3d.py

@@ -18,7 +18,7 @@ from typing import Optional, Tuple
 # Import libraries
 import dataclasses
 
-from official.modeling import hyperparams
+from modeling.official.modeling import hyperparams
 
 
 @dataclasses.dataclass

modeling/official/vision/configs/common.py

@@ -19,8 +19,8 @@ from typing import List, Optional
 
 # Import libraries
 
-from official.core import config_definitions as cfg
-from official.modeling import hyperparams
+from modeling.official.core import config_definitions as cfg
+from modeling.official.modeling import hyperparams
 
 
 @dataclasses.dataclass

modeling/official/vision/configs/video_classification.py

@@ -15,12 +15,12 @@
 """Video classification configuration definition."""
 import dataclasses
 from typing import Optional, Tuple, Union
-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.configs import backbones_3d
-from official.vision.configs import common
+from modeling.official.core import config_definitions as cfg
+from modeling.official.core import exp_factory
+from modeling.official.modeling import hyperparams
+from modeling.official.modeling import optimization
+from modeling.official.vision.configs import backbones_3d
+from modeling.official.vision.configs import common
 
 
 @dataclasses.dataclass

modeling/official/vision/modeling/backbones/efficientnet.py

@@ -21,11 +21,11 @@ from typing import Any, List, Tuple
 
 import tensorflow as tf, tf_keras
 
-from official.modeling import hyperparams
-from official.modeling import tf_utils
-from official.vision.modeling.backbones import factory
-from official.vision.modeling.layers import nn_blocks
-from official.vision.modeling.layers import nn_layers
+from modeling.official.modeling import hyperparams
+from modeling.official.modeling import tf_utils
+from modeling.official.vision.modeling.backbones import factory
+from modeling.official.vision.modeling.layers import nn_blocks
+from modeling.official.vision.modeling.layers import nn_layers
 
 layers = tf_keras.layers
 

modeling/official/vision/modeling/backbones/resnet_3d.py

@@ -18,11 +18,11 @@ from typing import Callable, List, Tuple, Optional
 # Import libraries
 import tensorflow as tf, tf_keras
 
-from official.modeling import hyperparams
-from official.modeling import tf_utils
-from official.vision.modeling.backbones import factory
-from official.vision.modeling.layers import nn_blocks_3d
-from official.vision.modeling.layers import nn_layers
+from modeling.official.modeling import hyperparams
+from modeling.official.modeling import tf_utils
+from modeling.official.vision.modeling.backbones import factory
+from modeling.official.vision.modeling.layers import nn_blocks_3d
+from modeling.official.vision.modeling.layers import nn_layers
 
 layers = tf_keras.layers
 

modeling/official/vision/modeling/backbones/vit.py

@@ -20,11 +20,11 @@ from typing import Optional, Tuple
 from absl import logging
 import tensorflow as tf, tf_keras
 
-from official.modeling import activations
-from official.vision.modeling.backbones import factory
-from official.vision.modeling.backbones.vit_specs import VIT_SPECS
-from official.vision.modeling.layers import nn_blocks
-from official.vision.modeling.layers import nn_layers
+from modeling.official.modeling import activations
+from modeling.official.vision.modeling.backbones import factory
+from modeling.official.vision.modeling.backbones.vit_specs import VIT_SPECS
+from modeling.official.vision.modeling.layers import nn_blocks
+from modeling.official.vision.modeling.layers import nn_layers
 
 
 layers = tf_keras.layers

modeling/official/vision/modeling/factory_3d.py

@@ -17,10 +17,10 @@
 # Import libraries
 import tensorflow as tf, tf_keras
 
-from official.core import registry
-from official.vision.configs import video_classification as video_classification_cfg
-from official.vision.modeling import video_classification_model
-from official.vision.modeling import backbones
+from modeling.official.core import registry
+from modeling.official.vision.configs import video_classification as video_classification_cfg
+from modeling.official.vision.modeling import video_classification_model
+from modeling.official.vision.modeling import backbones
 
 _REGISTERED_MODEL_CLS = {}
 

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

@@ -19,8 +19,8 @@ from typing import Any, Callable, Dict, List, Mapping, Optional, Tuple, Union
 from absl import logging
 import tensorflow as tf, tf_keras
 
-from official.modeling import tf_utils
-from official.vision.ops import spatial_transform_ops
+from modeling.official.modeling import tf_utils
+from modeling.official.vision.ops import spatial_transform_ops
 
 
 # Type annotations.