diff --git a/app.py b/app.py index b0cd01cbeaca15959370bfcdaafe95cad43bf6e5..153c11a74ad07c611d1da67c4c38a733f14e34d7 100644 --- a/app.py +++ b/app.py @@ -9,8 +9,8 @@ import tensorflow as tf, tf_keras import tensorflow_hub as hub from transformers import AutoTokenizer, TFAutoModelForSeq2SeqLM -from modeling.official.projects.movinet.modeling import movinet -from modeling.official.projects.movinet.modeling import movinet_model_a2_modified as movinet_model_modified +from official.projects.movinet.modeling import movinet +from official.projects.movinet.modeling import movinet_model_a2_modified as movinet_model_modified movinet_path = 'modeling/movinet_checkpoints_a2_epoch9' diff --git a/modeling/official/core/__init__.py b/modeling/official/core/__init__.py deleted file mode 100644 index 98da042c7f3cb3e84012d90646ac8b8f525be779..0000000000000000000000000000000000000000 --- a/modeling/official/core/__init__.py +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2023 The TensorFlow Authors. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -"""Core is shared by both `nlp` and `vision`.""" - -from modeling.official.core import actions -from modeling.official.core import base_task -from modeling.official.core import base_trainer -from modeling.official.core import config_definitions -from modeling.official.core import exp_factory -from modeling.official.core import export_base -from modeling.official.core import file_writers -from modeling.official.core import input_reader -from modeling.official.core import registry -from modeling.official.core import savedmodel_checkpoint_manager -from modeling.official.core import task_factory -from modeling.official.core import tf_example_builder -from modeling.official.core import tf_example_feature_key -from modeling.official.core import train_lib -from modeling.official.core import train_utils diff --git a/modeling/official/vision/configs/__init__.py b/modeling/official/vision/configs/__init__.py deleted file mode 100644 index 587268af87bd41f1941c0488c11cb8b00e633bf0..0000000000000000000000000000000000000000 --- a/modeling/official/vision/configs/__init__.py +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2023 The TensorFlow Authors. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -"""Configs package definition.""" - -from modeling.official.vision.configs import backbones -from modeling.official.vision.configs import backbones_3d -from modeling.official.vision.configs import common -from modeling.official.vision.configs import image_classification -from modeling.official.vision.configs import maskrcnn -from modeling.official.vision.configs import retinanet -from modeling.official.vision.configs import semantic_segmentation -from modeling.official.vision.configs import video_classification diff --git a/modeling/tensorflow_models/__init__.py b/modeling/tensorflow_models/__init__.py deleted file mode 100644 index 18eea8c6304e418deeb1b34e45a57fd437c81079..0000000000000000000000000000000000000000 --- a/modeling/tensorflow_models/__init__.py +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2023 The TensorFlow Authors. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -"""TensorFlow Models Libraries.""" -# pylint: disable=wildcard-import -from tensorflow_models import nlp -from tensorflow_models import vision - -from official import core -from official.modeling import hyperparams -from official.modeling import optimization -from official.modeling import tf_utils as utils diff --git a/modeling/tensorflow_models/nlp/__init__.py b/modeling/tensorflow_models/nlp/__init__.py deleted file mode 100644 index 85e499aaec0024ae438c49e9c905f016616c33d6..0000000000000000000000000000000000000000 --- a/modeling/tensorflow_models/nlp/__init__.py +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2023 The TensorFlow Authors. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -"""TensorFlow Models NLP Libraries.""" - -from official.nlp import tasks -from official.nlp.configs import encoders -from official.nlp.modeling import * -from official.nlp.serving import serving_modules diff --git a/modeling/tensorflow_models/tensorflow_models_pypi.ipynb b/modeling/tensorflow_models/tensorflow_models_pypi.ipynb deleted file mode 100644 index f7bd3dfa179ce4d724895140b2144f8a944ba068..0000000000000000000000000000000000000000 --- a/modeling/tensorflow_models/tensorflow_models_pypi.ipynb +++ /dev/null @@ -1,339 +0,0 @@ -{ - "cells": [ - { - "cell_type": "markdown", - "metadata": { - "id": "bK-7g5sizhg5" - }, - "source": [ - "## Install Tensorflow-Models packages\n", - "\n", - "The notebook is tested with Google Colab sandbox.\n", - "\n" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": { - "colab": { - "base_uri": "https://localhost:8080/" - }, - "executionInfo": { - "elapsed": 9737, - "status": "ok", - "timestamp": 1650513863935, - "user": { - "displayName": "Hongkun Yu", - "userId": "12855578661733349593" - }, - "user_tz": 420 - }, - "id": "eTz93_P2dMty", - "outputId": "d147b4b0-954f-4064-d179-bb82bc3ea4fe" - }, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "\u001b[K |████████████████████████████████| 21.8 MB 1.6 MB/s \n", - "\u001b[?25h" - ] - } - ], - "source": [ - "!pip3 install -q tf-models-nightly\n", - "# Fix Colab default opencv problem\n", - "!pip3 install -q opencv-python-headless==4.1.2.30\n", - "\n", - "## Colab environment setup. To use a stable TF release version\n", - "## because of the possible breakage in tf-nightly.\n", - "# !pip3 install -U numpy\u003e=1.20\n", - "# !pip3 install -q tensorflow==2.8.0" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": { - "colab": { - "base_uri": "https://localhost:8080/" - }, - "executionInfo": { - "elapsed": 2, - "status": "ok", - "timestamp": 1650513867685, - "user": { - "displayName": "Hongkun Yu", - "userId": "12855578661733349593" - }, - "user_tz": 420 - }, - "id": "GHvGWdCcdQqG", - "outputId": "863683b2-6b70-4de9-98bc-5df743619ad5" - }, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "1.21.6\n", - "2.10.0-dev20220420\n" - ] - } - ], - "source": [ - "import numpy as np\n", - "import tensorflow as tf\n", - "print(np.__version__)\n", - "print(tf.__version__)\n", - "\n", - "import tensorflow_models as tfm" - ] - }, - { - "cell_type": "markdown", - "metadata": { - "id": "eYSeQJniztc8" - }, - "source": [ - "## Check out modules\n", - "\n", - "**Note: As the TensorFlow Models (NLP + Vision) 2.9 release which is tested for this notebook, we partially exported selected modules but the APIs are not stable. Also be aware that, the\n", - "modeling libraries are advancing very fast, so we generally don't guarantee compatability between versions.** " - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": { - "colab": { - "base_uri": "https://localhost:8080/" - }, - "executionInfo": { - "elapsed": 206, - "status": "ok", - "timestamp": 1650513874596, - "user": { - "displayName": "Hongkun Yu", - "userId": "12855578661733349593" - }, - "user_tz": 420 - }, - "id": "Y1iEMMGTMrQu", - "outputId": "f3da68d7-ecda-471c-c27b-915b80b55131" - }, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "Top-level modules: ['__builtins__', '__cached__', '__doc__', '__file__', '__loader__', '__name__', '__package__', '__path__', '__spec__', 'core', 'hyperparams', 'nlp', 'optimization', 'utils', 'vision']\n", - "NLP modules: ['__builtins__', '__cached__', '__doc__', '__file__', '__loader__', '__name__', '__package__', '__path__', '__spec__', 'encoders', 'layers', 'losses', 'models', 'networks', 'ops', 'serving_modules', 'tasks']\n", - "Vision modules: ['__builtins__', '__cached__', '__doc__', '__file__', '__loader__', '__name__', '__package__', '__path__', '__spec__', 'anchor', 'anchor_generator', 'augment', 'backbones', 'box_matcher', 'box_ops', 'classification_model', 'configs', 'decoders', 'factory', 'factory_3d', 'heads', 'iou_similarity', 'layers', 'mask_ops', 'maskrcnn_model', 'nms', 'preprocess_ops', 'preprocess_ops_3d', 'retinanet_model', 'sampling_ops', 'segmentation_model', 'spatial_transform_ops', 'target_gather', 'video_classification_model']\n" - ] - } - ], - "source": [ - "print(\"Top-level modules: \", dir(tfm))\n", - "print(\"NLP modules: \", dir(tfm.nlp))\n", - "print(\"Vision modules: \", dir(tfm.vision))" - ] - }, - { - "cell_type": "markdown", - "metadata": { - "id": "UMHeJmk_1yUf" - }, - "source": [ - "## Quick Examples\n", - "\n", - "### 1. Use a tfm.nlp Keras layer" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": { - "colab": { - "base_uri": "https://localhost:8080/" - }, - "executionInfo": { - "elapsed": 400, - "status": "ok", - "timestamp": 1650514040957, - "user": { - "displayName": "Hongkun Yu", - "userId": "12855578661733349593" - }, - "user_tz": 420 - }, - "id": "XVWEUozQ1xQY", - "outputId": "5de2aa91-8c38-438e-80b6-481617917c08" - }, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "transformer_encoder_block_1\n", - "tf.Tensor(\n", - "[[[-1.063648 1.4375787 -0.79198956 0.4180589 ]\n", - " [-1.063648 1.4375787 -0.79198956 0.4180589 ]\n", - " [-1.063648 1.4375787 -0.79198956 0.4180589 ]]\n", - "\n", - " [[-1.063648 1.4375787 -0.79198956 0.4180589 ]\n", - " [-1.063648 1.4375787 -0.79198956 0.4180589 ]\n", - " [-1.063648 1.4375787 -0.7919895 0.41805887]]], shape=(2, 3, 4), dtype=float32)\n" - ] - } - ], - "source": [ - "encoder_block = tfm.nlp.layers.TransformerEncoderBlock(\n", - " num_attention_heads=2, inner_dim=10, inner_activation='relu')\n", - "\n", - "batch, length, hidden_size = 2, 3, 4\n", - "qkv_inputs = tf.ones((batch, length, hidden_size), tf.float32)\n", - "attention_mask = None\n", - "outputs = encoder_block([qkv_inputs, attention_mask])\n", - "print(encoder_block.name)\n", - "print(outputs)" - ] - }, - { - "cell_type": "markdown", - "metadata": { - "id": "AOOrWjKkSYM0" - }, - "source": [ - "### 2. Use a tfm.vision Backbone models" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": { - "colab": { - "base_uri": "https://localhost:8080/" - }, - "executionInfo": { - "elapsed": 5979, - "status": "ok", - "timestamp": 1650514078414, - "user": { - "displayName": "Hongkun Yu", - "userId": "12855578661733349593" - }, - "user_tz": 420 - }, - "id": "xwD0UhUdSzNU", - "outputId": "770d46c0-8c71-4f59-ee0b-67430c791380" - }, - "outputs": [ - { - "name": "stderr", - "output_type": "stream", - "text": [ - "WARNING:absl:SpineNet output level out of range [min_level, max_level] = [4, 6] will not be used for further processing.\n", - "WARNING:absl:SpineNet output level out of range [min_level, max_level] = [4, 6] will not be used for further processing.\n", - "WARNING:absl:SpineNet output level out of range [min_level, max_level] = [4, 6] will not be used for further processing.\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ - "spine_net\n", - "{'4': \u003cKerasTensor: shape=(1, 8, 8, 128) dtype=float32 (created by layer 'spine_net')\u003e, '5': \u003cKerasTensor: shape=(1, 4, 4, 128) dtype=float32 (created by layer 'spine_net')\u003e, '6': \u003cKerasTensor: shape=(1, 2, 2, 128) dtype=float32 (created by layer 'spine_net')\u003e}\n" - ] - } - ], - "source": [ - "input_size = 128\n", - "filter_size_scale, block_repeats, resample_alpha, endpoints_num_filters, min_level, max_level = 0.65, 1, 0.5, 128, 4, 6\n", - "input_specs = tf.keras.layers.InputSpec(\n", - " shape=[None, input_size, input_size, 3])\n", - "model = tfm.vision.backbones.SpineNet(\n", - " input_specs=input_specs,\n", - " min_level=min_level,\n", - " max_level=max_level,\n", - " endpoints_num_filters=endpoints_num_filters,\n", - " resample_alpha=resample_alpha,\n", - " block_repeats=block_repeats,\n", - " filter_size_scale=filter_size_scale,\n", - " init_stochastic_depth_rate=0.2,\n", - ")\n", - "\n", - "inputs = tf.keras.Input(shape=(input_size, input_size, 3), batch_size=1)\n", - "endpoints = model(inputs)\n", - "print(model.name)\n", - "print(endpoints)" - ] - }, - { - "cell_type": "markdown", - "metadata": { - "id": "HHJs4lRlTk8q" - }, - "source": [ - "### 3. Use Orbit package for advanced training loops" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": { - "colab": { - "base_uri": "https://localhost:8080/" - }, - "executionInfo": { - "elapsed": 215, - "status": "ok", - "timestamp": 1650514185283, - "user": { - "displayName": "Hongkun Yu", - "userId": "12855578661733349593" - }, - "user_tz": 420 - }, - "id": "X4ek9IrJTkP_", - "outputId": "7b31de68-53a0-4b8a-d9ab-109e7c43c933" - }, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "Orbit modules: ['AbstractEvaluator', 'AbstractTrainer', 'Action', 'Controller', 'StandardEvaluator', 'StandardEvaluatorOptions', 'StandardTrainer', 'StandardTrainerOptions', '__builtins__', '__cached__', '__doc__', '__file__', '__loader__', '__name__', '__package__', '__path__', '__spec__', 'actions', 'controller', 'runner', 'standard_runner', 'utils']\n" - ] - } - ], - "source": [ - "import orbit\n", - "print(\"Orbit modules: \", dir(orbit))" - ] - } - ], - "metadata": { - "colab": { - "collapsed_sections": [], - "name": "tensorflow_models_pypi", - "provenance": [ - { - "file_id": "1dm1dUZ2Bo6S6Zom7GTQrIG78Xz7iFeZY", - "timestamp": 1650514452505 - } - ] - }, - "kernelspec": { - "display_name": "Python 3", - "name": "python3" - }, - "language_info": { - "name": "python" - } - }, - "nbformat": 4, - "nbformat_minor": 0 -} diff --git a/modeling/tensorflow_models/tensorflow_models_test.py b/modeling/tensorflow_models/tensorflow_models_test.py deleted file mode 100644 index 8fc4d93e88a1a97b2f51820425e1d29ed7566a7b..0000000000000000000000000000000000000000 --- a/modeling/tensorflow_models/tensorflow_models_test.py +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 2023 The TensorFlow Authors. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -"""Tests for tensorflow_models imports.""" - -import tensorflow as tf, tf_keras -import tensorflow_models as tfm - - -class TensorflowModelsTest(tf.test.TestCase): - - def testVisionImport(self): - _ = tfm.vision.layers.SqueezeExcitation( - in_filters=8, out_filters=4, se_ratio=1) - _ = tfm.vision.configs.image_classification.Losses() - - def testNLPImport(self): - _ = tfm.nlp.layers.TransformerEncoderBlock( - num_attention_heads=2, inner_dim=10, inner_activation='relu') - _ = tfm.nlp.tasks.TaggingTask(params=tfm.nlp.tasks.TaggingConfig()) - - def testCommonImports(self): - _ = tfm.hyperparams.Config() - _ = tfm.optimization.LinearWarmup( - after_warmup_lr_sched=0.0, warmup_steps=10, warmup_learning_rate=0.1) - - -if __name__ == '__main__': - tf.test.main() diff --git a/modeling/official/README-TPU.md b/official/README-TPU.md similarity index 100% rename from modeling/official/README-TPU.md rename to official/README-TPU.md diff --git a/modeling/official/README.md b/official/README.md similarity index 100% rename from modeling/official/README.md rename to official/README.md diff --git a/modeling/official/__init__.py b/official/__init__.py similarity index 100% rename from modeling/official/__init__.py rename to official/__init__.py diff --git a/modeling/official/common/__init__.py b/official/common/__init__.py similarity index 100% rename from modeling/official/common/__init__.py rename to official/common/__init__.py diff --git a/modeling/official/common/dataset_fn.py b/official/common/dataset_fn.py similarity index 100% rename from modeling/official/common/dataset_fn.py rename to official/common/dataset_fn.py diff --git a/modeling/official/common/distribute_utils.py b/official/common/distribute_utils.py similarity index 100% rename from modeling/official/common/distribute_utils.py rename to official/common/distribute_utils.py diff --git a/modeling/official/common/distribute_utils_test.py b/official/common/distribute_utils_test.py similarity index 100% rename from modeling/official/common/distribute_utils_test.py rename to official/common/distribute_utils_test.py diff --git a/modeling/official/common/flags.py b/official/common/flags.py similarity index 100% rename from modeling/official/common/flags.py rename to official/common/flags.py diff --git a/modeling/official/common/registry_imports.py b/official/common/registry_imports.py similarity index 100% rename from modeling/official/common/registry_imports.py rename to official/common/registry_imports.py diff --git a/modeling/official/common/streamz_counters.py b/official/common/streamz_counters.py similarity index 100% rename from modeling/official/common/streamz_counters.py rename to official/common/streamz_counters.py diff --git a/official/core/__init__.py b/official/core/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..82b4f7623831e38c5c7cb6558cafac691ed4c232 --- /dev/null +++ b/official/core/__init__.py @@ -0,0 +1,31 @@ +# Copyright 2023 The TensorFlow Authors. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +"""Core is shared by both `nlp` and `vision`.""" + +from official.core import actions +from official.core import base_task +from official.core import base_trainer +from official.core import config_definitions +from official.core import exp_factory +from official.core import export_base +from official.core import file_writers +from official.core import input_reader +from official.core import registry +from official.core import savedmodel_checkpoint_manager +from official.core import task_factory +from official.core import tf_example_builder +from official.core import tf_example_feature_key +from official.core import train_lib +from official.core import train_utils diff --git a/modeling/official/core/actions.py b/official/core/actions.py similarity index 97% rename from modeling/official/core/actions.py rename to official/core/actions.py index 28a58933510ffbb5c4d8d72bc6993c30263bcdb6..d5555614f7700a7c2ff344a0c37af0ae3262959b 100644 --- a/modeling/official/core/actions.py +++ b/official/core/actions.py @@ -19,12 +19,12 @@ from typing import List from absl import logging import gin -import modeling.orbit +import orbit import tensorflow as tf, tf_keras -from modeling.official.core import base_trainer -from modeling.official.core import config_definitions -from modeling.official.modeling import optimization +from official.core import base_trainer +from official.core import config_definitions +from official.modeling import optimization class PruningAction: diff --git a/modeling/official/core/actions_test.py b/official/core/actions_test.py similarity index 100% rename from modeling/official/core/actions_test.py rename to official/core/actions_test.py diff --git a/modeling/official/core/base_task.py b/official/core/base_task.py similarity index 97% rename from modeling/official/core/base_task.py rename to official/core/base_task.py index b47c6ed50a3c15b759f8e38d526811df94edb9f0..fb95b1f3ca047dcc6e0419d81355b384e648b1e8 100644 --- a/modeling/official/core/base_task.py +++ b/official/core/base_task.py @@ -20,11 +20,11 @@ from typing import Optional from absl import logging import tensorflow as tf, tf_keras -from modeling.official.core import config_definitions -from modeling.official.modeling import optimization -from modeling.official.modeling import performance -from modeling.official.modeling.privacy import configs -from modeling.official.modeling.privacy import ops +from official.core import config_definitions +from official.modeling import optimization +from official.modeling import performance +from official.modeling.privacy import configs +from official.modeling.privacy import ops OptimizationConfig = optimization.OptimizationConfig RuntimeConfig = config_definitions.RuntimeConfig diff --git a/modeling/official/core/base_trainer.py b/official/core/base_trainer.py similarity index 98% rename from modeling/official/core/base_trainer.py rename to official/core/base_trainer.py index 43adbba68f79b6b42f89350a3a4a14bfbcd7a711..0d8c7821700d26a9b7a9092c8497acc3d915eeae 100644 --- a/modeling/official/core/base_trainer.py +++ b/official/core/base_trainer.py @@ -22,12 +22,12 @@ import functools from typing import Union, Optional from absl import logging import gin -import modeling.orbit as orbit +import orbit import tensorflow as tf, tf_keras -from modeling.official.core import base_task -from modeling.official.core import config_definitions -from modeling.official.modeling import optimization +from official.core import base_task +from official.core import config_definitions +from official.modeling import optimization ExperimentConfig = config_definitions.ExperimentConfig TrainerConfig = config_definitions.TrainerConfig diff --git a/modeling/official/core/base_trainer_test.py b/official/core/base_trainer_test.py similarity index 100% rename from modeling/official/core/base_trainer_test.py rename to official/core/base_trainer_test.py diff --git a/modeling/official/core/config_definitions.py b/official/core/config_definitions.py similarity index 98% rename from modeling/official/core/config_definitions.py rename to official/core/config_definitions.py index 9f3680ec5e28065ab0dd4b85294eb74506d39892..ef1f8acf1fb1c67d1f39d0285e64bba79da78083 100644 --- a/modeling/official/core/config_definitions.py +++ b/official/core/config_definitions.py @@ -17,9 +17,9 @@ import dataclasses from typing import Optional, Sequence, Union -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 +from official.modeling.hyperparams import base_config +from official.modeling.optimization.configs import optimization_config +from official.modeling.privacy import configs as dp_configs OptimizationConfig = optimization_config.OptimizationConfig diff --git a/modeling/official/core/exp_factory.py b/official/core/exp_factory.py similarity index 90% rename from modeling/official/core/exp_factory.py rename to official/core/exp_factory.py index df0b57e29e5f8ec72559b25f890ac048f2880584..b5c2cc132e9480e71b3af248cabd5de9be6b647c 100644 --- a/modeling/official/core/exp_factory.py +++ b/official/core/exp_factory.py @@ -14,8 +14,8 @@ """Experiment factory methods.""" -from modeling.official.core import config_definitions as cfg -from modeling.official.core import registry +from official.core import config_definitions as cfg +from official.core import registry _REGISTERED_CONFIGS = {} diff --git a/modeling/official/core/export_base.py b/official/core/export_base.py similarity index 100% rename from modeling/official/core/export_base.py rename to official/core/export_base.py diff --git a/modeling/official/core/export_base_test.py b/official/core/export_base_test.py similarity index 98% rename from modeling/official/core/export_base_test.py rename to official/core/export_base_test.py index 001d52f74d3c826328a583ed864483114788e1f2..f968735614f74646c379ddcf4c4dc06c5d1fb077 100644 --- a/modeling/official/core/export_base_test.py +++ b/official/core/export_base_test.py @@ -18,7 +18,7 @@ from typing import Any, Dict, Mapping, Text import tensorflow as tf, tf_keras -from modeling.official.core import export_base +from official.core import export_base class TestModule(export_base.ExportModule): diff --git a/modeling/official/core/file_writers.py b/official/core/file_writers.py similarity index 100% rename from modeling/official/core/file_writers.py rename to official/core/file_writers.py diff --git a/modeling/official/core/file_writers_test.py b/official/core/file_writers_test.py similarity index 100% rename from modeling/official/core/file_writers_test.py rename to official/core/file_writers_test.py diff --git a/modeling/official/core/input_reader.py b/official/core/input_reader.py similarity index 99% rename from modeling/official/core/input_reader.py rename to official/core/input_reader.py index 260dc8f0dca30b87675b7bb26b92369501c7fd73..356779e5e5afd8b52f5561ccb1faa747c71be2b5 100644 --- a/modeling/official/core/input_reader.py +++ b/official/core/input_reader.py @@ -21,7 +21,7 @@ from absl import logging import tensorflow as tf, tf_keras import tensorflow_datasets as tfds -from modeling.official.core import config_definitions as cfg +from official.core import config_definitions as cfg def _get_random_integer(): diff --git a/modeling/official/core/registry.py b/official/core/registry.py similarity index 100% rename from modeling/official/core/registry.py rename to official/core/registry.py diff --git a/modeling/official/core/registry_test.py b/official/core/registry_test.py similarity index 100% rename from modeling/official/core/registry_test.py rename to official/core/registry_test.py diff --git a/modeling/official/core/savedmodel_checkpoint_manager.py b/official/core/savedmodel_checkpoint_manager.py similarity index 100% rename from modeling/official/core/savedmodel_checkpoint_manager.py rename to official/core/savedmodel_checkpoint_manager.py diff --git a/modeling/official/core/savedmodel_checkpoint_manager_test.py b/official/core/savedmodel_checkpoint_manager_test.py similarity index 100% rename from modeling/official/core/savedmodel_checkpoint_manager_test.py rename to official/core/savedmodel_checkpoint_manager_test.py diff --git a/modeling/official/core/task_factory.py b/official/core/task_factory.py similarity index 98% rename from modeling/official/core/task_factory.py rename to official/core/task_factory.py index 2f966a5e02a06bbad7693f167c3e94dcd98d8c0d..e8833231ce32882a7d240bf2dd6eeb180994f35a 100644 --- a/modeling/official/core/task_factory.py +++ b/official/core/task_factory.py @@ -14,7 +14,7 @@ """A global factory to register and access all registered tasks.""" -from modeling.official.core import registry +from official.core import registry _REGISTERED_TASK_CLS = {} diff --git a/modeling/official/core/test_utils.py b/official/core/test_utils.py similarity index 100% rename from modeling/official/core/test_utils.py rename to official/core/test_utils.py diff --git a/modeling/official/core/tf_example_builder.py b/official/core/tf_example_builder.py similarity index 100% rename from modeling/official/core/tf_example_builder.py rename to official/core/tf_example_builder.py diff --git a/modeling/official/core/tf_example_builder_test.py b/official/core/tf_example_builder_test.py similarity index 100% rename from modeling/official/core/tf_example_builder_test.py rename to official/core/tf_example_builder_test.py diff --git a/modeling/official/core/tf_example_feature_key.py b/official/core/tf_example_feature_key.py similarity index 100% rename from modeling/official/core/tf_example_feature_key.py rename to official/core/tf_example_feature_key.py diff --git a/modeling/official/core/tf_example_feature_key_test.py b/official/core/tf_example_feature_key_test.py similarity index 100% rename from modeling/official/core/tf_example_feature_key_test.py rename to official/core/tf_example_feature_key_test.py diff --git a/modeling/official/core/train_lib.py b/official/core/train_lib.py similarity index 98% rename from modeling/official/core/train_lib.py rename to official/core/train_lib.py index bb357d4c23c387309e087a2b5887c889130d9382..37bc051e8bfac74b114008a03f84ffbd7dd8259f 100644 --- a/modeling/official/core/train_lib.py +++ b/official/core/train_lib.py @@ -21,14 +21,14 @@ from typing import Any, List, Mapping, Optional, Tuple # Import libraries from absl import logging -import modeling.orbit +import orbit import tensorflow as tf, tf_keras -from modeling.official.core import actions -from modeling.official.core import base_task -from modeling.official.core import base_trainer -from modeling.official.core import config_definitions -from modeling.official.core import train_utils +from official.core import actions +from official.core import base_task +from official.core import base_trainer +from official.core import config_definitions +from official.core import train_utils maybe_create_best_ckpt_exporter = train_utils.maybe_create_best_ckpt_exporter diff --git a/modeling/official/core/train_lib_test.py b/official/core/train_lib_test.py similarity index 100% rename from modeling/official/core/train_lib_test.py rename to official/core/train_lib_test.py diff --git a/modeling/official/core/train_utils.py b/official/core/train_utils.py similarity index 98% rename from modeling/official/core/train_utils.py rename to official/core/train_utils.py index 06ca387740fb5803cc74579ebf9778e625be2979..984ac319d504b067d2de0af138a012d8782af467 100644 --- a/modeling/official/core/train_utils.py +++ b/official/core/train_utils.py @@ -24,18 +24,18 @@ from typing import Any, Callable, Dict, List, Optional, Union from absl import logging import gin import numpy as np -import modeling.orbit +import orbit import tensorflow as tf, tf_keras # pylint: disable=g-direct-tensorflow-import from tensorflow.python.framework import ops from tensorflow.python.framework.convert_to_constants import convert_variables_to_constants_v2_as_graph # pylint: enable=g-direct-tensorflow-import -from modeling.official.core import base_task -from modeling.official.core import base_trainer -from modeling.official.core import config_definitions -from modeling.official.core import exp_factory -from modeling.official.modeling import hyperparams +from official.core import base_task +from official.core import base_trainer +from official.core import config_definitions +from official.core import exp_factory +from official.modeling import hyperparams BEST_CHECKPOINT_NAME = 'best_ckpt' diff --git a/modeling/official/core/train_utils_test.py b/official/core/train_utils_test.py similarity index 100% rename from modeling/official/core/train_utils_test.py rename to official/core/train_utils_test.py diff --git a/modeling/official/legacy/README.md b/official/legacy/README.md similarity index 100% rename from modeling/official/legacy/README.md rename to official/legacy/README.md diff --git a/modeling/official/legacy/__init__.py b/official/legacy/__init__.py similarity index 100% rename from modeling/official/legacy/__init__.py rename to official/legacy/__init__.py diff --git a/modeling/official/legacy/albert/README.md b/official/legacy/albert/README.md similarity index 100% rename from modeling/official/legacy/albert/README.md rename to official/legacy/albert/README.md diff --git a/modeling/official/legacy/albert/__init__.py b/official/legacy/albert/__init__.py similarity index 100% rename from modeling/official/legacy/albert/__init__.py rename to official/legacy/albert/__init__.py diff --git a/modeling/official/legacy/albert/configs.py b/official/legacy/albert/configs.py similarity index 100% rename from modeling/official/legacy/albert/configs.py rename to official/legacy/albert/configs.py diff --git a/modeling/official/legacy/bert/README.md b/official/legacy/bert/README.md similarity index 100% rename from modeling/official/legacy/bert/README.md rename to official/legacy/bert/README.md diff --git a/modeling/official/legacy/bert/__init__.py b/official/legacy/bert/__init__.py similarity index 100% rename from modeling/official/legacy/bert/__init__.py rename to official/legacy/bert/__init__.py diff --git a/modeling/official/legacy/bert/bert_cloud_tpu.md b/official/legacy/bert/bert_cloud_tpu.md similarity index 100% rename from modeling/official/legacy/bert/bert_cloud_tpu.md rename to official/legacy/bert/bert_cloud_tpu.md diff --git a/modeling/official/legacy/bert/bert_models.py b/official/legacy/bert/bert_models.py similarity index 100% rename from modeling/official/legacy/bert/bert_models.py rename to official/legacy/bert/bert_models.py diff --git a/modeling/official/legacy/bert/bert_models_test.py b/official/legacy/bert/bert_models_test.py similarity index 100% rename from modeling/official/legacy/bert/bert_models_test.py rename to official/legacy/bert/bert_models_test.py diff --git a/modeling/official/legacy/bert/common_flags.py b/official/legacy/bert/common_flags.py similarity index 100% rename from modeling/official/legacy/bert/common_flags.py rename to official/legacy/bert/common_flags.py diff --git a/modeling/official/legacy/bert/configs.py b/official/legacy/bert/configs.py similarity index 100% rename from modeling/official/legacy/bert/configs.py rename to official/legacy/bert/configs.py diff --git a/modeling/official/legacy/bert/export_tfhub.py b/official/legacy/bert/export_tfhub.py similarity index 100% rename from modeling/official/legacy/bert/export_tfhub.py rename to official/legacy/bert/export_tfhub.py diff --git a/modeling/official/legacy/bert/export_tfhub_test.py b/official/legacy/bert/export_tfhub_test.py similarity index 100% rename from modeling/official/legacy/bert/export_tfhub_test.py rename to official/legacy/bert/export_tfhub_test.py diff --git a/modeling/official/legacy/bert/input_pipeline.py b/official/legacy/bert/input_pipeline.py similarity index 100% rename from modeling/official/legacy/bert/input_pipeline.py rename to official/legacy/bert/input_pipeline.py diff --git a/modeling/official/legacy/bert/model_saving_utils.py b/official/legacy/bert/model_saving_utils.py similarity index 100% rename from modeling/official/legacy/bert/model_saving_utils.py rename to official/legacy/bert/model_saving_utils.py diff --git a/modeling/official/legacy/bert/model_training_utils.py b/official/legacy/bert/model_training_utils.py similarity index 100% rename from modeling/official/legacy/bert/model_training_utils.py rename to official/legacy/bert/model_training_utils.py diff --git a/modeling/official/legacy/bert/model_training_utils_test.py b/official/legacy/bert/model_training_utils_test.py similarity index 100% rename from modeling/official/legacy/bert/model_training_utils_test.py rename to official/legacy/bert/model_training_utils_test.py diff --git a/modeling/official/legacy/bert/run_classifier.py b/official/legacy/bert/run_classifier.py similarity index 100% rename from modeling/official/legacy/bert/run_classifier.py rename to official/legacy/bert/run_classifier.py diff --git a/modeling/official/legacy/bert/run_pretraining.py b/official/legacy/bert/run_pretraining.py similarity index 100% rename from modeling/official/legacy/bert/run_pretraining.py rename to official/legacy/bert/run_pretraining.py diff --git a/modeling/official/legacy/bert/run_squad.py b/official/legacy/bert/run_squad.py similarity index 100% rename from modeling/official/legacy/bert/run_squad.py rename to official/legacy/bert/run_squad.py diff --git a/modeling/official/legacy/bert/run_squad_helper.py b/official/legacy/bert/run_squad_helper.py similarity index 100% rename from modeling/official/legacy/bert/run_squad_helper.py rename to official/legacy/bert/run_squad_helper.py diff --git a/modeling/official/legacy/bert/serving.py b/official/legacy/bert/serving.py similarity index 100% rename from modeling/official/legacy/bert/serving.py rename to official/legacy/bert/serving.py diff --git a/modeling/official/legacy/detection/README.md b/official/legacy/detection/README.md similarity index 100% rename from modeling/official/legacy/detection/README.md rename to official/legacy/detection/README.md diff --git a/modeling/official/legacy/detection/__init__.py b/official/legacy/detection/__init__.py similarity index 100% rename from modeling/official/legacy/detection/__init__.py rename to official/legacy/detection/__init__.py diff --git a/modeling/official/legacy/detection/configs/__init__.py b/official/legacy/detection/configs/__init__.py similarity index 100% rename from modeling/official/legacy/detection/configs/__init__.py rename to official/legacy/detection/configs/__init__.py diff --git a/modeling/official/legacy/detection/configs/base_config.py b/official/legacy/detection/configs/base_config.py similarity index 100% rename from modeling/official/legacy/detection/configs/base_config.py rename to official/legacy/detection/configs/base_config.py diff --git a/modeling/official/legacy/detection/configs/factory.py b/official/legacy/detection/configs/factory.py similarity index 100% rename from modeling/official/legacy/detection/configs/factory.py rename to official/legacy/detection/configs/factory.py diff --git a/modeling/official/legacy/detection/configs/maskrcnn_config.py b/official/legacy/detection/configs/maskrcnn_config.py similarity index 100% rename from modeling/official/legacy/detection/configs/maskrcnn_config.py rename to official/legacy/detection/configs/maskrcnn_config.py diff --git a/modeling/official/legacy/detection/configs/olnmask_config.py b/official/legacy/detection/configs/olnmask_config.py similarity index 100% rename from modeling/official/legacy/detection/configs/olnmask_config.py rename to official/legacy/detection/configs/olnmask_config.py diff --git a/modeling/official/legacy/detection/configs/retinanet_config.py b/official/legacy/detection/configs/retinanet_config.py similarity index 100% rename from modeling/official/legacy/detection/configs/retinanet_config.py rename to official/legacy/detection/configs/retinanet_config.py diff --git a/modeling/official/legacy/detection/configs/shapemask_config.py b/official/legacy/detection/configs/shapemask_config.py similarity index 100% rename from modeling/official/legacy/detection/configs/shapemask_config.py rename to official/legacy/detection/configs/shapemask_config.py diff --git a/modeling/official/legacy/detection/dataloader/__init__.py b/official/legacy/detection/dataloader/__init__.py similarity index 100% rename from modeling/official/legacy/detection/dataloader/__init__.py rename to official/legacy/detection/dataloader/__init__.py diff --git a/modeling/official/legacy/detection/dataloader/anchor.py b/official/legacy/detection/dataloader/anchor.py similarity index 100% rename from modeling/official/legacy/detection/dataloader/anchor.py rename to official/legacy/detection/dataloader/anchor.py diff --git a/modeling/official/legacy/detection/dataloader/factory.py b/official/legacy/detection/dataloader/factory.py similarity index 100% rename from modeling/official/legacy/detection/dataloader/factory.py rename to official/legacy/detection/dataloader/factory.py diff --git a/modeling/official/legacy/detection/dataloader/input_reader.py b/official/legacy/detection/dataloader/input_reader.py similarity index 100% rename from modeling/official/legacy/detection/dataloader/input_reader.py rename to official/legacy/detection/dataloader/input_reader.py diff --git a/modeling/official/legacy/detection/dataloader/maskrcnn_parser.py b/official/legacy/detection/dataloader/maskrcnn_parser.py similarity index 100% rename from modeling/official/legacy/detection/dataloader/maskrcnn_parser.py rename to official/legacy/detection/dataloader/maskrcnn_parser.py diff --git a/modeling/official/legacy/detection/dataloader/mode_keys.py b/official/legacy/detection/dataloader/mode_keys.py similarity index 100% rename from modeling/official/legacy/detection/dataloader/mode_keys.py rename to official/legacy/detection/dataloader/mode_keys.py diff --git a/modeling/official/legacy/detection/dataloader/olnmask_parser.py b/official/legacy/detection/dataloader/olnmask_parser.py similarity index 100% rename from modeling/official/legacy/detection/dataloader/olnmask_parser.py rename to official/legacy/detection/dataloader/olnmask_parser.py diff --git a/modeling/official/legacy/detection/dataloader/retinanet_parser.py b/official/legacy/detection/dataloader/retinanet_parser.py similarity index 100% rename from modeling/official/legacy/detection/dataloader/retinanet_parser.py rename to official/legacy/detection/dataloader/retinanet_parser.py diff --git a/modeling/official/legacy/detection/dataloader/shapemask_parser.py b/official/legacy/detection/dataloader/shapemask_parser.py similarity index 100% rename from modeling/official/legacy/detection/dataloader/shapemask_parser.py rename to official/legacy/detection/dataloader/shapemask_parser.py diff --git a/modeling/official/legacy/detection/dataloader/tf_example_decoder.py b/official/legacy/detection/dataloader/tf_example_decoder.py similarity index 100% rename from modeling/official/legacy/detection/dataloader/tf_example_decoder.py rename to official/legacy/detection/dataloader/tf_example_decoder.py diff --git a/modeling/official/legacy/detection/evaluation/__init__.py b/official/legacy/detection/evaluation/__init__.py similarity index 100% rename from modeling/official/legacy/detection/evaluation/__init__.py rename to official/legacy/detection/evaluation/__init__.py diff --git a/modeling/official/legacy/detection/evaluation/coco_evaluator.py b/official/legacy/detection/evaluation/coco_evaluator.py similarity index 100% rename from modeling/official/legacy/detection/evaluation/coco_evaluator.py rename to official/legacy/detection/evaluation/coco_evaluator.py diff --git a/modeling/official/legacy/detection/evaluation/coco_utils.py b/official/legacy/detection/evaluation/coco_utils.py similarity index 100% rename from modeling/official/legacy/detection/evaluation/coco_utils.py rename to official/legacy/detection/evaluation/coco_utils.py diff --git a/modeling/official/legacy/detection/evaluation/factory.py b/official/legacy/detection/evaluation/factory.py similarity index 100% rename from modeling/official/legacy/detection/evaluation/factory.py rename to official/legacy/detection/evaluation/factory.py diff --git a/modeling/official/legacy/detection/executor/__init__.py b/official/legacy/detection/executor/__init__.py similarity index 100% rename from modeling/official/legacy/detection/executor/__init__.py rename to official/legacy/detection/executor/__init__.py diff --git a/modeling/official/legacy/detection/executor/detection_executor.py b/official/legacy/detection/executor/detection_executor.py similarity index 100% rename from modeling/official/legacy/detection/executor/detection_executor.py rename to official/legacy/detection/executor/detection_executor.py diff --git a/modeling/official/legacy/detection/executor/distributed_executor.py b/official/legacy/detection/executor/distributed_executor.py similarity index 100% rename from modeling/official/legacy/detection/executor/distributed_executor.py rename to official/legacy/detection/executor/distributed_executor.py diff --git a/modeling/official/legacy/detection/main.py b/official/legacy/detection/main.py similarity index 100% rename from modeling/official/legacy/detection/main.py rename to official/legacy/detection/main.py diff --git a/modeling/official/legacy/detection/modeling/__init__.py b/official/legacy/detection/modeling/__init__.py similarity index 100% rename from modeling/official/legacy/detection/modeling/__init__.py rename to official/legacy/detection/modeling/__init__.py diff --git a/modeling/official/legacy/detection/modeling/architecture/__init__.py b/official/legacy/detection/modeling/architecture/__init__.py similarity index 100% rename from modeling/official/legacy/detection/modeling/architecture/__init__.py rename to official/legacy/detection/modeling/architecture/__init__.py diff --git a/modeling/official/legacy/detection/modeling/architecture/factory.py b/official/legacy/detection/modeling/architecture/factory.py similarity index 100% rename from modeling/official/legacy/detection/modeling/architecture/factory.py rename to official/legacy/detection/modeling/architecture/factory.py diff --git a/modeling/official/legacy/detection/modeling/architecture/fpn.py b/official/legacy/detection/modeling/architecture/fpn.py similarity index 100% rename from modeling/official/legacy/detection/modeling/architecture/fpn.py rename to official/legacy/detection/modeling/architecture/fpn.py diff --git a/modeling/official/legacy/detection/modeling/architecture/heads.py b/official/legacy/detection/modeling/architecture/heads.py similarity index 100% rename from modeling/official/legacy/detection/modeling/architecture/heads.py rename to official/legacy/detection/modeling/architecture/heads.py diff --git a/modeling/official/legacy/detection/modeling/architecture/identity.py b/official/legacy/detection/modeling/architecture/identity.py similarity index 100% rename from modeling/official/legacy/detection/modeling/architecture/identity.py rename to official/legacy/detection/modeling/architecture/identity.py diff --git a/modeling/official/legacy/detection/modeling/architecture/nn_blocks.py b/official/legacy/detection/modeling/architecture/nn_blocks.py similarity index 100% rename from modeling/official/legacy/detection/modeling/architecture/nn_blocks.py rename to official/legacy/detection/modeling/architecture/nn_blocks.py diff --git a/modeling/official/legacy/detection/modeling/architecture/nn_ops.py b/official/legacy/detection/modeling/architecture/nn_ops.py similarity index 100% rename from modeling/official/legacy/detection/modeling/architecture/nn_ops.py rename to official/legacy/detection/modeling/architecture/nn_ops.py diff --git a/modeling/official/legacy/detection/modeling/architecture/resnet.py b/official/legacy/detection/modeling/architecture/resnet.py similarity index 100% rename from modeling/official/legacy/detection/modeling/architecture/resnet.py rename to official/legacy/detection/modeling/architecture/resnet.py diff --git a/modeling/official/legacy/detection/modeling/architecture/spinenet.py b/official/legacy/detection/modeling/architecture/spinenet.py similarity index 100% rename from modeling/official/legacy/detection/modeling/architecture/spinenet.py rename to official/legacy/detection/modeling/architecture/spinenet.py diff --git a/modeling/official/legacy/detection/modeling/base_model.py b/official/legacy/detection/modeling/base_model.py similarity index 100% rename from modeling/official/legacy/detection/modeling/base_model.py rename to official/legacy/detection/modeling/base_model.py diff --git a/modeling/official/legacy/detection/modeling/checkpoint_utils.py b/official/legacy/detection/modeling/checkpoint_utils.py similarity index 100% rename from modeling/official/legacy/detection/modeling/checkpoint_utils.py rename to official/legacy/detection/modeling/checkpoint_utils.py diff --git a/modeling/official/legacy/detection/modeling/factory.py b/official/legacy/detection/modeling/factory.py similarity index 100% rename from modeling/official/legacy/detection/modeling/factory.py rename to official/legacy/detection/modeling/factory.py diff --git a/modeling/official/legacy/detection/modeling/learning_rates.py b/official/legacy/detection/modeling/learning_rates.py similarity index 100% rename from modeling/official/legacy/detection/modeling/learning_rates.py rename to official/legacy/detection/modeling/learning_rates.py diff --git a/modeling/official/legacy/detection/modeling/losses.py b/official/legacy/detection/modeling/losses.py similarity index 100% rename from modeling/official/legacy/detection/modeling/losses.py rename to official/legacy/detection/modeling/losses.py diff --git a/modeling/official/legacy/detection/modeling/maskrcnn_model.py b/official/legacy/detection/modeling/maskrcnn_model.py similarity index 100% rename from modeling/official/legacy/detection/modeling/maskrcnn_model.py rename to official/legacy/detection/modeling/maskrcnn_model.py diff --git a/modeling/official/legacy/detection/modeling/olnmask_model.py b/official/legacy/detection/modeling/olnmask_model.py similarity index 100% rename from modeling/official/legacy/detection/modeling/olnmask_model.py rename to official/legacy/detection/modeling/olnmask_model.py diff --git a/modeling/official/legacy/detection/modeling/optimizers.py b/official/legacy/detection/modeling/optimizers.py similarity index 100% rename from modeling/official/legacy/detection/modeling/optimizers.py rename to official/legacy/detection/modeling/optimizers.py diff --git a/modeling/official/legacy/detection/modeling/retinanet_model.py b/official/legacy/detection/modeling/retinanet_model.py similarity index 100% rename from modeling/official/legacy/detection/modeling/retinanet_model.py rename to official/legacy/detection/modeling/retinanet_model.py diff --git a/modeling/official/legacy/detection/modeling/shapemask_model.py b/official/legacy/detection/modeling/shapemask_model.py similarity index 100% rename from modeling/official/legacy/detection/modeling/shapemask_model.py rename to official/legacy/detection/modeling/shapemask_model.py diff --git a/modeling/official/legacy/detection/ops/__init__.py b/official/legacy/detection/ops/__init__.py similarity index 100% rename from modeling/official/legacy/detection/ops/__init__.py rename to official/legacy/detection/ops/__init__.py diff --git a/modeling/official/legacy/detection/ops/nms.py b/official/legacy/detection/ops/nms.py similarity index 100% rename from modeling/official/legacy/detection/ops/nms.py rename to official/legacy/detection/ops/nms.py diff --git a/modeling/official/legacy/detection/ops/postprocess_ops.py b/official/legacy/detection/ops/postprocess_ops.py similarity index 100% rename from modeling/official/legacy/detection/ops/postprocess_ops.py rename to official/legacy/detection/ops/postprocess_ops.py diff --git a/modeling/official/legacy/detection/ops/roi_ops.py b/official/legacy/detection/ops/roi_ops.py similarity index 100% rename from modeling/official/legacy/detection/ops/roi_ops.py rename to official/legacy/detection/ops/roi_ops.py diff --git a/modeling/official/legacy/detection/ops/spatial_transform_ops.py b/official/legacy/detection/ops/spatial_transform_ops.py similarity index 100% rename from modeling/official/legacy/detection/ops/spatial_transform_ops.py rename to official/legacy/detection/ops/spatial_transform_ops.py diff --git a/modeling/official/legacy/detection/ops/target_ops.py b/official/legacy/detection/ops/target_ops.py similarity index 100% rename from modeling/official/legacy/detection/ops/target_ops.py rename to official/legacy/detection/ops/target_ops.py diff --git a/modeling/official/legacy/detection/utils/__init__.py b/official/legacy/detection/utils/__init__.py similarity index 100% rename from modeling/official/legacy/detection/utils/__init__.py rename to official/legacy/detection/utils/__init__.py diff --git a/modeling/official/legacy/detection/utils/box_utils.py b/official/legacy/detection/utils/box_utils.py similarity index 100% rename from modeling/official/legacy/detection/utils/box_utils.py rename to official/legacy/detection/utils/box_utils.py diff --git a/modeling/official/legacy/detection/utils/class_utils.py b/official/legacy/detection/utils/class_utils.py similarity index 100% rename from modeling/official/legacy/detection/utils/class_utils.py rename to official/legacy/detection/utils/class_utils.py diff --git a/modeling/official/legacy/detection/utils/dataloader_utils.py b/official/legacy/detection/utils/dataloader_utils.py similarity index 100% rename from modeling/official/legacy/detection/utils/dataloader_utils.py rename to official/legacy/detection/utils/dataloader_utils.py diff --git a/modeling/official/legacy/detection/utils/input_utils.py b/official/legacy/detection/utils/input_utils.py similarity index 100% rename from modeling/official/legacy/detection/utils/input_utils.py rename to official/legacy/detection/utils/input_utils.py diff --git a/modeling/official/legacy/detection/utils/mask_utils.py b/official/legacy/detection/utils/mask_utils.py similarity index 100% rename from modeling/official/legacy/detection/utils/mask_utils.py rename to official/legacy/detection/utils/mask_utils.py diff --git a/modeling/official/legacy/image_classification/README.md b/official/legacy/image_classification/README.md similarity index 100% rename from modeling/official/legacy/image_classification/README.md rename to official/legacy/image_classification/README.md diff --git a/modeling/official/legacy/image_classification/__init__.py b/official/legacy/image_classification/__init__.py similarity index 100% rename from modeling/official/legacy/image_classification/__init__.py rename to official/legacy/image_classification/__init__.py diff --git a/modeling/official/legacy/image_classification/augment.py b/official/legacy/image_classification/augment.py similarity index 100% rename from modeling/official/legacy/image_classification/augment.py rename to official/legacy/image_classification/augment.py diff --git a/modeling/official/legacy/image_classification/augment_test.py b/official/legacy/image_classification/augment_test.py similarity index 100% rename from modeling/official/legacy/image_classification/augment_test.py rename to official/legacy/image_classification/augment_test.py diff --git a/modeling/official/legacy/image_classification/callbacks.py b/official/legacy/image_classification/callbacks.py similarity index 100% rename from modeling/official/legacy/image_classification/callbacks.py rename to official/legacy/image_classification/callbacks.py diff --git a/modeling/official/legacy/image_classification/classifier_trainer.py b/official/legacy/image_classification/classifier_trainer.py similarity index 100% rename from modeling/official/legacy/image_classification/classifier_trainer.py rename to official/legacy/image_classification/classifier_trainer.py diff --git a/modeling/official/legacy/image_classification/classifier_trainer_test.py b/official/legacy/image_classification/classifier_trainer_test.py similarity index 100% rename from modeling/official/legacy/image_classification/classifier_trainer_test.py rename to official/legacy/image_classification/classifier_trainer_test.py diff --git a/modeling/official/legacy/image_classification/classifier_trainer_util_test.py b/official/legacy/image_classification/classifier_trainer_util_test.py similarity index 100% rename from modeling/official/legacy/image_classification/classifier_trainer_util_test.py rename to official/legacy/image_classification/classifier_trainer_util_test.py diff --git a/modeling/official/legacy/image_classification/configs/__init__.py b/official/legacy/image_classification/configs/__init__.py similarity index 100% rename from modeling/official/legacy/image_classification/configs/__init__.py rename to official/legacy/image_classification/configs/__init__.py diff --git a/modeling/official/legacy/image_classification/configs/base_configs.py b/official/legacy/image_classification/configs/base_configs.py similarity index 100% rename from modeling/official/legacy/image_classification/configs/base_configs.py rename to official/legacy/image_classification/configs/base_configs.py diff --git a/modeling/official/legacy/image_classification/configs/configs.py b/official/legacy/image_classification/configs/configs.py similarity index 100% rename from modeling/official/legacy/image_classification/configs/configs.py rename to official/legacy/image_classification/configs/configs.py diff --git a/modeling/official/legacy/image_classification/configs/examples/efficientnet/imagenet/efficientnet-b0-gpu.yaml b/official/legacy/image_classification/configs/examples/efficientnet/imagenet/efficientnet-b0-gpu.yaml similarity index 100% rename from modeling/official/legacy/image_classification/configs/examples/efficientnet/imagenet/efficientnet-b0-gpu.yaml rename to official/legacy/image_classification/configs/examples/efficientnet/imagenet/efficientnet-b0-gpu.yaml diff --git a/modeling/official/legacy/image_classification/configs/examples/efficientnet/imagenet/efficientnet-b0-tpu.yaml b/official/legacy/image_classification/configs/examples/efficientnet/imagenet/efficientnet-b0-tpu.yaml similarity index 100% rename from modeling/official/legacy/image_classification/configs/examples/efficientnet/imagenet/efficientnet-b0-tpu.yaml rename to official/legacy/image_classification/configs/examples/efficientnet/imagenet/efficientnet-b0-tpu.yaml diff --git a/modeling/official/legacy/image_classification/configs/examples/efficientnet/imagenet/efficientnet-b1-gpu.yaml b/official/legacy/image_classification/configs/examples/efficientnet/imagenet/efficientnet-b1-gpu.yaml similarity index 100% rename from modeling/official/legacy/image_classification/configs/examples/efficientnet/imagenet/efficientnet-b1-gpu.yaml rename to official/legacy/image_classification/configs/examples/efficientnet/imagenet/efficientnet-b1-gpu.yaml diff --git a/modeling/official/legacy/image_classification/configs/examples/efficientnet/imagenet/efficientnet-b1-tpu.yaml b/official/legacy/image_classification/configs/examples/efficientnet/imagenet/efficientnet-b1-tpu.yaml similarity index 100% rename from modeling/official/legacy/image_classification/configs/examples/efficientnet/imagenet/efficientnet-b1-tpu.yaml rename to official/legacy/image_classification/configs/examples/efficientnet/imagenet/efficientnet-b1-tpu.yaml diff --git a/modeling/official/legacy/image_classification/configs/examples/resnet/imagenet/gpu.yaml b/official/legacy/image_classification/configs/examples/resnet/imagenet/gpu.yaml similarity index 100% rename from modeling/official/legacy/image_classification/configs/examples/resnet/imagenet/gpu.yaml rename to official/legacy/image_classification/configs/examples/resnet/imagenet/gpu.yaml diff --git a/modeling/official/legacy/image_classification/configs/examples/resnet/imagenet/tpu.yaml b/official/legacy/image_classification/configs/examples/resnet/imagenet/tpu.yaml similarity index 100% rename from modeling/official/legacy/image_classification/configs/examples/resnet/imagenet/tpu.yaml rename to official/legacy/image_classification/configs/examples/resnet/imagenet/tpu.yaml diff --git a/modeling/official/legacy/image_classification/configs/examples/vgg16/imagenet/gpu.yaml b/official/legacy/image_classification/configs/examples/vgg16/imagenet/gpu.yaml similarity index 100% rename from modeling/official/legacy/image_classification/configs/examples/vgg16/imagenet/gpu.yaml rename to official/legacy/image_classification/configs/examples/vgg16/imagenet/gpu.yaml diff --git a/modeling/official/legacy/image_classification/dataset_factory.py b/official/legacy/image_classification/dataset_factory.py similarity index 100% rename from modeling/official/legacy/image_classification/dataset_factory.py rename to official/legacy/image_classification/dataset_factory.py diff --git a/modeling/official/legacy/image_classification/efficientnet/__init__.py b/official/legacy/image_classification/efficientnet/__init__.py similarity index 100% rename from modeling/official/legacy/image_classification/efficientnet/__init__.py rename to official/legacy/image_classification/efficientnet/__init__.py diff --git a/modeling/official/legacy/image_classification/efficientnet/common_modules.py b/official/legacy/image_classification/efficientnet/common_modules.py similarity index 100% rename from modeling/official/legacy/image_classification/efficientnet/common_modules.py rename to official/legacy/image_classification/efficientnet/common_modules.py diff --git a/modeling/official/legacy/image_classification/efficientnet/efficientnet_config.py b/official/legacy/image_classification/efficientnet/efficientnet_config.py similarity index 100% rename from modeling/official/legacy/image_classification/efficientnet/efficientnet_config.py rename to official/legacy/image_classification/efficientnet/efficientnet_config.py diff --git a/modeling/official/legacy/image_classification/efficientnet/efficientnet_model.py b/official/legacy/image_classification/efficientnet/efficientnet_model.py similarity index 100% rename from modeling/official/legacy/image_classification/efficientnet/efficientnet_model.py rename to official/legacy/image_classification/efficientnet/efficientnet_model.py diff --git a/modeling/official/legacy/image_classification/efficientnet/tfhub_export.py b/official/legacy/image_classification/efficientnet/tfhub_export.py similarity index 100% rename from modeling/official/legacy/image_classification/efficientnet/tfhub_export.py rename to official/legacy/image_classification/efficientnet/tfhub_export.py diff --git a/modeling/official/legacy/image_classification/learning_rate.py b/official/legacy/image_classification/learning_rate.py similarity index 100% rename from modeling/official/legacy/image_classification/learning_rate.py rename to official/legacy/image_classification/learning_rate.py diff --git a/modeling/official/legacy/image_classification/learning_rate_test.py b/official/legacy/image_classification/learning_rate_test.py similarity index 100% rename from modeling/official/legacy/image_classification/learning_rate_test.py rename to official/legacy/image_classification/learning_rate_test.py diff --git a/modeling/official/legacy/image_classification/mnist_main.py b/official/legacy/image_classification/mnist_main.py similarity index 100% rename from modeling/official/legacy/image_classification/mnist_main.py rename to official/legacy/image_classification/mnist_main.py diff --git a/modeling/official/legacy/image_classification/mnist_test.py b/official/legacy/image_classification/mnist_test.py similarity index 100% rename from modeling/official/legacy/image_classification/mnist_test.py rename to official/legacy/image_classification/mnist_test.py diff --git a/modeling/official/legacy/image_classification/optimizer_factory.py b/official/legacy/image_classification/optimizer_factory.py similarity index 100% rename from modeling/official/legacy/image_classification/optimizer_factory.py rename to official/legacy/image_classification/optimizer_factory.py diff --git a/modeling/official/legacy/image_classification/optimizer_factory_test.py b/official/legacy/image_classification/optimizer_factory_test.py similarity index 100% rename from modeling/official/legacy/image_classification/optimizer_factory_test.py rename to official/legacy/image_classification/optimizer_factory_test.py diff --git a/modeling/official/legacy/image_classification/preprocessing.py b/official/legacy/image_classification/preprocessing.py similarity index 100% rename from modeling/official/legacy/image_classification/preprocessing.py rename to official/legacy/image_classification/preprocessing.py diff --git a/modeling/official/legacy/image_classification/resnet/README.md b/official/legacy/image_classification/resnet/README.md similarity index 100% rename from modeling/official/legacy/image_classification/resnet/README.md rename to official/legacy/image_classification/resnet/README.md diff --git a/modeling/official/legacy/image_classification/resnet/__init__.py b/official/legacy/image_classification/resnet/__init__.py similarity index 100% rename from modeling/official/legacy/image_classification/resnet/__init__.py rename to official/legacy/image_classification/resnet/__init__.py diff --git a/modeling/official/legacy/image_classification/resnet/common.py b/official/legacy/image_classification/resnet/common.py similarity index 100% rename from modeling/official/legacy/image_classification/resnet/common.py rename to official/legacy/image_classification/resnet/common.py diff --git a/modeling/official/legacy/image_classification/resnet/imagenet_preprocessing.py b/official/legacy/image_classification/resnet/imagenet_preprocessing.py similarity index 100% rename from modeling/official/legacy/image_classification/resnet/imagenet_preprocessing.py rename to official/legacy/image_classification/resnet/imagenet_preprocessing.py diff --git a/modeling/official/legacy/image_classification/resnet/resnet_config.py b/official/legacy/image_classification/resnet/resnet_config.py similarity index 100% rename from modeling/official/legacy/image_classification/resnet/resnet_config.py rename to official/legacy/image_classification/resnet/resnet_config.py diff --git a/modeling/official/legacy/image_classification/resnet/resnet_ctl_imagenet_main.py b/official/legacy/image_classification/resnet/resnet_ctl_imagenet_main.py similarity index 100% rename from modeling/official/legacy/image_classification/resnet/resnet_ctl_imagenet_main.py rename to official/legacy/image_classification/resnet/resnet_ctl_imagenet_main.py diff --git a/modeling/official/legacy/image_classification/resnet/resnet_model.py b/official/legacy/image_classification/resnet/resnet_model.py similarity index 100% rename from modeling/official/legacy/image_classification/resnet/resnet_model.py rename to official/legacy/image_classification/resnet/resnet_model.py diff --git a/modeling/official/legacy/image_classification/resnet/resnet_runnable.py b/official/legacy/image_classification/resnet/resnet_runnable.py similarity index 100% rename from modeling/official/legacy/image_classification/resnet/resnet_runnable.py rename to official/legacy/image_classification/resnet/resnet_runnable.py diff --git a/modeling/official/legacy/image_classification/resnet/tfhub_export.py b/official/legacy/image_classification/resnet/tfhub_export.py similarity index 100% rename from modeling/official/legacy/image_classification/resnet/tfhub_export.py rename to official/legacy/image_classification/resnet/tfhub_export.py diff --git a/modeling/official/legacy/image_classification/test_utils.py b/official/legacy/image_classification/test_utils.py similarity index 100% rename from modeling/official/legacy/image_classification/test_utils.py rename to official/legacy/image_classification/test_utils.py diff --git a/modeling/official/legacy/image_classification/vgg/__init__.py b/official/legacy/image_classification/vgg/__init__.py similarity index 100% rename from modeling/official/legacy/image_classification/vgg/__init__.py rename to official/legacy/image_classification/vgg/__init__.py diff --git a/modeling/official/legacy/image_classification/vgg/vgg_config.py b/official/legacy/image_classification/vgg/vgg_config.py similarity index 100% rename from modeling/official/legacy/image_classification/vgg/vgg_config.py rename to official/legacy/image_classification/vgg/vgg_config.py diff --git a/modeling/official/legacy/image_classification/vgg/vgg_model.py b/official/legacy/image_classification/vgg/vgg_model.py similarity index 100% rename from modeling/official/legacy/image_classification/vgg/vgg_model.py rename to official/legacy/image_classification/vgg/vgg_model.py diff --git a/modeling/official/legacy/transformer/README.md b/official/legacy/transformer/README.md similarity index 100% rename from modeling/official/legacy/transformer/README.md rename to official/legacy/transformer/README.md diff --git a/modeling/official/legacy/transformer/__init__.py b/official/legacy/transformer/__init__.py similarity index 100% rename from modeling/official/legacy/transformer/__init__.py rename to official/legacy/transformer/__init__.py diff --git a/modeling/official/legacy/transformer/attention_layer.py b/official/legacy/transformer/attention_layer.py similarity index 100% rename from modeling/official/legacy/transformer/attention_layer.py rename to official/legacy/transformer/attention_layer.py diff --git a/modeling/official/legacy/transformer/beam_search_v1.py b/official/legacy/transformer/beam_search_v1.py similarity index 100% rename from modeling/official/legacy/transformer/beam_search_v1.py rename to official/legacy/transformer/beam_search_v1.py diff --git a/modeling/official/legacy/transformer/compute_bleu.py b/official/legacy/transformer/compute_bleu.py similarity index 100% rename from modeling/official/legacy/transformer/compute_bleu.py rename to official/legacy/transformer/compute_bleu.py diff --git a/modeling/official/legacy/transformer/compute_bleu_test.py b/official/legacy/transformer/compute_bleu_test.py similarity index 100% rename from modeling/official/legacy/transformer/compute_bleu_test.py rename to official/legacy/transformer/compute_bleu_test.py diff --git a/modeling/official/legacy/transformer/data_download.py b/official/legacy/transformer/data_download.py similarity index 100% rename from modeling/official/legacy/transformer/data_download.py rename to official/legacy/transformer/data_download.py diff --git a/modeling/official/legacy/transformer/data_pipeline.py b/official/legacy/transformer/data_pipeline.py similarity index 100% rename from modeling/official/legacy/transformer/data_pipeline.py rename to official/legacy/transformer/data_pipeline.py diff --git a/modeling/official/legacy/transformer/embedding_layer.py b/official/legacy/transformer/embedding_layer.py similarity index 100% rename from modeling/official/legacy/transformer/embedding_layer.py rename to official/legacy/transformer/embedding_layer.py diff --git a/modeling/official/legacy/transformer/ffn_layer.py b/official/legacy/transformer/ffn_layer.py similarity index 100% rename from modeling/official/legacy/transformer/ffn_layer.py rename to official/legacy/transformer/ffn_layer.py diff --git a/modeling/official/legacy/transformer/metrics.py b/official/legacy/transformer/metrics.py similarity index 100% rename from modeling/official/legacy/transformer/metrics.py rename to official/legacy/transformer/metrics.py diff --git a/modeling/official/legacy/transformer/misc.py b/official/legacy/transformer/misc.py similarity index 100% rename from modeling/official/legacy/transformer/misc.py rename to official/legacy/transformer/misc.py diff --git a/modeling/official/legacy/transformer/model_params.py b/official/legacy/transformer/model_params.py similarity index 100% rename from modeling/official/legacy/transformer/model_params.py rename to official/legacy/transformer/model_params.py diff --git a/modeling/official/legacy/transformer/model_utils.py b/official/legacy/transformer/model_utils.py similarity index 100% rename from modeling/official/legacy/transformer/model_utils.py rename to official/legacy/transformer/model_utils.py diff --git a/modeling/official/legacy/transformer/model_utils_test.py b/official/legacy/transformer/model_utils_test.py similarity index 100% rename from modeling/official/legacy/transformer/model_utils_test.py rename to official/legacy/transformer/model_utils_test.py diff --git a/modeling/official/legacy/transformer/optimizer.py b/official/legacy/transformer/optimizer.py similarity index 100% rename from modeling/official/legacy/transformer/optimizer.py rename to official/legacy/transformer/optimizer.py diff --git a/modeling/official/legacy/transformer/transformer.py b/official/legacy/transformer/transformer.py similarity index 100% rename from modeling/official/legacy/transformer/transformer.py rename to official/legacy/transformer/transformer.py diff --git a/modeling/official/legacy/transformer/transformer_forward_test.py b/official/legacy/transformer/transformer_forward_test.py similarity index 100% rename from modeling/official/legacy/transformer/transformer_forward_test.py rename to official/legacy/transformer/transformer_forward_test.py diff --git a/modeling/official/legacy/transformer/transformer_layers_test.py b/official/legacy/transformer/transformer_layers_test.py similarity index 100% rename from modeling/official/legacy/transformer/transformer_layers_test.py rename to official/legacy/transformer/transformer_layers_test.py diff --git a/modeling/official/legacy/transformer/transformer_main.py b/official/legacy/transformer/transformer_main.py similarity index 100% rename from modeling/official/legacy/transformer/transformer_main.py rename to official/legacy/transformer/transformer_main.py diff --git a/modeling/official/legacy/transformer/transformer_main_test.py b/official/legacy/transformer/transformer_main_test.py similarity index 100% rename from modeling/official/legacy/transformer/transformer_main_test.py rename to official/legacy/transformer/transformer_main_test.py diff --git a/modeling/official/legacy/transformer/transformer_test.py b/official/legacy/transformer/transformer_test.py similarity index 100% rename from modeling/official/legacy/transformer/transformer_test.py rename to official/legacy/transformer/transformer_test.py diff --git a/modeling/official/legacy/transformer/translate.py b/official/legacy/transformer/translate.py similarity index 100% rename from modeling/official/legacy/transformer/translate.py rename to official/legacy/transformer/translate.py diff --git a/modeling/official/legacy/transformer/utils/__init__.py b/official/legacy/transformer/utils/__init__.py similarity index 100% rename from modeling/official/legacy/transformer/utils/__init__.py rename to official/legacy/transformer/utils/__init__.py diff --git a/modeling/official/legacy/transformer/utils/metrics.py b/official/legacy/transformer/utils/metrics.py similarity index 100% rename from modeling/official/legacy/transformer/utils/metrics.py rename to official/legacy/transformer/utils/metrics.py diff --git a/modeling/official/legacy/transformer/utils/tokenizer.py b/official/legacy/transformer/utils/tokenizer.py similarity index 100% rename from modeling/official/legacy/transformer/utils/tokenizer.py rename to official/legacy/transformer/utils/tokenizer.py diff --git a/modeling/official/legacy/transformer/utils/tokenizer_test.py b/official/legacy/transformer/utils/tokenizer_test.py similarity index 100% rename from modeling/official/legacy/transformer/utils/tokenizer_test.py rename to official/legacy/transformer/utils/tokenizer_test.py diff --git a/modeling/official/legacy/xlnet/README.md b/official/legacy/xlnet/README.md similarity index 100% rename from modeling/official/legacy/xlnet/README.md rename to official/legacy/xlnet/README.md diff --git a/modeling/official/legacy/xlnet/__init__.py b/official/legacy/xlnet/__init__.py similarity index 100% rename from modeling/official/legacy/xlnet/__init__.py rename to official/legacy/xlnet/__init__.py diff --git a/modeling/official/legacy/xlnet/classifier_utils.py b/official/legacy/xlnet/classifier_utils.py similarity index 100% rename from modeling/official/legacy/xlnet/classifier_utils.py rename to official/legacy/xlnet/classifier_utils.py diff --git a/modeling/official/legacy/xlnet/common_flags.py b/official/legacy/xlnet/common_flags.py similarity index 100% rename from modeling/official/legacy/xlnet/common_flags.py rename to official/legacy/xlnet/common_flags.py diff --git a/modeling/official/legacy/xlnet/data_utils.py b/official/legacy/xlnet/data_utils.py similarity index 100% rename from modeling/official/legacy/xlnet/data_utils.py rename to official/legacy/xlnet/data_utils.py diff --git a/modeling/official/legacy/xlnet/optimization.py b/official/legacy/xlnet/optimization.py similarity index 100% rename from modeling/official/legacy/xlnet/optimization.py rename to official/legacy/xlnet/optimization.py diff --git a/modeling/official/legacy/xlnet/preprocess_classification_data.py b/official/legacy/xlnet/preprocess_classification_data.py similarity index 100% rename from modeling/official/legacy/xlnet/preprocess_classification_data.py rename to official/legacy/xlnet/preprocess_classification_data.py diff --git a/modeling/official/legacy/xlnet/preprocess_pretrain_data.py b/official/legacy/xlnet/preprocess_pretrain_data.py similarity index 100% rename from modeling/official/legacy/xlnet/preprocess_pretrain_data.py rename to official/legacy/xlnet/preprocess_pretrain_data.py diff --git a/modeling/official/legacy/xlnet/preprocess_squad_data.py b/official/legacy/xlnet/preprocess_squad_data.py similarity index 100% rename from modeling/official/legacy/xlnet/preprocess_squad_data.py rename to official/legacy/xlnet/preprocess_squad_data.py diff --git a/modeling/official/legacy/xlnet/preprocess_utils.py b/official/legacy/xlnet/preprocess_utils.py similarity index 100% rename from modeling/official/legacy/xlnet/preprocess_utils.py rename to official/legacy/xlnet/preprocess_utils.py diff --git a/modeling/official/legacy/xlnet/run_classifier.py b/official/legacy/xlnet/run_classifier.py similarity index 100% rename from modeling/official/legacy/xlnet/run_classifier.py rename to official/legacy/xlnet/run_classifier.py diff --git a/modeling/official/legacy/xlnet/run_pretrain.py b/official/legacy/xlnet/run_pretrain.py similarity index 100% rename from modeling/official/legacy/xlnet/run_pretrain.py rename to official/legacy/xlnet/run_pretrain.py diff --git a/modeling/official/legacy/xlnet/run_squad.py b/official/legacy/xlnet/run_squad.py similarity index 100% rename from modeling/official/legacy/xlnet/run_squad.py rename to official/legacy/xlnet/run_squad.py diff --git a/modeling/official/legacy/xlnet/squad_utils.py b/official/legacy/xlnet/squad_utils.py similarity index 100% rename from modeling/official/legacy/xlnet/squad_utils.py rename to official/legacy/xlnet/squad_utils.py diff --git a/modeling/official/legacy/xlnet/training_utils.py b/official/legacy/xlnet/training_utils.py similarity index 100% rename from modeling/official/legacy/xlnet/training_utils.py rename to official/legacy/xlnet/training_utils.py diff --git a/modeling/official/legacy/xlnet/xlnet_config.py b/official/legacy/xlnet/xlnet_config.py similarity index 100% rename from modeling/official/legacy/xlnet/xlnet_config.py rename to official/legacy/xlnet/xlnet_config.py diff --git a/modeling/official/legacy/xlnet/xlnet_modeling.py b/official/legacy/xlnet/xlnet_modeling.py similarity index 100% rename from modeling/official/legacy/xlnet/xlnet_modeling.py rename to official/legacy/xlnet/xlnet_modeling.py diff --git a/modeling/official/modeling/__init__.py b/official/modeling/__init__.py similarity index 100% rename from modeling/official/modeling/__init__.py rename to official/modeling/__init__.py diff --git a/modeling/official/modeling/activations/__init__.py b/official/modeling/activations/__init__.py similarity index 58% rename from modeling/official/modeling/activations/__init__.py rename to official/modeling/activations/__init__.py index f44d78d48ec6dc3677d7a2291f4f1ee803a9452f..8fe76b2901daff05be6438455b6f13097e9d3111 100644 --- a/modeling/official/modeling/activations/__init__.py +++ b/official/modeling/activations/__init__.py @@ -13,10 +13,10 @@ # limitations under the License. """Activations package definition.""" -from modeling.official.modeling.activations.gelu import gelu -from modeling.official.modeling.activations.mish import mish -from modeling.official.modeling.activations.relu import relu6 -from modeling.official.modeling.activations.sigmoid import hard_sigmoid -from modeling.official.modeling.activations.swish import hard_swish -from modeling.official.modeling.activations.swish import identity -from modeling.official.modeling.activations.swish import simple_swish +from official.modeling.activations.gelu import gelu +from official.modeling.activations.mish import mish +from official.modeling.activations.relu import relu6 +from official.modeling.activations.sigmoid import hard_sigmoid +from official.modeling.activations.swish import hard_swish +from official.modeling.activations.swish import identity +from official.modeling.activations.swish import simple_swish diff --git a/modeling/official/modeling/activations/gelu.py b/official/modeling/activations/gelu.py similarity index 100% rename from modeling/official/modeling/activations/gelu.py rename to official/modeling/activations/gelu.py diff --git a/modeling/official/modeling/activations/gelu_test.py b/official/modeling/activations/gelu_test.py similarity index 100% rename from modeling/official/modeling/activations/gelu_test.py rename to official/modeling/activations/gelu_test.py diff --git a/modeling/official/modeling/activations/mish.py b/official/modeling/activations/mish.py similarity index 100% rename from modeling/official/modeling/activations/mish.py rename to official/modeling/activations/mish.py diff --git a/modeling/official/modeling/activations/mish_test.py b/official/modeling/activations/mish_test.py similarity index 100% rename from modeling/official/modeling/activations/mish_test.py rename to official/modeling/activations/mish_test.py diff --git a/modeling/official/modeling/activations/relu.py b/official/modeling/activations/relu.py similarity index 100% rename from modeling/official/modeling/activations/relu.py rename to official/modeling/activations/relu.py diff --git a/modeling/official/modeling/activations/relu_test.py b/official/modeling/activations/relu_test.py similarity index 100% rename from modeling/official/modeling/activations/relu_test.py rename to official/modeling/activations/relu_test.py diff --git a/modeling/official/modeling/activations/sigmoid.py b/official/modeling/activations/sigmoid.py similarity index 100% rename from modeling/official/modeling/activations/sigmoid.py rename to official/modeling/activations/sigmoid.py diff --git a/modeling/official/modeling/activations/sigmoid_test.py b/official/modeling/activations/sigmoid_test.py similarity index 100% rename from modeling/official/modeling/activations/sigmoid_test.py rename to official/modeling/activations/sigmoid_test.py diff --git a/modeling/official/modeling/activations/swish.py b/official/modeling/activations/swish.py similarity index 100% rename from modeling/official/modeling/activations/swish.py rename to official/modeling/activations/swish.py diff --git a/modeling/official/modeling/activations/swish_test.py b/official/modeling/activations/swish_test.py similarity index 100% rename from modeling/official/modeling/activations/swish_test.py rename to official/modeling/activations/swish_test.py diff --git a/modeling/official/modeling/fast_training/experimental/tf2_utils_2x_wide.py b/official/modeling/fast_training/experimental/tf2_utils_2x_wide.py similarity index 100% rename from modeling/official/modeling/fast_training/experimental/tf2_utils_2x_wide.py rename to official/modeling/fast_training/experimental/tf2_utils_2x_wide.py diff --git a/modeling/official/modeling/fast_training/experimental/tf2_utils_2x_wide_test.py b/official/modeling/fast_training/experimental/tf2_utils_2x_wide_test.py similarity index 100% rename from modeling/official/modeling/fast_training/experimental/tf2_utils_2x_wide_test.py rename to official/modeling/fast_training/experimental/tf2_utils_2x_wide_test.py diff --git a/modeling/official/modeling/fast_training/progressive/policies.py b/official/modeling/fast_training/progressive/policies.py similarity index 100% rename from modeling/official/modeling/fast_training/progressive/policies.py rename to official/modeling/fast_training/progressive/policies.py diff --git a/modeling/official/modeling/fast_training/progressive/train.py b/official/modeling/fast_training/progressive/train.py similarity index 100% rename from modeling/official/modeling/fast_training/progressive/train.py rename to official/modeling/fast_training/progressive/train.py diff --git a/modeling/official/modeling/fast_training/progressive/train_lib.py b/official/modeling/fast_training/progressive/train_lib.py similarity index 100% rename from modeling/official/modeling/fast_training/progressive/train_lib.py rename to official/modeling/fast_training/progressive/train_lib.py diff --git a/modeling/official/modeling/fast_training/progressive/train_lib_test.py b/official/modeling/fast_training/progressive/train_lib_test.py similarity index 100% rename from modeling/official/modeling/fast_training/progressive/train_lib_test.py rename to official/modeling/fast_training/progressive/train_lib_test.py diff --git a/modeling/official/modeling/fast_training/progressive/trainer.py b/official/modeling/fast_training/progressive/trainer.py similarity index 100% rename from modeling/official/modeling/fast_training/progressive/trainer.py rename to official/modeling/fast_training/progressive/trainer.py diff --git a/modeling/official/modeling/fast_training/progressive/trainer_test.py b/official/modeling/fast_training/progressive/trainer_test.py similarity index 100% rename from modeling/official/modeling/fast_training/progressive/trainer_test.py rename to official/modeling/fast_training/progressive/trainer_test.py diff --git a/modeling/official/modeling/fast_training/progressive/utils.py b/official/modeling/fast_training/progressive/utils.py similarity index 100% rename from modeling/official/modeling/fast_training/progressive/utils.py rename to official/modeling/fast_training/progressive/utils.py diff --git a/modeling/official/modeling/grad_utils.py b/official/modeling/grad_utils.py similarity index 100% rename from modeling/official/modeling/grad_utils.py rename to official/modeling/grad_utils.py diff --git a/modeling/official/modeling/grad_utils_test.py b/official/modeling/grad_utils_test.py similarity index 100% rename from modeling/official/modeling/grad_utils_test.py rename to official/modeling/grad_utils_test.py diff --git a/modeling/official/modeling/hyperparams/__init__.py b/official/modeling/hyperparams/__init__.py similarity index 78% rename from modeling/official/modeling/hyperparams/__init__.py rename to official/modeling/hyperparams/__init__.py index 89b365600c01f5d0ba20e8734de17129e3b2ca26..34a0f116bb7a3537bc99a6d1b148bfc40361445b 100644 --- a/modeling/official/modeling/hyperparams/__init__.py +++ b/official/modeling/hyperparams/__init__.py @@ -14,7 +14,7 @@ """Hyperparams package definition.""" # pylint: disable=g-multiple-import -from modeling.official.modeling.hyperparams.base_config import * -from modeling.official.modeling.hyperparams.oneof import * -from modeling.official.modeling.hyperparams.params_dict import * +from official.modeling.hyperparams.base_config import * +from official.modeling.hyperparams.oneof import * +from official.modeling.hyperparams.params_dict import * diff --git a/modeling/official/modeling/hyperparams/base_config.py b/official/modeling/hyperparams/base_config.py similarity index 99% rename from modeling/official/modeling/hyperparams/base_config.py rename to official/modeling/hyperparams/base_config.py index 7db9876b03562b7a6c0703cd2ff55e1f1147c7b2..9e1a57995f004e532d5c6f79c73394d019700ee3 100644 --- a/modeling/official/modeling/hyperparams/base_config.py +++ b/official/modeling/hyperparams/base_config.py @@ -25,7 +25,7 @@ from absl import logging import tensorflow as tf, tf_keras import yaml -from modeling.official.modeling.hyperparams import params_dict +from official.modeling.hyperparams import params_dict _BOUND = set() diff --git a/modeling/official/modeling/hyperparams/base_config_test.py b/official/modeling/hyperparams/base_config_test.py similarity index 100% rename from modeling/official/modeling/hyperparams/base_config_test.py rename to official/modeling/hyperparams/base_config_test.py diff --git a/modeling/official/modeling/hyperparams/oneof.py b/official/modeling/hyperparams/oneof.py similarity index 96% rename from modeling/official/modeling/hyperparams/oneof.py rename to official/modeling/hyperparams/oneof.py index 889f125d6bee47a5445862a3a832c1ac05171f5a..52b2b174706ac6d6cce003f8256ac86e379a8060 100644 --- a/modeling/official/modeling/hyperparams/oneof.py +++ b/official/modeling/hyperparams/oneof.py @@ -17,7 +17,7 @@ from typing import Optional import dataclasses -from modeling.official.modeling.hyperparams import base_config +from official.modeling.hyperparams import base_config @dataclasses.dataclass diff --git a/modeling/official/modeling/hyperparams/oneof_test.py b/official/modeling/hyperparams/oneof_test.py similarity index 100% rename from modeling/official/modeling/hyperparams/oneof_test.py rename to official/modeling/hyperparams/oneof_test.py diff --git a/modeling/official/modeling/hyperparams/params_dict.py b/official/modeling/hyperparams/params_dict.py similarity index 100% rename from modeling/official/modeling/hyperparams/params_dict.py rename to official/modeling/hyperparams/params_dict.py diff --git a/modeling/official/modeling/hyperparams/params_dict_test.py b/official/modeling/hyperparams/params_dict_test.py similarity index 100% rename from modeling/official/modeling/hyperparams/params_dict_test.py rename to official/modeling/hyperparams/params_dict_test.py diff --git a/modeling/official/modeling/multitask/__init__.py b/official/modeling/multitask/__init__.py similarity index 100% rename from modeling/official/modeling/multitask/__init__.py rename to official/modeling/multitask/__init__.py diff --git a/modeling/official/modeling/multitask/base_model.py b/official/modeling/multitask/base_model.py similarity index 100% rename from modeling/official/modeling/multitask/base_model.py rename to official/modeling/multitask/base_model.py diff --git a/modeling/official/modeling/multitask/base_trainer.py b/official/modeling/multitask/base_trainer.py similarity index 96% rename from modeling/official/modeling/multitask/base_trainer.py rename to official/modeling/multitask/base_trainer.py index 9ee7ec5d7a1463f672e15d1bb3ac4534cf78ef5c..1ac812f2b1f60a10e9212a875f3f331c8e21ded0 100644 --- a/modeling/official/modeling/multitask/base_trainer.py +++ b/official/modeling/multitask/base_trainer.py @@ -19,12 +19,12 @@ The trainer derives from the Orbit `StandardTrainer` class. from typing import Union import gin -import modeling.orbit +import orbit import tensorflow as tf, tf_keras -from modeling.official.modeling import optimization -from modeling.official.modeling.multitask import base_model -from modeling.official.modeling.multitask import multitask +from official.modeling import optimization +from official.modeling.multitask import base_model +from official.modeling.multitask import multitask @gin.configurable diff --git a/modeling/official/modeling/multitask/base_trainer_test.py b/official/modeling/multitask/base_trainer_test.py similarity index 100% rename from modeling/official/modeling/multitask/base_trainer_test.py rename to official/modeling/multitask/base_trainer_test.py diff --git a/modeling/official/modeling/multitask/configs.py b/official/modeling/multitask/configs.py similarity index 94% rename from modeling/official/modeling/multitask/configs.py rename to official/modeling/multitask/configs.py index aa6663eda8f1ad2af1c276bd61cfacf1de0062ec..dcda4a568e174ff9da25cff6124aed9fb51ab2e0 100644 --- a/modeling/official/modeling/multitask/configs.py +++ b/official/modeling/multitask/configs.py @@ -16,9 +16,9 @@ import dataclasses from typing import Optional, Tuple -from modeling.official.core import config_definitions as cfg -from modeling.official.modeling import hyperparams -from modeling.official.modeling.privacy import configs as dp_configs +from official.core import config_definitions as cfg +from official.modeling import hyperparams +from official.modeling.privacy import configs as dp_configs @dataclasses.dataclass diff --git a/modeling/official/modeling/multitask/evaluator.py b/official/modeling/multitask/evaluator.py similarity index 97% rename from modeling/official/modeling/multitask/evaluator.py rename to official/modeling/multitask/evaluator.py index 49eb3da5075c0ddafc4b6abb9109666c1b004285..6e0ddb546820648598ea3366de256ba16db4c6cc 100644 --- a/modeling/official/modeling/multitask/evaluator.py +++ b/official/modeling/multitask/evaluator.py @@ -18,12 +18,12 @@ The evaluator implements the Orbit `AbstractEvaluator` interface. """ from typing import Dict, List, Optional, Union import gin -import modeling.orbit +import orbit import tensorflow as tf, tf_keras -from modeling.official.core import base_task -from modeling.official.core import train_utils -from modeling.official.modeling.multitask import base_model +from official.core import base_task +from official.core import train_utils +from official.modeling.multitask import base_model @gin.configurable diff --git a/modeling/official/modeling/multitask/evaluator_test.py b/official/modeling/multitask/evaluator_test.py similarity index 100% rename from modeling/official/modeling/multitask/evaluator_test.py rename to official/modeling/multitask/evaluator_test.py diff --git a/modeling/official/modeling/multitask/interleaving_trainer.py b/official/modeling/multitask/interleaving_trainer.py similarity index 93% rename from modeling/official/modeling/multitask/interleaving_trainer.py rename to official/modeling/multitask/interleaving_trainer.py index c5b6af90c1b1b2b9dfba8705dbdc054626f58a93..6347e98e17895255224b71dac09b625c168f227c 100644 --- a/modeling/official/modeling/multitask/interleaving_trainer.py +++ b/official/modeling/multitask/interleaving_trainer.py @@ -15,12 +15,12 @@ """Multitask trainer that interleaves each task's train step.""" from typing import Union import gin -import modeling.orbit +import orbit import tensorflow as tf, tf_keras -from modeling.official.modeling.multitask import base_model -from modeling.official.modeling.multitask import base_trainer -from modeling.official.modeling.multitask import multitask -from modeling.official.modeling.multitask import task_sampler as sampler +from official.modeling.multitask import base_model +from official.modeling.multitask import base_trainer +from official.modeling.multitask import multitask +from official.modeling.multitask import task_sampler as sampler @gin.configurable diff --git a/modeling/official/modeling/multitask/interleaving_trainer_test.py b/official/modeling/multitask/interleaving_trainer_test.py similarity index 100% rename from modeling/official/modeling/multitask/interleaving_trainer_test.py rename to official/modeling/multitask/interleaving_trainer_test.py diff --git a/modeling/official/modeling/multitask/multitask.py b/official/modeling/multitask/multitask.py similarity index 93% rename from modeling/official/modeling/multitask/multitask.py rename to official/modeling/multitask/multitask.py index cd9dda96ac370e11380d0ed3a116f96faf466efd..ded8aa65113f5e8b59790bd90f7e32b21bc216fe 100644 --- a/modeling/official/modeling/multitask/multitask.py +++ b/official/modeling/multitask/multitask.py @@ -17,13 +17,13 @@ import abc from typing import Dict, List, Optional, Text, Union import tensorflow as tf, tf_keras -from modeling.official.core import base_task -from modeling.official.core import config_definitions -from modeling.official.core import task_factory -from modeling.official.modeling import optimization -from modeling.official.modeling.multitask import base_model -from modeling.official.modeling.multitask import configs -from modeling.official.modeling.privacy import configs as dp_configs +from official.core import base_task +from official.core import config_definitions +from official.core import task_factory +from official.modeling import optimization +from official.modeling.multitask import base_model +from official.modeling.multitask import configs +from official.modeling.privacy import configs as dp_configs OptimizationConfig = optimization.OptimizationConfig RuntimeConfig = config_definitions.RuntimeConfig diff --git a/modeling/official/modeling/multitask/task_sampler.py b/official/modeling/multitask/task_sampler.py similarity index 98% rename from modeling/official/modeling/multitask/task_sampler.py rename to official/modeling/multitask/task_sampler.py index fd0411fd09c501d5974a0dcfbace09dff2a81f1c..620ebce3ddda0ea60ab730e70328c7704a087a41 100644 --- a/modeling/official/modeling/multitask/task_sampler.py +++ b/official/modeling/multitask/task_sampler.py @@ -17,7 +17,7 @@ import abc from typing import Union, Dict, Text import tensorflow as tf, tf_keras -from modeling.official.modeling.multitask import configs +from official.modeling.multitask import configs class TaskSampler(tf.Module, metaclass=abc.ABCMeta): diff --git a/modeling/official/modeling/multitask/task_sampler_test.py b/official/modeling/multitask/task_sampler_test.py similarity index 100% rename from modeling/official/modeling/multitask/task_sampler_test.py rename to official/modeling/multitask/task_sampler_test.py diff --git a/modeling/official/modeling/multitask/test_utils.py b/official/modeling/multitask/test_utils.py similarity index 95% rename from modeling/official/modeling/multitask/test_utils.py rename to official/modeling/multitask/test_utils.py index 5d6bf97208254db353807eb9f9d734bbfe64e685..747e88f26f8bc045b21934db8be0938ea7169cf2 100644 --- a/modeling/official/modeling/multitask/test_utils.py +++ b/official/modeling/multitask/test_utils.py @@ -15,10 +15,10 @@ """Testing utils for mock models and tasks.""" from typing import Dict, Text import tensorflow as tf, tf_keras -from modeling.official.core import base_task -from modeling.official.core import config_definitions as cfg -from modeling.official.core import task_factory -from modeling.official.modeling.multitask import base_model +from official.core import base_task +from official.core import config_definitions as cfg +from official.core import task_factory +from official.modeling.multitask import base_model class MockFooModel(tf_keras.Model): diff --git a/modeling/official/modeling/multitask/train_lib.py b/official/modeling/multitask/train_lib.py similarity index 94% rename from modeling/official/modeling/multitask/train_lib.py rename to official/modeling/multitask/train_lib.py index 80ce6096ab71843454a458bd6e433dbeadf3fd34..dd190bd7293a0ba1c032b300ac4001d574c796e4 100644 --- a/modeling/official/modeling/multitask/train_lib.py +++ b/official/modeling/multitask/train_lib.py @@ -17,18 +17,18 @@ import os from typing import Any, List, Mapping, Optional, Tuple, Union from absl import logging -import modeling.orbit +import orbit import tensorflow as tf, tf_keras -from modeling.official.core import base_task -from modeling.official.core import base_trainer as core_lib -from modeling.official.core import train_utils -from modeling.official.modeling.multitask import base_model -from modeling.official.modeling.multitask import base_trainer -from modeling.official.modeling.multitask import configs -from modeling.official.modeling.multitask import evaluator as evaluator_lib -from modeling.official.modeling.multitask import interleaving_trainer -from modeling.official.modeling.multitask import multitask -from modeling.official.modeling.multitask import task_sampler +from official.core import base_task +from official.core import base_trainer as core_lib +from official.core import train_utils +from official.modeling.multitask import base_model +from official.modeling.multitask import base_trainer +from official.modeling.multitask import configs +from official.modeling.multitask import evaluator as evaluator_lib +from official.modeling.multitask import interleaving_trainer +from official.modeling.multitask import multitask +from official.modeling.multitask import task_sampler TRAINERS = { 'interleaving': interleaving_trainer.MultiTaskInterleavingTrainer, diff --git a/modeling/official/modeling/multitask/train_lib_test.py b/official/modeling/multitask/train_lib_test.py similarity index 100% rename from modeling/official/modeling/multitask/train_lib_test.py rename to official/modeling/multitask/train_lib_test.py diff --git a/modeling/official/modeling/optimization/__init__.py b/official/modeling/optimization/__init__.py similarity index 54% rename from modeling/official/modeling/optimization/__init__.py rename to official/modeling/optimization/__init__.py index 009f25c4bb2e325127ed6a86ba3d87db51c96ae4..bae0d0ba195e1c6f47ee7bc3afe7b4164a5aa74a 100644 --- a/modeling/official/modeling/optimization/__init__.py +++ b/official/modeling/optimization/__init__.py @@ -15,10 +15,10 @@ """Optimization package definition.""" # pylint: disable=wildcard-import -from modeling.official.modeling.optimization.configs.learning_rate_config import * -from modeling.official.modeling.optimization.configs.optimization_config import * -from modeling.official.modeling.optimization.configs.optimizer_config import * -from modeling.official.modeling.optimization.ema_optimizer import ExponentialMovingAverage -from modeling.official.modeling.optimization.lr_schedule import * -from modeling.official.modeling.optimization.optimizer_factory import OptimizerFactory -from modeling.official.modeling.optimization.optimizer_factory import register_optimizer_cls +from official.modeling.optimization.configs.learning_rate_config import * +from official.modeling.optimization.configs.optimization_config import * +from official.modeling.optimization.configs.optimizer_config import * +from official.modeling.optimization.ema_optimizer import ExponentialMovingAverage +from official.modeling.optimization.lr_schedule import * +from official.modeling.optimization.optimizer_factory import OptimizerFactory +from official.modeling.optimization.optimizer_factory import register_optimizer_cls diff --git a/modeling/official/modeling/optimization/adafactor_optimizer.py b/official/modeling/optimization/adafactor_optimizer.py similarity index 100% rename from modeling/official/modeling/optimization/adafactor_optimizer.py rename to official/modeling/optimization/adafactor_optimizer.py diff --git a/modeling/official/modeling/optimization/configs/__init__.py b/official/modeling/optimization/configs/__init__.py similarity index 100% rename from modeling/official/modeling/optimization/configs/__init__.py rename to official/modeling/optimization/configs/__init__.py diff --git a/modeling/official/modeling/optimization/configs/learning_rate_config.py b/official/modeling/optimization/configs/learning_rate_config.py similarity index 99% rename from modeling/official/modeling/optimization/configs/learning_rate_config.py rename to official/modeling/optimization/configs/learning_rate_config.py index ed8b001250161528691bb44b18b9dd4f082d47d4..f37ed3713bbbc2c2fb32e2cf7669f3851926682a 100644 --- a/modeling/official/modeling/optimization/configs/learning_rate_config.py +++ b/official/modeling/optimization/configs/learning_rate_config.py @@ -16,7 +16,7 @@ from typing import List, Optional import dataclasses -from modeling.official.modeling.hyperparams import base_config +from official.modeling.hyperparams import base_config @dataclasses.dataclass diff --git a/modeling/official/modeling/optimization/configs/optimization_config.py b/official/modeling/optimization/configs/optimization_config.py similarity index 95% rename from modeling/official/modeling/optimization/configs/optimization_config.py rename to official/modeling/optimization/configs/optimization_config.py index 70222fffff10769f081427bbb6eddfdbc6a9bbc0..e52dec85cf1762a8d9e0c068f128188927bd932c 100644 --- a/modeling/official/modeling/optimization/configs/optimization_config.py +++ b/official/modeling/optimization/configs/optimization_config.py @@ -22,10 +22,10 @@ from typing import Optional import dataclasses -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 +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 @dataclasses.dataclass diff --git a/modeling/official/modeling/optimization/configs/optimization_config_test.py b/official/modeling/optimization/configs/optimization_config_test.py similarity index 87% rename from modeling/official/modeling/optimization/configs/optimization_config_test.py rename to official/modeling/optimization/configs/optimization_config_test.py index 1c96a3c50dc87936c5d8b1461dc1e4cccefb8a46..902dbcd4dad334e6d1d94a7785c637c60c13eac5 100644 --- a/modeling/official/modeling/optimization/configs/optimization_config_test.py +++ b/official/modeling/optimization/configs/optimization_config_test.py @@ -16,9 +16,9 @@ import tensorflow as tf, tf_keras -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 +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 class OptimizerConfigTest(tf.test.TestCase): diff --git a/modeling/official/modeling/optimization/configs/optimizer_config.py b/official/modeling/optimization/configs/optimizer_config.py similarity index 99% rename from modeling/official/modeling/optimization/configs/optimizer_config.py rename to official/modeling/optimization/configs/optimizer_config.py index 637ca838d7d009e416fa7fbb95f79c3a3d13acb1..cb52d6c2b40b401a43c8fe713f0ebdba96e1b8d4 100644 --- a/modeling/official/modeling/optimization/configs/optimizer_config.py +++ b/official/modeling/optimization/configs/optimizer_config.py @@ -16,7 +16,7 @@ from typing import List, Optional import dataclasses -from modeling.official.modeling.hyperparams import base_config +from official.modeling.hyperparams import base_config @dataclasses.dataclass diff --git a/modeling/official/modeling/optimization/ema_optimizer.py b/official/modeling/optimization/ema_optimizer.py similarity index 100% rename from modeling/official/modeling/optimization/ema_optimizer.py rename to official/modeling/optimization/ema_optimizer.py diff --git a/modeling/official/modeling/optimization/lamb.py b/official/modeling/optimization/lamb.py similarity index 100% rename from modeling/official/modeling/optimization/lamb.py rename to official/modeling/optimization/lamb.py diff --git a/modeling/official/modeling/optimization/lamb_test.py b/official/modeling/optimization/lamb_test.py similarity index 100% rename from modeling/official/modeling/optimization/lamb_test.py rename to official/modeling/optimization/lamb_test.py diff --git a/modeling/official/modeling/optimization/lars.py b/official/modeling/optimization/lars.py similarity index 100% rename from modeling/official/modeling/optimization/lars.py rename to official/modeling/optimization/lars.py diff --git a/modeling/official/modeling/optimization/legacy_adamw.py b/official/modeling/optimization/legacy_adamw.py similarity index 100% rename from modeling/official/modeling/optimization/legacy_adamw.py rename to official/modeling/optimization/legacy_adamw.py diff --git a/modeling/official/modeling/optimization/lr_schedule.py b/official/modeling/optimization/lr_schedule.py similarity index 100% rename from modeling/official/modeling/optimization/lr_schedule.py rename to official/modeling/optimization/lr_schedule.py diff --git a/modeling/official/modeling/optimization/lr_schedule_test.py b/official/modeling/optimization/lr_schedule_test.py similarity index 100% rename from modeling/official/modeling/optimization/lr_schedule_test.py rename to official/modeling/optimization/lr_schedule_test.py diff --git a/modeling/official/modeling/optimization/optimizer_factory.py b/official/modeling/optimization/optimizer_factory.py similarity index 94% rename from modeling/official/modeling/optimization/optimizer_factory.py rename to official/modeling/optimization/optimizer_factory.py index 1a2c5ab0d4ea69d3ca6748ab251ff31ddd1d5fad..6c37635537203fc223477cc5e128d55cab18103f 100644 --- a/modeling/official/modeling/optimization/optimizer_factory.py +++ b/official/modeling/optimization/optimizer_factory.py @@ -18,14 +18,14 @@ from typing import Callable, List, Optional, Tuple, Union import gin import tensorflow as tf, tf_keras -from modeling.official.modeling.optimization import slide_optimizer -from modeling.official.modeling.optimization import adafactor_optimizer -from modeling.official.modeling.optimization import ema_optimizer -from modeling.official.modeling.optimization import lamb -from modeling.official.modeling.optimization import lars -from modeling.official.modeling.optimization import legacy_adamw -from modeling.official.modeling.optimization import lr_schedule -from modeling.official.modeling.optimization.configs import optimization_config as opt_cfg +from official.modeling.optimization import slide_optimizer +from official.modeling.optimization import adafactor_optimizer +from official.modeling.optimization import ema_optimizer +from official.modeling.optimization import lamb +from official.modeling.optimization import lars +from official.modeling.optimization import legacy_adamw +from official.modeling.optimization import lr_schedule +from official.modeling.optimization.configs import optimization_config as opt_cfg # Optimizer CLS to be used in both legacy and new path. SHARED_OPTIMIZERS = { diff --git a/modeling/official/modeling/optimization/optimizer_factory_test.py b/official/modeling/optimization/optimizer_factory_test.py similarity index 100% rename from modeling/official/modeling/optimization/optimizer_factory_test.py rename to official/modeling/optimization/optimizer_factory_test.py diff --git a/modeling/official/modeling/optimization/slide_optimizer.py b/official/modeling/optimization/slide_optimizer.py similarity index 100% rename from modeling/official/modeling/optimization/slide_optimizer.py rename to official/modeling/optimization/slide_optimizer.py diff --git a/modeling/official/modeling/performance.py b/official/modeling/performance.py similarity index 100% rename from modeling/official/modeling/performance.py rename to official/modeling/performance.py diff --git a/modeling/official/modeling/privacy/__init__.py b/official/modeling/privacy/__init__.py similarity index 100% rename from modeling/official/modeling/privacy/__init__.py rename to official/modeling/privacy/__init__.py diff --git a/modeling/official/modeling/privacy/configs.py b/official/modeling/privacy/configs.py similarity index 93% rename from modeling/official/modeling/privacy/configs.py rename to official/modeling/privacy/configs.py index e4700af6eeb78c4c54ec9ede94a2a62aec179013..91e666d19882ab91bcad2b5a8ea65af96670c499 100644 --- a/modeling/official/modeling/privacy/configs.py +++ b/official/modeling/privacy/configs.py @@ -15,7 +15,7 @@ """Configs for differential privacy.""" import dataclasses -from modeling.official.modeling.hyperparams import base_config +from official.modeling.hyperparams import base_config @dataclasses.dataclass diff --git a/modeling/official/modeling/privacy/configs_test.py b/official/modeling/privacy/configs_test.py similarity index 96% rename from modeling/official/modeling/privacy/configs_test.py rename to official/modeling/privacy/configs_test.py index eb6b99ece6d647598e39024390e93dd95e07bbe4..dad44dc2a3ee76557b6094505ea3cd63af80acab 100644 --- a/modeling/official/modeling/privacy/configs_test.py +++ b/official/modeling/privacy/configs_test.py @@ -15,7 +15,7 @@ """Tests for configs.""" import tensorflow as tf, tf_keras -from modeling.official.modeling.privacy import configs +from official.modeling.privacy import configs class ConfigsTest(tf.test.TestCase): diff --git a/modeling/official/modeling/privacy/ops.py b/official/modeling/privacy/ops.py similarity index 100% rename from modeling/official/modeling/privacy/ops.py rename to official/modeling/privacy/ops.py diff --git a/modeling/official/modeling/privacy/ops_test.py b/official/modeling/privacy/ops_test.py similarity index 97% rename from modeling/official/modeling/privacy/ops_test.py rename to official/modeling/privacy/ops_test.py index 3c97dd97eae7cda37c8b717b60b983779e8f8bbe..f52386366d97d5a6305d05c01029cc5d6a6228df 100644 --- a/modeling/official/modeling/privacy/ops_test.py +++ b/official/modeling/privacy/ops_test.py @@ -18,7 +18,7 @@ from unittest import mock import tensorflow as tf, tf_keras -from modeling.official.modeling.privacy import ops +from official.modeling.privacy import ops class OpsTest(tf.test.TestCase): diff --git a/modeling/official/modeling/tf_utils.py b/official/modeling/tf_utils.py similarity index 99% rename from modeling/official/modeling/tf_utils.py rename to official/modeling/tf_utils.py index e1cdbacd0e19b8ae3d2fcdcbdc8f80bc7cda17cb..6c0bd9c8964bb4f1dc4e3a39db7821adb1cffb47 100644 --- a/modeling/official/modeling/tf_utils.py +++ b/official/modeling/tf_utils.py @@ -20,7 +20,7 @@ import six import tensorflow as tf, tf_keras from tensorflow.python.util import deprecation -from modeling.official.modeling import activations +from official.modeling import activations @deprecation.deprecated( diff --git a/modeling/official/modeling/tf_utils_test.py b/official/modeling/tf_utils_test.py similarity index 100% rename from modeling/official/modeling/tf_utils_test.py rename to official/modeling/tf_utils_test.py diff --git a/modeling/official/nightly_requirements.txt b/official/nightly_requirements.txt similarity index 100% rename from modeling/official/nightly_requirements.txt rename to official/nightly_requirements.txt diff --git a/modeling/official/nlp/MODEL_GARDEN.md b/official/nlp/MODEL_GARDEN.md similarity index 100% rename from modeling/official/nlp/MODEL_GARDEN.md rename to official/nlp/MODEL_GARDEN.md diff --git a/modeling/official/nlp/README.md b/official/nlp/README.md similarity index 100% rename from modeling/official/nlp/README.md rename to official/nlp/README.md diff --git a/modeling/official/nlp/__init__.py b/official/nlp/__init__.py similarity index 100% rename from modeling/official/nlp/__init__.py rename to official/nlp/__init__.py diff --git a/modeling/official/nlp/configs/__init__.py b/official/nlp/configs/__init__.py similarity index 100% rename from modeling/official/nlp/configs/__init__.py rename to official/nlp/configs/__init__.py diff --git a/modeling/official/nlp/configs/bert.py b/official/nlp/configs/bert.py similarity index 100% rename from modeling/official/nlp/configs/bert.py rename to official/nlp/configs/bert.py diff --git a/modeling/official/nlp/configs/electra.py b/official/nlp/configs/electra.py similarity index 100% rename from modeling/official/nlp/configs/electra.py rename to official/nlp/configs/electra.py diff --git a/modeling/official/nlp/configs/encoders.py b/official/nlp/configs/encoders.py similarity index 100% rename from modeling/official/nlp/configs/encoders.py rename to official/nlp/configs/encoders.py diff --git a/modeling/official/nlp/configs/encoders_test.py b/official/nlp/configs/encoders_test.py similarity index 100% rename from modeling/official/nlp/configs/encoders_test.py rename to official/nlp/configs/encoders_test.py diff --git a/modeling/official/nlp/configs/experiment_configs.py b/official/nlp/configs/experiment_configs.py similarity index 100% rename from modeling/official/nlp/configs/experiment_configs.py rename to official/nlp/configs/experiment_configs.py diff --git a/modeling/official/nlp/configs/experiments/glue_mnli_matched.yaml b/official/nlp/configs/experiments/glue_mnli_matched.yaml similarity index 100% rename from modeling/official/nlp/configs/experiments/glue_mnli_matched.yaml rename to official/nlp/configs/experiments/glue_mnli_matched.yaml diff --git a/modeling/official/nlp/configs/experiments/glue_mnli_text.yaml b/official/nlp/configs/experiments/glue_mnli_text.yaml similarity index 100% rename from modeling/official/nlp/configs/experiments/glue_mnli_text.yaml rename to official/nlp/configs/experiments/glue_mnli_text.yaml diff --git a/modeling/official/nlp/configs/experiments/squad_v1.yaml b/official/nlp/configs/experiments/squad_v1.yaml similarity index 100% rename from modeling/official/nlp/configs/experiments/squad_v1.yaml rename to official/nlp/configs/experiments/squad_v1.yaml diff --git a/modeling/official/nlp/configs/experiments/wiki_books_pretrain.yaml b/official/nlp/configs/experiments/wiki_books_pretrain.yaml similarity index 100% rename from modeling/official/nlp/configs/experiments/wiki_books_pretrain.yaml rename to official/nlp/configs/experiments/wiki_books_pretrain.yaml diff --git a/modeling/official/nlp/configs/experiments/wiki_tfds_pretrain.yaml b/official/nlp/configs/experiments/wiki_tfds_pretrain.yaml similarity index 100% rename from modeling/official/nlp/configs/experiments/wiki_tfds_pretrain.yaml rename to official/nlp/configs/experiments/wiki_tfds_pretrain.yaml diff --git a/modeling/official/nlp/configs/finetuning_experiments.py b/official/nlp/configs/finetuning_experiments.py similarity index 100% rename from modeling/official/nlp/configs/finetuning_experiments.py rename to official/nlp/configs/finetuning_experiments.py diff --git a/modeling/official/nlp/configs/models/albert_base.yaml b/official/nlp/configs/models/albert_base.yaml similarity index 100% rename from modeling/official/nlp/configs/models/albert_base.yaml rename to official/nlp/configs/models/albert_base.yaml diff --git a/modeling/official/nlp/configs/models/bert_en_uncased_base.yaml b/official/nlp/configs/models/bert_en_uncased_base.yaml similarity index 100% rename from modeling/official/nlp/configs/models/bert_en_uncased_base.yaml rename to official/nlp/configs/models/bert_en_uncased_base.yaml diff --git a/modeling/official/nlp/configs/pretraining_experiments.py b/official/nlp/configs/pretraining_experiments.py similarity index 100% rename from modeling/official/nlp/configs/pretraining_experiments.py rename to official/nlp/configs/pretraining_experiments.py diff --git a/modeling/official/nlp/configs/wmt_transformer_experiments.py b/official/nlp/configs/wmt_transformer_experiments.py similarity index 100% rename from modeling/official/nlp/configs/wmt_transformer_experiments.py rename to official/nlp/configs/wmt_transformer_experiments.py diff --git a/modeling/official/nlp/continuous_finetune_lib.py b/official/nlp/continuous_finetune_lib.py similarity index 100% rename from modeling/official/nlp/continuous_finetune_lib.py rename to official/nlp/continuous_finetune_lib.py diff --git a/modeling/official/nlp/continuous_finetune_lib_test.py b/official/nlp/continuous_finetune_lib_test.py similarity index 100% rename from modeling/official/nlp/continuous_finetune_lib_test.py rename to official/nlp/continuous_finetune_lib_test.py diff --git a/modeling/official/nlp/data/README.md b/official/nlp/data/README.md similarity index 100% rename from modeling/official/nlp/data/README.md rename to official/nlp/data/README.md diff --git a/modeling/official/nlp/data/__init__.py b/official/nlp/data/__init__.py similarity index 100% rename from modeling/official/nlp/data/__init__.py rename to official/nlp/data/__init__.py diff --git a/modeling/official/nlp/data/classifier_data_lib.py b/official/nlp/data/classifier_data_lib.py similarity index 100% rename from modeling/official/nlp/data/classifier_data_lib.py rename to official/nlp/data/classifier_data_lib.py diff --git a/modeling/official/nlp/data/classifier_data_lib_test.py b/official/nlp/data/classifier_data_lib_test.py similarity index 100% rename from modeling/official/nlp/data/classifier_data_lib_test.py rename to official/nlp/data/classifier_data_lib_test.py diff --git a/modeling/official/nlp/data/create_finetuning_data.py b/official/nlp/data/create_finetuning_data.py similarity index 100% rename from modeling/official/nlp/data/create_finetuning_data.py rename to official/nlp/data/create_finetuning_data.py diff --git a/modeling/official/nlp/data/create_pretraining_data.py b/official/nlp/data/create_pretraining_data.py similarity index 100% rename from modeling/official/nlp/data/create_pretraining_data.py rename to official/nlp/data/create_pretraining_data.py diff --git a/modeling/official/nlp/data/create_pretraining_data_test.py b/official/nlp/data/create_pretraining_data_test.py similarity index 100% rename from modeling/official/nlp/data/create_pretraining_data_test.py rename to official/nlp/data/create_pretraining_data_test.py diff --git a/modeling/official/nlp/data/create_xlnet_pretraining_data.py b/official/nlp/data/create_xlnet_pretraining_data.py similarity index 100% rename from modeling/official/nlp/data/create_xlnet_pretraining_data.py rename to official/nlp/data/create_xlnet_pretraining_data.py diff --git a/modeling/official/nlp/data/create_xlnet_pretraining_data_test.py b/official/nlp/data/create_xlnet_pretraining_data_test.py similarity index 100% rename from modeling/official/nlp/data/create_xlnet_pretraining_data_test.py rename to official/nlp/data/create_xlnet_pretraining_data_test.py diff --git a/modeling/official/nlp/data/data_loader.py b/official/nlp/data/data_loader.py similarity index 100% rename from modeling/official/nlp/data/data_loader.py rename to official/nlp/data/data_loader.py diff --git a/modeling/official/nlp/data/data_loader_factory.py b/official/nlp/data/data_loader_factory.py similarity index 100% rename from modeling/official/nlp/data/data_loader_factory.py rename to official/nlp/data/data_loader_factory.py diff --git a/modeling/official/nlp/data/data_loader_factory_test.py b/official/nlp/data/data_loader_factory_test.py similarity index 100% rename from modeling/official/nlp/data/data_loader_factory_test.py rename to official/nlp/data/data_loader_factory_test.py diff --git a/modeling/official/nlp/data/dual_encoder_dataloader.py b/official/nlp/data/dual_encoder_dataloader.py similarity index 100% rename from modeling/official/nlp/data/dual_encoder_dataloader.py rename to official/nlp/data/dual_encoder_dataloader.py diff --git a/modeling/official/nlp/data/dual_encoder_dataloader_test.py b/official/nlp/data/dual_encoder_dataloader_test.py similarity index 100% rename from modeling/official/nlp/data/dual_encoder_dataloader_test.py rename to official/nlp/data/dual_encoder_dataloader_test.py diff --git a/modeling/official/nlp/data/pretrain_dataloader.py b/official/nlp/data/pretrain_dataloader.py similarity index 100% rename from modeling/official/nlp/data/pretrain_dataloader.py rename to official/nlp/data/pretrain_dataloader.py diff --git a/modeling/official/nlp/data/pretrain_dataloader_test.py b/official/nlp/data/pretrain_dataloader_test.py similarity index 100% rename from modeling/official/nlp/data/pretrain_dataloader_test.py rename to official/nlp/data/pretrain_dataloader_test.py diff --git a/modeling/official/nlp/data/pretrain_dynamic_dataloader.py b/official/nlp/data/pretrain_dynamic_dataloader.py similarity index 100% rename from modeling/official/nlp/data/pretrain_dynamic_dataloader.py rename to official/nlp/data/pretrain_dynamic_dataloader.py diff --git a/modeling/official/nlp/data/pretrain_dynamic_dataloader_test.py b/official/nlp/data/pretrain_dynamic_dataloader_test.py similarity index 100% rename from modeling/official/nlp/data/pretrain_dynamic_dataloader_test.py rename to official/nlp/data/pretrain_dynamic_dataloader_test.py diff --git a/modeling/official/nlp/data/pretrain_text_dataloader.py b/official/nlp/data/pretrain_text_dataloader.py similarity index 100% rename from modeling/official/nlp/data/pretrain_text_dataloader.py rename to official/nlp/data/pretrain_text_dataloader.py diff --git a/modeling/official/nlp/data/question_answering_dataloader.py b/official/nlp/data/question_answering_dataloader.py similarity index 100% rename from modeling/official/nlp/data/question_answering_dataloader.py rename to official/nlp/data/question_answering_dataloader.py diff --git a/modeling/official/nlp/data/question_answering_dataloader_test.py b/official/nlp/data/question_answering_dataloader_test.py similarity index 100% rename from modeling/official/nlp/data/question_answering_dataloader_test.py rename to official/nlp/data/question_answering_dataloader_test.py diff --git a/modeling/official/nlp/data/sentence_prediction_dataloader.py b/official/nlp/data/sentence_prediction_dataloader.py similarity index 100% rename from modeling/official/nlp/data/sentence_prediction_dataloader.py rename to official/nlp/data/sentence_prediction_dataloader.py diff --git a/modeling/official/nlp/data/sentence_prediction_dataloader_test.py b/official/nlp/data/sentence_prediction_dataloader_test.py similarity index 100% rename from modeling/official/nlp/data/sentence_prediction_dataloader_test.py rename to official/nlp/data/sentence_prediction_dataloader_test.py diff --git a/modeling/official/nlp/data/sentence_retrieval_lib.py b/official/nlp/data/sentence_retrieval_lib.py similarity index 100% rename from modeling/official/nlp/data/sentence_retrieval_lib.py rename to official/nlp/data/sentence_retrieval_lib.py diff --git a/modeling/official/nlp/data/squad_lib.py b/official/nlp/data/squad_lib.py similarity index 100% rename from modeling/official/nlp/data/squad_lib.py rename to official/nlp/data/squad_lib.py diff --git a/modeling/official/nlp/data/squad_lib_sp.py b/official/nlp/data/squad_lib_sp.py similarity index 100% rename from modeling/official/nlp/data/squad_lib_sp.py rename to official/nlp/data/squad_lib_sp.py diff --git a/modeling/official/nlp/data/tagging_data_lib.py b/official/nlp/data/tagging_data_lib.py similarity index 100% rename from modeling/official/nlp/data/tagging_data_lib.py rename to official/nlp/data/tagging_data_lib.py diff --git a/modeling/official/nlp/data/tagging_data_lib_test.py b/official/nlp/data/tagging_data_lib_test.py similarity index 100% rename from modeling/official/nlp/data/tagging_data_lib_test.py rename to official/nlp/data/tagging_data_lib_test.py diff --git a/modeling/official/nlp/data/tagging_dataloader.py b/official/nlp/data/tagging_dataloader.py similarity index 100% rename from modeling/official/nlp/data/tagging_dataloader.py rename to official/nlp/data/tagging_dataloader.py diff --git a/modeling/official/nlp/data/tagging_dataloader_test.py b/official/nlp/data/tagging_dataloader_test.py similarity index 100% rename from modeling/official/nlp/data/tagging_dataloader_test.py rename to official/nlp/data/tagging_dataloader_test.py diff --git a/modeling/official/nlp/data/train_sentencepiece.py b/official/nlp/data/train_sentencepiece.py similarity index 100% rename from modeling/official/nlp/data/train_sentencepiece.py rename to official/nlp/data/train_sentencepiece.py diff --git a/modeling/official/nlp/data/wmt_dataloader.py b/official/nlp/data/wmt_dataloader.py similarity index 100% rename from modeling/official/nlp/data/wmt_dataloader.py rename to official/nlp/data/wmt_dataloader.py diff --git a/modeling/official/nlp/data/wmt_dataloader_test.py b/official/nlp/data/wmt_dataloader_test.py similarity index 100% rename from modeling/official/nlp/data/wmt_dataloader_test.py rename to official/nlp/data/wmt_dataloader_test.py diff --git a/modeling/official/nlp/docs/README.md b/official/nlp/docs/README.md similarity index 100% rename from modeling/official/nlp/docs/README.md rename to official/nlp/docs/README.md diff --git a/modeling/official/nlp/docs/pretrain.md b/official/nlp/docs/pretrain.md similarity index 100% rename from modeling/official/nlp/docs/pretrain.md rename to official/nlp/docs/pretrain.md diff --git a/modeling/official/nlp/docs/pretrained_models.md b/official/nlp/docs/pretrained_models.md similarity index 100% rename from modeling/official/nlp/docs/pretrained_models.md rename to official/nlp/docs/pretrained_models.md diff --git a/modeling/official/nlp/docs/tfhub.md b/official/nlp/docs/tfhub.md similarity index 100% rename from modeling/official/nlp/docs/tfhub.md rename to official/nlp/docs/tfhub.md diff --git a/modeling/official/nlp/docs/train.md b/official/nlp/docs/train.md similarity index 100% rename from modeling/official/nlp/docs/train.md rename to official/nlp/docs/train.md diff --git a/modeling/official/nlp/finetuning/binary_helper.py b/official/nlp/finetuning/binary_helper.py similarity index 100% rename from modeling/official/nlp/finetuning/binary_helper.py rename to official/nlp/finetuning/binary_helper.py diff --git a/modeling/official/nlp/finetuning/glue/flags.py b/official/nlp/finetuning/glue/flags.py similarity index 100% rename from modeling/official/nlp/finetuning/glue/flags.py rename to official/nlp/finetuning/glue/flags.py diff --git a/modeling/official/nlp/finetuning/glue/run_glue.py b/official/nlp/finetuning/glue/run_glue.py similarity index 100% rename from modeling/official/nlp/finetuning/glue/run_glue.py rename to official/nlp/finetuning/glue/run_glue.py diff --git a/modeling/official/nlp/finetuning/superglue/flags.py b/official/nlp/finetuning/superglue/flags.py similarity index 100% rename from modeling/official/nlp/finetuning/superglue/flags.py rename to official/nlp/finetuning/superglue/flags.py diff --git a/modeling/official/nlp/finetuning/superglue/run_superglue.py b/official/nlp/finetuning/superglue/run_superglue.py similarity index 100% rename from modeling/official/nlp/finetuning/superglue/run_superglue.py rename to official/nlp/finetuning/superglue/run_superglue.py diff --git a/modeling/official/nlp/metrics/__init__.py b/official/nlp/metrics/__init__.py similarity index 100% rename from modeling/official/nlp/metrics/__init__.py rename to official/nlp/metrics/__init__.py diff --git a/modeling/official/nlp/metrics/bleu.py b/official/nlp/metrics/bleu.py similarity index 100% rename from modeling/official/nlp/metrics/bleu.py rename to official/nlp/metrics/bleu.py diff --git a/modeling/official/nlp/metrics/bleu_test.py b/official/nlp/metrics/bleu_test.py similarity index 100% rename from modeling/official/nlp/metrics/bleu_test.py rename to official/nlp/metrics/bleu_test.py diff --git a/modeling/official/nlp/modeling/README.md b/official/nlp/modeling/README.md similarity index 100% rename from modeling/official/nlp/modeling/README.md rename to official/nlp/modeling/README.md diff --git a/modeling/official/nlp/modeling/__init__.py b/official/nlp/modeling/__init__.py similarity index 100% rename from modeling/official/nlp/modeling/__init__.py rename to official/nlp/modeling/__init__.py diff --git a/modeling/official/nlp/modeling/layers/README.md b/official/nlp/modeling/layers/README.md similarity index 100% rename from modeling/official/nlp/modeling/layers/README.md rename to official/nlp/modeling/layers/README.md diff --git a/modeling/official/nlp/modeling/layers/__init__.py b/official/nlp/modeling/layers/__init__.py similarity index 100% rename from modeling/official/nlp/modeling/layers/__init__.py rename to official/nlp/modeling/layers/__init__.py diff --git a/modeling/official/nlp/modeling/layers/attention.py b/official/nlp/modeling/layers/attention.py similarity index 100% rename from modeling/official/nlp/modeling/layers/attention.py rename to official/nlp/modeling/layers/attention.py diff --git a/modeling/official/nlp/modeling/layers/attention_test.py b/official/nlp/modeling/layers/attention_test.py similarity index 100% rename from modeling/official/nlp/modeling/layers/attention_test.py rename to official/nlp/modeling/layers/attention_test.py diff --git a/modeling/official/nlp/modeling/layers/bigbird_attention.py b/official/nlp/modeling/layers/bigbird_attention.py similarity index 100% rename from modeling/official/nlp/modeling/layers/bigbird_attention.py rename to official/nlp/modeling/layers/bigbird_attention.py diff --git a/modeling/official/nlp/modeling/layers/bigbird_attention_test.py b/official/nlp/modeling/layers/bigbird_attention_test.py similarity index 100% rename from modeling/official/nlp/modeling/layers/bigbird_attention_test.py rename to official/nlp/modeling/layers/bigbird_attention_test.py diff --git a/modeling/official/nlp/modeling/layers/block_diag_feedforward.py b/official/nlp/modeling/layers/block_diag_feedforward.py similarity index 100% rename from modeling/official/nlp/modeling/layers/block_diag_feedforward.py rename to official/nlp/modeling/layers/block_diag_feedforward.py diff --git a/modeling/official/nlp/modeling/layers/block_diag_feedforward_test.py b/official/nlp/modeling/layers/block_diag_feedforward_test.py similarity index 100% rename from modeling/official/nlp/modeling/layers/block_diag_feedforward_test.py rename to official/nlp/modeling/layers/block_diag_feedforward_test.py diff --git a/modeling/official/nlp/modeling/layers/cls_head.py b/official/nlp/modeling/layers/cls_head.py similarity index 100% rename from modeling/official/nlp/modeling/layers/cls_head.py rename to official/nlp/modeling/layers/cls_head.py diff --git a/modeling/official/nlp/modeling/layers/cls_head_test.py b/official/nlp/modeling/layers/cls_head_test.py similarity index 100% rename from modeling/official/nlp/modeling/layers/cls_head_test.py rename to official/nlp/modeling/layers/cls_head_test.py diff --git a/modeling/official/nlp/modeling/layers/factorized_embedding.py b/official/nlp/modeling/layers/factorized_embedding.py similarity index 100% rename from modeling/official/nlp/modeling/layers/factorized_embedding.py rename to official/nlp/modeling/layers/factorized_embedding.py diff --git a/modeling/official/nlp/modeling/layers/factorized_embedding_test.py b/official/nlp/modeling/layers/factorized_embedding_test.py similarity index 100% rename from modeling/official/nlp/modeling/layers/factorized_embedding_test.py rename to official/nlp/modeling/layers/factorized_embedding_test.py diff --git a/modeling/official/nlp/modeling/layers/gated_feedforward.py b/official/nlp/modeling/layers/gated_feedforward.py similarity index 100% rename from modeling/official/nlp/modeling/layers/gated_feedforward.py rename to official/nlp/modeling/layers/gated_feedforward.py diff --git a/modeling/official/nlp/modeling/layers/gated_feedforward_test.py b/official/nlp/modeling/layers/gated_feedforward_test.py similarity index 100% rename from modeling/official/nlp/modeling/layers/gated_feedforward_test.py rename to official/nlp/modeling/layers/gated_feedforward_test.py diff --git a/modeling/official/nlp/modeling/layers/gaussian_process.py b/official/nlp/modeling/layers/gaussian_process.py similarity index 100% rename from modeling/official/nlp/modeling/layers/gaussian_process.py rename to official/nlp/modeling/layers/gaussian_process.py diff --git a/modeling/official/nlp/modeling/layers/gaussian_process_test.py b/official/nlp/modeling/layers/gaussian_process_test.py similarity index 100% rename from modeling/official/nlp/modeling/layers/gaussian_process_test.py rename to official/nlp/modeling/layers/gaussian_process_test.py diff --git a/modeling/official/nlp/modeling/layers/kernel_attention.py b/official/nlp/modeling/layers/kernel_attention.py similarity index 100% rename from modeling/official/nlp/modeling/layers/kernel_attention.py rename to official/nlp/modeling/layers/kernel_attention.py diff --git a/modeling/official/nlp/modeling/layers/kernel_attention_test.py b/official/nlp/modeling/layers/kernel_attention_test.py similarity index 100% rename from modeling/official/nlp/modeling/layers/kernel_attention_test.py rename to official/nlp/modeling/layers/kernel_attention_test.py diff --git a/modeling/official/nlp/modeling/layers/masked_lm.py b/official/nlp/modeling/layers/masked_lm.py similarity index 100% rename from modeling/official/nlp/modeling/layers/masked_lm.py rename to official/nlp/modeling/layers/masked_lm.py diff --git a/modeling/official/nlp/modeling/layers/masked_lm_test.py b/official/nlp/modeling/layers/masked_lm_test.py similarity index 100% rename from modeling/official/nlp/modeling/layers/masked_lm_test.py rename to official/nlp/modeling/layers/masked_lm_test.py diff --git a/modeling/official/nlp/modeling/layers/masked_softmax.py b/official/nlp/modeling/layers/masked_softmax.py similarity index 100% rename from modeling/official/nlp/modeling/layers/masked_softmax.py rename to official/nlp/modeling/layers/masked_softmax.py diff --git a/modeling/official/nlp/modeling/layers/masked_softmax_test.py b/official/nlp/modeling/layers/masked_softmax_test.py similarity index 100% rename from modeling/official/nlp/modeling/layers/masked_softmax_test.py rename to official/nlp/modeling/layers/masked_softmax_test.py diff --git a/modeling/official/nlp/modeling/layers/mat_mul_with_margin.py b/official/nlp/modeling/layers/mat_mul_with_margin.py similarity index 100% rename from modeling/official/nlp/modeling/layers/mat_mul_with_margin.py rename to official/nlp/modeling/layers/mat_mul_with_margin.py diff --git a/modeling/official/nlp/modeling/layers/mat_mul_with_margin_test.py b/official/nlp/modeling/layers/mat_mul_with_margin_test.py similarity index 100% rename from modeling/official/nlp/modeling/layers/mat_mul_with_margin_test.py rename to official/nlp/modeling/layers/mat_mul_with_margin_test.py diff --git a/modeling/official/nlp/modeling/layers/mixing.py b/official/nlp/modeling/layers/mixing.py similarity index 100% rename from modeling/official/nlp/modeling/layers/mixing.py rename to official/nlp/modeling/layers/mixing.py diff --git a/modeling/official/nlp/modeling/layers/mixing_test.py b/official/nlp/modeling/layers/mixing_test.py similarity index 100% rename from modeling/official/nlp/modeling/layers/mixing_test.py rename to official/nlp/modeling/layers/mixing_test.py diff --git a/modeling/official/nlp/modeling/layers/mobile_bert_layers.py b/official/nlp/modeling/layers/mobile_bert_layers.py similarity index 100% rename from modeling/official/nlp/modeling/layers/mobile_bert_layers.py rename to official/nlp/modeling/layers/mobile_bert_layers.py diff --git a/modeling/official/nlp/modeling/layers/mobile_bert_layers_test.py b/official/nlp/modeling/layers/mobile_bert_layers_test.py similarity index 100% rename from modeling/official/nlp/modeling/layers/mobile_bert_layers_test.py rename to official/nlp/modeling/layers/mobile_bert_layers_test.py diff --git a/modeling/official/nlp/modeling/layers/moe.py b/official/nlp/modeling/layers/moe.py similarity index 100% rename from modeling/official/nlp/modeling/layers/moe.py rename to official/nlp/modeling/layers/moe.py diff --git a/modeling/official/nlp/modeling/layers/moe_test.py b/official/nlp/modeling/layers/moe_test.py similarity index 100% rename from modeling/official/nlp/modeling/layers/moe_test.py rename to official/nlp/modeling/layers/moe_test.py diff --git a/modeling/official/nlp/modeling/layers/multi_channel_attention.py b/official/nlp/modeling/layers/multi_channel_attention.py similarity index 100% rename from modeling/official/nlp/modeling/layers/multi_channel_attention.py rename to official/nlp/modeling/layers/multi_channel_attention.py diff --git a/modeling/official/nlp/modeling/layers/multi_channel_attention_test.py b/official/nlp/modeling/layers/multi_channel_attention_test.py similarity index 100% rename from modeling/official/nlp/modeling/layers/multi_channel_attention_test.py rename to official/nlp/modeling/layers/multi_channel_attention_test.py diff --git a/modeling/official/nlp/modeling/layers/on_device_embedding.py b/official/nlp/modeling/layers/on_device_embedding.py similarity index 100% rename from modeling/official/nlp/modeling/layers/on_device_embedding.py rename to official/nlp/modeling/layers/on_device_embedding.py diff --git a/modeling/official/nlp/modeling/layers/on_device_embedding_test.py b/official/nlp/modeling/layers/on_device_embedding_test.py similarity index 100% rename from modeling/official/nlp/modeling/layers/on_device_embedding_test.py rename to official/nlp/modeling/layers/on_device_embedding_test.py diff --git a/modeling/official/nlp/modeling/layers/pack_optimization.py b/official/nlp/modeling/layers/pack_optimization.py similarity index 100% rename from modeling/official/nlp/modeling/layers/pack_optimization.py rename to official/nlp/modeling/layers/pack_optimization.py diff --git a/modeling/official/nlp/modeling/layers/pack_optimization_test.py b/official/nlp/modeling/layers/pack_optimization_test.py similarity index 100% rename from modeling/official/nlp/modeling/layers/pack_optimization_test.py rename to official/nlp/modeling/layers/pack_optimization_test.py diff --git a/modeling/official/nlp/modeling/layers/per_dim_scale_attention.py b/official/nlp/modeling/layers/per_dim_scale_attention.py similarity index 100% rename from modeling/official/nlp/modeling/layers/per_dim_scale_attention.py rename to official/nlp/modeling/layers/per_dim_scale_attention.py diff --git a/modeling/official/nlp/modeling/layers/per_dim_scale_attention_test.py b/official/nlp/modeling/layers/per_dim_scale_attention_test.py similarity index 100% rename from modeling/official/nlp/modeling/layers/per_dim_scale_attention_test.py rename to official/nlp/modeling/layers/per_dim_scale_attention_test.py diff --git a/modeling/official/nlp/modeling/layers/position_embedding.py b/official/nlp/modeling/layers/position_embedding.py similarity index 100% rename from modeling/official/nlp/modeling/layers/position_embedding.py rename to official/nlp/modeling/layers/position_embedding.py diff --git a/modeling/official/nlp/modeling/layers/position_embedding_test.py b/official/nlp/modeling/layers/position_embedding_test.py similarity index 100% rename from modeling/official/nlp/modeling/layers/position_embedding_test.py rename to official/nlp/modeling/layers/position_embedding_test.py diff --git a/modeling/official/nlp/modeling/layers/relative_attention.py b/official/nlp/modeling/layers/relative_attention.py similarity index 100% rename from modeling/official/nlp/modeling/layers/relative_attention.py rename to official/nlp/modeling/layers/relative_attention.py diff --git a/modeling/official/nlp/modeling/layers/relative_attention_test.py b/official/nlp/modeling/layers/relative_attention_test.py similarity index 100% rename from modeling/official/nlp/modeling/layers/relative_attention_test.py rename to official/nlp/modeling/layers/relative_attention_test.py diff --git a/modeling/official/nlp/modeling/layers/reuse_attention.py b/official/nlp/modeling/layers/reuse_attention.py similarity index 100% rename from modeling/official/nlp/modeling/layers/reuse_attention.py rename to official/nlp/modeling/layers/reuse_attention.py diff --git a/modeling/official/nlp/modeling/layers/reuse_attention_test.py b/official/nlp/modeling/layers/reuse_attention_test.py similarity index 100% rename from modeling/official/nlp/modeling/layers/reuse_attention_test.py rename to official/nlp/modeling/layers/reuse_attention_test.py diff --git a/modeling/official/nlp/modeling/layers/reuse_transformer.py b/official/nlp/modeling/layers/reuse_transformer.py similarity index 100% rename from modeling/official/nlp/modeling/layers/reuse_transformer.py rename to official/nlp/modeling/layers/reuse_transformer.py diff --git a/modeling/official/nlp/modeling/layers/reuse_transformer_test.py b/official/nlp/modeling/layers/reuse_transformer_test.py similarity index 100% rename from modeling/official/nlp/modeling/layers/reuse_transformer_test.py rename to official/nlp/modeling/layers/reuse_transformer_test.py diff --git a/modeling/official/nlp/modeling/layers/rezero_transformer.py b/official/nlp/modeling/layers/rezero_transformer.py similarity index 100% rename from modeling/official/nlp/modeling/layers/rezero_transformer.py rename to official/nlp/modeling/layers/rezero_transformer.py diff --git a/modeling/official/nlp/modeling/layers/rezero_transformer_test.py b/official/nlp/modeling/layers/rezero_transformer_test.py similarity index 100% rename from modeling/official/nlp/modeling/layers/rezero_transformer_test.py rename to official/nlp/modeling/layers/rezero_transformer_test.py diff --git a/modeling/official/nlp/modeling/layers/routing.py b/official/nlp/modeling/layers/routing.py similarity index 100% rename from modeling/official/nlp/modeling/layers/routing.py rename to official/nlp/modeling/layers/routing.py diff --git a/modeling/official/nlp/modeling/layers/routing_test.py b/official/nlp/modeling/layers/routing_test.py similarity index 100% rename from modeling/official/nlp/modeling/layers/routing_test.py rename to official/nlp/modeling/layers/routing_test.py diff --git a/modeling/official/nlp/modeling/layers/self_attention_mask.py b/official/nlp/modeling/layers/self_attention_mask.py similarity index 100% rename from modeling/official/nlp/modeling/layers/self_attention_mask.py rename to official/nlp/modeling/layers/self_attention_mask.py diff --git a/modeling/official/nlp/modeling/layers/spectral_normalization.py b/official/nlp/modeling/layers/spectral_normalization.py similarity index 100% rename from modeling/official/nlp/modeling/layers/spectral_normalization.py rename to official/nlp/modeling/layers/spectral_normalization.py diff --git a/modeling/official/nlp/modeling/layers/spectral_normalization_test.py b/official/nlp/modeling/layers/spectral_normalization_test.py similarity index 100% rename from modeling/official/nlp/modeling/layers/spectral_normalization_test.py rename to official/nlp/modeling/layers/spectral_normalization_test.py diff --git a/modeling/official/nlp/modeling/layers/talking_heads_attention.py b/official/nlp/modeling/layers/talking_heads_attention.py similarity index 100% rename from modeling/official/nlp/modeling/layers/talking_heads_attention.py rename to official/nlp/modeling/layers/talking_heads_attention.py diff --git a/modeling/official/nlp/modeling/layers/talking_heads_attention_test.py b/official/nlp/modeling/layers/talking_heads_attention_test.py similarity index 100% rename from modeling/official/nlp/modeling/layers/talking_heads_attention_test.py rename to official/nlp/modeling/layers/talking_heads_attention_test.py diff --git a/modeling/official/nlp/modeling/layers/text_layers.py b/official/nlp/modeling/layers/text_layers.py similarity index 100% rename from modeling/official/nlp/modeling/layers/text_layers.py rename to official/nlp/modeling/layers/text_layers.py diff --git a/modeling/official/nlp/modeling/layers/text_layers_test.py b/official/nlp/modeling/layers/text_layers_test.py similarity index 100% rename from modeling/official/nlp/modeling/layers/text_layers_test.py rename to official/nlp/modeling/layers/text_layers_test.py diff --git a/modeling/official/nlp/modeling/layers/tn_expand_condense.py b/official/nlp/modeling/layers/tn_expand_condense.py similarity index 100% rename from modeling/official/nlp/modeling/layers/tn_expand_condense.py rename to official/nlp/modeling/layers/tn_expand_condense.py diff --git a/modeling/official/nlp/modeling/layers/tn_expand_condense_test.py b/official/nlp/modeling/layers/tn_expand_condense_test.py similarity index 100% rename from modeling/official/nlp/modeling/layers/tn_expand_condense_test.py rename to official/nlp/modeling/layers/tn_expand_condense_test.py diff --git a/modeling/official/nlp/modeling/layers/tn_transformer_expand_condense.py b/official/nlp/modeling/layers/tn_transformer_expand_condense.py similarity index 100% rename from modeling/official/nlp/modeling/layers/tn_transformer_expand_condense.py rename to official/nlp/modeling/layers/tn_transformer_expand_condense.py diff --git a/modeling/official/nlp/modeling/layers/tn_transformer_test.py b/official/nlp/modeling/layers/tn_transformer_test.py similarity index 100% rename from modeling/official/nlp/modeling/layers/tn_transformer_test.py rename to official/nlp/modeling/layers/tn_transformer_test.py diff --git a/modeling/official/nlp/modeling/layers/transformer.py b/official/nlp/modeling/layers/transformer.py similarity index 100% rename from modeling/official/nlp/modeling/layers/transformer.py rename to official/nlp/modeling/layers/transformer.py diff --git a/modeling/official/nlp/modeling/layers/transformer_encoder_block.py b/official/nlp/modeling/layers/transformer_encoder_block.py similarity index 100% rename from modeling/official/nlp/modeling/layers/transformer_encoder_block.py rename to official/nlp/modeling/layers/transformer_encoder_block.py diff --git a/modeling/official/nlp/modeling/layers/transformer_encoder_block_test.py b/official/nlp/modeling/layers/transformer_encoder_block_test.py similarity index 100% rename from modeling/official/nlp/modeling/layers/transformer_encoder_block_test.py rename to official/nlp/modeling/layers/transformer_encoder_block_test.py diff --git a/modeling/official/nlp/modeling/layers/transformer_scaffold.py b/official/nlp/modeling/layers/transformer_scaffold.py similarity index 100% rename from modeling/official/nlp/modeling/layers/transformer_scaffold.py rename to official/nlp/modeling/layers/transformer_scaffold.py diff --git a/modeling/official/nlp/modeling/layers/transformer_scaffold_test.py b/official/nlp/modeling/layers/transformer_scaffold_test.py similarity index 100% rename from modeling/official/nlp/modeling/layers/transformer_scaffold_test.py rename to official/nlp/modeling/layers/transformer_scaffold_test.py diff --git a/modeling/official/nlp/modeling/layers/transformer_test.py b/official/nlp/modeling/layers/transformer_test.py similarity index 100% rename from modeling/official/nlp/modeling/layers/transformer_test.py rename to official/nlp/modeling/layers/transformer_test.py diff --git a/modeling/official/nlp/modeling/layers/transformer_xl.py b/official/nlp/modeling/layers/transformer_xl.py similarity index 100% rename from modeling/official/nlp/modeling/layers/transformer_xl.py rename to official/nlp/modeling/layers/transformer_xl.py diff --git a/modeling/official/nlp/modeling/layers/transformer_xl_test.py b/official/nlp/modeling/layers/transformer_xl_test.py similarity index 100% rename from modeling/official/nlp/modeling/layers/transformer_xl_test.py rename to official/nlp/modeling/layers/transformer_xl_test.py diff --git a/modeling/official/nlp/modeling/layers/util.py b/official/nlp/modeling/layers/util.py similarity index 100% rename from modeling/official/nlp/modeling/layers/util.py rename to official/nlp/modeling/layers/util.py diff --git a/modeling/official/nlp/modeling/losses/README.md b/official/nlp/modeling/losses/README.md similarity index 100% rename from modeling/official/nlp/modeling/losses/README.md rename to official/nlp/modeling/losses/README.md diff --git a/modeling/official/nlp/modeling/losses/__init__.py b/official/nlp/modeling/losses/__init__.py similarity index 100% rename from modeling/official/nlp/modeling/losses/__init__.py rename to official/nlp/modeling/losses/__init__.py diff --git a/modeling/official/nlp/modeling/losses/weighted_sparse_categorical_crossentropy.py b/official/nlp/modeling/losses/weighted_sparse_categorical_crossentropy.py similarity index 100% rename from modeling/official/nlp/modeling/losses/weighted_sparse_categorical_crossentropy.py rename to official/nlp/modeling/losses/weighted_sparse_categorical_crossentropy.py diff --git a/modeling/official/nlp/modeling/losses/weighted_sparse_categorical_crossentropy_test.py b/official/nlp/modeling/losses/weighted_sparse_categorical_crossentropy_test.py similarity index 100% rename from modeling/official/nlp/modeling/losses/weighted_sparse_categorical_crossentropy_test.py rename to official/nlp/modeling/losses/weighted_sparse_categorical_crossentropy_test.py diff --git a/modeling/official/nlp/modeling/models/README.md b/official/nlp/modeling/models/README.md similarity index 100% rename from modeling/official/nlp/modeling/models/README.md rename to official/nlp/modeling/models/README.md diff --git a/modeling/official/nlp/modeling/models/__init__.py b/official/nlp/modeling/models/__init__.py similarity index 100% rename from modeling/official/nlp/modeling/models/__init__.py rename to official/nlp/modeling/models/__init__.py diff --git a/modeling/official/nlp/modeling/models/bert_classifier.py b/official/nlp/modeling/models/bert_classifier.py similarity index 100% rename from modeling/official/nlp/modeling/models/bert_classifier.py rename to official/nlp/modeling/models/bert_classifier.py diff --git a/modeling/official/nlp/modeling/models/bert_classifier_test.py b/official/nlp/modeling/models/bert_classifier_test.py similarity index 100% rename from modeling/official/nlp/modeling/models/bert_classifier_test.py rename to official/nlp/modeling/models/bert_classifier_test.py diff --git a/modeling/official/nlp/modeling/models/bert_pretrainer.py b/official/nlp/modeling/models/bert_pretrainer.py similarity index 100% rename from modeling/official/nlp/modeling/models/bert_pretrainer.py rename to official/nlp/modeling/models/bert_pretrainer.py diff --git a/modeling/official/nlp/modeling/models/bert_pretrainer_test.py b/official/nlp/modeling/models/bert_pretrainer_test.py similarity index 100% rename from modeling/official/nlp/modeling/models/bert_pretrainer_test.py rename to official/nlp/modeling/models/bert_pretrainer_test.py diff --git a/modeling/official/nlp/modeling/models/bert_span_labeler.py b/official/nlp/modeling/models/bert_span_labeler.py similarity index 100% rename from modeling/official/nlp/modeling/models/bert_span_labeler.py rename to official/nlp/modeling/models/bert_span_labeler.py diff --git a/modeling/official/nlp/modeling/models/bert_span_labeler_test.py b/official/nlp/modeling/models/bert_span_labeler_test.py similarity index 100% rename from modeling/official/nlp/modeling/models/bert_span_labeler_test.py rename to official/nlp/modeling/models/bert_span_labeler_test.py diff --git a/modeling/official/nlp/modeling/models/bert_token_classifier.py b/official/nlp/modeling/models/bert_token_classifier.py similarity index 100% rename from modeling/official/nlp/modeling/models/bert_token_classifier.py rename to official/nlp/modeling/models/bert_token_classifier.py diff --git a/modeling/official/nlp/modeling/models/bert_token_classifier_test.py b/official/nlp/modeling/models/bert_token_classifier_test.py similarity index 100% rename from modeling/official/nlp/modeling/models/bert_token_classifier_test.py rename to official/nlp/modeling/models/bert_token_classifier_test.py diff --git a/modeling/official/nlp/modeling/models/dual_encoder.py b/official/nlp/modeling/models/dual_encoder.py similarity index 100% rename from modeling/official/nlp/modeling/models/dual_encoder.py rename to official/nlp/modeling/models/dual_encoder.py diff --git a/modeling/official/nlp/modeling/models/dual_encoder_test.py b/official/nlp/modeling/models/dual_encoder_test.py similarity index 100% rename from modeling/official/nlp/modeling/models/dual_encoder_test.py rename to official/nlp/modeling/models/dual_encoder_test.py diff --git a/modeling/official/nlp/modeling/models/electra_pretrainer.py b/official/nlp/modeling/models/electra_pretrainer.py similarity index 100% rename from modeling/official/nlp/modeling/models/electra_pretrainer.py rename to official/nlp/modeling/models/electra_pretrainer.py diff --git a/modeling/official/nlp/modeling/models/electra_pretrainer_test.py b/official/nlp/modeling/models/electra_pretrainer_test.py similarity index 100% rename from modeling/official/nlp/modeling/models/electra_pretrainer_test.py rename to official/nlp/modeling/models/electra_pretrainer_test.py diff --git a/modeling/official/nlp/modeling/models/seq2seq_transformer.py b/official/nlp/modeling/models/seq2seq_transformer.py similarity index 100% rename from modeling/official/nlp/modeling/models/seq2seq_transformer.py rename to official/nlp/modeling/models/seq2seq_transformer.py diff --git a/modeling/official/nlp/modeling/models/seq2seq_transformer_test.py b/official/nlp/modeling/models/seq2seq_transformer_test.py similarity index 100% rename from modeling/official/nlp/modeling/models/seq2seq_transformer_test.py rename to official/nlp/modeling/models/seq2seq_transformer_test.py diff --git a/modeling/official/nlp/modeling/models/t5.py b/official/nlp/modeling/models/t5.py similarity index 100% rename from modeling/official/nlp/modeling/models/t5.py rename to official/nlp/modeling/models/t5.py diff --git a/modeling/official/nlp/modeling/models/t5_test.py b/official/nlp/modeling/models/t5_test.py similarity index 100% rename from modeling/official/nlp/modeling/models/t5_test.py rename to official/nlp/modeling/models/t5_test.py diff --git a/modeling/official/nlp/modeling/models/xlnet.py b/official/nlp/modeling/models/xlnet.py similarity index 100% rename from modeling/official/nlp/modeling/models/xlnet.py rename to official/nlp/modeling/models/xlnet.py diff --git a/modeling/official/nlp/modeling/models/xlnet_test.py b/official/nlp/modeling/models/xlnet_test.py similarity index 100% rename from modeling/official/nlp/modeling/models/xlnet_test.py rename to official/nlp/modeling/models/xlnet_test.py diff --git a/modeling/official/nlp/modeling/networks/README.md b/official/nlp/modeling/networks/README.md similarity index 100% rename from modeling/official/nlp/modeling/networks/README.md rename to official/nlp/modeling/networks/README.md diff --git a/modeling/official/nlp/modeling/networks/__init__.py b/official/nlp/modeling/networks/__init__.py similarity index 100% rename from modeling/official/nlp/modeling/networks/__init__.py rename to official/nlp/modeling/networks/__init__.py diff --git a/modeling/official/nlp/modeling/networks/albert_encoder.py b/official/nlp/modeling/networks/albert_encoder.py similarity index 100% rename from modeling/official/nlp/modeling/networks/albert_encoder.py rename to official/nlp/modeling/networks/albert_encoder.py diff --git a/modeling/official/nlp/modeling/networks/albert_encoder_test.py b/official/nlp/modeling/networks/albert_encoder_test.py similarity index 100% rename from modeling/official/nlp/modeling/networks/albert_encoder_test.py rename to official/nlp/modeling/networks/albert_encoder_test.py diff --git a/modeling/official/nlp/modeling/networks/bert_dense_encoder_test.py b/official/nlp/modeling/networks/bert_dense_encoder_test.py similarity index 100% rename from modeling/official/nlp/modeling/networks/bert_dense_encoder_test.py rename to official/nlp/modeling/networks/bert_dense_encoder_test.py diff --git a/modeling/official/nlp/modeling/networks/bert_encoder.py b/official/nlp/modeling/networks/bert_encoder.py similarity index 100% rename from modeling/official/nlp/modeling/networks/bert_encoder.py rename to official/nlp/modeling/networks/bert_encoder.py diff --git a/modeling/official/nlp/modeling/networks/bert_encoder_test.py b/official/nlp/modeling/networks/bert_encoder_test.py similarity index 100% rename from modeling/official/nlp/modeling/networks/bert_encoder_test.py rename to official/nlp/modeling/networks/bert_encoder_test.py diff --git a/modeling/official/nlp/modeling/networks/classification.py b/official/nlp/modeling/networks/classification.py similarity index 100% rename from modeling/official/nlp/modeling/networks/classification.py rename to official/nlp/modeling/networks/classification.py diff --git a/modeling/official/nlp/modeling/networks/classification_test.py b/official/nlp/modeling/networks/classification_test.py similarity index 100% rename from modeling/official/nlp/modeling/networks/classification_test.py rename to official/nlp/modeling/networks/classification_test.py diff --git a/modeling/official/nlp/modeling/networks/encoder_scaffold.py b/official/nlp/modeling/networks/encoder_scaffold.py similarity index 100% rename from modeling/official/nlp/modeling/networks/encoder_scaffold.py rename to official/nlp/modeling/networks/encoder_scaffold.py diff --git a/modeling/official/nlp/modeling/networks/encoder_scaffold_test.py b/official/nlp/modeling/networks/encoder_scaffold_test.py similarity index 100% rename from modeling/official/nlp/modeling/networks/encoder_scaffold_test.py rename to official/nlp/modeling/networks/encoder_scaffold_test.py diff --git a/modeling/official/nlp/modeling/networks/fnet.py b/official/nlp/modeling/networks/fnet.py similarity index 100% rename from modeling/official/nlp/modeling/networks/fnet.py rename to official/nlp/modeling/networks/fnet.py diff --git a/modeling/official/nlp/modeling/networks/fnet_test.py b/official/nlp/modeling/networks/fnet_test.py similarity index 100% rename from modeling/official/nlp/modeling/networks/fnet_test.py rename to official/nlp/modeling/networks/fnet_test.py diff --git a/modeling/official/nlp/modeling/networks/funnel_transformer.py b/official/nlp/modeling/networks/funnel_transformer.py similarity index 100% rename from modeling/official/nlp/modeling/networks/funnel_transformer.py rename to official/nlp/modeling/networks/funnel_transformer.py diff --git a/modeling/official/nlp/modeling/networks/funnel_transformer_test.py b/official/nlp/modeling/networks/funnel_transformer_test.py similarity index 100% rename from modeling/official/nlp/modeling/networks/funnel_transformer_test.py rename to official/nlp/modeling/networks/funnel_transformer_test.py diff --git a/modeling/official/nlp/modeling/networks/mobile_bert_encoder.py b/official/nlp/modeling/networks/mobile_bert_encoder.py similarity index 100% rename from modeling/official/nlp/modeling/networks/mobile_bert_encoder.py rename to official/nlp/modeling/networks/mobile_bert_encoder.py diff --git a/modeling/official/nlp/modeling/networks/mobile_bert_encoder_test.py b/official/nlp/modeling/networks/mobile_bert_encoder_test.py similarity index 100% rename from modeling/official/nlp/modeling/networks/mobile_bert_encoder_test.py rename to official/nlp/modeling/networks/mobile_bert_encoder_test.py diff --git a/modeling/official/nlp/modeling/networks/packed_sequence_embedding.py b/official/nlp/modeling/networks/packed_sequence_embedding.py similarity index 100% rename from modeling/official/nlp/modeling/networks/packed_sequence_embedding.py rename to official/nlp/modeling/networks/packed_sequence_embedding.py diff --git a/modeling/official/nlp/modeling/networks/packed_sequence_embedding_test.py b/official/nlp/modeling/networks/packed_sequence_embedding_test.py similarity index 100% rename from modeling/official/nlp/modeling/networks/packed_sequence_embedding_test.py rename to official/nlp/modeling/networks/packed_sequence_embedding_test.py diff --git a/modeling/official/nlp/modeling/networks/span_labeling.py b/official/nlp/modeling/networks/span_labeling.py similarity index 100% rename from modeling/official/nlp/modeling/networks/span_labeling.py rename to official/nlp/modeling/networks/span_labeling.py diff --git a/modeling/official/nlp/modeling/networks/span_labeling_test.py b/official/nlp/modeling/networks/span_labeling_test.py similarity index 100% rename from modeling/official/nlp/modeling/networks/span_labeling_test.py rename to official/nlp/modeling/networks/span_labeling_test.py diff --git a/modeling/official/nlp/modeling/networks/sparse_mixer.py b/official/nlp/modeling/networks/sparse_mixer.py similarity index 100% rename from modeling/official/nlp/modeling/networks/sparse_mixer.py rename to official/nlp/modeling/networks/sparse_mixer.py diff --git a/modeling/official/nlp/modeling/networks/sparse_mixer_test.py b/official/nlp/modeling/networks/sparse_mixer_test.py similarity index 100% rename from modeling/official/nlp/modeling/networks/sparse_mixer_test.py rename to official/nlp/modeling/networks/sparse_mixer_test.py diff --git a/modeling/official/nlp/modeling/networks/xlnet_base.py b/official/nlp/modeling/networks/xlnet_base.py similarity index 100% rename from modeling/official/nlp/modeling/networks/xlnet_base.py rename to official/nlp/modeling/networks/xlnet_base.py diff --git a/modeling/official/nlp/modeling/networks/xlnet_base_test.py b/official/nlp/modeling/networks/xlnet_base_test.py similarity index 100% rename from modeling/official/nlp/modeling/networks/xlnet_base_test.py rename to official/nlp/modeling/networks/xlnet_base_test.py diff --git a/modeling/official/nlp/modeling/ops/__init__.py b/official/nlp/modeling/ops/__init__.py similarity index 100% rename from modeling/official/nlp/modeling/ops/__init__.py rename to official/nlp/modeling/ops/__init__.py diff --git a/modeling/official/nlp/modeling/ops/beam_search.py b/official/nlp/modeling/ops/beam_search.py similarity index 100% rename from modeling/official/nlp/modeling/ops/beam_search.py rename to official/nlp/modeling/ops/beam_search.py diff --git a/modeling/official/nlp/modeling/ops/beam_search_test.py b/official/nlp/modeling/ops/beam_search_test.py similarity index 100% rename from modeling/official/nlp/modeling/ops/beam_search_test.py rename to official/nlp/modeling/ops/beam_search_test.py diff --git a/modeling/official/nlp/modeling/ops/decoding_module.py b/official/nlp/modeling/ops/decoding_module.py similarity index 100% rename from modeling/official/nlp/modeling/ops/decoding_module.py rename to official/nlp/modeling/ops/decoding_module.py diff --git a/modeling/official/nlp/modeling/ops/decoding_module_test.py b/official/nlp/modeling/ops/decoding_module_test.py similarity index 100% rename from modeling/official/nlp/modeling/ops/decoding_module_test.py rename to official/nlp/modeling/ops/decoding_module_test.py diff --git a/modeling/official/nlp/modeling/ops/sampling_module.py b/official/nlp/modeling/ops/sampling_module.py similarity index 100% rename from modeling/official/nlp/modeling/ops/sampling_module.py rename to official/nlp/modeling/ops/sampling_module.py diff --git a/modeling/official/nlp/modeling/ops/segment_extractor.py b/official/nlp/modeling/ops/segment_extractor.py similarity index 100% rename from modeling/official/nlp/modeling/ops/segment_extractor.py rename to official/nlp/modeling/ops/segment_extractor.py diff --git a/modeling/official/nlp/modeling/ops/segment_extractor_test.py b/official/nlp/modeling/ops/segment_extractor_test.py similarity index 100% rename from modeling/official/nlp/modeling/ops/segment_extractor_test.py rename to official/nlp/modeling/ops/segment_extractor_test.py diff --git a/modeling/official/nlp/optimization.py b/official/nlp/optimization.py similarity index 100% rename from modeling/official/nlp/optimization.py rename to official/nlp/optimization.py diff --git a/modeling/official/nlp/serving/__init__.py b/official/nlp/serving/__init__.py similarity index 100% rename from modeling/official/nlp/serving/__init__.py rename to official/nlp/serving/__init__.py diff --git a/modeling/official/nlp/serving/export_savedmodel.py b/official/nlp/serving/export_savedmodel.py similarity index 100% rename from modeling/official/nlp/serving/export_savedmodel.py rename to official/nlp/serving/export_savedmodel.py diff --git a/modeling/official/nlp/serving/export_savedmodel_test.py b/official/nlp/serving/export_savedmodel_test.py similarity index 100% rename from modeling/official/nlp/serving/export_savedmodel_test.py rename to official/nlp/serving/export_savedmodel_test.py diff --git a/modeling/official/nlp/serving/export_savedmodel_util.py b/official/nlp/serving/export_savedmodel_util.py similarity index 100% rename from modeling/official/nlp/serving/export_savedmodel_util.py rename to official/nlp/serving/export_savedmodel_util.py diff --git a/modeling/official/nlp/serving/serving_modules.py b/official/nlp/serving/serving_modules.py similarity index 100% rename from modeling/official/nlp/serving/serving_modules.py rename to official/nlp/serving/serving_modules.py diff --git a/modeling/official/nlp/serving/serving_modules_test.py b/official/nlp/serving/serving_modules_test.py similarity index 100% rename from modeling/official/nlp/serving/serving_modules_test.py rename to official/nlp/serving/serving_modules_test.py diff --git a/modeling/official/nlp/tasks/__init__.py b/official/nlp/tasks/__init__.py similarity index 100% rename from modeling/official/nlp/tasks/__init__.py rename to official/nlp/tasks/__init__.py diff --git a/modeling/official/nlp/tasks/dual_encoder.py b/official/nlp/tasks/dual_encoder.py similarity index 100% rename from modeling/official/nlp/tasks/dual_encoder.py rename to official/nlp/tasks/dual_encoder.py diff --git a/modeling/official/nlp/tasks/dual_encoder_test.py b/official/nlp/tasks/dual_encoder_test.py similarity index 100% rename from modeling/official/nlp/tasks/dual_encoder_test.py rename to official/nlp/tasks/dual_encoder_test.py diff --git a/modeling/official/nlp/tasks/electra_task.py b/official/nlp/tasks/electra_task.py similarity index 100% rename from modeling/official/nlp/tasks/electra_task.py rename to official/nlp/tasks/electra_task.py diff --git a/modeling/official/nlp/tasks/electra_task_test.py b/official/nlp/tasks/electra_task_test.py similarity index 100% rename from modeling/official/nlp/tasks/electra_task_test.py rename to official/nlp/tasks/electra_task_test.py diff --git a/modeling/official/nlp/tasks/masked_lm.py b/official/nlp/tasks/masked_lm.py similarity index 100% rename from modeling/official/nlp/tasks/masked_lm.py rename to official/nlp/tasks/masked_lm.py diff --git a/modeling/official/nlp/tasks/masked_lm_determinism_test.py b/official/nlp/tasks/masked_lm_determinism_test.py similarity index 100% rename from modeling/official/nlp/tasks/masked_lm_determinism_test.py rename to official/nlp/tasks/masked_lm_determinism_test.py diff --git a/modeling/official/nlp/tasks/masked_lm_test.py b/official/nlp/tasks/masked_lm_test.py similarity index 100% rename from modeling/official/nlp/tasks/masked_lm_test.py rename to official/nlp/tasks/masked_lm_test.py diff --git a/modeling/official/nlp/tasks/question_answering.py b/official/nlp/tasks/question_answering.py similarity index 100% rename from modeling/official/nlp/tasks/question_answering.py rename to official/nlp/tasks/question_answering.py diff --git a/modeling/official/nlp/tasks/question_answering_test.py b/official/nlp/tasks/question_answering_test.py similarity index 100% rename from modeling/official/nlp/tasks/question_answering_test.py rename to official/nlp/tasks/question_answering_test.py diff --git a/modeling/official/nlp/tasks/sentence_prediction.py b/official/nlp/tasks/sentence_prediction.py similarity index 100% rename from modeling/official/nlp/tasks/sentence_prediction.py rename to official/nlp/tasks/sentence_prediction.py diff --git a/modeling/official/nlp/tasks/sentence_prediction_test.py b/official/nlp/tasks/sentence_prediction_test.py similarity index 100% rename from modeling/official/nlp/tasks/sentence_prediction_test.py rename to official/nlp/tasks/sentence_prediction_test.py diff --git a/modeling/official/nlp/tasks/tagging.py b/official/nlp/tasks/tagging.py similarity index 100% rename from modeling/official/nlp/tasks/tagging.py rename to official/nlp/tasks/tagging.py diff --git a/modeling/official/nlp/tasks/tagging_test.py b/official/nlp/tasks/tagging_test.py similarity index 100% rename from modeling/official/nlp/tasks/tagging_test.py rename to official/nlp/tasks/tagging_test.py diff --git a/modeling/official/nlp/tasks/translation.py b/official/nlp/tasks/translation.py similarity index 100% rename from modeling/official/nlp/tasks/translation.py rename to official/nlp/tasks/translation.py diff --git a/modeling/official/nlp/tasks/translation_test.py b/official/nlp/tasks/translation_test.py similarity index 100% rename from modeling/official/nlp/tasks/translation_test.py rename to official/nlp/tasks/translation_test.py diff --git a/modeling/official/nlp/tasks/utils.py b/official/nlp/tasks/utils.py similarity index 100% rename from modeling/official/nlp/tasks/utils.py rename to official/nlp/tasks/utils.py diff --git a/modeling/official/nlp/tools/__init__.py b/official/nlp/tools/__init__.py similarity index 100% rename from modeling/official/nlp/tools/__init__.py rename to official/nlp/tools/__init__.py diff --git a/modeling/official/nlp/tools/export_tfhub.py b/official/nlp/tools/export_tfhub.py similarity index 100% rename from modeling/official/nlp/tools/export_tfhub.py rename to official/nlp/tools/export_tfhub.py diff --git a/modeling/official/nlp/tools/export_tfhub_lib.py b/official/nlp/tools/export_tfhub_lib.py similarity index 100% rename from modeling/official/nlp/tools/export_tfhub_lib.py rename to official/nlp/tools/export_tfhub_lib.py diff --git a/modeling/official/nlp/tools/export_tfhub_lib_test.py b/official/nlp/tools/export_tfhub_lib_test.py similarity index 100% rename from modeling/official/nlp/tools/export_tfhub_lib_test.py rename to official/nlp/tools/export_tfhub_lib_test.py diff --git a/modeling/official/nlp/tools/squad_evaluate_v1_1.py b/official/nlp/tools/squad_evaluate_v1_1.py similarity index 100% rename from modeling/official/nlp/tools/squad_evaluate_v1_1.py rename to official/nlp/tools/squad_evaluate_v1_1.py diff --git a/modeling/official/nlp/tools/squad_evaluate_v2_0.py b/official/nlp/tools/squad_evaluate_v2_0.py similarity index 100% rename from modeling/official/nlp/tools/squad_evaluate_v2_0.py rename to official/nlp/tools/squad_evaluate_v2_0.py diff --git a/modeling/official/nlp/tools/tf1_bert_checkpoint_converter_lib.py b/official/nlp/tools/tf1_bert_checkpoint_converter_lib.py similarity index 100% rename from modeling/official/nlp/tools/tf1_bert_checkpoint_converter_lib.py rename to official/nlp/tools/tf1_bert_checkpoint_converter_lib.py diff --git a/modeling/official/nlp/tools/tf2_albert_encoder_checkpoint_converter.py b/official/nlp/tools/tf2_albert_encoder_checkpoint_converter.py similarity index 100% rename from modeling/official/nlp/tools/tf2_albert_encoder_checkpoint_converter.py rename to official/nlp/tools/tf2_albert_encoder_checkpoint_converter.py diff --git a/modeling/official/nlp/tools/tf2_bert_encoder_checkpoint_converter.py b/official/nlp/tools/tf2_bert_encoder_checkpoint_converter.py similarity index 100% rename from modeling/official/nlp/tools/tf2_bert_encoder_checkpoint_converter.py rename to official/nlp/tools/tf2_bert_encoder_checkpoint_converter.py diff --git a/modeling/official/nlp/tools/tokenization.py b/official/nlp/tools/tokenization.py similarity index 100% rename from modeling/official/nlp/tools/tokenization.py rename to official/nlp/tools/tokenization.py diff --git a/modeling/official/nlp/tools/tokenization_test.py b/official/nlp/tools/tokenization_test.py similarity index 100% rename from modeling/official/nlp/tools/tokenization_test.py rename to official/nlp/tools/tokenization_test.py diff --git a/modeling/official/nlp/train.py b/official/nlp/train.py similarity index 100% rename from modeling/official/nlp/train.py rename to official/nlp/train.py diff --git a/modeling/official/pip_package/setup.py b/official/pip_package/setup.py similarity index 100% rename from modeling/official/pip_package/setup.py rename to official/pip_package/setup.py diff --git a/modeling/official/projects/README.md b/official/projects/README.md similarity index 100% rename from modeling/official/projects/README.md rename to official/projects/README.md diff --git a/modeling/official/projects/__init__.py b/official/projects/__init__.py similarity index 100% rename from modeling/official/projects/__init__.py rename to official/projects/__init__.py diff --git a/modeling/official/projects/backbone_reuse/README.md b/official/projects/backbone_reuse/README.md similarity index 100% rename from modeling/official/projects/backbone_reuse/README.md rename to official/projects/backbone_reuse/README.md diff --git a/modeling/official/projects/backbone_reuse/configs/experiments/faster_rcnn/fastrcnn_resnet101_fpn_600epochs.yaml b/official/projects/backbone_reuse/configs/experiments/faster_rcnn/fastrcnn_resnet101_fpn_600epochs.yaml similarity index 100% rename from modeling/official/projects/backbone_reuse/configs/experiments/faster_rcnn/fastrcnn_resnet101_fpn_600epochs.yaml rename to official/projects/backbone_reuse/configs/experiments/faster_rcnn/fastrcnn_resnet101_fpn_600epochs.yaml diff --git a/modeling/official/projects/backbone_reuse/configs/experiments/faster_rcnn/fastrcnn_resnet101_fpn_72epochs.yaml b/official/projects/backbone_reuse/configs/experiments/faster_rcnn/fastrcnn_resnet101_fpn_72epochs.yaml similarity index 100% rename from modeling/official/projects/backbone_reuse/configs/experiments/faster_rcnn/fastrcnn_resnet101_fpn_72epochs.yaml rename to official/projects/backbone_reuse/configs/experiments/faster_rcnn/fastrcnn_resnet101_fpn_72epochs.yaml diff --git a/modeling/official/projects/backbone_reuse/configs/experiments/faster_rcnn/fastrcnn_resnet101_fpn_cascade_600epochs.yaml b/official/projects/backbone_reuse/configs/experiments/faster_rcnn/fastrcnn_resnet101_fpn_cascade_600epochs.yaml similarity index 100% rename from modeling/official/projects/backbone_reuse/configs/experiments/faster_rcnn/fastrcnn_resnet101_fpn_cascade_600epochs.yaml rename to official/projects/backbone_reuse/configs/experiments/faster_rcnn/fastrcnn_resnet101_fpn_cascade_600epochs.yaml diff --git a/modeling/official/projects/backbone_reuse/configs/experiments/faster_rcnn/fastrcnn_resnet101_fpn_cascade_72epochs.yaml b/official/projects/backbone_reuse/configs/experiments/faster_rcnn/fastrcnn_resnet101_fpn_cascade_72epochs.yaml similarity index 100% rename from modeling/official/projects/backbone_reuse/configs/experiments/faster_rcnn/fastrcnn_resnet101_fpn_cascade_72epochs.yaml rename to official/projects/backbone_reuse/configs/experiments/faster_rcnn/fastrcnn_resnet101_fpn_cascade_72epochs.yaml diff --git a/modeling/official/projects/backbone_reuse/configs/experiments/faster_rcnn/fastrcnn_resnet101_nasfpn_600epochs.yaml b/official/projects/backbone_reuse/configs/experiments/faster_rcnn/fastrcnn_resnet101_nasfpn_600epochs.yaml similarity index 100% rename from modeling/official/projects/backbone_reuse/configs/experiments/faster_rcnn/fastrcnn_resnet101_nasfpn_600epochs.yaml rename to official/projects/backbone_reuse/configs/experiments/faster_rcnn/fastrcnn_resnet101_nasfpn_600epochs.yaml diff --git a/modeling/official/projects/backbone_reuse/configs/experiments/faster_rcnn/fastrcnn_resnet101_nasfpn_72epochs.yaml b/official/projects/backbone_reuse/configs/experiments/faster_rcnn/fastrcnn_resnet101_nasfpn_72epochs.yaml similarity index 100% rename from modeling/official/projects/backbone_reuse/configs/experiments/faster_rcnn/fastrcnn_resnet101_nasfpn_72epochs.yaml rename to official/projects/backbone_reuse/configs/experiments/faster_rcnn/fastrcnn_resnet101_nasfpn_72epochs.yaml diff --git a/modeling/official/projects/backbone_reuse/configs/experiments/faster_rcnn/fastrcnn_resnet101_nasfpn_cascade_600epochs.yaml b/official/projects/backbone_reuse/configs/experiments/faster_rcnn/fastrcnn_resnet101_nasfpn_cascade_600epochs.yaml similarity index 100% rename from modeling/official/projects/backbone_reuse/configs/experiments/faster_rcnn/fastrcnn_resnet101_nasfpn_cascade_600epochs.yaml rename to official/projects/backbone_reuse/configs/experiments/faster_rcnn/fastrcnn_resnet101_nasfpn_cascade_600epochs.yaml diff --git a/modeling/official/projects/backbone_reuse/configs/experiments/faster_rcnn/fastrcnn_resnet101_nasfpn_cascade_72epochs.yaml b/official/projects/backbone_reuse/configs/experiments/faster_rcnn/fastrcnn_resnet101_nasfpn_cascade_72epochs.yaml similarity index 100% rename from modeling/official/projects/backbone_reuse/configs/experiments/faster_rcnn/fastrcnn_resnet101_nasfpn_cascade_72epochs.yaml rename to official/projects/backbone_reuse/configs/experiments/faster_rcnn/fastrcnn_resnet101_nasfpn_cascade_72epochs.yaml diff --git a/modeling/official/projects/backbone_reuse/configs/experiments/retinanet/retinanet_resnet101_fpn_600epochs.yaml b/official/projects/backbone_reuse/configs/experiments/retinanet/retinanet_resnet101_fpn_600epochs.yaml similarity index 100% rename from modeling/official/projects/backbone_reuse/configs/experiments/retinanet/retinanet_resnet101_fpn_600epochs.yaml rename to official/projects/backbone_reuse/configs/experiments/retinanet/retinanet_resnet101_fpn_600epochs.yaml diff --git a/modeling/official/projects/backbone_reuse/configs/experiments/retinanet/retinanet_resnet101_fpn_72epochs.yaml b/official/projects/backbone_reuse/configs/experiments/retinanet/retinanet_resnet101_fpn_72epochs.yaml similarity index 100% rename from modeling/official/projects/backbone_reuse/configs/experiments/retinanet/retinanet_resnet101_fpn_72epochs.yaml rename to official/projects/backbone_reuse/configs/experiments/retinanet/retinanet_resnet101_fpn_72epochs.yaml diff --git a/modeling/official/projects/backbone_reuse/configs/experiments/retinanet/retinanet_resnet101_nasfpn_600epochs.yaml b/official/projects/backbone_reuse/configs/experiments/retinanet/retinanet_resnet101_nasfpn_600epochs.yaml similarity index 100% rename from modeling/official/projects/backbone_reuse/configs/experiments/retinanet/retinanet_resnet101_nasfpn_600epochs.yaml rename to official/projects/backbone_reuse/configs/experiments/retinanet/retinanet_resnet101_nasfpn_600epochs.yaml diff --git a/modeling/official/projects/backbone_reuse/configs/experiments/retinanet/retinanet_resnet101_nasfpn_72epochs.yaml b/official/projects/backbone_reuse/configs/experiments/retinanet/retinanet_resnet101_nasfpn_72epochs.yaml similarity index 100% rename from modeling/official/projects/backbone_reuse/configs/experiments/retinanet/retinanet_resnet101_nasfpn_72epochs.yaml rename to official/projects/backbone_reuse/configs/experiments/retinanet/retinanet_resnet101_nasfpn_72epochs.yaml diff --git a/modeling/official/projects/movinet/README.md b/official/projects/movinet/README.md similarity index 100% rename from modeling/official/projects/movinet/README.md rename to official/projects/movinet/README.md diff --git a/modeling/official/projects/movinet/__init__.py b/official/projects/movinet/__init__.py similarity index 100% rename from modeling/official/projects/movinet/__init__.py rename to official/projects/movinet/__init__.py diff --git a/modeling/official/projects/movinet/configs/__init__.py b/official/projects/movinet/configs/__init__.py similarity index 100% rename from modeling/official/projects/movinet/configs/__init__.py rename to official/projects/movinet/configs/__init__.py diff --git a/modeling/official/projects/movinet/configs/movinet.py b/official/projects/movinet/configs/movinet.py similarity index 92% rename from modeling/official/projects/movinet/configs/movinet.py rename to official/projects/movinet/configs/movinet.py index 6591b4e483d2a3a7e50be7e20fd9c16aa93c7301..2d5c96a124759f8d80a1e1e9e018171ebd5928b2 100644 --- a/modeling/official/projects/movinet/configs/movinet.py +++ b/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 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 +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 @dataclasses.dataclass diff --git a/modeling/official/projects/movinet/configs/movinet_test.py b/official/projects/movinet/configs/movinet_test.py similarity index 100% rename from modeling/official/projects/movinet/configs/movinet_test.py rename to official/projects/movinet/configs/movinet_test.py diff --git a/modeling/official/projects/movinet/configs/yaml/movinet_a0_gpu.yaml b/official/projects/movinet/configs/yaml/movinet_a0_gpu.yaml similarity index 100% rename from modeling/official/projects/movinet/configs/yaml/movinet_a0_gpu.yaml rename to official/projects/movinet/configs/yaml/movinet_a0_gpu.yaml diff --git a/modeling/official/projects/movinet/configs/yaml/movinet_a0_k600_8x8.yaml b/official/projects/movinet/configs/yaml/movinet_a0_k600_8x8.yaml similarity index 100% rename from modeling/official/projects/movinet/configs/yaml/movinet_a0_k600_8x8.yaml rename to official/projects/movinet/configs/yaml/movinet_a0_k600_8x8.yaml diff --git a/modeling/official/projects/movinet/configs/yaml/movinet_a0_k600_cpu_local.yaml b/official/projects/movinet/configs/yaml/movinet_a0_k600_cpu_local.yaml similarity index 100% rename from modeling/official/projects/movinet/configs/yaml/movinet_a0_k600_cpu_local.yaml rename to official/projects/movinet/configs/yaml/movinet_a0_k600_cpu_local.yaml diff --git a/modeling/official/projects/movinet/configs/yaml/movinet_a0_stream_gpu.yaml b/official/projects/movinet/configs/yaml/movinet_a0_stream_gpu.yaml similarity index 100% rename from modeling/official/projects/movinet/configs/yaml/movinet_a0_stream_gpu.yaml rename to official/projects/movinet/configs/yaml/movinet_a0_stream_gpu.yaml diff --git a/modeling/official/projects/movinet/configs/yaml/movinet_a0_stream_k600_8x8.yaml b/official/projects/movinet/configs/yaml/movinet_a0_stream_k600_8x8.yaml similarity index 100% rename from modeling/official/projects/movinet/configs/yaml/movinet_a0_stream_k600_8x8.yaml rename to official/projects/movinet/configs/yaml/movinet_a0_stream_k600_8x8.yaml diff --git a/modeling/official/projects/movinet/configs/yaml/movinet_a1_gpu.yaml b/official/projects/movinet/configs/yaml/movinet_a1_gpu.yaml similarity index 100% rename from modeling/official/projects/movinet/configs/yaml/movinet_a1_gpu.yaml rename to official/projects/movinet/configs/yaml/movinet_a1_gpu.yaml diff --git a/modeling/official/projects/movinet/configs/yaml/movinet_a1_k600_8x8.yaml b/official/projects/movinet/configs/yaml/movinet_a1_k600_8x8.yaml similarity index 100% rename from modeling/official/projects/movinet/configs/yaml/movinet_a1_k600_8x8.yaml rename to official/projects/movinet/configs/yaml/movinet_a1_k600_8x8.yaml diff --git a/modeling/official/projects/movinet/configs/yaml/movinet_a1_stream_gpu.yaml b/official/projects/movinet/configs/yaml/movinet_a1_stream_gpu.yaml similarity index 100% rename from modeling/official/projects/movinet/configs/yaml/movinet_a1_stream_gpu.yaml rename to official/projects/movinet/configs/yaml/movinet_a1_stream_gpu.yaml diff --git a/modeling/official/projects/movinet/configs/yaml/movinet_a1_stream_k600_8x8.yaml b/official/projects/movinet/configs/yaml/movinet_a1_stream_k600_8x8.yaml similarity index 100% rename from modeling/official/projects/movinet/configs/yaml/movinet_a1_stream_k600_8x8.yaml rename to official/projects/movinet/configs/yaml/movinet_a1_stream_k600_8x8.yaml diff --git a/modeling/official/projects/movinet/configs/yaml/movinet_a2_gpu.yaml b/official/projects/movinet/configs/yaml/movinet_a2_gpu.yaml similarity index 100% rename from modeling/official/projects/movinet/configs/yaml/movinet_a2_gpu.yaml rename to official/projects/movinet/configs/yaml/movinet_a2_gpu.yaml diff --git a/modeling/official/projects/movinet/configs/yaml/movinet_a2_k600_8x8.yaml b/official/projects/movinet/configs/yaml/movinet_a2_k600_8x8.yaml similarity index 100% rename from modeling/official/projects/movinet/configs/yaml/movinet_a2_k600_8x8.yaml rename to official/projects/movinet/configs/yaml/movinet_a2_k600_8x8.yaml diff --git a/modeling/official/projects/movinet/configs/yaml/movinet_a2_stream_gpu.yaml b/official/projects/movinet/configs/yaml/movinet_a2_stream_gpu.yaml similarity index 100% rename from modeling/official/projects/movinet/configs/yaml/movinet_a2_stream_gpu.yaml rename to official/projects/movinet/configs/yaml/movinet_a2_stream_gpu.yaml diff --git a/modeling/official/projects/movinet/configs/yaml/movinet_a2_stream_k600_8x8.yaml b/official/projects/movinet/configs/yaml/movinet_a2_stream_k600_8x8.yaml similarity index 100% rename from modeling/official/projects/movinet/configs/yaml/movinet_a2_stream_k600_8x8.yaml rename to official/projects/movinet/configs/yaml/movinet_a2_stream_k600_8x8.yaml diff --git a/modeling/official/projects/movinet/configs/yaml/movinet_a3_gpu.yaml b/official/projects/movinet/configs/yaml/movinet_a3_gpu.yaml similarity index 100% rename from modeling/official/projects/movinet/configs/yaml/movinet_a3_gpu.yaml rename to official/projects/movinet/configs/yaml/movinet_a3_gpu.yaml diff --git a/modeling/official/projects/movinet/configs/yaml/movinet_a3_k600_8x8.yaml b/official/projects/movinet/configs/yaml/movinet_a3_k600_8x8.yaml similarity index 100% rename from modeling/official/projects/movinet/configs/yaml/movinet_a3_k600_8x8.yaml rename to official/projects/movinet/configs/yaml/movinet_a3_k600_8x8.yaml diff --git a/modeling/official/projects/movinet/configs/yaml/movinet_a3_stream_gpu.yaml b/official/projects/movinet/configs/yaml/movinet_a3_stream_gpu.yaml similarity index 100% rename from modeling/official/projects/movinet/configs/yaml/movinet_a3_stream_gpu.yaml rename to official/projects/movinet/configs/yaml/movinet_a3_stream_gpu.yaml diff --git a/modeling/official/projects/movinet/configs/yaml/movinet_a3_stream_k600_8x8.yaml b/official/projects/movinet/configs/yaml/movinet_a3_stream_k600_8x8.yaml similarity index 100% rename from modeling/official/projects/movinet/configs/yaml/movinet_a3_stream_k600_8x8.yaml rename to official/projects/movinet/configs/yaml/movinet_a3_stream_k600_8x8.yaml diff --git a/modeling/official/projects/movinet/configs/yaml/movinet_a4_gpu.yaml b/official/projects/movinet/configs/yaml/movinet_a4_gpu.yaml similarity index 100% rename from modeling/official/projects/movinet/configs/yaml/movinet_a4_gpu.yaml rename to official/projects/movinet/configs/yaml/movinet_a4_gpu.yaml diff --git a/modeling/official/projects/movinet/configs/yaml/movinet_a4_k600_8x8.yaml b/official/projects/movinet/configs/yaml/movinet_a4_k600_8x8.yaml similarity index 100% rename from modeling/official/projects/movinet/configs/yaml/movinet_a4_k600_8x8.yaml rename to official/projects/movinet/configs/yaml/movinet_a4_k600_8x8.yaml diff --git a/modeling/official/projects/movinet/configs/yaml/movinet_a4_stream_gpu.yaml b/official/projects/movinet/configs/yaml/movinet_a4_stream_gpu.yaml similarity index 100% rename from modeling/official/projects/movinet/configs/yaml/movinet_a4_stream_gpu.yaml rename to official/projects/movinet/configs/yaml/movinet_a4_stream_gpu.yaml diff --git a/modeling/official/projects/movinet/configs/yaml/movinet_a4_stream_k600_8x8.yaml b/official/projects/movinet/configs/yaml/movinet_a4_stream_k600_8x8.yaml similarity index 100% rename from modeling/official/projects/movinet/configs/yaml/movinet_a4_stream_k600_8x8.yaml rename to official/projects/movinet/configs/yaml/movinet_a4_stream_k600_8x8.yaml diff --git a/modeling/official/projects/movinet/configs/yaml/movinet_a5_gpu.yaml b/official/projects/movinet/configs/yaml/movinet_a5_gpu.yaml similarity index 100% rename from modeling/official/projects/movinet/configs/yaml/movinet_a5_gpu.yaml rename to official/projects/movinet/configs/yaml/movinet_a5_gpu.yaml diff --git a/modeling/official/projects/movinet/configs/yaml/movinet_a5_k600_8x8.yaml b/official/projects/movinet/configs/yaml/movinet_a5_k600_8x8.yaml similarity index 100% rename from modeling/official/projects/movinet/configs/yaml/movinet_a5_k600_8x8.yaml rename to official/projects/movinet/configs/yaml/movinet_a5_k600_8x8.yaml diff --git a/modeling/official/projects/movinet/configs/yaml/movinet_a5_stream_gpu.yaml b/official/projects/movinet/configs/yaml/movinet_a5_stream_gpu.yaml similarity index 100% rename from modeling/official/projects/movinet/configs/yaml/movinet_a5_stream_gpu.yaml rename to official/projects/movinet/configs/yaml/movinet_a5_stream_gpu.yaml diff --git a/modeling/official/projects/movinet/configs/yaml/movinet_a5_stream_k600_8x8.yaml b/official/projects/movinet/configs/yaml/movinet_a5_stream_k600_8x8.yaml similarity index 100% rename from modeling/official/projects/movinet/configs/yaml/movinet_a5_stream_k600_8x8.yaml rename to official/projects/movinet/configs/yaml/movinet_a5_stream_k600_8x8.yaml diff --git a/modeling/official/projects/movinet/configs/yaml/movinet_t0_k600_8x8.yaml b/official/projects/movinet/configs/yaml/movinet_t0_k600_8x8.yaml similarity index 100% rename from modeling/official/projects/movinet/configs/yaml/movinet_t0_k600_8x8.yaml rename to official/projects/movinet/configs/yaml/movinet_t0_k600_8x8.yaml diff --git a/modeling/official/projects/movinet/configs/yaml/movinet_t0_stream_k600_8x8.yaml b/official/projects/movinet/configs/yaml/movinet_t0_stream_k600_8x8.yaml similarity index 100% rename from modeling/official/projects/movinet/configs/yaml/movinet_t0_stream_k600_8x8.yaml rename to official/projects/movinet/configs/yaml/movinet_t0_stream_k600_8x8.yaml diff --git a/modeling/official/projects/movinet/files/jumpingjack.gif b/official/projects/movinet/files/jumpingjack.gif similarity index 100% rename from modeling/official/projects/movinet/files/jumpingjack.gif rename to official/projects/movinet/files/jumpingjack.gif diff --git a/modeling/official/projects/movinet/files/kinetics_600_labels.txt b/official/projects/movinet/files/kinetics_600_labels.txt similarity index 100% rename from modeling/official/projects/movinet/files/kinetics_600_labels.txt rename to official/projects/movinet/files/kinetics_600_labels.txt diff --git a/modeling/official/projects/movinet/modeling/__init__.py b/official/projects/movinet/modeling/__init__.py similarity index 100% rename from modeling/official/projects/movinet/modeling/__init__.py rename to official/projects/movinet/modeling/__init__.py diff --git a/modeling/official/projects/movinet/modeling/movinet.py b/official/projects/movinet/modeling/movinet.py similarity index 99% rename from modeling/official/projects/movinet/modeling/movinet.py rename to official/projects/movinet/modeling/movinet.py index 178efd238eba8beb2b573af45329ffa5415f46fe..ee39c097c714d4b270fed6bbb85f3d8e957ec72c 100644 --- a/modeling/official/projects/movinet/modeling/movinet.py +++ b/official/projects/movinet/modeling/movinet.py @@ -23,9 +23,9 @@ from typing import Dict, Mapping, Optional, Sequence, Tuple, Union from absl import logging import tensorflow as tf, tf_keras -from modeling.official.modeling import hyperparams -from modeling.official.projects.movinet.modeling import movinet_layers -from modeling.official.vision.modeling.backbones import factory +from official.modeling import hyperparams +from official.projects.movinet.modeling import movinet_layers +from official.vision.modeling.backbones import factory # Defines a set of kernel sizes and stride sizes to simplify and shorten # architecture definitions for configs below. diff --git a/modeling/official/projects/movinet/modeling/movinet_layers.py b/official/projects/movinet/modeling/movinet_layers.py similarity index 99% rename from modeling/official/projects/movinet/modeling/movinet_layers.py rename to official/projects/movinet/modeling/movinet_layers.py index 05d8f967b0b9e1d5bedd4b360d87915572aac8c8..3a2225571184f86013956021d5478f51c681e050 100644 --- a/modeling/official/projects/movinet/modeling/movinet_layers.py +++ b/official/projects/movinet/modeling/movinet_layers.py @@ -21,8 +21,8 @@ from typing import Any, Mapping, Optional, Sequence, Tuple, Union import tensorflow as tf, tf_keras -from modeling.official.modeling import tf_utils -from modeling.official.vision.modeling.layers import nn_layers +from official.modeling import tf_utils +from official.vision.modeling.layers import nn_layers # Default kernel weight decay that may be overridden KERNEL_WEIGHT_DECAY = 1.5e-5 diff --git a/modeling/official/projects/movinet/modeling/movinet_layers_a2_modified.py b/official/projects/movinet/modeling/movinet_layers_a2_modified.py similarity index 99% rename from modeling/official/projects/movinet/modeling/movinet_layers_a2_modified.py rename to official/projects/movinet/modeling/movinet_layers_a2_modified.py index dcabaff4b1fe281d4f037e91bd9fab04f3ea10cd..9aa91031e2ddb6761a7104a8304edce92498b474 100644 --- a/modeling/official/projects/movinet/modeling/movinet_layers_a2_modified.py +++ b/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 modeling.official.modeling import tf_utils -from modeling.official.vision.modeling.layers import nn_layers +from official.modeling import tf_utils +from official.vision.modeling.layers import nn_layers # Default kernel weight decay that may be overridden KERNEL_WEIGHT_DECAY = 1.5e-5 diff --git a/modeling/official/projects/movinet/modeling/movinet_layers_test.py b/official/projects/movinet/modeling/movinet_layers_test.py similarity index 100% rename from modeling/official/projects/movinet/modeling/movinet_layers_test.py rename to official/projects/movinet/modeling/movinet_layers_test.py diff --git a/modeling/official/projects/movinet/modeling/movinet_model.py b/official/projects/movinet/modeling/movinet_model.py similarity index 100% rename from modeling/official/projects/movinet/modeling/movinet_model.py rename to official/projects/movinet/modeling/movinet_model.py diff --git a/modeling/official/projects/movinet/modeling/movinet_model_a2_modified.py b/official/projects/movinet/modeling/movinet_model_a2_modified.py similarity index 97% rename from modeling/official/projects/movinet/modeling/movinet_model_a2_modified.py rename to official/projects/movinet/modeling/movinet_model_a2_modified.py index ff7b0dd9d588258512bcb0fca0475d29251de83a..b84cd53127c867d41aa0f2ff80e3918d5ef74dac 100644 --- a/modeling/official/projects/movinet/modeling/movinet_model_a2_modified.py +++ b/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 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 +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 @tf_keras.utils.register_keras_serializable(package='Vision') diff --git a/modeling/official/projects/movinet/modeling/movinet_model_test.py b/official/projects/movinet/modeling/movinet_model_test.py similarity index 100% rename from modeling/official/projects/movinet/modeling/movinet_model_test.py rename to official/projects/movinet/modeling/movinet_model_test.py diff --git a/modeling/official/projects/movinet/modeling/movinet_test.py b/official/projects/movinet/modeling/movinet_test.py similarity index 100% rename from modeling/official/projects/movinet/modeling/movinet_test.py rename to official/projects/movinet/modeling/movinet_test.py diff --git a/modeling/official/projects/movinet/movinet_streaming_model_training_and_inference.ipynb b/official/projects/movinet/movinet_streaming_model_training_and_inference.ipynb similarity index 100% rename from modeling/official/projects/movinet/movinet_streaming_model_training_and_inference.ipynb rename to official/projects/movinet/movinet_streaming_model_training_and_inference.ipynb diff --git a/modeling/official/projects/movinet/movinet_tutorial.ipynb b/official/projects/movinet/movinet_tutorial.ipynb similarity index 100% rename from modeling/official/projects/movinet/movinet_tutorial.ipynb rename to official/projects/movinet/movinet_tutorial.ipynb diff --git a/modeling/official/projects/movinet/requirements.txt b/official/projects/movinet/requirements.txt similarity index 100% rename from modeling/official/projects/movinet/requirements.txt rename to official/projects/movinet/requirements.txt diff --git a/modeling/official/projects/movinet/tools/__init__.py b/official/projects/movinet/tools/__init__.py similarity index 100% rename from modeling/official/projects/movinet/tools/__init__.py rename to official/projects/movinet/tools/__init__.py diff --git a/modeling/official/projects/movinet/tools/convert_3d_2plus1d.py b/official/projects/movinet/tools/convert_3d_2plus1d.py similarity index 100% rename from modeling/official/projects/movinet/tools/convert_3d_2plus1d.py rename to official/projects/movinet/tools/convert_3d_2plus1d.py diff --git a/modeling/official/projects/movinet/tools/convert_3d_2plus1d_test.py b/official/projects/movinet/tools/convert_3d_2plus1d_test.py similarity index 100% rename from modeling/official/projects/movinet/tools/convert_3d_2plus1d_test.py rename to official/projects/movinet/tools/convert_3d_2plus1d_test.py diff --git a/modeling/official/projects/movinet/tools/export_saved_model.py b/official/projects/movinet/tools/export_saved_model.py similarity index 100% rename from modeling/official/projects/movinet/tools/export_saved_model.py rename to official/projects/movinet/tools/export_saved_model.py diff --git a/modeling/official/projects/movinet/tools/export_saved_model_test.py b/official/projects/movinet/tools/export_saved_model_test.py similarity index 100% rename from modeling/official/projects/movinet/tools/export_saved_model_test.py rename to official/projects/movinet/tools/export_saved_model_test.py diff --git a/modeling/official/projects/movinet/tools/plot_movinet_video_stream_predictions.ipynb b/official/projects/movinet/tools/plot_movinet_video_stream_predictions.ipynb similarity index 100% rename from modeling/official/projects/movinet/tools/plot_movinet_video_stream_predictions.ipynb rename to official/projects/movinet/tools/plot_movinet_video_stream_predictions.ipynb diff --git a/modeling/official/projects/movinet/tools/quantize_movinet.py b/official/projects/movinet/tools/quantize_movinet.py similarity index 100% rename from modeling/official/projects/movinet/tools/quantize_movinet.py rename to official/projects/movinet/tools/quantize_movinet.py diff --git a/modeling/official/projects/movinet/train.py b/official/projects/movinet/train.py similarity index 100% rename from modeling/official/projects/movinet/train.py rename to official/projects/movinet/train.py diff --git a/modeling/official/projects/movinet/train_test.py b/official/projects/movinet/train_test.py similarity index 100% rename from modeling/official/projects/movinet/train_test.py rename to official/projects/movinet/train_test.py diff --git a/modeling/official/recommendation/README.md b/official/recommendation/README.md similarity index 100% rename from modeling/official/recommendation/README.md rename to official/recommendation/README.md diff --git a/modeling/official/recommendation/__init__.py b/official/recommendation/__init__.py similarity index 100% rename from modeling/official/recommendation/__init__.py rename to official/recommendation/__init__.py diff --git a/modeling/official/recommendation/constants.py b/official/recommendation/constants.py similarity index 100% rename from modeling/official/recommendation/constants.py rename to official/recommendation/constants.py diff --git a/modeling/official/recommendation/create_ncf_data.py b/official/recommendation/create_ncf_data.py similarity index 100% rename from modeling/official/recommendation/create_ncf_data.py rename to official/recommendation/create_ncf_data.py diff --git a/modeling/official/recommendation/data_pipeline.py b/official/recommendation/data_pipeline.py similarity index 100% rename from modeling/official/recommendation/data_pipeline.py rename to official/recommendation/data_pipeline.py diff --git a/modeling/official/recommendation/data_preprocessing.py b/official/recommendation/data_preprocessing.py similarity index 100% rename from modeling/official/recommendation/data_preprocessing.py rename to official/recommendation/data_preprocessing.py diff --git a/modeling/official/recommendation/data_test.py b/official/recommendation/data_test.py similarity index 100% rename from modeling/official/recommendation/data_test.py rename to official/recommendation/data_test.py diff --git a/modeling/official/recommendation/movielens.py b/official/recommendation/movielens.py similarity index 100% rename from modeling/official/recommendation/movielens.py rename to official/recommendation/movielens.py diff --git a/modeling/official/recommendation/ncf_common.py b/official/recommendation/ncf_common.py similarity index 100% rename from modeling/official/recommendation/ncf_common.py rename to official/recommendation/ncf_common.py diff --git a/modeling/official/recommendation/ncf_input_pipeline.py b/official/recommendation/ncf_input_pipeline.py similarity index 100% rename from modeling/official/recommendation/ncf_input_pipeline.py rename to official/recommendation/ncf_input_pipeline.py diff --git a/modeling/official/recommendation/ncf_keras_main.py b/official/recommendation/ncf_keras_main.py similarity index 100% rename from modeling/official/recommendation/ncf_keras_main.py rename to official/recommendation/ncf_keras_main.py diff --git a/modeling/official/recommendation/ncf_test.py b/official/recommendation/ncf_test.py similarity index 100% rename from modeling/official/recommendation/ncf_test.py rename to official/recommendation/ncf_test.py diff --git a/modeling/official/recommendation/neumf_model.py b/official/recommendation/neumf_model.py similarity index 100% rename from modeling/official/recommendation/neumf_model.py rename to official/recommendation/neumf_model.py diff --git a/modeling/official/recommendation/popen_helper.py b/official/recommendation/popen_helper.py similarity index 100% rename from modeling/official/recommendation/popen_helper.py rename to official/recommendation/popen_helper.py diff --git a/modeling/official/recommendation/ranking/README.md b/official/recommendation/ranking/README.md similarity index 100% rename from modeling/official/recommendation/ranking/README.md rename to official/recommendation/ranking/README.md diff --git a/modeling/official/recommendation/ranking/__init__.py b/official/recommendation/ranking/__init__.py similarity index 100% rename from modeling/official/recommendation/ranking/__init__.py rename to official/recommendation/ranking/__init__.py diff --git a/modeling/official/recommendation/ranking/common.py b/official/recommendation/ranking/common.py similarity index 100% rename from modeling/official/recommendation/ranking/common.py rename to official/recommendation/ranking/common.py diff --git a/modeling/official/recommendation/ranking/configs/__init__.py b/official/recommendation/ranking/configs/__init__.py similarity index 100% rename from modeling/official/recommendation/ranking/configs/__init__.py rename to official/recommendation/ranking/configs/__init__.py diff --git a/modeling/official/recommendation/ranking/configs/config.py b/official/recommendation/ranking/configs/config.py similarity index 100% rename from modeling/official/recommendation/ranking/configs/config.py rename to official/recommendation/ranking/configs/config.py diff --git a/modeling/official/recommendation/ranking/configs/config_test.py b/official/recommendation/ranking/configs/config_test.py similarity index 100% rename from modeling/official/recommendation/ranking/configs/config_test.py rename to official/recommendation/ranking/configs/config_test.py diff --git a/modeling/official/recommendation/ranking/configs/yaml/dcn_v2_criteo_tpu.yaml b/official/recommendation/ranking/configs/yaml/dcn_v2_criteo_tpu.yaml similarity index 100% rename from modeling/official/recommendation/ranking/configs/yaml/dcn_v2_criteo_tpu.yaml rename to official/recommendation/ranking/configs/yaml/dcn_v2_criteo_tpu.yaml diff --git a/modeling/official/recommendation/ranking/configs/yaml/dlrm_criteo_tpu.yaml b/official/recommendation/ranking/configs/yaml/dlrm_criteo_tpu.yaml similarity index 100% rename from modeling/official/recommendation/ranking/configs/yaml/dlrm_criteo_tpu.yaml rename to official/recommendation/ranking/configs/yaml/dlrm_criteo_tpu.yaml diff --git a/modeling/official/recommendation/ranking/data/__init__.py b/official/recommendation/ranking/data/__init__.py similarity index 100% rename from modeling/official/recommendation/ranking/data/__init__.py rename to official/recommendation/ranking/data/__init__.py diff --git a/modeling/official/recommendation/ranking/data/data_pipeline.py b/official/recommendation/ranking/data/data_pipeline.py similarity index 100% rename from modeling/official/recommendation/ranking/data/data_pipeline.py rename to official/recommendation/ranking/data/data_pipeline.py diff --git a/modeling/official/recommendation/ranking/data/data_pipeline_test.py b/official/recommendation/ranking/data/data_pipeline_test.py similarity index 100% rename from modeling/official/recommendation/ranking/data/data_pipeline_test.py rename to official/recommendation/ranking/data/data_pipeline_test.py diff --git a/modeling/official/recommendation/ranking/preprocessing/README.md b/official/recommendation/ranking/preprocessing/README.md similarity index 100% rename from modeling/official/recommendation/ranking/preprocessing/README.md rename to official/recommendation/ranking/preprocessing/README.md diff --git a/modeling/official/recommendation/ranking/preprocessing/criteo_preprocess.py b/official/recommendation/ranking/preprocessing/criteo_preprocess.py similarity index 100% rename from modeling/official/recommendation/ranking/preprocessing/criteo_preprocess.py rename to official/recommendation/ranking/preprocessing/criteo_preprocess.py diff --git a/modeling/official/recommendation/ranking/preprocessing/setup.py b/official/recommendation/ranking/preprocessing/setup.py similarity index 100% rename from modeling/official/recommendation/ranking/preprocessing/setup.py rename to official/recommendation/ranking/preprocessing/setup.py diff --git a/modeling/official/recommendation/ranking/preprocessing/shard_rebalancer.py b/official/recommendation/ranking/preprocessing/shard_rebalancer.py similarity index 100% rename from modeling/official/recommendation/ranking/preprocessing/shard_rebalancer.py rename to official/recommendation/ranking/preprocessing/shard_rebalancer.py diff --git a/modeling/official/recommendation/ranking/task.py b/official/recommendation/ranking/task.py similarity index 100% rename from modeling/official/recommendation/ranking/task.py rename to official/recommendation/ranking/task.py diff --git a/modeling/official/recommendation/ranking/task_test.py b/official/recommendation/ranking/task_test.py similarity index 100% rename from modeling/official/recommendation/ranking/task_test.py rename to official/recommendation/ranking/task_test.py diff --git a/modeling/official/recommendation/ranking/train.py b/official/recommendation/ranking/train.py similarity index 100% rename from modeling/official/recommendation/ranking/train.py rename to official/recommendation/ranking/train.py diff --git a/modeling/official/recommendation/ranking/train_test.py b/official/recommendation/ranking/train_test.py similarity index 100% rename from modeling/official/recommendation/ranking/train_test.py rename to official/recommendation/ranking/train_test.py diff --git a/modeling/official/recommendation/run.sh b/official/recommendation/run.sh similarity index 100% rename from modeling/official/recommendation/run.sh rename to official/recommendation/run.sh diff --git a/modeling/official/recommendation/stat_utils.py b/official/recommendation/stat_utils.py similarity index 100% rename from modeling/official/recommendation/stat_utils.py rename to official/recommendation/stat_utils.py diff --git a/modeling/official/recommendation/uplift/README.md b/official/recommendation/uplift/README.md similarity index 100% rename from modeling/official/recommendation/uplift/README.md rename to official/recommendation/uplift/README.md diff --git a/modeling/official/recommendation/uplift/keras_test_case.py b/official/recommendation/uplift/keras_test_case.py similarity index 100% rename from modeling/official/recommendation/uplift/keras_test_case.py rename to official/recommendation/uplift/keras_test_case.py diff --git a/modeling/official/recommendation/uplift/keys.py b/official/recommendation/uplift/keys.py similarity index 100% rename from modeling/official/recommendation/uplift/keys.py rename to official/recommendation/uplift/keys.py diff --git a/modeling/official/recommendation/uplift/layers/encoders/concat_features.py b/official/recommendation/uplift/layers/encoders/concat_features.py similarity index 100% rename from modeling/official/recommendation/uplift/layers/encoders/concat_features.py rename to official/recommendation/uplift/layers/encoders/concat_features.py diff --git a/modeling/official/recommendation/uplift/layers/encoders/concat_features_test.py b/official/recommendation/uplift/layers/encoders/concat_features_test.py similarity index 100% rename from modeling/official/recommendation/uplift/layers/encoders/concat_features_test.py rename to official/recommendation/uplift/layers/encoders/concat_features_test.py diff --git a/modeling/official/recommendation/uplift/layers/heads/two_tower_logits_head.py b/official/recommendation/uplift/layers/heads/two_tower_logits_head.py similarity index 100% rename from modeling/official/recommendation/uplift/layers/heads/two_tower_logits_head.py rename to official/recommendation/uplift/layers/heads/two_tower_logits_head.py diff --git a/modeling/official/recommendation/uplift/layers/heads/two_tower_logits_head_test.py b/official/recommendation/uplift/layers/heads/two_tower_logits_head_test.py similarity index 100% rename from modeling/official/recommendation/uplift/layers/heads/two_tower_logits_head_test.py rename to official/recommendation/uplift/layers/heads/two_tower_logits_head_test.py diff --git a/modeling/official/recommendation/uplift/layers/uplift_networks/base_uplift_networks.py b/official/recommendation/uplift/layers/uplift_networks/base_uplift_networks.py similarity index 100% rename from modeling/official/recommendation/uplift/layers/uplift_networks/base_uplift_networks.py rename to official/recommendation/uplift/layers/uplift_networks/base_uplift_networks.py diff --git a/modeling/official/recommendation/uplift/layers/uplift_networks/two_tower_output_head.py b/official/recommendation/uplift/layers/uplift_networks/two_tower_output_head.py similarity index 100% rename from modeling/official/recommendation/uplift/layers/uplift_networks/two_tower_output_head.py rename to official/recommendation/uplift/layers/uplift_networks/two_tower_output_head.py diff --git a/modeling/official/recommendation/uplift/layers/uplift_networks/two_tower_output_head_test.py b/official/recommendation/uplift/layers/uplift_networks/two_tower_output_head_test.py similarity index 100% rename from modeling/official/recommendation/uplift/layers/uplift_networks/two_tower_output_head_test.py rename to official/recommendation/uplift/layers/uplift_networks/two_tower_output_head_test.py diff --git a/modeling/official/recommendation/uplift/layers/uplift_networks/two_tower_uplift_network.py b/official/recommendation/uplift/layers/uplift_networks/two_tower_uplift_network.py similarity index 100% rename from modeling/official/recommendation/uplift/layers/uplift_networks/two_tower_uplift_network.py rename to official/recommendation/uplift/layers/uplift_networks/two_tower_uplift_network.py diff --git a/modeling/official/recommendation/uplift/layers/uplift_networks/two_tower_uplift_network_test.py b/official/recommendation/uplift/layers/uplift_networks/two_tower_uplift_network_test.py similarity index 100% rename from modeling/official/recommendation/uplift/layers/uplift_networks/two_tower_uplift_network_test.py rename to official/recommendation/uplift/layers/uplift_networks/two_tower_uplift_network_test.py diff --git a/modeling/official/recommendation/uplift/losses/true_logits_loss.py b/official/recommendation/uplift/losses/true_logits_loss.py similarity index 100% rename from modeling/official/recommendation/uplift/losses/true_logits_loss.py rename to official/recommendation/uplift/losses/true_logits_loss.py diff --git a/modeling/official/recommendation/uplift/losses/true_logits_loss_test.py b/official/recommendation/uplift/losses/true_logits_loss_test.py similarity index 100% rename from modeling/official/recommendation/uplift/losses/true_logits_loss_test.py rename to official/recommendation/uplift/losses/true_logits_loss_test.py diff --git a/modeling/official/recommendation/uplift/metrics/label_mean.py b/official/recommendation/uplift/metrics/label_mean.py similarity index 100% rename from modeling/official/recommendation/uplift/metrics/label_mean.py rename to official/recommendation/uplift/metrics/label_mean.py diff --git a/modeling/official/recommendation/uplift/metrics/label_mean_test.py b/official/recommendation/uplift/metrics/label_mean_test.py similarity index 100% rename from modeling/official/recommendation/uplift/metrics/label_mean_test.py rename to official/recommendation/uplift/metrics/label_mean_test.py diff --git a/modeling/official/recommendation/uplift/metrics/label_variance.py b/official/recommendation/uplift/metrics/label_variance.py similarity index 100% rename from modeling/official/recommendation/uplift/metrics/label_variance.py rename to official/recommendation/uplift/metrics/label_variance.py diff --git a/modeling/official/recommendation/uplift/metrics/label_variance_test.py b/official/recommendation/uplift/metrics/label_variance_test.py similarity index 100% rename from modeling/official/recommendation/uplift/metrics/label_variance_test.py rename to official/recommendation/uplift/metrics/label_variance_test.py diff --git a/modeling/official/recommendation/uplift/metrics/metric_configs.py b/official/recommendation/uplift/metrics/metric_configs.py similarity index 100% rename from modeling/official/recommendation/uplift/metrics/metric_configs.py rename to official/recommendation/uplift/metrics/metric_configs.py diff --git a/modeling/official/recommendation/uplift/metrics/sliced_metric.py b/official/recommendation/uplift/metrics/sliced_metric.py similarity index 100% rename from modeling/official/recommendation/uplift/metrics/sliced_metric.py rename to official/recommendation/uplift/metrics/sliced_metric.py diff --git a/modeling/official/recommendation/uplift/metrics/sliced_metric_test.py b/official/recommendation/uplift/metrics/sliced_metric_test.py similarity index 100% rename from modeling/official/recommendation/uplift/metrics/sliced_metric_test.py rename to official/recommendation/uplift/metrics/sliced_metric_test.py diff --git a/modeling/official/recommendation/uplift/metrics/treatment_fraction.py b/official/recommendation/uplift/metrics/treatment_fraction.py similarity index 100% rename from modeling/official/recommendation/uplift/metrics/treatment_fraction.py rename to official/recommendation/uplift/metrics/treatment_fraction.py diff --git a/modeling/official/recommendation/uplift/metrics/treatment_fraction_test.py b/official/recommendation/uplift/metrics/treatment_fraction_test.py similarity index 100% rename from modeling/official/recommendation/uplift/metrics/treatment_fraction_test.py rename to official/recommendation/uplift/metrics/treatment_fraction_test.py diff --git a/modeling/official/recommendation/uplift/metrics/treatment_sliced_metric.py b/official/recommendation/uplift/metrics/treatment_sliced_metric.py similarity index 100% rename from modeling/official/recommendation/uplift/metrics/treatment_sliced_metric.py rename to official/recommendation/uplift/metrics/treatment_sliced_metric.py diff --git a/modeling/official/recommendation/uplift/metrics/treatment_sliced_metric_test.py b/official/recommendation/uplift/metrics/treatment_sliced_metric_test.py similarity index 100% rename from modeling/official/recommendation/uplift/metrics/treatment_sliced_metric_test.py rename to official/recommendation/uplift/metrics/treatment_sliced_metric_test.py diff --git a/modeling/official/recommendation/uplift/metrics/uplift_mean.py b/official/recommendation/uplift/metrics/uplift_mean.py similarity index 100% rename from modeling/official/recommendation/uplift/metrics/uplift_mean.py rename to official/recommendation/uplift/metrics/uplift_mean.py diff --git a/modeling/official/recommendation/uplift/metrics/uplift_mean_test.py b/official/recommendation/uplift/metrics/uplift_mean_test.py similarity index 100% rename from modeling/official/recommendation/uplift/metrics/uplift_mean_test.py rename to official/recommendation/uplift/metrics/uplift_mean_test.py diff --git a/modeling/official/recommendation/uplift/metrics/variance.py b/official/recommendation/uplift/metrics/variance.py similarity index 100% rename from modeling/official/recommendation/uplift/metrics/variance.py rename to official/recommendation/uplift/metrics/variance.py diff --git a/modeling/official/recommendation/uplift/metrics/variance_test.py b/official/recommendation/uplift/metrics/variance_test.py similarity index 100% rename from modeling/official/recommendation/uplift/metrics/variance_test.py rename to official/recommendation/uplift/metrics/variance_test.py diff --git a/modeling/official/recommendation/uplift/models/two_tower_uplift_model.py b/official/recommendation/uplift/models/two_tower_uplift_model.py similarity index 100% rename from modeling/official/recommendation/uplift/models/two_tower_uplift_model.py rename to official/recommendation/uplift/models/two_tower_uplift_model.py diff --git a/modeling/official/recommendation/uplift/models/two_tower_uplift_model_test.py b/official/recommendation/uplift/models/two_tower_uplift_model_test.py similarity index 100% rename from modeling/official/recommendation/uplift/models/two_tower_uplift_model_test.py rename to official/recommendation/uplift/models/two_tower_uplift_model_test.py diff --git a/modeling/official/recommendation/uplift/two_tower_uplift_network_architecture.svg b/official/recommendation/uplift/two_tower_uplift_network_architecture.svg similarity index 100% rename from modeling/official/recommendation/uplift/two_tower_uplift_network_architecture.svg rename to official/recommendation/uplift/two_tower_uplift_network_architecture.svg diff --git a/modeling/official/recommendation/uplift/types.py b/official/recommendation/uplift/types.py similarity index 100% rename from modeling/official/recommendation/uplift/types.py rename to official/recommendation/uplift/types.py diff --git a/modeling/official/recommendation/uplift/utils.py b/official/recommendation/uplift/utils.py similarity index 100% rename from modeling/official/recommendation/uplift/utils.py rename to official/recommendation/uplift/utils.py diff --git a/modeling/official/recommendation/uplift/utils_test.py b/official/recommendation/uplift/utils_test.py similarity index 100% rename from modeling/official/recommendation/uplift/utils_test.py rename to official/recommendation/uplift/utils_test.py diff --git a/modeling/official/requirements.txt b/official/requirements.txt similarity index 100% rename from modeling/official/requirements.txt rename to official/requirements.txt diff --git a/modeling/official/utils/__init__.py b/official/utils/__init__.py similarity index 100% rename from modeling/official/utils/__init__.py rename to official/utils/__init__.py diff --git a/modeling/official/utils/docs/README.md b/official/utils/docs/README.md similarity index 100% rename from modeling/official/utils/docs/README.md rename to official/utils/docs/README.md diff --git a/modeling/official/utils/docs/__init__.py b/official/utils/docs/__init__.py similarity index 100% rename from modeling/official/utils/docs/__init__.py rename to official/utils/docs/__init__.py diff --git a/modeling/official/utils/docs/build_orbit_api_docs.py b/official/utils/docs/build_orbit_api_docs.py similarity index 100% rename from modeling/official/utils/docs/build_orbit_api_docs.py rename to official/utils/docs/build_orbit_api_docs.py diff --git a/modeling/official/utils/docs/build_tfm_api_docs.py b/official/utils/docs/build_tfm_api_docs.py similarity index 100% rename from modeling/official/utils/docs/build_tfm_api_docs.py rename to official/utils/docs/build_tfm_api_docs.py diff --git a/modeling/official/utils/flags/README.md b/official/utils/flags/README.md similarity index 100% rename from modeling/official/utils/flags/README.md rename to official/utils/flags/README.md diff --git a/modeling/official/utils/flags/__init__.py b/official/utils/flags/__init__.py similarity index 100% rename from modeling/official/utils/flags/__init__.py rename to official/utils/flags/__init__.py diff --git a/modeling/official/utils/flags/_base.py b/official/utils/flags/_base.py similarity index 100% rename from modeling/official/utils/flags/_base.py rename to official/utils/flags/_base.py diff --git a/modeling/official/utils/flags/_benchmark.py b/official/utils/flags/_benchmark.py similarity index 100% rename from modeling/official/utils/flags/_benchmark.py rename to official/utils/flags/_benchmark.py diff --git a/modeling/official/utils/flags/_conventions.py b/official/utils/flags/_conventions.py similarity index 100% rename from modeling/official/utils/flags/_conventions.py rename to official/utils/flags/_conventions.py diff --git a/modeling/official/utils/flags/_device.py b/official/utils/flags/_device.py similarity index 100% rename from modeling/official/utils/flags/_device.py rename to official/utils/flags/_device.py diff --git a/modeling/official/utils/flags/_distribution.py b/official/utils/flags/_distribution.py similarity index 100% rename from modeling/official/utils/flags/_distribution.py rename to official/utils/flags/_distribution.py diff --git a/modeling/official/utils/flags/_misc.py b/official/utils/flags/_misc.py similarity index 100% rename from modeling/official/utils/flags/_misc.py rename to official/utils/flags/_misc.py diff --git a/modeling/official/utils/flags/_performance.py b/official/utils/flags/_performance.py similarity index 100% rename from modeling/official/utils/flags/_performance.py rename to official/utils/flags/_performance.py diff --git a/modeling/official/utils/flags/core.py b/official/utils/flags/core.py similarity index 100% rename from modeling/official/utils/flags/core.py rename to official/utils/flags/core.py diff --git a/modeling/official/utils/flags/flags_test.py b/official/utils/flags/flags_test.py similarity index 100% rename from modeling/official/utils/flags/flags_test.py rename to official/utils/flags/flags_test.py diff --git a/modeling/official/utils/flags/guidelines.md b/official/utils/flags/guidelines.md similarity index 100% rename from modeling/official/utils/flags/guidelines.md rename to official/utils/flags/guidelines.md diff --git a/modeling/official/utils/hyperparams_flags.py b/official/utils/hyperparams_flags.py similarity index 100% rename from modeling/official/utils/hyperparams_flags.py rename to official/utils/hyperparams_flags.py diff --git a/modeling/official/utils/misc/__init__.py b/official/utils/misc/__init__.py similarity index 100% rename from modeling/official/utils/misc/__init__.py rename to official/utils/misc/__init__.py diff --git a/modeling/official/utils/misc/keras_utils.py b/official/utils/misc/keras_utils.py similarity index 100% rename from modeling/official/utils/misc/keras_utils.py rename to official/utils/misc/keras_utils.py diff --git a/modeling/official/utils/misc/model_helpers.py b/official/utils/misc/model_helpers.py similarity index 100% rename from modeling/official/utils/misc/model_helpers.py rename to official/utils/misc/model_helpers.py diff --git a/modeling/official/utils/misc/model_helpers_test.py b/official/utils/misc/model_helpers_test.py similarity index 100% rename from modeling/official/utils/misc/model_helpers_test.py rename to official/utils/misc/model_helpers_test.py diff --git a/modeling/official/utils/testing/__init__.py b/official/utils/testing/__init__.py similarity index 100% rename from modeling/official/utils/testing/__init__.py rename to official/utils/testing/__init__.py diff --git a/modeling/official/utils/testing/integration.py b/official/utils/testing/integration.py similarity index 100% rename from modeling/official/utils/testing/integration.py rename to official/utils/testing/integration.py diff --git a/modeling/official/utils/testing/mock_task.py b/official/utils/testing/mock_task.py similarity index 100% rename from modeling/official/utils/testing/mock_task.py rename to official/utils/testing/mock_task.py diff --git a/modeling/official/utils/testing/pylint.rcfile b/official/utils/testing/pylint.rcfile similarity index 100% rename from modeling/official/utils/testing/pylint.rcfile rename to official/utils/testing/pylint.rcfile diff --git a/modeling/official/utils/testing/scripts/builds_common.sh b/official/utils/testing/scripts/builds_common.sh similarity index 100% rename from modeling/official/utils/testing/scripts/builds_common.sh rename to official/utils/testing/scripts/builds_common.sh diff --git a/modeling/official/utils/testing/scripts/ci_sanity.sh b/official/utils/testing/scripts/ci_sanity.sh similarity index 100% rename from modeling/official/utils/testing/scripts/ci_sanity.sh rename to official/utils/testing/scripts/ci_sanity.sh diff --git a/modeling/official/utils/testing/scripts/presubmit.sh b/official/utils/testing/scripts/presubmit.sh similarity index 100% rename from modeling/official/utils/testing/scripts/presubmit.sh rename to official/utils/testing/scripts/presubmit.sh diff --git a/modeling/official/vision/MODEL_GARDEN.md b/official/vision/MODEL_GARDEN.md similarity index 100% rename from modeling/official/vision/MODEL_GARDEN.md rename to official/vision/MODEL_GARDEN.md diff --git a/modeling/official/vision/README.md b/official/vision/README.md similarity index 100% rename from modeling/official/vision/README.md rename to official/vision/README.md diff --git a/modeling/official/vision/__init__.py b/official/vision/__init__.py similarity index 88% rename from modeling/official/vision/__init__.py rename to official/vision/__init__.py index 753b98b2b329b06eafdcee576e17268b6df4dbb2..825360fe6029f257abed89a6b1a473924a421164 100644 --- a/modeling/official/vision/__init__.py +++ b/official/vision/__init__.py @@ -14,5 +14,5 @@ """Vision package definition.""" # pylint: disable=unused-import -from modeling.official.vision import configs -from modeling.official.vision import tasks +from official.vision import configs +from official.vision import tasks diff --git a/modeling/tensorflow_models/vision/__init__.py b/official/vision/configs/__init__.py similarity index 58% rename from modeling/tensorflow_models/vision/__init__.py rename to official/vision/configs/__init__.py index 60f6552310200245668795844ada9092abe39c85..ded98a99f5e7df916c686a307bb8c7f9046b921f 100644 --- a/modeling/tensorflow_models/vision/__init__.py +++ b/official/vision/configs/__init__.py @@ -12,10 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -"""TensorFlow Models Vision Libraries.""" -from official.vision import configs -from official.vision import serving -from official.vision.modeling import * -from official.vision.ops import * -from official.vision.tasks import * +"""Configs package definition.""" +from official.vision.configs import backbones +from official.vision.configs import backbones_3d +from official.vision.configs import common +from official.vision.configs import image_classification +from official.vision.configs import maskrcnn +from official.vision.configs import retinanet +from official.vision.configs import semantic_segmentation +from official.vision.configs import video_classification diff --git a/modeling/official/vision/configs/backbones.py b/official/vision/configs/backbones.py similarity index 99% rename from modeling/official/vision/configs/backbones.py rename to official/vision/configs/backbones.py index acd2617a3c851228ef5b6535b32a812062b8b8a4..baf08ca923f4b3f069c5d1ece21248a173c96939 100644 --- a/modeling/official/vision/configs/backbones.py +++ b/official/vision/configs/backbones.py @@ -16,7 +16,7 @@ import dataclasses from typing import List, Optional, Tuple -from modeling.official.modeling import hyperparams +from official.modeling import hyperparams @dataclasses.dataclass diff --git a/modeling/official/vision/configs/backbones_3d.py b/official/vision/configs/backbones_3d.py similarity index 98% rename from modeling/official/vision/configs/backbones_3d.py rename to official/vision/configs/backbones_3d.py index 01df5a8fc2af7f836871160857c4ee5ff5b16866..f5d8cd19f6070db9ff32a0078623dd0daad7f015 100644 --- a/modeling/official/vision/configs/backbones_3d.py +++ b/official/vision/configs/backbones_3d.py @@ -18,7 +18,7 @@ from typing import Optional, Tuple # Import libraries import dataclasses -from modeling.official.modeling import hyperparams +from official.modeling import hyperparams @dataclasses.dataclass diff --git a/modeling/official/vision/configs/common.py b/official/vision/configs/common.py similarity index 97% rename from modeling/official/vision/configs/common.py rename to official/vision/configs/common.py index cc643781223065ee98ab679e8449978abee5cf7f..184633032529a589a490fabcb735a2873b07a70f 100644 --- a/modeling/official/vision/configs/common.py +++ b/official/vision/configs/common.py @@ -19,8 +19,8 @@ from typing import List, Optional # Import libraries -from modeling.official.core import config_definitions as cfg -from modeling.official.modeling import hyperparams +from official.core import config_definitions as cfg +from official.modeling import hyperparams @dataclasses.dataclass diff --git a/modeling/official/vision/configs/decoders.py b/official/vision/configs/decoders.py similarity index 97% rename from modeling/official/vision/configs/decoders.py rename to official/vision/configs/decoders.py index 86a49a0ace60a8194e03463fa1024e9263d41a33..9c476f4ab53897cecc34290a9431afa58562ccdb 100644 --- a/modeling/official/vision/configs/decoders.py +++ b/official/vision/configs/decoders.py @@ -18,7 +18,7 @@ from typing import List, Optional # Import libraries -from modeling.official.modeling import hyperparams +from official.modeling import hyperparams @dataclasses.dataclass diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_mobilenetv1_tpu.yaml b/official/vision/configs/experiments/image_classification/imagenet_mobilenetv1_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_mobilenetv1_tpu.yaml rename to official/vision/configs/experiments/image_classification/imagenet_mobilenetv1_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_mobilenetv2_gpu.yaml b/official/vision/configs/experiments/image_classification/imagenet_mobilenetv2_gpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_mobilenetv2_gpu.yaml rename to official/vision/configs/experiments/image_classification/imagenet_mobilenetv2_gpu.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_mobilenetv2_tpu.yaml b/official/vision/configs/experiments/image_classification/imagenet_mobilenetv2_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_mobilenetv2_tpu.yaml rename to official/vision/configs/experiments/image_classification/imagenet_mobilenetv2_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_mobilenetv3.5_avg_tpu.yaml b/official/vision/configs/experiments/image_classification/imagenet_mobilenetv3.5_avg_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_mobilenetv3.5_avg_tpu.yaml rename to official/vision/configs/experiments/image_classification/imagenet_mobilenetv3.5_avg_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_mobilenetv3.5_avgseg_tpu.yaml b/official/vision/configs/experiments/image_classification/imagenet_mobilenetv3.5_avgseg_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_mobilenetv3.5_avgseg_tpu.yaml rename to official/vision/configs/experiments/image_classification/imagenet_mobilenetv3.5_avgseg_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_mobilenetv3large_tpu.yaml b/official/vision/configs/experiments/image_classification/imagenet_mobilenetv3large_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_mobilenetv3large_tpu.yaml rename to official/vision/configs/experiments/image_classification/imagenet_mobilenetv3large_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_mobilenetv3small_tpu.yaml b/official/vision/configs/experiments/image_classification/imagenet_mobilenetv3small_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_mobilenetv3small_tpu.yaml rename to official/vision/configs/experiments/image_classification/imagenet_mobilenetv3small_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_resnet101_deeplab_tpu.yaml b/official/vision/configs/experiments/image_classification/imagenet_resnet101_deeplab_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_resnet101_deeplab_tpu.yaml rename to official/vision/configs/experiments/image_classification/imagenet_resnet101_deeplab_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_resnet101_tpu.yaml b/official/vision/configs/experiments/image_classification/imagenet_resnet101_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_resnet101_tpu.yaml rename to official/vision/configs/experiments/image_classification/imagenet_resnet101_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_resnet152_tpu.yaml b/official/vision/configs/experiments/image_classification/imagenet_resnet152_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_resnet152_tpu.yaml rename to official/vision/configs/experiments/image_classification/imagenet_resnet152_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_resnet26_tpu.yaml b/official/vision/configs/experiments/image_classification/imagenet_resnet26_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_resnet26_tpu.yaml rename to official/vision/configs/experiments/image_classification/imagenet_resnet26_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_resnet50_deeplab_tpu.yaml b/official/vision/configs/experiments/image_classification/imagenet_resnet50_deeplab_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_resnet50_deeplab_tpu.yaml rename to official/vision/configs/experiments/image_classification/imagenet_resnet50_deeplab_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_resnet50_gpu.yaml b/official/vision/configs/experiments/image_classification/imagenet_resnet50_gpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_resnet50_gpu.yaml rename to official/vision/configs/experiments/image_classification/imagenet_resnet50_gpu.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_resnet50_tfds_tpu.yaml b/official/vision/configs/experiments/image_classification/imagenet_resnet50_tfds_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_resnet50_tfds_tpu.yaml rename to official/vision/configs/experiments/image_classification/imagenet_resnet50_tfds_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_resnet50_tpu.yaml b/official/vision/configs/experiments/image_classification/imagenet_resnet50_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_resnet50_tpu.yaml rename to official/vision/configs/experiments/image_classification/imagenet_resnet50_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_resnetrs101_i160.yaml b/official/vision/configs/experiments/image_classification/imagenet_resnetrs101_i160.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_resnetrs101_i160.yaml rename to official/vision/configs/experiments/image_classification/imagenet_resnetrs101_i160.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_resnetrs101_i192.yaml b/official/vision/configs/experiments/image_classification/imagenet_resnetrs101_i192.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_resnetrs101_i192.yaml rename to official/vision/configs/experiments/image_classification/imagenet_resnetrs101_i192.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_resnetrs152_i192.yaml b/official/vision/configs/experiments/image_classification/imagenet_resnetrs152_i192.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_resnetrs152_i192.yaml rename to official/vision/configs/experiments/image_classification/imagenet_resnetrs152_i192.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_resnetrs152_i224.yaml b/official/vision/configs/experiments/image_classification/imagenet_resnetrs152_i224.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_resnetrs152_i224.yaml rename to official/vision/configs/experiments/image_classification/imagenet_resnetrs152_i224.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_resnetrs152_i256.yaml b/official/vision/configs/experiments/image_classification/imagenet_resnetrs152_i256.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_resnetrs152_i256.yaml rename to official/vision/configs/experiments/image_classification/imagenet_resnetrs152_i256.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_resnetrs200_i256.yaml b/official/vision/configs/experiments/image_classification/imagenet_resnetrs200_i256.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_resnetrs200_i256.yaml rename to official/vision/configs/experiments/image_classification/imagenet_resnetrs200_i256.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_resnetrs270_i256.yaml b/official/vision/configs/experiments/image_classification/imagenet_resnetrs270_i256.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_resnetrs270_i256.yaml rename to official/vision/configs/experiments/image_classification/imagenet_resnetrs270_i256.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_resnetrs350_i256.yaml b/official/vision/configs/experiments/image_classification/imagenet_resnetrs350_i256.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_resnetrs350_i256.yaml rename to official/vision/configs/experiments/image_classification/imagenet_resnetrs350_i256.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_resnetrs350_i320.yaml b/official/vision/configs/experiments/image_classification/imagenet_resnetrs350_i320.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_resnetrs350_i320.yaml rename to official/vision/configs/experiments/image_classification/imagenet_resnetrs350_i320.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_resnetrs420_i320.yaml b/official/vision/configs/experiments/image_classification/imagenet_resnetrs420_i320.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_resnetrs420_i320.yaml rename to official/vision/configs/experiments/image_classification/imagenet_resnetrs420_i320.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_resnetrs50_i160.yaml b/official/vision/configs/experiments/image_classification/imagenet_resnetrs50_i160.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_resnetrs50_i160.yaml rename to official/vision/configs/experiments/image_classification/imagenet_resnetrs50_i160.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_resnetrs50_i160_gpu.yaml b/official/vision/configs/experiments/image_classification/imagenet_resnetrs50_i160_gpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_resnetrs50_i160_gpu.yaml rename to official/vision/configs/experiments/image_classification/imagenet_resnetrs50_i160_gpu.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_vitb16_i224_gpu.yaml b/official/vision/configs/experiments/image_classification/imagenet_vitb16_i224_gpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_vitb16_i224_gpu.yaml rename to official/vision/configs/experiments/image_classification/imagenet_vitb16_i224_gpu.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_vitb16_i224_tpu.yaml b/official/vision/configs/experiments/image_classification/imagenet_vitb16_i224_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_vitb16_i224_tpu.yaml rename to official/vision/configs/experiments/image_classification/imagenet_vitb16_i224_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_vitb16_i384_gpu.yaml b/official/vision/configs/experiments/image_classification/imagenet_vitb16_i384_gpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_vitb16_i384_gpu.yaml rename to official/vision/configs/experiments/image_classification/imagenet_vitb16_i384_gpu.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_vitb16_i384_tpu.yaml b/official/vision/configs/experiments/image_classification/imagenet_vitb16_i384_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_vitb16_i384_tpu.yaml rename to official/vision/configs/experiments/image_classification/imagenet_vitb16_i384_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_vith14_i384_gpu.yaml b/official/vision/configs/experiments/image_classification/imagenet_vith14_i384_gpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_vith14_i384_gpu.yaml rename to official/vision/configs/experiments/image_classification/imagenet_vith14_i384_gpu.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_vith14_i384_tpu.yaml b/official/vision/configs/experiments/image_classification/imagenet_vith14_i384_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_vith14_i384_tpu.yaml rename to official/vision/configs/experiments/image_classification/imagenet_vith14_i384_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_vitl16_i224_gpu.yaml b/official/vision/configs/experiments/image_classification/imagenet_vitl16_i224_gpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_vitl16_i224_gpu.yaml rename to official/vision/configs/experiments/image_classification/imagenet_vitl16_i224_gpu.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_vitl16_i224_tpu.yaml b/official/vision/configs/experiments/image_classification/imagenet_vitl16_i224_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_vitl16_i224_tpu.yaml rename to official/vision/configs/experiments/image_classification/imagenet_vitl16_i224_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_vitl16_i384_gpu.yaml b/official/vision/configs/experiments/image_classification/imagenet_vitl16_i384_gpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_vitl16_i384_gpu.yaml rename to official/vision/configs/experiments/image_classification/imagenet_vitl16_i384_gpu.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_vitl16_i384_tpu.yaml b/official/vision/configs/experiments/image_classification/imagenet_vitl16_i384_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_vitl16_i384_tpu.yaml rename to official/vision/configs/experiments/image_classification/imagenet_vitl16_i384_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_vits16_i224_gpu.yaml b/official/vision/configs/experiments/image_classification/imagenet_vits16_i224_gpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_vits16_i224_gpu.yaml rename to official/vision/configs/experiments/image_classification/imagenet_vits16_i224_gpu.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_vits16_i224_tpu.yaml b/official/vision/configs/experiments/image_classification/imagenet_vits16_i224_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_vits16_i224_tpu.yaml rename to official/vision/configs/experiments/image_classification/imagenet_vits16_i224_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_vitti16_i224_gpu.yaml b/official/vision/configs/experiments/image_classification/imagenet_vitti16_i224_gpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_vitti16_i224_gpu.yaml rename to official/vision/configs/experiments/image_classification/imagenet_vitti16_i224_gpu.yaml diff --git a/modeling/official/vision/configs/experiments/image_classification/imagenet_vitti16_i224_tpu.yaml b/official/vision/configs/experiments/image_classification/imagenet_vitti16_i224_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/image_classification/imagenet_vitti16_i224_tpu.yaml rename to official/vision/configs/experiments/image_classification/imagenet_vitti16_i224_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/maskrcnn/coco_mobilenetv2_mrcnn_tpu.yaml b/official/vision/configs/experiments/maskrcnn/coco_mobilenetv2_mrcnn_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/maskrcnn/coco_mobilenetv2_mrcnn_tpu.yaml rename to official/vision/configs/experiments/maskrcnn/coco_mobilenetv2_mrcnn_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/maskrcnn/coco_spinenet143_cascadercnn_tpu.yaml b/official/vision/configs/experiments/maskrcnn/coco_spinenet143_cascadercnn_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/maskrcnn/coco_spinenet143_cascadercnn_tpu.yaml rename to official/vision/configs/experiments/maskrcnn/coco_spinenet143_cascadercnn_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/maskrcnn/coco_spinenet143_mrcnn_tpu.yaml b/official/vision/configs/experiments/maskrcnn/coco_spinenet143_mrcnn_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/maskrcnn/coco_spinenet143_mrcnn_tpu.yaml rename to official/vision/configs/experiments/maskrcnn/coco_spinenet143_mrcnn_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/maskrcnn/coco_spinenet49_cascadercnn_tpu.yaml b/official/vision/configs/experiments/maskrcnn/coco_spinenet49_cascadercnn_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/maskrcnn/coco_spinenet49_cascadercnn_tpu.yaml rename to official/vision/configs/experiments/maskrcnn/coco_spinenet49_cascadercnn_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/maskrcnn/coco_spinenet49_mrcnn_tpu.yaml b/official/vision/configs/experiments/maskrcnn/coco_spinenet49_mrcnn_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/maskrcnn/coco_spinenet49_mrcnn_tpu.yaml rename to official/vision/configs/experiments/maskrcnn/coco_spinenet49_mrcnn_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/maskrcnn/coco_spinenet96_cascadercnn_tpu.yaml b/official/vision/configs/experiments/maskrcnn/coco_spinenet96_cascadercnn_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/maskrcnn/coco_spinenet96_cascadercnn_tpu.yaml rename to official/vision/configs/experiments/maskrcnn/coco_spinenet96_cascadercnn_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/maskrcnn/coco_spinenet96_mrcnn_tpu.yaml b/official/vision/configs/experiments/maskrcnn/coco_spinenet96_mrcnn_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/maskrcnn/coco_spinenet96_mrcnn_tpu.yaml rename to official/vision/configs/experiments/maskrcnn/coco_spinenet96_mrcnn_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/maskrcnn/r50fpn_640_coco_scratch_tpu4x4.yaml b/official/vision/configs/experiments/maskrcnn/r50fpn_640_coco_scratch_tpu4x4.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/maskrcnn/r50fpn_640_coco_scratch_tpu4x4.yaml rename to official/vision/configs/experiments/maskrcnn/r50fpn_640_coco_scratch_tpu4x4.yaml diff --git a/modeling/official/vision/configs/experiments/retinanet/coco_mobiledetcpu_tpu.yaml b/official/vision/configs/experiments/retinanet/coco_mobiledetcpu_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/retinanet/coco_mobiledetcpu_tpu.yaml rename to official/vision/configs/experiments/retinanet/coco_mobiledetcpu_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/retinanet/coco_mobilenetv2_tpu.yaml b/official/vision/configs/experiments/retinanet/coco_mobilenetv2_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/retinanet/coco_mobilenetv2_tpu.yaml rename to official/vision/configs/experiments/retinanet/coco_mobilenetv2_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/retinanet/coco_mobilenetv3.5_avg_tpu.yaml b/official/vision/configs/experiments/retinanet/coco_mobilenetv3.5_avg_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/retinanet/coco_mobilenetv3.5_avg_tpu.yaml rename to official/vision/configs/experiments/retinanet/coco_mobilenetv3.5_avg_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/retinanet/coco_spinenet143_gpu_multiworker_mirrored.yaml b/official/vision/configs/experiments/retinanet/coco_spinenet143_gpu_multiworker_mirrored.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/retinanet/coco_spinenet143_gpu_multiworker_mirrored.yaml rename to official/vision/configs/experiments/retinanet/coco_spinenet143_gpu_multiworker_mirrored.yaml diff --git a/modeling/official/vision/configs/experiments/retinanet/coco_spinenet143_tpu.yaml b/official/vision/configs/experiments/retinanet/coco_spinenet143_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/retinanet/coco_spinenet143_tpu.yaml rename to official/vision/configs/experiments/retinanet/coco_spinenet143_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/retinanet/coco_spinenet190_tpu.yaml b/official/vision/configs/experiments/retinanet/coco_spinenet190_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/retinanet/coco_spinenet190_tpu.yaml rename to official/vision/configs/experiments/retinanet/coco_spinenet190_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/retinanet/coco_spinenet49_gpu_multiworker_mirrored.yaml b/official/vision/configs/experiments/retinanet/coco_spinenet49_gpu_multiworker_mirrored.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/retinanet/coco_spinenet49_gpu_multiworker_mirrored.yaml rename to official/vision/configs/experiments/retinanet/coco_spinenet49_gpu_multiworker_mirrored.yaml diff --git a/modeling/official/vision/configs/experiments/retinanet/coco_spinenet49_mobile_tpu.yaml b/official/vision/configs/experiments/retinanet/coco_spinenet49_mobile_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/retinanet/coco_spinenet49_mobile_tpu.yaml rename to official/vision/configs/experiments/retinanet/coco_spinenet49_mobile_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/retinanet/coco_spinenet49_tpu.yaml b/official/vision/configs/experiments/retinanet/coco_spinenet49_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/retinanet/coco_spinenet49_tpu.yaml rename to official/vision/configs/experiments/retinanet/coco_spinenet49_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/retinanet/coco_spinenet49s_mobile_tpu.yaml b/official/vision/configs/experiments/retinanet/coco_spinenet49s_mobile_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/retinanet/coco_spinenet49s_mobile_tpu.yaml rename to official/vision/configs/experiments/retinanet/coco_spinenet49s_mobile_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/retinanet/coco_spinenet49xs_mobile_tpu.yaml b/official/vision/configs/experiments/retinanet/coco_spinenet49xs_mobile_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/retinanet/coco_spinenet49xs_mobile_tpu.yaml rename to official/vision/configs/experiments/retinanet/coco_spinenet49xs_mobile_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/retinanet/coco_spinenet96_gpu_multiworker_mirrored.yaml b/official/vision/configs/experiments/retinanet/coco_spinenet96_gpu_multiworker_mirrored.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/retinanet/coco_spinenet96_gpu_multiworker_mirrored.yaml rename to official/vision/configs/experiments/retinanet/coco_spinenet96_gpu_multiworker_mirrored.yaml diff --git a/modeling/official/vision/configs/experiments/retinanet/coco_spinenet96_tpu.yaml b/official/vision/configs/experiments/retinanet/coco_spinenet96_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/retinanet/coco_spinenet96_tpu.yaml rename to official/vision/configs/experiments/retinanet/coco_spinenet96_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/retinanet/resnet50fpn_coco_tfds_tpu.yaml b/official/vision/configs/experiments/retinanet/resnet50fpn_coco_tfds_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/retinanet/resnet50fpn_coco_tfds_tpu.yaml rename to official/vision/configs/experiments/retinanet/resnet50fpn_coco_tfds_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/retinanet/resnet50fpn_coco_tpu4x4_benchmark.yaml b/official/vision/configs/experiments/retinanet/resnet50fpn_coco_tpu4x4_benchmark.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/retinanet/resnet50fpn_coco_tpu4x4_benchmark.yaml rename to official/vision/configs/experiments/retinanet/resnet50fpn_coco_tpu4x4_benchmark.yaml diff --git a/modeling/official/vision/configs/experiments/semantic_segmentation/deeplabv3plus_resnet101_cityscapes_gpu.yaml b/official/vision/configs/experiments/semantic_segmentation/deeplabv3plus_resnet101_cityscapes_gpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/semantic_segmentation/deeplabv3plus_resnet101_cityscapes_gpu.yaml rename to official/vision/configs/experiments/semantic_segmentation/deeplabv3plus_resnet101_cityscapes_gpu.yaml diff --git a/modeling/official/vision/configs/experiments/semantic_segmentation/deeplabv3plus_resnet101_cityscapes_gpu_multiworker_mirrored.yaml b/official/vision/configs/experiments/semantic_segmentation/deeplabv3plus_resnet101_cityscapes_gpu_multiworker_mirrored.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/semantic_segmentation/deeplabv3plus_resnet101_cityscapes_gpu_multiworker_mirrored.yaml rename to official/vision/configs/experiments/semantic_segmentation/deeplabv3plus_resnet101_cityscapes_gpu_multiworker_mirrored.yaml diff --git a/modeling/official/vision/configs/experiments/semantic_segmentation/deeplabv3plus_resnet101_cityscapes_tfds_tpu.yaml b/official/vision/configs/experiments/semantic_segmentation/deeplabv3plus_resnet101_cityscapes_tfds_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/semantic_segmentation/deeplabv3plus_resnet101_cityscapes_tfds_tpu.yaml rename to official/vision/configs/experiments/semantic_segmentation/deeplabv3plus_resnet101_cityscapes_tfds_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/video_classification/k400_3d-resnet50_tpu.yaml b/official/vision/configs/experiments/video_classification/k400_3d-resnet50_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/video_classification/k400_3d-resnet50_tpu.yaml rename to official/vision/configs/experiments/video_classification/k400_3d-resnet50_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/video_classification/k400_resnet3drs_50_tpu.yaml b/official/vision/configs/experiments/video_classification/k400_resnet3drs_50_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/video_classification/k400_resnet3drs_50_tpu.yaml rename to official/vision/configs/experiments/video_classification/k400_resnet3drs_50_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/video_classification/k400_slowonly16x4_tpu.yaml b/official/vision/configs/experiments/video_classification/k400_slowonly16x4_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/video_classification/k400_slowonly16x4_tpu.yaml rename to official/vision/configs/experiments/video_classification/k400_slowonly16x4_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/video_classification/k400_slowonly8x8_tpu.yaml b/official/vision/configs/experiments/video_classification/k400_slowonly8x8_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/video_classification/k400_slowonly8x8_tpu.yaml rename to official/vision/configs/experiments/video_classification/k400_slowonly8x8_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/video_classification/k600_3d-resnet50_tpu.yaml b/official/vision/configs/experiments/video_classification/k600_3d-resnet50_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/video_classification/k600_3d-resnet50_tpu.yaml rename to official/vision/configs/experiments/video_classification/k600_3d-resnet50_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/video_classification/k600_3d-resnet50g_tpu.yaml b/official/vision/configs/experiments/video_classification/k600_3d-resnet50g_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/video_classification/k600_3d-resnet50g_tpu.yaml rename to official/vision/configs/experiments/video_classification/k600_3d-resnet50g_tpu.yaml diff --git a/modeling/official/vision/configs/experiments/video_classification/k600_slowonly8x8_tpu.yaml b/official/vision/configs/experiments/video_classification/k600_slowonly8x8_tpu.yaml similarity index 100% rename from modeling/official/vision/configs/experiments/video_classification/k600_slowonly8x8_tpu.yaml rename to official/vision/configs/experiments/video_classification/k600_slowonly8x8_tpu.yaml diff --git a/modeling/official/vision/configs/image_classification.py b/official/vision/configs/image_classification.py similarity index 98% rename from modeling/official/vision/configs/image_classification.py rename to official/vision/configs/image_classification.py index 1512b4bd7db0eb769b9af9a89dfbb16722c2bf44..0d5487abb6217007b80aa5500cfe924100b15581 100644 --- a/modeling/official/vision/configs/image_classification.py +++ b/official/vision/configs/image_classification.py @@ -17,12 +17,12 @@ import dataclasses import os from typing import List, Optional, Tuple, Union, Sequence -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 common -from modeling.official.vision.configs import backbones +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 common +from official.vision.configs import backbones @dataclasses.dataclass diff --git a/modeling/official/vision/configs/image_classification_test.py b/official/vision/configs/image_classification_test.py similarity index 88% rename from modeling/official/vision/configs/image_classification_test.py rename to official/vision/configs/image_classification_test.py index adb5699094d699085ee622433889d3543b0e6c74..03c30fa8b32a5300efb1a5c86bddd59e2ae5e745 100644 --- a/modeling/official/vision/configs/image_classification_test.py +++ b/official/vision/configs/image_classification_test.py @@ -17,10 +17,10 @@ from absl.testing import parameterized import tensorflow as tf, tf_keras -from modeling.official import vision -from modeling.official.core import config_definitions as cfg -from modeling.official.core import exp_factory -from modeling.official.vision.configs import image_classification as exp_cfg +from official import vision +from official.core import config_definitions as cfg +from official.core import exp_factory +from official.vision.configs import image_classification as exp_cfg class ImageClassificationConfigTest(tf.test.TestCase, parameterized.TestCase): diff --git a/modeling/official/vision/configs/maskrcnn.py b/official/vision/configs/maskrcnn.py similarity index 98% rename from modeling/official/vision/configs/maskrcnn.py rename to official/vision/configs/maskrcnn.py index 4adf14d1a07f7a1c2e98adb9d4dc762cce30708b..f51f82a3114d48de7ded081d7b088878bfaeb25d 100644 --- a/modeling/official/vision/configs/maskrcnn.py +++ b/official/vision/configs/maskrcnn.py @@ -18,13 +18,13 @@ import dataclasses import os from typing import List, Optional, Sequence, Union -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 common -from modeling.official.vision.configs import decoders -from modeling.official.vision.configs import backbones +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 common +from official.vision.configs import decoders +from official.vision.configs import backbones # pylint: disable=missing-class-docstring diff --git a/modeling/official/vision/configs/maskrcnn_test.py b/official/vision/configs/maskrcnn_test.py similarity index 88% rename from modeling/official/vision/configs/maskrcnn_test.py rename to official/vision/configs/maskrcnn_test.py index 6e4921328aba5accc19459a39f4a10c70ae16e66..31e0ce356911fe3b6a8517562f4bdcef9f10a4b6 100644 --- a/modeling/official/vision/configs/maskrcnn_test.py +++ b/official/vision/configs/maskrcnn_test.py @@ -17,10 +17,10 @@ from absl.testing import parameterized import tensorflow as tf, tf_keras -from modeling.official import vision -from modeling.official.core import config_definitions as cfg -from modeling.official.core import exp_factory -from modeling.official.vision.configs import maskrcnn as exp_cfg +from official import vision +from official.core import config_definitions as cfg +from official.core import exp_factory +from official.vision.configs import maskrcnn as exp_cfg class MaskRCNNConfigTest(tf.test.TestCase, parameterized.TestCase): diff --git a/modeling/official/vision/configs/retinanet.py b/official/vision/configs/retinanet.py similarity index 97% rename from modeling/official/vision/configs/retinanet.py rename to official/vision/configs/retinanet.py index 9dd3ddde58b90bb5b6fcd525c547e2428da5814e..130527e24978b906eb6618bfc031e9c27b2ccb6f 100644 --- a/modeling/official/vision/configs/retinanet.py +++ b/official/vision/configs/retinanet.py @@ -18,14 +18,14 @@ import dataclasses import os from typing import Optional, List, Sequence, Union -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.modeling.hyperparams import base_config -from modeling.official.vision.configs import common -from modeling.official.vision.configs import decoders -from modeling.official.vision.configs import backbones +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.modeling.hyperparams import base_config +from official.vision.configs import common +from official.vision.configs import decoders +from official.vision.configs import backbones # pylint: disable=missing-class-docstring diff --git a/modeling/official/vision/configs/retinanet_test.py b/official/vision/configs/retinanet_test.py similarity index 100% rename from modeling/official/vision/configs/retinanet_test.py rename to official/vision/configs/retinanet_test.py diff --git a/modeling/official/vision/configs/semantic_segmentation.py b/official/vision/configs/semantic_segmentation.py similarity index 98% rename from modeling/official/vision/configs/semantic_segmentation.py rename to official/vision/configs/semantic_segmentation.py index e172977b19dffdabb7c6ab95cf315b572736bdde..c84fa11dde98501a01e2fe8e4a29fa02141436ef 100644 --- a/modeling/official/vision/configs/semantic_segmentation.py +++ b/official/vision/configs/semantic_segmentation.py @@ -19,14 +19,14 @@ from typing import List, Optional, Sequence, Union import numpy as np -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 common -from modeling.official.vision.configs import decoders -from modeling.official.vision.configs import backbones -from modeling.official.vision.ops import preprocess_ops +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 common +from official.vision.configs import decoders +from official.vision.configs import backbones +from official.vision.ops import preprocess_ops @dataclasses.dataclass diff --git a/modeling/official/vision/configs/semantic_segmentation_test.py b/official/vision/configs/semantic_segmentation_test.py similarity index 100% rename from modeling/official/vision/configs/semantic_segmentation_test.py rename to official/vision/configs/semantic_segmentation_test.py diff --git a/modeling/official/vision/configs/video_classification.py b/official/vision/configs/video_classification.py similarity index 97% rename from modeling/official/vision/configs/video_classification.py rename to official/vision/configs/video_classification.py index a3a1984de70cfeb5ea9ce0394b45848e0ea93f9b..91fa9e59debd8963efdd1de5559766c0813391c2 100644 --- a/modeling/official/vision/configs/video_classification.py +++ b/official/vision/configs/video_classification.py @@ -15,12 +15,12 @@ """Video classification configuration definition.""" import dataclasses from typing import Optional, Tuple, Union -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 +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 @dataclasses.dataclass diff --git a/modeling/official/vision/configs/video_classification_test.py b/official/vision/configs/video_classification_test.py similarity index 100% rename from modeling/official/vision/configs/video_classification_test.py rename to official/vision/configs/video_classification_test.py diff --git a/modeling/official/vision/data/__init__.py b/official/vision/data/__init__.py similarity index 100% rename from modeling/official/vision/data/__init__.py rename to official/vision/data/__init__.py diff --git a/modeling/official/vision/data/create_coco_tf_record.py b/official/vision/data/create_coco_tf_record.py similarity index 100% rename from modeling/official/vision/data/create_coco_tf_record.py rename to official/vision/data/create_coco_tf_record.py diff --git a/modeling/official/vision/data/fake_feature_generator.py b/official/vision/data/fake_feature_generator.py similarity index 100% rename from modeling/official/vision/data/fake_feature_generator.py rename to official/vision/data/fake_feature_generator.py diff --git a/modeling/official/vision/data/image_utils.py b/official/vision/data/image_utils.py similarity index 100% rename from modeling/official/vision/data/image_utils.py rename to official/vision/data/image_utils.py diff --git a/modeling/official/vision/data/image_utils_test.py b/official/vision/data/image_utils_test.py similarity index 100% rename from modeling/official/vision/data/image_utils_test.py rename to official/vision/data/image_utils_test.py diff --git a/modeling/official/vision/data/process_coco_few_shot.sh b/official/vision/data/process_coco_few_shot.sh similarity index 100% rename from modeling/official/vision/data/process_coco_few_shot.sh rename to official/vision/data/process_coco_few_shot.sh diff --git a/modeling/official/vision/data/process_coco_few_shot_json_files.py b/official/vision/data/process_coco_few_shot_json_files.py similarity index 100% rename from modeling/official/vision/data/process_coco_few_shot_json_files.py rename to official/vision/data/process_coco_few_shot_json_files.py diff --git a/modeling/official/vision/data/process_coco_panoptic.sh b/official/vision/data/process_coco_panoptic.sh similarity index 100% rename from modeling/official/vision/data/process_coco_panoptic.sh rename to official/vision/data/process_coco_panoptic.sh diff --git a/modeling/official/vision/data/tf_example_builder.py b/official/vision/data/tf_example_builder.py similarity index 100% rename from modeling/official/vision/data/tf_example_builder.py rename to official/vision/data/tf_example_builder.py diff --git a/modeling/official/vision/data/tf_example_builder_test.py b/official/vision/data/tf_example_builder_test.py similarity index 100% rename from modeling/official/vision/data/tf_example_builder_test.py rename to official/vision/data/tf_example_builder_test.py diff --git a/modeling/official/vision/data/tf_example_feature_key.py b/official/vision/data/tf_example_feature_key.py similarity index 100% rename from modeling/official/vision/data/tf_example_feature_key.py rename to official/vision/data/tf_example_feature_key.py diff --git a/modeling/official/vision/data/tfrecord_lib.py b/official/vision/data/tfrecord_lib.py similarity index 100% rename from modeling/official/vision/data/tfrecord_lib.py rename to official/vision/data/tfrecord_lib.py diff --git a/modeling/official/vision/data/tfrecord_lib_test.py b/official/vision/data/tfrecord_lib_test.py similarity index 100% rename from modeling/official/vision/data/tfrecord_lib_test.py rename to official/vision/data/tfrecord_lib_test.py diff --git a/modeling/official/vision/dataloaders/__init__.py b/official/vision/dataloaders/__init__.py similarity index 100% rename from modeling/official/vision/dataloaders/__init__.py rename to official/vision/dataloaders/__init__.py diff --git a/modeling/official/vision/dataloaders/classification_input.py b/official/vision/dataloaders/classification_input.py similarity index 100% rename from modeling/official/vision/dataloaders/classification_input.py rename to official/vision/dataloaders/classification_input.py diff --git a/modeling/official/vision/dataloaders/decoder.py b/official/vision/dataloaders/decoder.py similarity index 100% rename from modeling/official/vision/dataloaders/decoder.py rename to official/vision/dataloaders/decoder.py diff --git a/modeling/official/vision/dataloaders/input_reader.py b/official/vision/dataloaders/input_reader.py similarity index 100% rename from modeling/official/vision/dataloaders/input_reader.py rename to official/vision/dataloaders/input_reader.py diff --git a/modeling/official/vision/dataloaders/input_reader_factory.py b/official/vision/dataloaders/input_reader_factory.py similarity index 100% rename from modeling/official/vision/dataloaders/input_reader_factory.py rename to official/vision/dataloaders/input_reader_factory.py diff --git a/modeling/official/vision/dataloaders/maskrcnn_input.py b/official/vision/dataloaders/maskrcnn_input.py similarity index 100% rename from modeling/official/vision/dataloaders/maskrcnn_input.py rename to official/vision/dataloaders/maskrcnn_input.py diff --git a/modeling/official/vision/dataloaders/parser.py b/official/vision/dataloaders/parser.py similarity index 100% rename from modeling/official/vision/dataloaders/parser.py rename to official/vision/dataloaders/parser.py diff --git a/modeling/official/vision/dataloaders/retinanet_input.py b/official/vision/dataloaders/retinanet_input.py similarity index 100% rename from modeling/official/vision/dataloaders/retinanet_input.py rename to official/vision/dataloaders/retinanet_input.py diff --git a/modeling/official/vision/dataloaders/segmentation_input.py b/official/vision/dataloaders/segmentation_input.py similarity index 100% rename from modeling/official/vision/dataloaders/segmentation_input.py rename to official/vision/dataloaders/segmentation_input.py diff --git a/modeling/official/vision/dataloaders/tf_example_decoder.py b/official/vision/dataloaders/tf_example_decoder.py similarity index 100% rename from modeling/official/vision/dataloaders/tf_example_decoder.py rename to official/vision/dataloaders/tf_example_decoder.py diff --git a/modeling/official/vision/dataloaders/tf_example_decoder_test.py b/official/vision/dataloaders/tf_example_decoder_test.py similarity index 100% rename from modeling/official/vision/dataloaders/tf_example_decoder_test.py rename to official/vision/dataloaders/tf_example_decoder_test.py diff --git a/modeling/official/vision/dataloaders/tf_example_label_map_decoder.py b/official/vision/dataloaders/tf_example_label_map_decoder.py similarity index 100% rename from modeling/official/vision/dataloaders/tf_example_label_map_decoder.py rename to official/vision/dataloaders/tf_example_label_map_decoder.py diff --git a/modeling/official/vision/dataloaders/tf_example_label_map_decoder_test.py b/official/vision/dataloaders/tf_example_label_map_decoder_test.py similarity index 100% rename from modeling/official/vision/dataloaders/tf_example_label_map_decoder_test.py rename to official/vision/dataloaders/tf_example_label_map_decoder_test.py diff --git a/modeling/official/vision/dataloaders/tfds_classification_decoders.py b/official/vision/dataloaders/tfds_classification_decoders.py similarity index 100% rename from modeling/official/vision/dataloaders/tfds_classification_decoders.py rename to official/vision/dataloaders/tfds_classification_decoders.py diff --git a/modeling/official/vision/dataloaders/tfds_detection_decoders.py b/official/vision/dataloaders/tfds_detection_decoders.py similarity index 100% rename from modeling/official/vision/dataloaders/tfds_detection_decoders.py rename to official/vision/dataloaders/tfds_detection_decoders.py diff --git a/modeling/official/vision/dataloaders/tfds_factory.py b/official/vision/dataloaders/tfds_factory.py similarity index 100% rename from modeling/official/vision/dataloaders/tfds_factory.py rename to official/vision/dataloaders/tfds_factory.py diff --git a/modeling/official/vision/dataloaders/tfds_factory_test.py b/official/vision/dataloaders/tfds_factory_test.py similarity index 100% rename from modeling/official/vision/dataloaders/tfds_factory_test.py rename to official/vision/dataloaders/tfds_factory_test.py diff --git a/modeling/official/vision/dataloaders/tfds_segmentation_decoders.py b/official/vision/dataloaders/tfds_segmentation_decoders.py similarity index 100% rename from modeling/official/vision/dataloaders/tfds_segmentation_decoders.py rename to official/vision/dataloaders/tfds_segmentation_decoders.py diff --git a/modeling/official/vision/dataloaders/tfexample_utils.py b/official/vision/dataloaders/tfexample_utils.py similarity index 100% rename from modeling/official/vision/dataloaders/tfexample_utils.py rename to official/vision/dataloaders/tfexample_utils.py diff --git a/modeling/official/vision/dataloaders/utils.py b/official/vision/dataloaders/utils.py similarity index 100% rename from modeling/official/vision/dataloaders/utils.py rename to official/vision/dataloaders/utils.py diff --git a/modeling/official/vision/dataloaders/utils_test.py b/official/vision/dataloaders/utils_test.py similarity index 100% rename from modeling/official/vision/dataloaders/utils_test.py rename to official/vision/dataloaders/utils_test.py diff --git a/modeling/official/vision/dataloaders/video_input.py b/official/vision/dataloaders/video_input.py similarity index 100% rename from modeling/official/vision/dataloaders/video_input.py rename to official/vision/dataloaders/video_input.py diff --git a/modeling/official/vision/dataloaders/video_input_test.py b/official/vision/dataloaders/video_input_test.py similarity index 100% rename from modeling/official/vision/dataloaders/video_input_test.py rename to official/vision/dataloaders/video_input_test.py diff --git a/modeling/official/vision/evaluation/__init__.py b/official/vision/evaluation/__init__.py similarity index 100% rename from modeling/official/vision/evaluation/__init__.py rename to official/vision/evaluation/__init__.py diff --git a/modeling/official/vision/evaluation/coco_evaluator.py b/official/vision/evaluation/coco_evaluator.py similarity index 100% rename from modeling/official/vision/evaluation/coco_evaluator.py rename to official/vision/evaluation/coco_evaluator.py diff --git a/modeling/official/vision/evaluation/coco_utils.py b/official/vision/evaluation/coco_utils.py similarity index 100% rename from modeling/official/vision/evaluation/coco_utils.py rename to official/vision/evaluation/coco_utils.py diff --git a/modeling/official/vision/evaluation/coco_utils_test.py b/official/vision/evaluation/coco_utils_test.py similarity index 100% rename from modeling/official/vision/evaluation/coco_utils_test.py rename to official/vision/evaluation/coco_utils_test.py diff --git a/modeling/official/vision/evaluation/instance_metrics.py b/official/vision/evaluation/instance_metrics.py similarity index 100% rename from modeling/official/vision/evaluation/instance_metrics.py rename to official/vision/evaluation/instance_metrics.py diff --git a/modeling/official/vision/evaluation/instance_metrics_test.py b/official/vision/evaluation/instance_metrics_test.py similarity index 100% rename from modeling/official/vision/evaluation/instance_metrics_test.py rename to official/vision/evaluation/instance_metrics_test.py diff --git a/modeling/official/vision/evaluation/iou.py b/official/vision/evaluation/iou.py similarity index 100% rename from modeling/official/vision/evaluation/iou.py rename to official/vision/evaluation/iou.py diff --git a/modeling/official/vision/evaluation/iou_test.py b/official/vision/evaluation/iou_test.py similarity index 100% rename from modeling/official/vision/evaluation/iou_test.py rename to official/vision/evaluation/iou_test.py diff --git a/modeling/official/vision/evaluation/panoptic_quality.py b/official/vision/evaluation/panoptic_quality.py similarity index 100% rename from modeling/official/vision/evaluation/panoptic_quality.py rename to official/vision/evaluation/panoptic_quality.py diff --git a/modeling/official/vision/evaluation/panoptic_quality_evaluator.py b/official/vision/evaluation/panoptic_quality_evaluator.py similarity index 100% rename from modeling/official/vision/evaluation/panoptic_quality_evaluator.py rename to official/vision/evaluation/panoptic_quality_evaluator.py diff --git a/modeling/official/vision/evaluation/panoptic_quality_evaluator_test.py b/official/vision/evaluation/panoptic_quality_evaluator_test.py similarity index 100% rename from modeling/official/vision/evaluation/panoptic_quality_evaluator_test.py rename to official/vision/evaluation/panoptic_quality_evaluator_test.py diff --git a/modeling/official/vision/evaluation/panoptic_quality_test.py b/official/vision/evaluation/panoptic_quality_test.py similarity index 100% rename from modeling/official/vision/evaluation/panoptic_quality_test.py rename to official/vision/evaluation/panoptic_quality_test.py diff --git a/modeling/official/vision/evaluation/segmentation_metrics.py b/official/vision/evaluation/segmentation_metrics.py similarity index 100% rename from modeling/official/vision/evaluation/segmentation_metrics.py rename to official/vision/evaluation/segmentation_metrics.py diff --git a/modeling/official/vision/evaluation/segmentation_metrics_test.py b/official/vision/evaluation/segmentation_metrics_test.py similarity index 100% rename from modeling/official/vision/evaluation/segmentation_metrics_test.py rename to official/vision/evaluation/segmentation_metrics_test.py diff --git a/modeling/official/vision/evaluation/wod_detection_evaluator.py b/official/vision/evaluation/wod_detection_evaluator.py similarity index 100% rename from modeling/official/vision/evaluation/wod_detection_evaluator.py rename to official/vision/evaluation/wod_detection_evaluator.py diff --git a/modeling/official/vision/examples/starter/README.md b/official/vision/examples/starter/README.md similarity index 100% rename from modeling/official/vision/examples/starter/README.md rename to official/vision/examples/starter/README.md diff --git a/modeling/official/vision/examples/starter/example_config.py b/official/vision/examples/starter/example_config.py similarity index 100% rename from modeling/official/vision/examples/starter/example_config.py rename to official/vision/examples/starter/example_config.py diff --git a/modeling/official/vision/examples/starter/example_config_local.yaml b/official/vision/examples/starter/example_config_local.yaml similarity index 100% rename from modeling/official/vision/examples/starter/example_config_local.yaml rename to official/vision/examples/starter/example_config_local.yaml diff --git a/modeling/official/vision/examples/starter/example_config_tpu.yaml b/official/vision/examples/starter/example_config_tpu.yaml similarity index 100% rename from modeling/official/vision/examples/starter/example_config_tpu.yaml rename to official/vision/examples/starter/example_config_tpu.yaml diff --git a/modeling/official/vision/examples/starter/example_input.py b/official/vision/examples/starter/example_input.py similarity index 100% rename from modeling/official/vision/examples/starter/example_input.py rename to official/vision/examples/starter/example_input.py diff --git a/modeling/official/vision/examples/starter/example_model.py b/official/vision/examples/starter/example_model.py similarity index 100% rename from modeling/official/vision/examples/starter/example_model.py rename to official/vision/examples/starter/example_model.py diff --git a/modeling/official/vision/examples/starter/example_task.py b/official/vision/examples/starter/example_task.py similarity index 100% rename from modeling/official/vision/examples/starter/example_task.py rename to official/vision/examples/starter/example_task.py diff --git a/modeling/official/vision/examples/starter/registry_imports.py b/official/vision/examples/starter/registry_imports.py similarity index 100% rename from modeling/official/vision/examples/starter/registry_imports.py rename to official/vision/examples/starter/registry_imports.py diff --git a/modeling/official/vision/examples/starter/train.py b/official/vision/examples/starter/train.py similarity index 100% rename from modeling/official/vision/examples/starter/train.py rename to official/vision/examples/starter/train.py diff --git a/modeling/official/vision/losses/__init__.py b/official/vision/losses/__init__.py similarity index 100% rename from modeling/official/vision/losses/__init__.py rename to official/vision/losses/__init__.py diff --git a/modeling/official/vision/losses/focal_loss.py b/official/vision/losses/focal_loss.py similarity index 100% rename from modeling/official/vision/losses/focal_loss.py rename to official/vision/losses/focal_loss.py diff --git a/modeling/official/vision/losses/loss_utils.py b/official/vision/losses/loss_utils.py similarity index 100% rename from modeling/official/vision/losses/loss_utils.py rename to official/vision/losses/loss_utils.py diff --git a/modeling/official/vision/losses/maskrcnn_losses.py b/official/vision/losses/maskrcnn_losses.py similarity index 100% rename from modeling/official/vision/losses/maskrcnn_losses.py rename to official/vision/losses/maskrcnn_losses.py diff --git a/modeling/official/vision/losses/maskrcnn_losses_test.py b/official/vision/losses/maskrcnn_losses_test.py similarity index 100% rename from modeling/official/vision/losses/maskrcnn_losses_test.py rename to official/vision/losses/maskrcnn_losses_test.py diff --git a/modeling/official/vision/losses/retinanet_losses.py b/official/vision/losses/retinanet_losses.py similarity index 100% rename from modeling/official/vision/losses/retinanet_losses.py rename to official/vision/losses/retinanet_losses.py diff --git a/modeling/official/vision/losses/segmentation_losses.py b/official/vision/losses/segmentation_losses.py similarity index 100% rename from modeling/official/vision/losses/segmentation_losses.py rename to official/vision/losses/segmentation_losses.py diff --git a/modeling/official/vision/losses/segmentation_losses_test.py b/official/vision/losses/segmentation_losses_test.py similarity index 100% rename from modeling/official/vision/losses/segmentation_losses_test.py rename to official/vision/losses/segmentation_losses_test.py diff --git a/modeling/official/vision/modeling/__init__.py b/official/vision/modeling/__init__.py similarity index 100% rename from modeling/official/vision/modeling/__init__.py rename to official/vision/modeling/__init__.py diff --git a/modeling/official/vision/modeling/backbones/__init__.py b/official/vision/modeling/backbones/__init__.py similarity index 100% rename from modeling/official/vision/modeling/backbones/__init__.py rename to official/vision/modeling/backbones/__init__.py diff --git a/modeling/official/vision/modeling/backbones/efficientnet.py b/official/vision/modeling/backbones/efficientnet.py similarity index 97% rename from modeling/official/vision/modeling/backbones/efficientnet.py rename to official/vision/modeling/backbones/efficientnet.py index b39c35174fc676ecf87583a020e8b9b8f19fd9c2..9f4d4876d1a20bf2e3db1d0f41fe842d39236ced 100644 --- a/modeling/official/vision/modeling/backbones/efficientnet.py +++ b/official/vision/modeling/backbones/efficientnet.py @@ -21,11 +21,11 @@ from typing import Any, List, Tuple import tensorflow as tf, tf_keras -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 +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 layers = tf_keras.layers diff --git a/modeling/official/vision/modeling/backbones/efficientnet_test.py b/official/vision/modeling/backbones/efficientnet_test.py similarity index 100% rename from modeling/official/vision/modeling/backbones/efficientnet_test.py rename to official/vision/modeling/backbones/efficientnet_test.py diff --git a/modeling/official/vision/modeling/backbones/factory.py b/official/vision/modeling/backbones/factory.py similarity index 97% rename from modeling/official/vision/modeling/backbones/factory.py rename to official/vision/modeling/backbones/factory.py index a6b90cc90972ba5ade21ab1c4c8f0b597e53232b..7f0670ccbae1afbad5a48978c9c645a9cee0ed98 100644 --- a/modeling/official/vision/modeling/backbones/factory.py +++ b/official/vision/modeling/backbones/factory.py @@ -47,8 +47,8 @@ from typing import Sequence, Union import tensorflow as tf, tf_keras -from modeling.official.core import registry -from modeling.official.modeling import hyperparams +from official.core import registry +from official.modeling import hyperparams _REGISTERED_BACKBONE_CLS = {} diff --git a/modeling/official/vision/modeling/backbones/factory_test.py b/official/vision/modeling/backbones/factory_test.py similarity index 100% rename from modeling/official/vision/modeling/backbones/factory_test.py rename to official/vision/modeling/backbones/factory_test.py diff --git a/modeling/official/vision/modeling/backbones/mobiledet.py b/official/vision/modeling/backbones/mobiledet.py similarity index 100% rename from modeling/official/vision/modeling/backbones/mobiledet.py rename to official/vision/modeling/backbones/mobiledet.py diff --git a/modeling/official/vision/modeling/backbones/mobiledet_test.py b/official/vision/modeling/backbones/mobiledet_test.py similarity index 100% rename from modeling/official/vision/modeling/backbones/mobiledet_test.py rename to official/vision/modeling/backbones/mobiledet_test.py diff --git a/modeling/official/vision/modeling/backbones/mobilenet.py b/official/vision/modeling/backbones/mobilenet.py similarity index 100% rename from modeling/official/vision/modeling/backbones/mobilenet.py rename to official/vision/modeling/backbones/mobilenet.py diff --git a/modeling/official/vision/modeling/backbones/mobilenet_test.py b/official/vision/modeling/backbones/mobilenet_test.py similarity index 100% rename from modeling/official/vision/modeling/backbones/mobilenet_test.py rename to official/vision/modeling/backbones/mobilenet_test.py diff --git a/modeling/official/vision/modeling/backbones/resnet.py b/official/vision/modeling/backbones/resnet.py similarity index 100% rename from modeling/official/vision/modeling/backbones/resnet.py rename to official/vision/modeling/backbones/resnet.py diff --git a/modeling/official/vision/modeling/backbones/resnet_3d.py b/official/vision/modeling/backbones/resnet_3d.py similarity index 98% rename from modeling/official/vision/modeling/backbones/resnet_3d.py rename to official/vision/modeling/backbones/resnet_3d.py index 07df8c57ac4fd6d352253a08ad3de07f32d58faa..f1f45b304fda6b100314fe35a200e2226763cb14 100644 --- a/modeling/official/vision/modeling/backbones/resnet_3d.py +++ b/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 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 +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 layers = tf_keras.layers diff --git a/modeling/official/vision/modeling/backbones/resnet_3d_test.py b/official/vision/modeling/backbones/resnet_3d_test.py similarity index 100% rename from modeling/official/vision/modeling/backbones/resnet_3d_test.py rename to official/vision/modeling/backbones/resnet_3d_test.py diff --git a/modeling/official/vision/modeling/backbones/resnet_deeplab.py b/official/vision/modeling/backbones/resnet_deeplab.py similarity index 100% rename from modeling/official/vision/modeling/backbones/resnet_deeplab.py rename to official/vision/modeling/backbones/resnet_deeplab.py diff --git a/modeling/official/vision/modeling/backbones/resnet_deeplab_test.py b/official/vision/modeling/backbones/resnet_deeplab_test.py similarity index 100% rename from modeling/official/vision/modeling/backbones/resnet_deeplab_test.py rename to official/vision/modeling/backbones/resnet_deeplab_test.py diff --git a/modeling/official/vision/modeling/backbones/resnet_test.py b/official/vision/modeling/backbones/resnet_test.py similarity index 100% rename from modeling/official/vision/modeling/backbones/resnet_test.py rename to official/vision/modeling/backbones/resnet_test.py diff --git a/modeling/official/vision/modeling/backbones/revnet.py b/official/vision/modeling/backbones/revnet.py similarity index 100% rename from modeling/official/vision/modeling/backbones/revnet.py rename to official/vision/modeling/backbones/revnet.py diff --git a/modeling/official/vision/modeling/backbones/revnet_test.py b/official/vision/modeling/backbones/revnet_test.py similarity index 100% rename from modeling/official/vision/modeling/backbones/revnet_test.py rename to official/vision/modeling/backbones/revnet_test.py diff --git a/modeling/official/vision/modeling/backbones/spinenet.py b/official/vision/modeling/backbones/spinenet.py similarity index 100% rename from modeling/official/vision/modeling/backbones/spinenet.py rename to official/vision/modeling/backbones/spinenet.py diff --git a/modeling/official/vision/modeling/backbones/spinenet_mobile.py b/official/vision/modeling/backbones/spinenet_mobile.py similarity index 100% rename from modeling/official/vision/modeling/backbones/spinenet_mobile.py rename to official/vision/modeling/backbones/spinenet_mobile.py diff --git a/modeling/official/vision/modeling/backbones/spinenet_mobile_test.py b/official/vision/modeling/backbones/spinenet_mobile_test.py similarity index 100% rename from modeling/official/vision/modeling/backbones/spinenet_mobile_test.py rename to official/vision/modeling/backbones/spinenet_mobile_test.py diff --git a/modeling/official/vision/modeling/backbones/spinenet_test.py b/official/vision/modeling/backbones/spinenet_test.py similarity index 100% rename from modeling/official/vision/modeling/backbones/spinenet_test.py rename to official/vision/modeling/backbones/spinenet_test.py diff --git a/modeling/official/vision/modeling/backbones/vit.py b/official/vision/modeling/backbones/vit.py similarity index 97% rename from modeling/official/vision/modeling/backbones/vit.py rename to official/vision/modeling/backbones/vit.py index 85c2753a97ad9f1801b9ed724076f22d803aa010..85daa5d12990e756c0e2f0d335e41076e694f902 100644 --- a/modeling/official/vision/modeling/backbones/vit.py +++ b/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 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 +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 layers = tf_keras.layers diff --git a/modeling/official/vision/modeling/backbones/vit_specs.py b/official/vision/modeling/backbones/vit_specs.py similarity index 100% rename from modeling/official/vision/modeling/backbones/vit_specs.py rename to official/vision/modeling/backbones/vit_specs.py diff --git a/modeling/official/vision/modeling/backbones/vit_test.py b/official/vision/modeling/backbones/vit_test.py similarity index 100% rename from modeling/official/vision/modeling/backbones/vit_test.py rename to official/vision/modeling/backbones/vit_test.py diff --git a/modeling/official/vision/modeling/classification_model.py b/official/vision/modeling/classification_model.py similarity index 100% rename from modeling/official/vision/modeling/classification_model.py rename to official/vision/modeling/classification_model.py diff --git a/modeling/official/vision/modeling/classification_model_test.py b/official/vision/modeling/classification_model_test.py similarity index 100% rename from modeling/official/vision/modeling/classification_model_test.py rename to official/vision/modeling/classification_model_test.py diff --git a/modeling/official/vision/modeling/decoders/__init__.py b/official/vision/modeling/decoders/__init__.py similarity index 100% rename from modeling/official/vision/modeling/decoders/__init__.py rename to official/vision/modeling/decoders/__init__.py diff --git a/modeling/official/vision/modeling/decoders/aspp.py b/official/vision/modeling/decoders/aspp.py similarity index 100% rename from modeling/official/vision/modeling/decoders/aspp.py rename to official/vision/modeling/decoders/aspp.py diff --git a/modeling/official/vision/modeling/decoders/aspp_test.py b/official/vision/modeling/decoders/aspp_test.py similarity index 100% rename from modeling/official/vision/modeling/decoders/aspp_test.py rename to official/vision/modeling/decoders/aspp_test.py diff --git a/modeling/official/vision/modeling/decoders/factory.py b/official/vision/modeling/decoders/factory.py similarity index 100% rename from modeling/official/vision/modeling/decoders/factory.py rename to official/vision/modeling/decoders/factory.py diff --git a/modeling/official/vision/modeling/decoders/factory_test.py b/official/vision/modeling/decoders/factory_test.py similarity index 100% rename from modeling/official/vision/modeling/decoders/factory_test.py rename to official/vision/modeling/decoders/factory_test.py diff --git a/modeling/official/vision/modeling/decoders/fpn.py b/official/vision/modeling/decoders/fpn.py similarity index 100% rename from modeling/official/vision/modeling/decoders/fpn.py rename to official/vision/modeling/decoders/fpn.py diff --git a/modeling/official/vision/modeling/decoders/fpn_test.py b/official/vision/modeling/decoders/fpn_test.py similarity index 100% rename from modeling/official/vision/modeling/decoders/fpn_test.py rename to official/vision/modeling/decoders/fpn_test.py diff --git a/modeling/official/vision/modeling/decoders/nasfpn.py b/official/vision/modeling/decoders/nasfpn.py similarity index 100% rename from modeling/official/vision/modeling/decoders/nasfpn.py rename to official/vision/modeling/decoders/nasfpn.py diff --git a/modeling/official/vision/modeling/decoders/nasfpn_test.py b/official/vision/modeling/decoders/nasfpn_test.py similarity index 100% rename from modeling/official/vision/modeling/decoders/nasfpn_test.py rename to official/vision/modeling/decoders/nasfpn_test.py diff --git a/modeling/official/vision/modeling/factory.py b/official/vision/modeling/factory.py similarity index 100% rename from modeling/official/vision/modeling/factory.py rename to official/vision/modeling/factory.py diff --git a/modeling/official/vision/modeling/factory_3d.py b/official/vision/modeling/factory_3d.py similarity index 92% rename from modeling/official/vision/modeling/factory_3d.py rename to official/vision/modeling/factory_3d.py index 3955ebfc5b201e7a44a23cafc5e29f593964c4e0..b8e557d0e51014307ec9bf04d7ec9ee4c70c00cc 100644 --- a/modeling/official/vision/modeling/factory_3d.py +++ b/official/vision/modeling/factory_3d.py @@ -17,10 +17,10 @@ # Import libraries import tensorflow as tf, tf_keras -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 +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 _REGISTERED_MODEL_CLS = {} diff --git a/modeling/official/vision/modeling/factory_test.py b/official/vision/modeling/factory_test.py similarity index 100% rename from modeling/official/vision/modeling/factory_test.py rename to official/vision/modeling/factory_test.py diff --git a/modeling/official/vision/modeling/heads/__init__.py b/official/vision/modeling/heads/__init__.py similarity index 100% rename from modeling/official/vision/modeling/heads/__init__.py rename to official/vision/modeling/heads/__init__.py diff --git a/modeling/official/vision/modeling/heads/dense_prediction_heads.py b/official/vision/modeling/heads/dense_prediction_heads.py similarity index 100% rename from modeling/official/vision/modeling/heads/dense_prediction_heads.py rename to official/vision/modeling/heads/dense_prediction_heads.py diff --git a/modeling/official/vision/modeling/heads/dense_prediction_heads_test.py b/official/vision/modeling/heads/dense_prediction_heads_test.py similarity index 100% rename from modeling/official/vision/modeling/heads/dense_prediction_heads_test.py rename to official/vision/modeling/heads/dense_prediction_heads_test.py diff --git a/modeling/official/vision/modeling/heads/instance_heads.py b/official/vision/modeling/heads/instance_heads.py similarity index 100% rename from modeling/official/vision/modeling/heads/instance_heads.py rename to official/vision/modeling/heads/instance_heads.py diff --git a/modeling/official/vision/modeling/heads/instance_heads_test.py b/official/vision/modeling/heads/instance_heads_test.py similarity index 100% rename from modeling/official/vision/modeling/heads/instance_heads_test.py rename to official/vision/modeling/heads/instance_heads_test.py diff --git a/modeling/official/vision/modeling/heads/segmentation_heads.py b/official/vision/modeling/heads/segmentation_heads.py similarity index 100% rename from modeling/official/vision/modeling/heads/segmentation_heads.py rename to official/vision/modeling/heads/segmentation_heads.py diff --git a/modeling/official/vision/modeling/heads/segmentation_heads_test.py b/official/vision/modeling/heads/segmentation_heads_test.py similarity index 100% rename from modeling/official/vision/modeling/heads/segmentation_heads_test.py rename to official/vision/modeling/heads/segmentation_heads_test.py diff --git a/modeling/official/vision/modeling/layers/__init__.py b/official/vision/modeling/layers/__init__.py similarity index 100% rename from modeling/official/vision/modeling/layers/__init__.py rename to official/vision/modeling/layers/__init__.py diff --git a/modeling/official/vision/modeling/layers/box_sampler.py b/official/vision/modeling/layers/box_sampler.py similarity index 100% rename from modeling/official/vision/modeling/layers/box_sampler.py rename to official/vision/modeling/layers/box_sampler.py diff --git a/modeling/official/vision/modeling/layers/deeplab.py b/official/vision/modeling/layers/deeplab.py similarity index 100% rename from modeling/official/vision/modeling/layers/deeplab.py rename to official/vision/modeling/layers/deeplab.py diff --git a/modeling/official/vision/modeling/layers/deeplab_test.py b/official/vision/modeling/layers/deeplab_test.py similarity index 100% rename from modeling/official/vision/modeling/layers/deeplab_test.py rename to official/vision/modeling/layers/deeplab_test.py diff --git a/modeling/official/vision/modeling/layers/detection_generator.py b/official/vision/modeling/layers/detection_generator.py similarity index 100% rename from modeling/official/vision/modeling/layers/detection_generator.py rename to official/vision/modeling/layers/detection_generator.py diff --git a/modeling/official/vision/modeling/layers/detection_generator_test.py b/official/vision/modeling/layers/detection_generator_test.py similarity index 100% rename from modeling/official/vision/modeling/layers/detection_generator_test.py rename to official/vision/modeling/layers/detection_generator_test.py diff --git a/modeling/official/vision/modeling/layers/edgetpu.py b/official/vision/modeling/layers/edgetpu.py similarity index 100% rename from modeling/official/vision/modeling/layers/edgetpu.py rename to official/vision/modeling/layers/edgetpu.py diff --git a/modeling/official/vision/modeling/layers/edgetpu_test.py b/official/vision/modeling/layers/edgetpu_test.py similarity index 100% rename from modeling/official/vision/modeling/layers/edgetpu_test.py rename to official/vision/modeling/layers/edgetpu_test.py diff --git a/modeling/official/vision/modeling/layers/mask_sampler.py b/official/vision/modeling/layers/mask_sampler.py similarity index 100% rename from modeling/official/vision/modeling/layers/mask_sampler.py rename to official/vision/modeling/layers/mask_sampler.py diff --git a/modeling/official/vision/modeling/layers/nn_blocks.py b/official/vision/modeling/layers/nn_blocks.py similarity index 100% rename from modeling/official/vision/modeling/layers/nn_blocks.py rename to official/vision/modeling/layers/nn_blocks.py diff --git a/modeling/official/vision/modeling/layers/nn_blocks_3d.py b/official/vision/modeling/layers/nn_blocks_3d.py similarity index 100% rename from modeling/official/vision/modeling/layers/nn_blocks_3d.py rename to official/vision/modeling/layers/nn_blocks_3d.py diff --git a/modeling/official/vision/modeling/layers/nn_blocks_3d_test.py b/official/vision/modeling/layers/nn_blocks_3d_test.py similarity index 100% rename from modeling/official/vision/modeling/layers/nn_blocks_3d_test.py rename to official/vision/modeling/layers/nn_blocks_3d_test.py diff --git a/modeling/official/vision/modeling/layers/nn_blocks_test.py b/official/vision/modeling/layers/nn_blocks_test.py similarity index 100% rename from modeling/official/vision/modeling/layers/nn_blocks_test.py rename to official/vision/modeling/layers/nn_blocks_test.py diff --git a/modeling/official/vision/modeling/layers/nn_layers.py b/official/vision/modeling/layers/nn_layers.py similarity index 99% rename from modeling/official/vision/modeling/layers/nn_layers.py rename to official/vision/modeling/layers/nn_layers.py index 5bea9ea5ba35d6a6965d59682857447de6d4e2c1..c299df0a88a8d8b6946ad2eb606f639ab1e45b9d 100644 --- a/modeling/official/vision/modeling/layers/nn_layers.py +++ b/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 modeling.official.modeling import tf_utils -from modeling.official.vision.ops import spatial_transform_ops +from official.modeling import tf_utils +from official.vision.ops import spatial_transform_ops # Type annotations. diff --git a/modeling/official/vision/modeling/layers/nn_layers_test.py b/official/vision/modeling/layers/nn_layers_test.py similarity index 100% rename from modeling/official/vision/modeling/layers/nn_layers_test.py rename to official/vision/modeling/layers/nn_layers_test.py diff --git a/modeling/official/vision/modeling/layers/roi_aligner.py b/official/vision/modeling/layers/roi_aligner.py similarity index 100% rename from modeling/official/vision/modeling/layers/roi_aligner.py rename to official/vision/modeling/layers/roi_aligner.py diff --git a/modeling/official/vision/modeling/layers/roi_aligner_test.py b/official/vision/modeling/layers/roi_aligner_test.py similarity index 100% rename from modeling/official/vision/modeling/layers/roi_aligner_test.py rename to official/vision/modeling/layers/roi_aligner_test.py diff --git a/modeling/official/vision/modeling/layers/roi_generator.py b/official/vision/modeling/layers/roi_generator.py similarity index 100% rename from modeling/official/vision/modeling/layers/roi_generator.py rename to official/vision/modeling/layers/roi_generator.py diff --git a/modeling/official/vision/modeling/layers/roi_sampler.py b/official/vision/modeling/layers/roi_sampler.py similarity index 100% rename from modeling/official/vision/modeling/layers/roi_sampler.py rename to official/vision/modeling/layers/roi_sampler.py diff --git a/modeling/official/vision/modeling/maskrcnn_model.py b/official/vision/modeling/maskrcnn_model.py similarity index 100% rename from modeling/official/vision/modeling/maskrcnn_model.py rename to official/vision/modeling/maskrcnn_model.py diff --git a/modeling/official/vision/modeling/maskrcnn_model_test.py b/official/vision/modeling/maskrcnn_model_test.py similarity index 100% rename from modeling/official/vision/modeling/maskrcnn_model_test.py rename to official/vision/modeling/maskrcnn_model_test.py diff --git a/modeling/official/vision/modeling/models/__init__.py b/official/vision/modeling/models/__init__.py similarity index 100% rename from modeling/official/vision/modeling/models/__init__.py rename to official/vision/modeling/models/__init__.py diff --git a/modeling/official/vision/modeling/retinanet_model.py b/official/vision/modeling/retinanet_model.py similarity index 100% rename from modeling/official/vision/modeling/retinanet_model.py rename to official/vision/modeling/retinanet_model.py diff --git a/modeling/official/vision/modeling/retinanet_model_test.py b/official/vision/modeling/retinanet_model_test.py similarity index 100% rename from modeling/official/vision/modeling/retinanet_model_test.py rename to official/vision/modeling/retinanet_model_test.py diff --git a/modeling/official/vision/modeling/segmentation_model.py b/official/vision/modeling/segmentation_model.py similarity index 100% rename from modeling/official/vision/modeling/segmentation_model.py rename to official/vision/modeling/segmentation_model.py diff --git a/modeling/official/vision/modeling/segmentation_model_test.py b/official/vision/modeling/segmentation_model_test.py similarity index 100% rename from modeling/official/vision/modeling/segmentation_model_test.py rename to official/vision/modeling/segmentation_model_test.py diff --git a/modeling/official/vision/modeling/video_classification_model.py b/official/vision/modeling/video_classification_model.py similarity index 100% rename from modeling/official/vision/modeling/video_classification_model.py rename to official/vision/modeling/video_classification_model.py diff --git a/modeling/official/vision/modeling/video_classification_model_test.py b/official/vision/modeling/video_classification_model_test.py similarity index 100% rename from modeling/official/vision/modeling/video_classification_model_test.py rename to official/vision/modeling/video_classification_model_test.py diff --git a/modeling/official/vision/ops/__init__.py b/official/vision/ops/__init__.py similarity index 100% rename from modeling/official/vision/ops/__init__.py rename to official/vision/ops/__init__.py diff --git a/modeling/official/vision/ops/anchor.py b/official/vision/ops/anchor.py similarity index 100% rename from modeling/official/vision/ops/anchor.py rename to official/vision/ops/anchor.py diff --git a/modeling/official/vision/ops/anchor_generator.py b/official/vision/ops/anchor_generator.py similarity index 100% rename from modeling/official/vision/ops/anchor_generator.py rename to official/vision/ops/anchor_generator.py diff --git a/modeling/official/vision/ops/anchor_generator_test.py b/official/vision/ops/anchor_generator_test.py similarity index 100% rename from modeling/official/vision/ops/anchor_generator_test.py rename to official/vision/ops/anchor_generator_test.py diff --git a/modeling/official/vision/ops/anchor_test.py b/official/vision/ops/anchor_test.py similarity index 100% rename from modeling/official/vision/ops/anchor_test.py rename to official/vision/ops/anchor_test.py diff --git a/modeling/official/vision/ops/augment.py b/official/vision/ops/augment.py similarity index 100% rename from modeling/official/vision/ops/augment.py rename to official/vision/ops/augment.py diff --git a/modeling/official/vision/ops/augment_test.py b/official/vision/ops/augment_test.py similarity index 100% rename from modeling/official/vision/ops/augment_test.py rename to official/vision/ops/augment_test.py diff --git a/modeling/official/vision/ops/box_matcher.py b/official/vision/ops/box_matcher.py similarity index 100% rename from modeling/official/vision/ops/box_matcher.py rename to official/vision/ops/box_matcher.py diff --git a/modeling/official/vision/ops/box_matcher_test.py b/official/vision/ops/box_matcher_test.py similarity index 100% rename from modeling/official/vision/ops/box_matcher_test.py rename to official/vision/ops/box_matcher_test.py diff --git a/modeling/official/vision/ops/box_ops.py b/official/vision/ops/box_ops.py similarity index 100% rename from modeling/official/vision/ops/box_ops.py rename to official/vision/ops/box_ops.py diff --git a/modeling/official/vision/ops/iou_similarity.py b/official/vision/ops/iou_similarity.py similarity index 100% rename from modeling/official/vision/ops/iou_similarity.py rename to official/vision/ops/iou_similarity.py diff --git a/modeling/official/vision/ops/iou_similarity_test.py b/official/vision/ops/iou_similarity_test.py similarity index 100% rename from modeling/official/vision/ops/iou_similarity_test.py rename to official/vision/ops/iou_similarity_test.py diff --git a/modeling/official/vision/ops/mask_ops.py b/official/vision/ops/mask_ops.py similarity index 100% rename from modeling/official/vision/ops/mask_ops.py rename to official/vision/ops/mask_ops.py diff --git a/modeling/official/vision/ops/mask_ops_test.py b/official/vision/ops/mask_ops_test.py similarity index 100% rename from modeling/official/vision/ops/mask_ops_test.py rename to official/vision/ops/mask_ops_test.py diff --git a/modeling/official/vision/ops/nms.py b/official/vision/ops/nms.py similarity index 100% rename from modeling/official/vision/ops/nms.py rename to official/vision/ops/nms.py diff --git a/modeling/official/vision/ops/preprocess_ops.py b/official/vision/ops/preprocess_ops.py similarity index 100% rename from modeling/official/vision/ops/preprocess_ops.py rename to official/vision/ops/preprocess_ops.py diff --git a/modeling/official/vision/ops/preprocess_ops_3d.py b/official/vision/ops/preprocess_ops_3d.py similarity index 100% rename from modeling/official/vision/ops/preprocess_ops_3d.py rename to official/vision/ops/preprocess_ops_3d.py diff --git a/modeling/official/vision/ops/preprocess_ops_3d_test.py b/official/vision/ops/preprocess_ops_3d_test.py similarity index 100% rename from modeling/official/vision/ops/preprocess_ops_3d_test.py rename to official/vision/ops/preprocess_ops_3d_test.py diff --git a/modeling/official/vision/ops/preprocess_ops_test.py b/official/vision/ops/preprocess_ops_test.py similarity index 100% rename from modeling/official/vision/ops/preprocess_ops_test.py rename to official/vision/ops/preprocess_ops_test.py diff --git a/modeling/official/vision/ops/sampling_ops.py b/official/vision/ops/sampling_ops.py similarity index 100% rename from modeling/official/vision/ops/sampling_ops.py rename to official/vision/ops/sampling_ops.py diff --git a/modeling/official/vision/ops/spatial_transform_ops.py b/official/vision/ops/spatial_transform_ops.py similarity index 100% rename from modeling/official/vision/ops/spatial_transform_ops.py rename to official/vision/ops/spatial_transform_ops.py diff --git a/modeling/official/vision/ops/target_gather.py b/official/vision/ops/target_gather.py similarity index 100% rename from modeling/official/vision/ops/target_gather.py rename to official/vision/ops/target_gather.py diff --git a/modeling/official/vision/ops/target_gather_test.py b/official/vision/ops/target_gather_test.py similarity index 100% rename from modeling/official/vision/ops/target_gather_test.py rename to official/vision/ops/target_gather_test.py diff --git a/modeling/official/vision/registry_imports.py b/official/vision/registry_imports.py similarity index 100% rename from modeling/official/vision/registry_imports.py rename to official/vision/registry_imports.py diff --git a/modeling/official/vision/serving/__init__.py b/official/vision/serving/__init__.py similarity index 100% rename from modeling/official/vision/serving/__init__.py rename to official/vision/serving/__init__.py diff --git a/modeling/official/vision/serving/detection.py b/official/vision/serving/detection.py similarity index 100% rename from modeling/official/vision/serving/detection.py rename to official/vision/serving/detection.py diff --git a/modeling/official/vision/serving/detection_test.py b/official/vision/serving/detection_test.py similarity index 100% rename from modeling/official/vision/serving/detection_test.py rename to official/vision/serving/detection_test.py diff --git a/modeling/official/vision/serving/export_base.py b/official/vision/serving/export_base.py similarity index 100% rename from modeling/official/vision/serving/export_base.py rename to official/vision/serving/export_base.py diff --git a/modeling/official/vision/serving/export_base_v2.py b/official/vision/serving/export_base_v2.py similarity index 100% rename from modeling/official/vision/serving/export_base_v2.py rename to official/vision/serving/export_base_v2.py diff --git a/modeling/official/vision/serving/export_base_v2_test.py b/official/vision/serving/export_base_v2_test.py similarity index 100% rename from modeling/official/vision/serving/export_base_v2_test.py rename to official/vision/serving/export_base_v2_test.py diff --git a/modeling/official/vision/serving/export_module_factory.py b/official/vision/serving/export_module_factory.py similarity index 100% rename from modeling/official/vision/serving/export_module_factory.py rename to official/vision/serving/export_module_factory.py diff --git a/modeling/official/vision/serving/export_module_factory_test.py b/official/vision/serving/export_module_factory_test.py similarity index 100% rename from modeling/official/vision/serving/export_module_factory_test.py rename to official/vision/serving/export_module_factory_test.py diff --git a/modeling/official/vision/serving/export_saved_model.py b/official/vision/serving/export_saved_model.py similarity index 100% rename from modeling/official/vision/serving/export_saved_model.py rename to official/vision/serving/export_saved_model.py diff --git a/modeling/official/vision/serving/export_saved_model_lib.py b/official/vision/serving/export_saved_model_lib.py similarity index 100% rename from modeling/official/vision/serving/export_saved_model_lib.py rename to official/vision/serving/export_saved_model_lib.py diff --git a/modeling/official/vision/serving/export_saved_model_lib_test.py b/official/vision/serving/export_saved_model_lib_test.py similarity index 100% rename from modeling/official/vision/serving/export_saved_model_lib_test.py rename to official/vision/serving/export_saved_model_lib_test.py diff --git a/modeling/official/vision/serving/export_saved_model_lib_v2.py b/official/vision/serving/export_saved_model_lib_v2.py similarity index 100% rename from modeling/official/vision/serving/export_saved_model_lib_v2.py rename to official/vision/serving/export_saved_model_lib_v2.py diff --git a/modeling/official/vision/serving/export_tfhub.py b/official/vision/serving/export_tfhub.py similarity index 100% rename from modeling/official/vision/serving/export_tfhub.py rename to official/vision/serving/export_tfhub.py diff --git a/modeling/official/vision/serving/export_tfhub_lib.py b/official/vision/serving/export_tfhub_lib.py similarity index 100% rename from modeling/official/vision/serving/export_tfhub_lib.py rename to official/vision/serving/export_tfhub_lib.py diff --git a/modeling/official/vision/serving/export_tflite.py b/official/vision/serving/export_tflite.py similarity index 100% rename from modeling/official/vision/serving/export_tflite.py rename to official/vision/serving/export_tflite.py diff --git a/modeling/official/vision/serving/export_tflite_lib.py b/official/vision/serving/export_tflite_lib.py similarity index 100% rename from modeling/official/vision/serving/export_tflite_lib.py rename to official/vision/serving/export_tflite_lib.py diff --git a/modeling/official/vision/serving/export_utils.py b/official/vision/serving/export_utils.py similarity index 100% rename from modeling/official/vision/serving/export_utils.py rename to official/vision/serving/export_utils.py diff --git a/modeling/official/vision/serving/image_classification.py b/official/vision/serving/image_classification.py similarity index 100% rename from modeling/official/vision/serving/image_classification.py rename to official/vision/serving/image_classification.py diff --git a/modeling/official/vision/serving/image_classification_test.py b/official/vision/serving/image_classification_test.py similarity index 100% rename from modeling/official/vision/serving/image_classification_test.py rename to official/vision/serving/image_classification_test.py diff --git a/modeling/official/vision/serving/semantic_segmentation.py b/official/vision/serving/semantic_segmentation.py similarity index 100% rename from modeling/official/vision/serving/semantic_segmentation.py rename to official/vision/serving/semantic_segmentation.py diff --git a/modeling/official/vision/serving/semantic_segmentation_test.py b/official/vision/serving/semantic_segmentation_test.py similarity index 100% rename from modeling/official/vision/serving/semantic_segmentation_test.py rename to official/vision/serving/semantic_segmentation_test.py diff --git a/modeling/official/vision/serving/video_classification.py b/official/vision/serving/video_classification.py similarity index 100% rename from modeling/official/vision/serving/video_classification.py rename to official/vision/serving/video_classification.py diff --git a/modeling/official/vision/serving/video_classification_test.py b/official/vision/serving/video_classification_test.py similarity index 100% rename from modeling/official/vision/serving/video_classification_test.py rename to official/vision/serving/video_classification_test.py diff --git a/modeling/official/vision/tasks/__init__.py b/official/vision/tasks/__init__.py similarity index 100% rename from modeling/official/vision/tasks/__init__.py rename to official/vision/tasks/__init__.py diff --git a/modeling/official/vision/tasks/image_classification.py b/official/vision/tasks/image_classification.py similarity index 100% rename from modeling/official/vision/tasks/image_classification.py rename to official/vision/tasks/image_classification.py diff --git a/modeling/official/vision/tasks/maskrcnn.py b/official/vision/tasks/maskrcnn.py similarity index 100% rename from modeling/official/vision/tasks/maskrcnn.py rename to official/vision/tasks/maskrcnn.py diff --git a/modeling/official/vision/tasks/retinanet.py b/official/vision/tasks/retinanet.py similarity index 100% rename from modeling/official/vision/tasks/retinanet.py rename to official/vision/tasks/retinanet.py diff --git a/modeling/official/vision/tasks/semantic_segmentation.py b/official/vision/tasks/semantic_segmentation.py similarity index 100% rename from modeling/official/vision/tasks/semantic_segmentation.py rename to official/vision/tasks/semantic_segmentation.py diff --git a/modeling/official/vision/tasks/video_classification.py b/official/vision/tasks/video_classification.py similarity index 100% rename from modeling/official/vision/tasks/video_classification.py rename to official/vision/tasks/video_classification.py diff --git a/modeling/official/vision/train.py b/official/vision/train.py similarity index 100% rename from modeling/official/vision/train.py rename to official/vision/train.py diff --git a/modeling/official/vision/train_spatial_partitioning.py b/official/vision/train_spatial_partitioning.py similarity index 100% rename from modeling/official/vision/train_spatial_partitioning.py rename to official/vision/train_spatial_partitioning.py diff --git a/modeling/official/vision/utils/__init__.py b/official/vision/utils/__init__.py similarity index 100% rename from modeling/official/vision/utils/__init__.py rename to official/vision/utils/__init__.py diff --git a/modeling/official/vision/utils/object_detection/__init__.py b/official/vision/utils/object_detection/__init__.py similarity index 100% rename from modeling/official/vision/utils/object_detection/__init__.py rename to official/vision/utils/object_detection/__init__.py diff --git a/modeling/official/vision/utils/object_detection/argmax_matcher.py b/official/vision/utils/object_detection/argmax_matcher.py similarity index 100% rename from modeling/official/vision/utils/object_detection/argmax_matcher.py rename to official/vision/utils/object_detection/argmax_matcher.py diff --git a/modeling/official/vision/utils/object_detection/balanced_positive_negative_sampler.py b/official/vision/utils/object_detection/balanced_positive_negative_sampler.py similarity index 100% rename from modeling/official/vision/utils/object_detection/balanced_positive_negative_sampler.py rename to official/vision/utils/object_detection/balanced_positive_negative_sampler.py diff --git a/modeling/official/vision/utils/object_detection/box_coder.py b/official/vision/utils/object_detection/box_coder.py similarity index 100% rename from modeling/official/vision/utils/object_detection/box_coder.py rename to official/vision/utils/object_detection/box_coder.py diff --git a/modeling/official/vision/utils/object_detection/box_list.py b/official/vision/utils/object_detection/box_list.py similarity index 100% rename from modeling/official/vision/utils/object_detection/box_list.py rename to official/vision/utils/object_detection/box_list.py diff --git a/modeling/official/vision/utils/object_detection/box_list_ops.py b/official/vision/utils/object_detection/box_list_ops.py similarity index 100% rename from modeling/official/vision/utils/object_detection/box_list_ops.py rename to official/vision/utils/object_detection/box_list_ops.py diff --git a/modeling/official/vision/utils/object_detection/faster_rcnn_box_coder.py b/official/vision/utils/object_detection/faster_rcnn_box_coder.py similarity index 100% rename from modeling/official/vision/utils/object_detection/faster_rcnn_box_coder.py rename to official/vision/utils/object_detection/faster_rcnn_box_coder.py diff --git a/modeling/official/vision/utils/object_detection/matcher.py b/official/vision/utils/object_detection/matcher.py similarity index 100% rename from modeling/official/vision/utils/object_detection/matcher.py rename to official/vision/utils/object_detection/matcher.py diff --git a/modeling/official/vision/utils/object_detection/minibatch_sampler.py b/official/vision/utils/object_detection/minibatch_sampler.py similarity index 100% rename from modeling/official/vision/utils/object_detection/minibatch_sampler.py rename to official/vision/utils/object_detection/minibatch_sampler.py diff --git a/modeling/official/vision/utils/object_detection/ops.py b/official/vision/utils/object_detection/ops.py similarity index 100% rename from modeling/official/vision/utils/object_detection/ops.py rename to official/vision/utils/object_detection/ops.py diff --git a/modeling/official/vision/utils/object_detection/preprocessor.py b/official/vision/utils/object_detection/preprocessor.py similarity index 100% rename from modeling/official/vision/utils/object_detection/preprocessor.py rename to official/vision/utils/object_detection/preprocessor.py diff --git a/modeling/official/vision/utils/object_detection/region_similarity_calculator.py b/official/vision/utils/object_detection/region_similarity_calculator.py similarity index 100% rename from modeling/official/vision/utils/object_detection/region_similarity_calculator.py rename to official/vision/utils/object_detection/region_similarity_calculator.py diff --git a/modeling/official/vision/utils/object_detection/shape_utils.py b/official/vision/utils/object_detection/shape_utils.py similarity index 100% rename from modeling/official/vision/utils/object_detection/shape_utils.py rename to official/vision/utils/object_detection/shape_utils.py diff --git a/modeling/official/vision/utils/object_detection/target_assigner.py b/official/vision/utils/object_detection/target_assigner.py similarity index 100% rename from modeling/official/vision/utils/object_detection/target_assigner.py rename to official/vision/utils/object_detection/target_assigner.py diff --git a/modeling/official/vision/utils/object_detection/visualization_utils.py b/official/vision/utils/object_detection/visualization_utils.py similarity index 100% rename from modeling/official/vision/utils/object_detection/visualization_utils.py rename to official/vision/utils/object_detection/visualization_utils.py diff --git a/modeling/official/vision/utils/ops_test.py b/official/vision/utils/ops_test.py similarity index 100% rename from modeling/official/vision/utils/ops_test.py rename to official/vision/utils/ops_test.py diff --git a/modeling/official/vision/utils/summary_manager.py b/official/vision/utils/summary_manager.py similarity index 100% rename from modeling/official/vision/utils/summary_manager.py rename to official/vision/utils/summary_manager.py diff --git a/modeling/orbit/LICENSE b/orbit/LICENSE similarity index 100% rename from modeling/orbit/LICENSE rename to orbit/LICENSE diff --git a/modeling/orbit/README.md b/orbit/README.md similarity index 100% rename from modeling/orbit/README.md rename to orbit/README.md diff --git a/modeling/orbit/__init__.py b/orbit/__init__.py similarity index 57% rename from modeling/orbit/__init__.py rename to orbit/__init__.py index 1de079a20f7525a5d6ab0306a21abd730e91b306..da292ccce9cb7c2ecd1ac6b24344622140f61a77 100644 --- a/modeling/orbit/__init__.py +++ b/orbit/__init__.py @@ -14,17 +14,17 @@ """Defines exported symbols for the `orbit` package.""" -from modeling.orbit import actions +from orbit import actions # Internal import orbit. -from modeling.orbit import utils +from orbit import utils -from modeling.orbit.controller import Action -from modeling.orbit.controller import Controller +from orbit.controller import Action +from orbit.controller import Controller -from modeling.orbit.runner import AbstractEvaluator -from modeling.orbit.runner import AbstractTrainer +from orbit.runner import AbstractEvaluator +from orbit.runner import AbstractTrainer -from modeling.orbit.standard_runner import StandardEvaluator -from modeling.orbit.standard_runner import StandardEvaluatorOptions -from modeling.orbit.standard_runner import StandardTrainer -from modeling.orbit.standard_runner import StandardTrainerOptions +from orbit.standard_runner import StandardEvaluator +from orbit.standard_runner import StandardEvaluatorOptions +from orbit.standard_runner import StandardTrainer +from orbit.standard_runner import StandardTrainerOptions diff --git a/modeling/orbit/actions/__init__.py b/orbit/actions/__init__.py similarity index 86% rename from modeling/orbit/actions/__init__.py rename to orbit/actions/__init__.py index 92092b1602c5a3a446fb2d5e5838faeca524b630..b8502c744ef19869e6807ba9ea1006ea1e18a151 100644 --- a/modeling/orbit/actions/__init__.py +++ b/orbit/actions/__init__.py @@ -65,12 +65,12 @@ to avoid unnecessary writes by setting the `write_value` parameter to `False` for most clients. """ -from modeling.orbit.actions.conditional_action import ConditionalAction +from orbit.actions.conditional_action import ConditionalAction -from modeling.orbit.actions.export_saved_model import ExportFileManager -from modeling.orbit.actions.export_saved_model import ExportSavedModel +from orbit.actions.export_saved_model import ExportFileManager +from orbit.actions.export_saved_model import ExportSavedModel -from modeling.orbit.actions.new_best_metric import JSONPersistedValue -from modeling.orbit.actions.new_best_metric import NewBestMetric +from orbit.actions.new_best_metric import JSONPersistedValue +from orbit.actions.new_best_metric import NewBestMetric -from modeling.orbit.actions.save_checkpoint_if_preempted import SaveCheckpointIfPreempted +from orbit.actions.save_checkpoint_if_preempted import SaveCheckpointIfPreempted diff --git a/modeling/orbit/actions/conditional_action.py b/orbit/actions/conditional_action.py similarity index 96% rename from modeling/orbit/actions/conditional_action.py rename to orbit/actions/conditional_action.py index 7523e349d790d3232ea0734433281ec49f9308b6..d84e199f9ce2e92a97b81a34aae1dac012cde78c 100644 --- a/modeling/orbit/actions/conditional_action.py +++ b/orbit/actions/conditional_action.py @@ -16,8 +16,8 @@ from typing import Any, Callable, Sequence, Union -from modeling.orbit import controller -from modeling.orbit import runner +from orbit import controller +from orbit import runner import tensorflow as tf, tf_keras diff --git a/modeling/orbit/actions/conditional_action_test.py b/orbit/actions/conditional_action_test.py similarity index 100% rename from modeling/orbit/actions/conditional_action_test.py rename to orbit/actions/conditional_action_test.py diff --git a/modeling/orbit/actions/export_saved_model.py b/orbit/actions/export_saved_model.py similarity index 100% rename from modeling/orbit/actions/export_saved_model.py rename to orbit/actions/export_saved_model.py diff --git a/modeling/orbit/actions/export_saved_model_test.py b/orbit/actions/export_saved_model_test.py similarity index 100% rename from modeling/orbit/actions/export_saved_model_test.py rename to orbit/actions/export_saved_model_test.py diff --git a/modeling/orbit/actions/new_best_metric.py b/orbit/actions/new_best_metric.py similarity index 99% rename from modeling/orbit/actions/new_best_metric.py rename to orbit/actions/new_best_metric.py index 0c1c07c06d7403fb265fc56764ae6e78ac4faa82..3d9e411199e71701693c3f4ce2ad7d0d2581c039 100644 --- a/modeling/orbit/actions/new_best_metric.py +++ b/orbit/actions/new_best_metric.py @@ -20,8 +20,8 @@ import sys from typing import Any, Callable, Optional, Union import uuid -from modeling.orbit import runner -from modeling.orbit import utils +from orbit import runner +from orbit import utils import tensorflow as tf, tf_keras diff --git a/modeling/orbit/actions/new_best_metric_test.py b/orbit/actions/new_best_metric_test.py similarity index 100% rename from modeling/orbit/actions/new_best_metric_test.py rename to orbit/actions/new_best_metric_test.py diff --git a/modeling/orbit/actions/save_checkpoint_if_preempted.py b/orbit/actions/save_checkpoint_if_preempted.py similarity index 100% rename from modeling/orbit/actions/save_checkpoint_if_preempted.py rename to orbit/actions/save_checkpoint_if_preempted.py diff --git a/modeling/orbit/controller.py b/orbit/controller.py similarity index 99% rename from modeling/orbit/controller.py rename to orbit/controller.py index 7db81366acb7197d0a01f92e4258ed7d2b502665..bd787ed90051081338844d5f7657fc55d00547b8 100644 --- a/modeling/orbit/controller.py +++ b/orbit/controller.py @@ -21,8 +21,8 @@ from typing import Callable, Iterable, Optional, Union from absl import logging -from modeling.orbit import runner -from modeling.orbit import utils +from orbit import runner +from orbit import utils import tensorflow as tf, tf_keras diff --git a/modeling/orbit/controller_test.py b/orbit/controller_test.py similarity index 100% rename from modeling/orbit/controller_test.py rename to orbit/controller_test.py diff --git a/modeling/orbit/examples/__init__.py b/orbit/examples/__init__.py similarity index 100% rename from modeling/orbit/examples/__init__.py rename to orbit/examples/__init__.py diff --git a/modeling/orbit/examples/single_task/__init__.py b/orbit/examples/single_task/__init__.py similarity index 100% rename from modeling/orbit/examples/single_task/__init__.py rename to orbit/examples/single_task/__init__.py diff --git a/modeling/orbit/examples/single_task/single_task_evaluator.py b/orbit/examples/single_task/single_task_evaluator.py similarity index 100% rename from modeling/orbit/examples/single_task/single_task_evaluator.py rename to orbit/examples/single_task/single_task_evaluator.py diff --git a/modeling/orbit/examples/single_task/single_task_evaluator_test.py b/orbit/examples/single_task/single_task_evaluator_test.py similarity index 100% rename from modeling/orbit/examples/single_task/single_task_evaluator_test.py rename to orbit/examples/single_task/single_task_evaluator_test.py diff --git a/modeling/orbit/examples/single_task/single_task_trainer.py b/orbit/examples/single_task/single_task_trainer.py similarity index 100% rename from modeling/orbit/examples/single_task/single_task_trainer.py rename to orbit/examples/single_task/single_task_trainer.py diff --git a/modeling/orbit/examples/single_task/single_task_trainer_test.py b/orbit/examples/single_task/single_task_trainer_test.py similarity index 100% rename from modeling/orbit/examples/single_task/single_task_trainer_test.py rename to orbit/examples/single_task/single_task_trainer_test.py diff --git a/modeling/orbit/runner.py b/orbit/runner.py similarity index 100% rename from modeling/orbit/runner.py rename to orbit/runner.py diff --git a/modeling/orbit/standard_runner.py b/orbit/standard_runner.py similarity index 99% rename from modeling/orbit/standard_runner.py rename to orbit/standard_runner.py index 78f177508620330230194aa9ab623175ef5cbf39..a592c01b977a1a6c9077da0246c59a645fdb7681 100644 --- a/modeling/orbit/standard_runner.py +++ b/orbit/standard_runner.py @@ -39,8 +39,8 @@ from typing import Any, Optional import dataclasses -from modeling.orbit import runner -from modeling.orbit.utils import loop_fns +from orbit import runner +from orbit.utils import loop_fns import tensorflow as tf, tf_keras diff --git a/modeling/orbit/standard_runner_test.py b/orbit/standard_runner_test.py similarity index 100% rename from modeling/orbit/standard_runner_test.py rename to orbit/standard_runner_test.py diff --git a/modeling/orbit/utils/__init__.py b/orbit/utils/__init__.py similarity index 51% rename from modeling/orbit/utils/__init__.py rename to orbit/utils/__init__.py index 6d50ad424680db58a88488e0bda520408f32ebc3..1bcace1a6d13e5792fc5ed904c0e3cb5388e46c1 100644 --- a/modeling/orbit/utils/__init__.py +++ b/orbit/utils/__init__.py @@ -14,17 +14,17 @@ """Defines exported symbols for the `orbit.utils` package.""" -from modeling.orbit.utils.common import create_global_step -from modeling.orbit.utils.common import get_value -from modeling.orbit.utils.common import make_distributed_dataset +from orbit.utils.common import create_global_step +from orbit.utils.common import get_value +from orbit.utils.common import make_distributed_dataset -from modeling.orbit.utils.epoch_helper import EpochHelper +from orbit.utils.epoch_helper import EpochHelper -from modeling.orbit.utils.loop_fns import create_loop_fn -from modeling.orbit.utils.loop_fns import create_tf_while_loop_fn -from modeling.orbit.utils.loop_fns import LoopFnWithSummaries +from orbit.utils.loop_fns import create_loop_fn +from orbit.utils.loop_fns import create_tf_while_loop_fn +from orbit.utils.loop_fns import LoopFnWithSummaries -from modeling.orbit.utils.summary_manager import SummaryManager -from modeling.orbit.utils.summary_manager_interface import SummaryManagerInterface +from orbit.utils.summary_manager import SummaryManager +from orbit.utils.summary_manager_interface import SummaryManagerInterface -from modeling.orbit.utils.tpu_summaries import OptionalSummariesFunction +from orbit.utils.tpu_summaries import OptionalSummariesFunction diff --git a/modeling/orbit/utils/common.py b/orbit/utils/common.py similarity index 100% rename from modeling/orbit/utils/common.py rename to orbit/utils/common.py diff --git a/modeling/orbit/utils/common_test.py b/orbit/utils/common_test.py similarity index 100% rename from modeling/orbit/utils/common_test.py rename to orbit/utils/common_test.py diff --git a/modeling/orbit/utils/epoch_helper.py b/orbit/utils/epoch_helper.py similarity index 100% rename from modeling/orbit/utils/epoch_helper.py rename to orbit/utils/epoch_helper.py diff --git a/modeling/orbit/utils/loop_fns.py b/orbit/utils/loop_fns.py similarity index 99% rename from modeling/orbit/utils/loop_fns.py rename to orbit/utils/loop_fns.py index 739d3b6e14b4696b5b4422404aca30f1ab10a0c8..d784df26e5fc766582f9c7ae1fe9f4ea8e241a08 100644 --- a/modeling/orbit/utils/loop_fns.py +++ b/orbit/utils/loop_fns.py @@ -15,7 +15,7 @@ """Utilities for creating loop functions.""" from absl import logging -from modeling.orbit.utils import tpu_summaries +from orbit.utils import tpu_summaries import tensorflow as tf, tf_keras diff --git a/modeling/orbit/utils/summary_manager.py b/orbit/utils/summary_manager.py similarity index 98% rename from modeling/orbit/utils/summary_manager.py rename to orbit/utils/summary_manager.py index 71420926c39aa18136dd4f1d6162e25d6dbe1540..416827f5015ed268392c0c3743e3736f4ce36583 100644 --- a/modeling/orbit/utils/summary_manager.py +++ b/orbit/utils/summary_manager.py @@ -16,7 +16,7 @@ import os -from modeling.orbit.utils.summary_manager_interface import SummaryManagerInterface +from orbit.utils.summary_manager_interface import SummaryManagerInterface import tensorflow as tf, tf_keras diff --git a/modeling/orbit/utils/summary_manager_interface.py b/orbit/utils/summary_manager_interface.py similarity index 100% rename from modeling/orbit/utils/summary_manager_interface.py rename to orbit/utils/summary_manager_interface.py diff --git a/modeling/orbit/utils/tpu_summaries.py b/orbit/utils/tpu_summaries.py similarity index 100% rename from modeling/orbit/utils/tpu_summaries.py rename to orbit/utils/tpu_summaries.py diff --git a/modeling/orbit/utils/tpu_summaries_test.py b/orbit/utils/tpu_summaries_test.py similarity index 100% rename from modeling/orbit/utils/tpu_summaries_test.py rename to orbit/utils/tpu_summaries_test.py