tensorflow · hadim · Jul 25, 2018 · Jul 25, 2018 · Jul 27, 2018 · Jul 27, 2018
diff --git a/research/object_detection/environment.yml b/research/object_detection/environment.yml
@@ -0,0 +1,20 @@
+# Create with `conda env create -f environment.yml`
+name: object_detection
+
+channels:
+ - conda-forge
+
+dependencies:
+  - python=3.6
+  - python
+  - pillow
+  - matplotlib
+  - cython
+  - protobuf
+  - jupyter
+  - jupyterlab
+  - pip:
+    - pycocotools
+    - tensorflow-gpu
+    # or
+    # - tensorflow
diff --git a/research/object_detection/g3doc/installation.md b/research/object_detection/g3doc/installation.md
@@ -1,112 +1,21 @@
 # Installation
 
-## Dependencies
-
-Tensorflow Object Detection API depends on the following libraries:
-
-*   Protobuf 3.0.0
-*   Python-tk
-*   Pillow 1.0
-*   lxml
-*   tf Slim (which is included in the "tensorflow/models/research/" checkout)
-*   Jupyter notebook
-*   Matplotlib
-*   Tensorflow
-*   Cython
-*   contextlib2
-*   cocoapi
-
-For detailed steps to install Tensorflow, follow the [Tensorflow installation
-instructions](https://www.tensorflow.org/install/). A typical user can install
-Tensorflow using one of the following commands:
-
-``` bash
-# For CPU
-pip install tensorflow
-# For GPU
-pip install tensorflow-gpu
-```
-
-The remaining libraries can be installed on Ubuntu 16.04 using via apt-get:
+It is recommended to use the [Anaconda Python distribution](https://www.anaconda.com/downloa) to install and use the `object_detection` API. Then you can setup a new Conda environment with all the necessary dependencies:
 
 ``` bash
-sudo apt-get install protobuf-compiler python-pil python-lxml python-tk
-pip install --user Cython
-pip install --user contextlib2
-pip install --user jupyter
-pip install --user matplotlib
-```
+wget https://raw.githubusercontent.com/hadim/models/master/research/object_detection/environment.yml
+conda env create -f environment.yml
 
-Alternatively, users can install dependencies using pip:
+source activate object_detection
+pip install object_detection
 
-``` bash
-pip install --user Cython
-pip install --user contextlib2
-pip install --user pillow
-pip install --user lxml
-pip install --user jupyter
-pip install --user matplotlib
-```
-
-Note that sometimes "sudo apt-get install protobuf-compiler" will install
-Protobuf 3+ versions for you and some users have issues when using 3.5.
-If that is your case, you're suggested to download and install Protobuf 3.0.0
-(available [here](https://github.com/google/protobuf/releases/tag/v3.0.0)).
-
-## COCO API installation
-
-Download the
-<a href="https://github.com/cocodataset/cocoapi" target=_blank>cocoapi</a> and
-copy the pycocotools subfolder to the tensorflow/models/research directory if
-you are interested in using COCO evaluation metrics. The default metrics are
-based on those used in Pascal VOC evaluation. To use the COCO object detection
-metrics add `metrics_set: "coco_detection_metrics"` to the `eval_config` message
-in the config file. To use the COCO instance segmentation metrics add
-`metrics_set: "coco_mask_metrics"` to the `eval_config` message in the config
-file.
-
-```bash
-git clone https://github.com/cocodataset/cocoapi.git
-cd cocoapi/PythonAPI
-make
-cp -r pycocotools <path_to_tensorflow>/models/research/
+# or to install from a local directory
+# pip install -e .
 ```
 
-## Protobuf Compilation
-
-The Tensorflow Object Detection API uses Protobufs to configure model and
-training parameters. Before the framework can be used, the Protobuf libraries
-must be compiled. This should be done by running the following command from
-the tensorflow/models/research/ directory:
-
-
-``` bash
-# From tensorflow/models/research/
-protoc object_detection/protos/*.proto --python_out=.
-```
-
-## Add Libraries to PYTHONPATH
-
-When running locally, the tensorflow/models/research/ and slim directories
-should be appended to PYTHONPATH. This can be done by running the following from
-tensorflow/models/research/:
-
-
-``` bash
-# From tensorflow/models/research/
-export PYTHONPATH=$PYTHONPATH:`pwd`:`pwd`/slim
-```
-
-Note: This command needs to run from every new terminal you start. If you wish
-to avoid running this manually, you can add it as a new line to the end of your
-~/.bashrc file, replacing \`pwd\` with the absolute path of
-tensorflow/models/research on your system.
-
-# Testing the Installation
-
-You can test that you have correctly installed the Tensorflow Object Detection\
-API by running the following command:
+Check the installation is correct by running tests:
 
 ```bash
-python object_detection/builders/model_builder_test.py
+source activate object_detection
+model_builder_test
 ```
diff --git a/research/object_detection/__init__.py → ...ct_detection/object_detection/__init__.py b/research/object_detection/__init__.py → ...ct_detection/object_detection/__init__.py
diff --git a/...t_detection/anchor_generators/__init__.py → ...t_detection/anchor_generators/__init__.py b/...t_detection/anchor_generators/__init__.py → ...t_detection/anchor_generators/__init__.py
diff --git a/...nchor_generators/grid_anchor_generator.py → ...nchor_generators/grid_anchor_generator.py b/...nchor_generators/grid_anchor_generator.py → ...nchor_generators/grid_anchor_generator.py
diff --git a/..._generators/grid_anchor_generator_test.py → ..._generators/grid_anchor_generator_test.py b/..._generators/grid_anchor_generator_test.py → ..._generators/grid_anchor_generator_test.py
diff --git a/...erators/multiple_grid_anchor_generator.py → ...erators/multiple_grid_anchor_generator.py b/...erators/multiple_grid_anchor_generator.py → ...erators/multiple_grid_anchor_generator.py
diff --git a/...rs/multiple_grid_anchor_generator_test.py → ...rs/multiple_grid_anchor_generator_test.py b/...rs/multiple_grid_anchor_generator_test.py → ...rs/multiple_grid_anchor_generator_test.py
diff --git a/...ators/multiscale_grid_anchor_generator.py → ...ators/multiscale_grid_anchor_generator.py b/...ators/multiscale_grid_anchor_generator.py → ...ators/multiscale_grid_anchor_generator.py
diff --git a/.../multiscale_grid_anchor_generator_test.py → .../multiscale_grid_anchor_generator_test.py b/.../multiscale_grid_anchor_generator_test.py → .../multiscale_grid_anchor_generator_test.py
diff --git a/...h/object_detection/box_coders/__init__.py → ...n/object_detection/box_coders/__init__.py b/...h/object_detection/box_coders/__init__.py → ...n/object_detection/box_coders/__init__.py
diff --git a/...ction/box_coders/faster_rcnn_box_coder.py → ...ction/box_coders/faster_rcnn_box_coder.py b/...ction/box_coders/faster_rcnn_box_coder.py → ...ction/box_coders/faster_rcnn_box_coder.py
diff --git a/.../box_coders/faster_rcnn_box_coder_test.py → .../box_coders/faster_rcnn_box_coder_test.py b/.../box_coders/faster_rcnn_box_coder_test.py → .../box_coders/faster_rcnn_box_coder_test.py
diff --git a/...etection/box_coders/keypoint_box_coder.py → ...etection/box_coders/keypoint_box_coder.py b/...etection/box_coders/keypoint_box_coder.py → ...etection/box_coders/keypoint_box_coder.py
diff --git a/...ion/box_coders/keypoint_box_coder_test.py → ...ion/box_coders/keypoint_box_coder_test.py b/...ion/box_coders/keypoint_box_coder_test.py → ...ion/box_coders/keypoint_box_coder_test.py
diff --git a/...ction/box_coders/mean_stddev_box_coder.py → ...ction/box_coders/mean_stddev_box_coder.py b/...ction/box_coders/mean_stddev_box_coder.py → ...ction/box_coders/mean_stddev_box_coder.py
diff --git a/.../box_coders/mean_stddev_box_coder_test.py → .../box_coders/mean_stddev_box_coder_test.py b/.../box_coders/mean_stddev_box_coder_test.py → .../box_coders/mean_stddev_box_coder_test.py
diff --git a/..._detection/box_coders/square_box_coder.py → ..._detection/box_coders/square_box_coder.py b/..._detection/box_coders/square_box_coder.py → ..._detection/box_coders/square_box_coder.py
diff --git a/...ction/box_coders/square_box_coder_test.py → ...ction/box_coders/square_box_coder_test.py b/...ction/box_coders/square_box_coder_test.py → ...ction/box_coders/square_box_coder_test.py
diff --git a/...rch/object_detection/builders/__init__.py → ...ion/object_detection/builders/__init__.py b/...rch/object_detection/builders/__init__.py → ...ion/object_detection/builders/__init__.py
diff --git a/...tion/builders/anchor_generator_builder.py → ...tion/builders/anchor_generator_builder.py b/...tion/builders/anchor_generator_builder.py → ...tion/builders/anchor_generator_builder.py
diff --git a/...builders/anchor_generator_builder_test.py → ...builders/anchor_generator_builder_test.py b/...builders/anchor_generator_builder_test.py → ...builders/anchor_generator_builder_test.py
diff --git a/...t_detection/builders/box_coder_builder.py → ...t_detection/builders/box_coder_builder.py b/...t_detection/builders/box_coder_builder.py → ...t_detection/builders/box_coder_builder.py
diff --git a/...ection/builders/box_coder_builder_test.py → ...ection/builders/box_coder_builder_test.py b/...ection/builders/box_coder_builder_test.py → ...ection/builders/box_coder_builder_test.py
diff --git a/...tection/builders/box_predictor_builder.py → ...tection/builders/box_predictor_builder.py b/...tection/builders/box_predictor_builder.py → ...tection/builders/box_predictor_builder.py
diff --git a/...on/builders/box_predictor_builder_test.py → ...on/builders/box_predictor_builder_test.py b/...on/builders/box_predictor_builder_test.py → ...on/builders/box_predictor_builder_test.py
diff --git a/...ect_detection/builders/dataset_builder.py → ...ect_detection/builders/dataset_builder.py b/...ect_detection/builders/dataset_builder.py → ...ect_detection/builders/dataset_builder.py
diff --git a/...etection/builders/dataset_builder_test.py → ...etection/builders/dataset_builder_test.py b/...etection/builders/dataset_builder_test.py → ...etection/builders/dataset_builder_test.py
diff --git a/...ection/builders/graph_rewriter_builder.py → ...ection/builders/graph_rewriter_builder.py b/...ection/builders/graph_rewriter_builder.py → ...ection/builders/graph_rewriter_builder.py
diff --git a/...n/builders/graph_rewriter_builder_test.py → ...n/builders/graph_rewriter_builder_test.py b/...n/builders/graph_rewriter_builder_test.py → ...n/builders/graph_rewriter_builder_test.py
diff --git a/...detection/builders/hyperparams_builder.py → ...detection/builders/hyperparams_builder.py b/...detection/builders/hyperparams_builder.py → ...detection/builders/hyperparams_builder.py
diff --git a/...tion/builders/hyperparams_builder_test.py → ...tion/builders/hyperparams_builder_test.py b/...tion/builders/hyperparams_builder_test.py → ...tion/builders/hyperparams_builder_test.py
diff --git a/...tection/builders/image_resizer_builder.py → ...tection/builders/image_resizer_builder.py b/...tection/builders/image_resizer_builder.py → ...tection/builders/image_resizer_builder.py
diff --git a/...on/builders/image_resizer_builder_test.py → ...on/builders/image_resizer_builder_test.py b/...on/builders/image_resizer_builder_test.py → ...on/builders/image_resizer_builder_test.py
diff --git a/...etection/builders/input_reader_builder.py → ...etection/builders/input_reader_builder.py b/...etection/builders/input_reader_builder.py → ...etection/builders/input_reader_builder.py
diff --git a/...ion/builders/input_reader_builder_test.py → ...ion/builders/input_reader_builder_test.py b/...ion/builders/input_reader_builder_test.py → ...ion/builders/input_reader_builder_test.py
diff --git a/...ject_detection/builders/losses_builder.py → ...ject_detection/builders/losses_builder.py b/...ject_detection/builders/losses_builder.py → ...ject_detection/builders/losses_builder.py
diff --git a/...detection/builders/losses_builder_test.py → ...detection/builders/losses_builder_test.py b/...detection/builders/losses_builder_test.py → ...detection/builders/losses_builder_test.py
diff --git a/...ect_detection/builders/matcher_builder.py → ...ect_detection/builders/matcher_builder.py b/...ect_detection/builders/matcher_builder.py → ...ect_detection/builders/matcher_builder.py
diff --git a/...etection/builders/matcher_builder_test.py → ...etection/builders/matcher_builder_test.py b/...etection/builders/matcher_builder_test.py → ...etection/builders/matcher_builder_test.py
diff --git a/...bject_detection/builders/model_builder.py → ...bject_detection/builders/model_builder.py b/...bject_detection/builders/model_builder.py → ...bject_detection/builders/model_builder.py
diff --git a/..._detection/builders/model_builder_test.py → ..._detection/builders/model_builder_test.py b/..._detection/builders/model_builder_test.py → ..._detection/builders/model_builder_test.py
diff --git a/...t_detection/builders/optimizer_builder.py → ...t_detection/builders/optimizer_builder.py b/...t_detection/builders/optimizer_builder.py → ...t_detection/builders/optimizer_builder.py
diff --git a/...ection/builders/optimizer_builder_test.py → ...ection/builders/optimizer_builder_test.py b/...ection/builders/optimizer_builder_test.py → ...ection/builders/optimizer_builder_test.py
diff --git a/...ction/builders/post_processing_builder.py → ...ction/builders/post_processing_builder.py b/...ction/builders/post_processing_builder.py → ...ction/builders/post_processing_builder.py
diff --git a/.../builders/post_processing_builder_test.py → .../builders/post_processing_builder_test.py b/.../builders/post_processing_builder_test.py → .../builders/post_processing_builder_test.py
diff --git a/...etection/builders/preprocessor_builder.py → ...etection/builders/preprocessor_builder.py b/...etection/builders/preprocessor_builder.py → ...etection/builders/preprocessor_builder.py
diff --git a/...ion/builders/preprocessor_builder_test.py → ...ion/builders/preprocessor_builder_test.py b/...ion/builders/preprocessor_builder_test.py → ...ion/builders/preprocessor_builder_test.py
diff --git a/...s/region_similarity_calculator_builder.py → ...s/region_similarity_calculator_builder.py b/...s/region_similarity_calculator_builder.py → ...s/region_similarity_calculator_builder.py
diff --git a/...ion_similarity_calculator_builder_test.py → ...ion_similarity_calculator_builder_test.py b/...ion_similarity_calculator_builder_test.py → ...ion_similarity_calculator_builder_test.py
diff --git a/research/object_detection/core/__init__.py → ...tection/object_detection/core/__init__.py b/research/object_detection/core/__init__.py → ...tection/object_detection/core/__init__.py
diff --git a/...object_detection/core/anchor_generator.py → ...object_detection/core/anchor_generator.py b/...object_detection/core/anchor_generator.py → ...object_detection/core/anchor_generator.py
diff --git a/...ore/balanced_positive_negative_sampler.py → ...ore/balanced_positive_negative_sampler.py b/...ore/balanced_positive_negative_sampler.py → ...ore/balanced_positive_negative_sampler.py
diff --git a/...alanced_positive_negative_sampler_test.py → ...alanced_positive_negative_sampler_test.py b/...alanced_positive_negative_sampler_test.py → ...alanced_positive_negative_sampler_test.py
diff --git a/research/object_detection/core/batcher.py → ...etection/object_detection/core/batcher.py b/research/object_detection/core/batcher.py → ...etection/object_detection/core/batcher.py
diff --git a/...rch/object_detection/core/batcher_test.py → ...ion/object_detection/core/batcher_test.py b/...rch/object_detection/core/batcher_test.py → ...ion/object_detection/core/batcher_test.py
diff --git a/research/object_detection/core/box_coder.py → ...ection/object_detection/core/box_coder.py b/research/object_detection/core/box_coder.py → ...ection/object_detection/core/box_coder.py
diff --git a/...h/object_detection/core/box_coder_test.py → ...n/object_detection/core/box_coder_test.py b/...h/object_detection/core/box_coder_test.py → ...n/object_detection/core/box_coder_test.py
diff --git a/research/object_detection/core/box_list.py → ...tection/object_detection/core/box_list.py b/research/object_detection/core/box_list.py → ...tection/object_detection/core/box_list.py
diff --git a/...rch/object_detection/core/box_list_ops.py → ...ion/object_detection/core/box_list_ops.py b/...rch/object_detection/core/box_list_ops.py → ...ion/object_detection/core/box_list_ops.py
diff --git a/...bject_detection/core/box_list_ops_test.py → ...bject_detection/core/box_list_ops_test.py b/...bject_detection/core/box_list_ops_test.py → ...bject_detection/core/box_list_ops_test.py
diff --git a/...ch/object_detection/core/box_list_test.py → ...on/object_detection/core/box_list_test.py b/...ch/object_detection/core/box_list_test.py → ...on/object_detection/core/box_list_test.py
diff --git a/...ch/object_detection/core/box_predictor.py → ...on/object_detection/core/box_predictor.py b/...ch/object_detection/core/box_predictor.py → ...on/object_detection/core/box_predictor.py
diff --git a/...ject_detection/core/box_predictor_test.py → ...ject_detection/core/box_predictor_test.py b/...ject_detection/core/box_predictor_test.py → ...ject_detection/core/box_predictor_test.py
diff --git a/...rch/object_detection/core/data_decoder.py → ...ion/object_detection/core/data_decoder.py b/...rch/object_detection/core/data_decoder.py → ...ion/object_detection/core/data_decoder.py
diff --git a/...arch/object_detection/core/data_parser.py → ...tion/object_detection/core/data_parser.py b/...arch/object_detection/core/data_parser.py → ...tion/object_detection/core/data_parser.py
diff --git a/...rch/object_detection/core/keypoint_ops.py → ...ion/object_detection/core/keypoint_ops.py b/...rch/object_detection/core/keypoint_ops.py → ...ion/object_detection/core/keypoint_ops.py
diff --git a/...bject_detection/core/keypoint_ops_test.py → ...bject_detection/core/keypoint_ops_test.py b/...bject_detection/core/keypoint_ops_test.py → ...bject_detection/core/keypoint_ops_test.py
diff --git a/research/object_detection/core/losses.py → ...detection/object_detection/core/losses.py b/research/object_detection/core/losses.py → ...detection/object_detection/core/losses.py
diff --git a/...arch/object_detection/core/losses_test.py → ...tion/object_detection/core/losses_test.py b/...arch/object_detection/core/losses_test.py → ...tion/object_detection/core/losses_test.py
diff --git a/research/object_detection/core/matcher.py → ...etection/object_detection/core/matcher.py b/research/object_detection/core/matcher.py → ...etection/object_detection/core/matcher.py
diff --git a/...rch/object_detection/core/matcher_test.py → ...ion/object_detection/core/matcher_test.py b/...rch/object_detection/core/matcher_test.py → ...ion/object_detection/core/matcher_test.py
diff --git a/...bject_detection/core/minibatch_sampler.py → ...bject_detection/core/minibatch_sampler.py b/...bject_detection/core/minibatch_sampler.py → ...bject_detection/core/minibatch_sampler.py
diff --git a/..._detection/core/minibatch_sampler_test.py → ..._detection/core/minibatch_sampler_test.py b/..._detection/core/minibatch_sampler_test.py → ..._detection/core/minibatch_sampler_test.py
diff --git a/research/object_detection/core/model.py → ..._detection/object_detection/core/model.py b/research/object_detection/core/model.py → ..._detection/object_detection/core/model.py
diff --git a/.../object_detection/core/post_processing.py → .../object_detection/core/post_processing.py b/.../object_detection/core/post_processing.py → .../object_detection/core/post_processing.py
diff --git a/...ct_detection/core/post_processing_test.py → ...ct_detection/core/post_processing_test.py b/...ct_detection/core/post_processing_test.py → ...ct_detection/core/post_processing_test.py
diff --git a/research/object_detection/core/prefetcher.py → ...ction/object_detection/core/prefetcher.py b/research/object_detection/core/prefetcher.py → ...ction/object_detection/core/prefetcher.py
diff --git a/.../object_detection/core/prefetcher_test.py → .../object_detection/core/prefetcher_test.py b/.../object_detection/core/prefetcher_test.py → .../object_detection/core/prefetcher_test.py
diff --git a/...rch/object_detection/core/preprocessor.py → ...ion/object_detection/core/preprocessor.py b/...rch/object_detection/core/preprocessor.py → ...ion/object_detection/core/preprocessor.py
diff --git a/...ject_detection/core/preprocessor_cache.py → ...ject_detection/core/preprocessor_cache.py b/...ject_detection/core/preprocessor_cache.py → ...ject_detection/core/preprocessor_cache.py
diff --git a/...bject_detection/core/preprocessor_test.py → ...bject_detection/core/preprocessor_test.py b/...bject_detection/core/preprocessor_test.py → ...bject_detection/core/preprocessor_test.py
diff --git a/...tion/core/region_similarity_calculator.py → ...tion/core/region_similarity_calculator.py b/...tion/core/region_similarity_calculator.py → ...tion/core/region_similarity_calculator.py
diff --git a/...core/region_similarity_calculator_test.py → ...core/region_similarity_calculator_test.py b/...core/region_similarity_calculator_test.py → ...core/region_similarity_calculator_test.py
diff --git a/.../object_detection/core/standard_fields.py → .../object_detection/core/standard_fields.py b/.../object_detection/core/standard_fields.py → .../object_detection/core/standard_fields.py
diff --git a/.../object_detection/core/target_assigner.py → .../object_detection/core/target_assigner.py b/.../object_detection/core/target_assigner.py → .../object_detection/core/target_assigner.py
diff --git a/...ct_detection/core/target_assigner_test.py → ...ct_detection/core/target_assigner_test.py b/...ct_detection/core/target_assigner_test.py → ...ct_detection/core/target_assigner_test.py
diff --git a/...t_detection/data/ava_label_map_v2.1.pbtxt → ...t_detection/data/ava_label_map_v2.1.pbtxt b/...t_detection/data/ava_label_map_v2.1.pbtxt → ...t_detection/data/ava_label_map_v2.1.pbtxt
diff --git a/...ject_detection/data/kitti_label_map.pbtxt → ...ject_detection/data/kitti_label_map.pbtxt b/...ject_detection/data/kitti_label_map.pbtxt → ...ject_detection/data/kitti_label_map.pbtxt
diff --git a/...ect_detection/data/mscoco_label_map.pbtxt → ...ect_detection/data/mscoco_label_map.pbtxt b/...ect_detection/data/mscoco_label_map.pbtxt → ...ect_detection/data/mscoco_label_map.pbtxt
diff --git a/...n/data/oid_bbox_trainable_label_map.pbtxt → ...n/data/oid_bbox_trainable_label_map.pbtxt b/...n/data/oid_bbox_trainable_label_map.pbtxt → ...n/data/oid_bbox_trainable_label_map.pbtxt
diff --git a/...t_detection_challenge_500_label_map.pbtxt → ...t_detection_challenge_500_label_map.pbtxt b/...t_detection_challenge_500_label_map.pbtxt → ...t_detection_challenge_500_label_map.pbtxt
diff --git a/...ect_detection/data/pascal_label_map.pbtxt → ...ect_detection/data/pascal_label_map.pbtxt b/...ect_detection/data/pascal_label_map.pbtxt → ...ect_detection/data/pascal_label_map.pbtxt
diff --git a/...object_detection/data/pet_label_map.pbtxt → ...object_detection/data/pet_label_map.pbtxt b/...object_detection/data/pet_label_map.pbtxt → ...object_detection/data/pet_label_map.pbtxt
diff --git a/...bject_detection/data_decoders/__init__.py → ...bject_detection/data_decoders/__init__.py b/...bject_detection/data_decoders/__init__.py → ...bject_detection/data_decoders/__init__.py
diff --git a/...ction/data_decoders/tf_example_decoder.py → ...ction/data_decoders/tf_example_decoder.py b/...ction/data_decoders/tf_example_decoder.py → ...ction/data_decoders/tf_example_decoder.py
diff --git a/.../data_decoders/tf_example_decoder_test.py → .../data_decoders/tf_example_decoder_test.py b/.../data_decoders/tf_example_decoder_test.py → .../data_decoders/tf_example_decoder_test.py
diff --git a/...bject_detection/dataset_tools/__init__.py → ...bject_detection/dataset_tools/__init__.py b/...bject_detection/dataset_tools/__init__.py → ...bject_detection/dataset_tools/__init__.py
diff --git a/...on/dataset_tools/create_coco_tf_record.py → ...on/dataset_tools/create_coco_tf_record.py b/...on/dataset_tools/create_coco_tf_record.py → ...on/dataset_tools/create_coco_tf_record.py
diff --git a/...taset_tools/create_coco_tf_record_test.py → ...taset_tools/create_coco_tf_record_test.py b/...taset_tools/create_coco_tf_record_test.py → ...taset_tools/create_coco_tf_record_test.py
diff --git a/...n/dataset_tools/create_kitti_tf_record.py → ...n/dataset_tools/create_kitti_tf_record.py b/...n/dataset_tools/create_kitti_tf_record.py → ...n/dataset_tools/create_kitti_tf_record.py
diff --git a/...aset_tools/create_kitti_tf_record_test.py → ...aset_tools/create_kitti_tf_record_test.py b/...aset_tools/create_kitti_tf_record_test.py → ...aset_tools/create_kitti_tf_record_test.py
diff --git a/...ion/dataset_tools/create_oid_tf_record.py → ...ion/dataset_tools/create_oid_tf_record.py b/...ion/dataset_tools/create_oid_tf_record.py → ...ion/dataset_tools/create_oid_tf_record.py
diff --git a/.../dataset_tools/create_pascal_tf_record.py → .../dataset_tools/create_pascal_tf_record.py b/.../dataset_tools/create_pascal_tf_record.py → .../dataset_tools/create_pascal_tf_record.py
diff --git a/...set_tools/create_pascal_tf_record_test.py → ...set_tools/create_pascal_tf_record_test.py b/...set_tools/create_pascal_tf_record_test.py → ...set_tools/create_pascal_tf_record_test.py
diff --git a/...ion/dataset_tools/create_pet_tf_record.py → ...ion/dataset_tools/create_pet_tf_record.py b/...ion/dataset_tools/create_pet_tf_record.py → ...ion/dataset_tools/create_pet_tf_record.py
diff --git a/...taset_tools/create_pycocotools_package.sh → ...taset_tools/create_pycocotools_package.sh b/...taset_tools/create_pycocotools_package.sh → ...taset_tools/create_pycocotools_package.sh
diff --git a/...t_tools/download_and_preprocess_mscoco.sh → ...t_tools/download_and_preprocess_mscoco.sh b/...t_tools/download_and_preprocess_mscoco.sh → ...t_tools/download_and_preprocess_mscoco.sh
diff --git a/...ools/oid_hierarchical_labels_expansion.py → ...ools/oid_hierarchical_labels_expansion.py b/...ools/oid_hierarchical_labels_expansion.py → ...ools/oid_hierarchical_labels_expansion.py
diff --git a/...oid_hierarchical_labels_expansion_test.py → ...oid_hierarchical_labels_expansion_test.py b/...oid_hierarchical_labels_expansion_test.py → ...oid_hierarchical_labels_expansion_test.py
diff --git a/...on/dataset_tools/oid_tfrecord_creation.py → ...on/dataset_tools/oid_tfrecord_creation.py b/...on/dataset_tools/oid_tfrecord_creation.py → ...on/dataset_tools/oid_tfrecord_creation.py
diff --git a/...taset_tools/oid_tfrecord_creation_test.py → ...taset_tools/oid_tfrecord_creation_test.py b/...taset_tools/oid_tfrecord_creation_test.py → ...taset_tools/oid_tfrecord_creation_test.py
diff --git a/.../dataset_tools/tf_record_creation_util.py → .../dataset_tools/tf_record_creation_util.py b/.../dataset_tools/tf_record_creation_util.py → .../dataset_tools/tf_record_creation_util.py
diff --git a/...set_tools/tf_record_creation_util_test.py → ...set_tools/tf_record_creation_util_test.py b/...set_tools/tf_record_creation_util_test.py → ...set_tools/tf_record_creation_util_test.py
diff --git a/..._detection/dockerfiles/android/Dockerfile → ..._detection/dockerfiles/android/Dockerfile b/..._detection/dockerfiles/android/Dockerfile → ..._detection/dockerfiles/android/Dockerfile
diff --git a/...t_detection/dockerfiles/android/README.md → ...t_detection/dockerfiles/android/README.md b/...t_detection/dockerfiles/android/README.md → ...t_detection/dockerfiles/android/README.md
diff --git a/research/object_detection/eval_util.py → ...t_detection/object_detection/eval_util.py b/research/object_detection/eval_util.py → ...t_detection/object_detection/eval_util.py
diff --git a/research/object_detection/eval_util_test.py → ...ection/object_detection/eval_util_test.py b/research/object_detection/eval_util_test.py → ...ection/object_detection/eval_util_test.py
diff --git a/...bject_detection/export_inference_graph.py → ...bject_detection/export_inference_graph.py b/...bject_detection/export_inference_graph.py → ...bject_detection/export_inference_graph.py
diff --git a/...ject_detection/export_tflite_ssd_graph.py → ...ject_detection/export_tflite_ssd_graph.py b/...ject_detection/export_tflite_ssd_graph.py → ...ject_detection/export_tflite_ssd_graph.py
diff --git a/..._detection/export_tflite_ssd_graph_lib.py → ..._detection/export_tflite_ssd_graph_lib.py b/..._detection/export_tflite_ssd_graph_lib.py → ..._detection/export_tflite_ssd_graph_lib.py
diff --git a/...ction/export_tflite_ssd_graph_lib_test.py → ...ction/export_tflite_ssd_graph_lib_test.py b/...ction/export_tflite_ssd_graph_lib_test.py → ...ction/export_tflite_ssd_graph_lib_test.py
diff --git a/research/object_detection/exporter.py → ...ct_detection/object_detection/exporter.py b/research/object_detection/exporter.py → ...ct_detection/object_detection/exporter.py
diff --git a/research/object_detection/exporter_test.py → ...tection/object_detection/exporter_test.py b/research/object_detection/exporter_test.py → ...tection/object_detection/exporter_test.py
diff --git a/...ch/object_detection/inference/__init__.py → ...on/object_detection/inference/__init__.py b/...ch/object_detection/inference/__init__.py → ...on/object_detection/inference/__init__.py
diff --git a/...etection/inference/detection_inference.py → ...etection/inference/detection_inference.py b/...etection/inference/detection_inference.py → ...etection/inference/detection_inference.py
diff --git a/...ion/inference/detection_inference_test.py → ...ion/inference/detection_inference_test.py b/...ion/inference/detection_inference_test.py → ...ion/inference/detection_inference_test.py
diff --git a/...t_detection/inference/infer_detections.py → ...t_detection/inference/infer_detections.py b/...t_detection/inference/infer_detections.py → ...t_detection/inference/infer_detections.py
diff --git a/research/object_detection/inputs.py → ...ject_detection/object_detection/inputs.py b/research/object_detection/inputs.py → ...ject_detection/object_detection/inputs.py
diff --git a/research/object_detection/inputs_test.py → ...detection/object_detection/inputs_test.py b/research/object_detection/inputs_test.py → ...detection/object_detection/inputs_test.py
diff --git a/research/object_detection/legacy/__init__.py → ...ction/object_detection/legacy/__init__.py b/research/object_detection/legacy/__init__.py → ...ction/object_detection/legacy/__init__.py
diff --git a/research/object_detection/legacy/eval.py → ...detection/object_detection/legacy/eval.py b/research/object_detection/legacy/eval.py → ...detection/object_detection/legacy/eval.py
diff --git a/...arch/object_detection/legacy/evaluator.py → ...tion/object_detection/legacy/evaluator.py b/...arch/object_detection/legacy/evaluator.py → ...tion/object_detection/legacy/evaluator.py
diff --git a/research/object_detection/legacy/train.py → ...etection/object_detection/legacy/train.py b/research/object_detection/legacy/train.py → ...etection/object_detection/legacy/train.py
diff --git a/research/object_detection/legacy/trainer.py → ...ection/object_detection/legacy/trainer.py b/research/object_detection/legacy/trainer.py → ...ection/object_detection/legacy/trainer.py
diff --git a/...h/object_detection/legacy/trainer_test.py → ...n/object_detection/legacy/trainer_test.py b/...h/object_detection/legacy/trainer_test.py → ...n/object_detection/legacy/trainer_test.py
diff --git a/...rch/object_detection/matchers/__init__.py → ...ion/object_detection/matchers/__init__.py b/...rch/object_detection/matchers/__init__.py → ...ion/object_detection/matchers/__init__.py
diff --git a/...ject_detection/matchers/argmax_matcher.py → ...ject_detection/matchers/argmax_matcher.py b/...ject_detection/matchers/argmax_matcher.py → ...ject_detection/matchers/argmax_matcher.py
diff --git a/...detection/matchers/argmax_matcher_test.py → ...detection/matchers/argmax_matcher_test.py b/...detection/matchers/argmax_matcher_test.py → ...detection/matchers/argmax_matcher_test.py
diff --git a/...t_detection/matchers/bipartite_matcher.py → ...t_detection/matchers/bipartite_matcher.py b/...t_detection/matchers/bipartite_matcher.py → ...t_detection/matchers/bipartite_matcher.py
diff --git a/...ection/matchers/bipartite_matcher_test.py → ...ection/matchers/bipartite_matcher_test.py b/...ection/matchers/bipartite_matcher_test.py → ...ection/matchers/bipartite_matcher_test.py
diff --git a/..._detection/meta_architectures/__init__.py → ..._detection/meta_architectures/__init__.py b/..._detection/meta_architectures/__init__.py → ..._detection/meta_architectures/__init__.py
diff --git a/...ta_architectures/faster_rcnn_meta_arch.py → ...ta_architectures/faster_rcnn_meta_arch.py b/...ta_architectures/faster_rcnn_meta_arch.py → ...ta_architectures/faster_rcnn_meta_arch.py
diff --git a/...chitectures/faster_rcnn_meta_arch_test.py → ...chitectures/faster_rcnn_meta_arch_test.py b/...chitectures/faster_rcnn_meta_arch_test.py → ...chitectures/faster_rcnn_meta_arch_test.py
diff --git a/...ectures/faster_rcnn_meta_arch_test_lib.py → ...ectures/faster_rcnn_meta_arch_test_lib.py b/...ectures/faster_rcnn_meta_arch_test_lib.py → ...ectures/faster_rcnn_meta_arch_test_lib.py
diff --git a/...tion/meta_architectures/rfcn_meta_arch.py → ...tion/meta_architectures/rfcn_meta_arch.py b/...tion/meta_architectures/rfcn_meta_arch.py → ...tion/meta_architectures/rfcn_meta_arch.py
diff --git a/...meta_architectures/rfcn_meta_arch_test.py → ...meta_architectures/rfcn_meta_arch_test.py b/...meta_architectures/rfcn_meta_arch_test.py → ...meta_architectures/rfcn_meta_arch_test.py
diff --git a/...ction/meta_architectures/ssd_meta_arch.py → ...ction/meta_architectures/ssd_meta_arch.py b/...ction/meta_architectures/ssd_meta_arch.py → ...ction/meta_architectures/ssd_meta_arch.py
diff --git a/.../meta_architectures/ssd_meta_arch_test.py → .../meta_architectures/ssd_meta_arch_test.py b/.../meta_architectures/ssd_meta_arch_test.py → .../meta_architectures/ssd_meta_arch_test.py
diff --git a/...arch/object_detection/metrics/__init__.py → ...tion/object_detection/metrics/__init__.py b/...arch/object_detection/metrics/__init__.py → ...tion/object_detection/metrics/__init__.py
diff --git a/...ject_detection/metrics/coco_evaluation.py → ...ject_detection/metrics/coco_evaluation.py b/...ject_detection/metrics/coco_evaluation.py → ...ject_detection/metrics/coco_evaluation.py
diff --git a/...detection/metrics/coco_evaluation_test.py → ...detection/metrics/coco_evaluation_test.py b/...detection/metrics/coco_evaluation_test.py → ...detection/metrics/coco_evaluation_test.py
diff --git a/...ch/object_detection/metrics/coco_tools.py → ...on/object_detection/metrics/coco_tools.py b/...ch/object_detection/metrics/coco_tools.py → ...on/object_detection/metrics/coco_tools.py
diff --git a/...ject_detection/metrics/coco_tools_test.py → ...ject_detection/metrics/coco_tools_test.py b/...ject_detection/metrics/coco_tools_test.py → ...ject_detection/metrics/coco_tools_test.py
diff --git a/...arch/object_detection/metrics/io_utils.py → ...tion/object_detection/metrics/io_utils.py b/...arch/object_detection/metrics/io_utils.py → ...tion/object_detection/metrics/io_utils.py
diff --git a/...ection/metrics/offline_eval_map_corloc.py → ...ection/metrics/offline_eval_map_corloc.py b/...ection/metrics/offline_eval_map_corloc.py → ...ection/metrics/offline_eval_map_corloc.py
diff --git a/...n/metrics/offline_eval_map_corloc_test.py → ...n/metrics/offline_eval_map_corloc_test.py b/...n/metrics/offline_eval_map_corloc_test.py → ...n/metrics/offline_eval_map_corloc_test.py
diff --git a/...on/metrics/oid_od_challenge_evaluation.py → ...on/metrics/oid_od_challenge_evaluation.py b/...on/metrics/oid_od_challenge_evaluation.py → ...on/metrics/oid_od_challenge_evaluation.py
diff --git a/...rics/oid_od_challenge_evaluation_utils.py → ...rics/oid_od_challenge_evaluation_utils.py b/...rics/oid_od_challenge_evaluation_utils.py → ...rics/oid_od_challenge_evaluation_utils.py
diff --git a/...oid_od_challenge_evaluation_utils_test.py → ...oid_od_challenge_evaluation_utils_test.py b/...oid_od_challenge_evaluation_utils_test.py → ...oid_od_challenge_evaluation_utils_test.py
diff --git a/...n/metrics/oid_vrd_challenge_evaluation.py → ...n/metrics/oid_vrd_challenge_evaluation.py b/...n/metrics/oid_vrd_challenge_evaluation.py → ...n/metrics/oid_vrd_challenge_evaluation.py
diff --git a/...ics/oid_vrd_challenge_evaluation_utils.py → ...ics/oid_vrd_challenge_evaluation_utils.py b/...ics/oid_vrd_challenge_evaluation_utils.py → ...ics/oid_vrd_challenge_evaluation_utils.py
diff --git a/...id_vrd_challenge_evaluation_utils_test.py → ...id_vrd_challenge_evaluation_utils_test.py b/...id_vrd_challenge_evaluation_utils_test.py → ...id_vrd_challenge_evaluation_utils_test.py
diff --git a/...ct_detection/metrics/tf_example_parser.py → ...ct_detection/metrics/tf_example_parser.py b/...ct_detection/metrics/tf_example_parser.py → ...ct_detection/metrics/tf_example_parser.py
diff --git a/...tection/metrics/tf_example_parser_test.py → ...tection/metrics/tf_example_parser_test.py b/...tection/metrics/tf_example_parser_test.py → ...tection/metrics/tf_example_parser_test.py
diff --git a/research/object_detection/model_hparams.py → ...tection/object_detection/model_hparams.py b/research/object_detection/model_hparams.py → ...tection/object_detection/model_hparams.py
diff --git a/research/object_detection/model_lib.py → ...t_detection/object_detection/model_lib.py b/research/object_detection/model_lib.py → ...t_detection/object_detection/model_lib.py
diff --git a/research/object_detection/model_lib_test.py → ...ection/object_detection/model_lib_test.py b/research/object_detection/model_lib_test.py → ...ection/object_detection/model_lib_test.py
diff --git a/research/object_detection/model_main.py → ..._detection/object_detection/model_main.py b/research/object_detection/model_main.py → ..._detection/object_detection/model_main.py
diff --git a/research/object_detection/model_tpu_main.py → ...ection/object_detection/model_tpu_main.py b/research/object_detection/model_tpu_main.py → ...ection/object_detection/model_tpu_main.py
diff --git a/research/object_detection/models/__init__.py → ...ction/object_detection/models/__init__.py b/research/object_detection/models/__init__.py → ...ction/object_detection/models/__init__.py
diff --git a/...ded_ssd_mobilenet_v1_feature_extractor.py → ...ded_ssd_mobilenet_v1_feature_extractor.py b/...ded_ssd_mobilenet_v1_feature_extractor.py → ...ded_ssd_mobilenet_v1_feature_extractor.py
@@ -21,7 +21,7 @@
 from object_detection.models import feature_map_generators
 from object_detection.utils import context_manager
 from object_detection.utils import ops
-from nets import mobilenet_v1
+from slim.nets import mobilenet_v1
 
 slim = tf.contrib.slim
 

diff --git a/...sd_mobilenet_v1_feature_extractor_test.py → ...sd_mobilenet_v1_feature_extractor_test.py b/...sd_mobilenet_v1_feature_extractor_test.py → ...sd_mobilenet_v1_feature_extractor_test.py
diff --git a/..._inception_resnet_v2_feature_extractor.py → ..._inception_resnet_v2_feature_extractor.py b/..._inception_resnet_v2_feature_extractor.py → ..._inception_resnet_v2_feature_extractor.py
@@ -25,7 +25,7 @@
 import tensorflow as tf
 
 from object_detection.meta_architectures import faster_rcnn_meta_arch
-from nets import inception_resnet_v2
+from slim.nets import inception_resnet_v2
 
 slim = tf.contrib.slim
 

diff --git a/...ption_resnet_v2_feature_extractor_test.py → ...ption_resnet_v2_feature_extractor_test.py b/...ption_resnet_v2_feature_extractor_test.py → ...ption_resnet_v2_feature_extractor_test.py
diff --git a/...er_rcnn_inception_v2_feature_extractor.py → ...er_rcnn_inception_v2_feature_extractor.py b/...er_rcnn_inception_v2_feature_extractor.py → ...er_rcnn_inception_v2_feature_extractor.py
@@ -21,7 +21,7 @@
 import tensorflow as tf
 
 from object_detection.meta_architectures import faster_rcnn_meta_arch
-from nets import inception_v2
+from slim.nets import inception_v2
 
 slim = tf.contrib.slim
 

diff --git a/...nn_inception_v2_feature_extractor_test.py → ...nn_inception_v2_feature_extractor_test.py b/...nn_inception_v2_feature_extractor_test.py → ...nn_inception_v2_feature_extractor_test.py
diff --git a/...er_rcnn_mobilenet_v1_feature_extractor.py → ...er_rcnn_mobilenet_v1_feature_extractor.py b/...er_rcnn_mobilenet_v1_feature_extractor.py → ...er_rcnn_mobilenet_v1_feature_extractor.py
@@ -20,7 +20,7 @@
 
 from object_detection.meta_architectures import faster_rcnn_meta_arch
 from object_detection.utils import shape_utils
-from nets import mobilenet_v1
+from slim.nets import mobilenet_v1
 
 slim = tf.contrib.slim
 

diff --git a/...nn_mobilenet_v1_feature_extractor_test.py → ...nn_mobilenet_v1_feature_extractor_test.py b/...nn_mobilenet_v1_feature_extractor_test.py → ...nn_mobilenet_v1_feature_extractor_test.py
diff --git a/...dels/faster_rcnn_nas_feature_extractor.py → ...dels/faster_rcnn_nas_feature_extractor.py b/...dels/faster_rcnn_nas_feature_extractor.py → ...dels/faster_rcnn_nas_feature_extractor.py
@@ -23,8 +23,8 @@
 import tensorflow as tf
 
 from object_detection.meta_architectures import faster_rcnn_meta_arch
-from nets.nasnet import nasnet
-from nets.nasnet import nasnet_utils
+from slim.nets.nasnet import nasnet
+from slim.nets.nasnet import nasnet_utils
 
 arg_scope = tf.contrib.framework.arg_scope
 slim = tf.contrib.slim

diff --git a/...faster_rcnn_nas_feature_extractor_test.py → ...faster_rcnn_nas_feature_extractor_test.py b/...faster_rcnn_nas_feature_extractor_test.py → ...faster_rcnn_nas_feature_extractor_test.py
diff --git a/...els/faster_rcnn_pnas_feature_extractor.py → ...els/faster_rcnn_pnas_feature_extractor.py b/...els/faster_rcnn_pnas_feature_extractor.py → ...els/faster_rcnn_pnas_feature_extractor.py
@@ -21,8 +21,8 @@
 import tensorflow as tf
 
 from object_detection.meta_architectures import faster_rcnn_meta_arch
-from nets.nasnet import nasnet_utils
-from nets.nasnet import pnasnet
+from slim.nets.nasnet import nasnet_utils
+from slim.nets.nasnet import pnasnet
 
 arg_scope = tf.contrib.framework.arg_scope
 slim = tf.contrib.slim

diff --git a/...aster_rcnn_pnas_feature_extractor_test.py → ...aster_rcnn_pnas_feature_extractor_test.py b/...aster_rcnn_pnas_feature_extractor_test.py → ...aster_rcnn_pnas_feature_extractor_test.py
diff --git a/...aster_rcnn_resnet_v1_feature_extractor.py → ...aster_rcnn_resnet_v1_feature_extractor.py b/...aster_rcnn_resnet_v1_feature_extractor.py → ...aster_rcnn_resnet_v1_feature_extractor.py
@@ -27,8 +27,8 @@
 import tensorflow as tf
 
 from object_detection.meta_architectures import faster_rcnn_meta_arch
-from nets import resnet_utils
-from nets import resnet_v1
+from slim.nets import resnet_utils
+from slim.nets import resnet_v1
 
 slim = tf.contrib.slim
 

diff --git a/..._rcnn_resnet_v1_feature_extractor_test.py → ..._rcnn_resnet_v1_feature_extractor_test.py b/..._rcnn_resnet_v1_feature_extractor_test.py → ..._rcnn_resnet_v1_feature_extractor_test.py
diff --git a/...etection/models/feature_map_generators.py → ...etection/models/feature_map_generators.py b/...etection/models/feature_map_generators.py → ...etection/models/feature_map_generators.py
diff --git a/...ion/models/feature_map_generators_test.py → ...ion/models/feature_map_generators_test.py b/...ion/models/feature_map_generators_test.py → ...ion/models/feature_map_generators_test.py
diff --git a/...tion/models/ssd_feature_extractor_test.py → ...tion/models/ssd_feature_extractor_test.py b/...tion/models/ssd_feature_extractor_test.py → ...tion/models/ssd_feature_extractor_test.py
diff --git a/...els/ssd_inception_v2_feature_extractor.py → ...els/ssd_inception_v2_feature_extractor.py b/...els/ssd_inception_v2_feature_extractor.py → ...els/ssd_inception_v2_feature_extractor.py
@@ -20,7 +20,7 @@
 from object_detection.models import feature_map_generators
 from object_detection.utils import ops
 from object_detection.utils import shape_utils
-from nets import inception_v2
+from slim.nets import inception_v2
 
 slim = tf.contrib.slim
 

diff --git a/...sd_inception_v2_feature_extractor_test.py → ...sd_inception_v2_feature_extractor_test.py b/...sd_inception_v2_feature_extractor_test.py → ...sd_inception_v2_feature_extractor_test.py
diff --git a/...els/ssd_inception_v3_feature_extractor.py → ...els/ssd_inception_v3_feature_extractor.py b/...els/ssd_inception_v3_feature_extractor.py → ...els/ssd_inception_v3_feature_extractor.py
@@ -20,7 +20,7 @@
 from object_detection.models import feature_map_generators
 from object_detection.utils import ops
 from object_detection.utils import shape_utils
-from nets import inception_v3
+from slim.nets import inception_v3
 
 slim = tf.contrib.slim
 

diff --git a/...sd_inception_v3_feature_extractor_test.py → ...sd_inception_v3_feature_extractor_test.py b/...sd_inception_v3_feature_extractor_test.py → ...sd_inception_v3_feature_extractor_test.py
diff --git a/...els/ssd_mobilenet_v1_feature_extractor.py → ...els/ssd_mobilenet_v1_feature_extractor.py b/...els/ssd_mobilenet_v1_feature_extractor.py → ...els/ssd_mobilenet_v1_feature_extractor.py
@@ -22,7 +22,7 @@
 from object_detection.utils import context_manager
 from object_detection.utils import ops
 from object_detection.utils import shape_utils
-from nets import mobilenet_v1
+from slim.nets import mobilenet_v1
 
 slim = tf.contrib.slim
 

diff --git a/...sd_mobilenet_v1_feature_extractor_test.py → ...sd_mobilenet_v1_feature_extractor_test.py b/...sd_mobilenet_v1_feature_extractor_test.py → ...sd_mobilenet_v1_feature_extractor_test.py
diff --git a/...ssd_mobilenet_v1_fpn_feature_extractor.py → ...ssd_mobilenet_v1_fpn_feature_extractor.py b/...ssd_mobilenet_v1_fpn_feature_extractor.py → ...ssd_mobilenet_v1_fpn_feature_extractor.py
@@ -22,7 +22,7 @@
 from object_detection.utils import context_manager
 from object_detection.utils import ops
 from object_detection.utils import shape_utils
-from nets import mobilenet_v1
+from slim.nets import mobilenet_v1
 
 slim = tf.contrib.slim
 

diff --git a/...obilenet_v1_fpn_feature_extractor_test.py → ...obilenet_v1_fpn_feature_extractor_test.py b/...obilenet_v1_fpn_feature_extractor_test.py → ...obilenet_v1_fpn_feature_extractor_test.py
diff --git a/...ssd_mobilenet_v1_ppn_feature_extractor.py → ...ssd_mobilenet_v1_ppn_feature_extractor.py b/...ssd_mobilenet_v1_ppn_feature_extractor.py → ...ssd_mobilenet_v1_ppn_feature_extractor.py
@@ -22,7 +22,7 @@
 from object_detection.utils import context_manager
 from object_detection.utils import ops
 from object_detection.utils import shape_utils
-from nets import mobilenet_v1
+from slim.nets import mobilenet_v1
 
 slim = tf.contrib.slim
 

diff --git a/...obilenet_v1_ppn_feature_extractor_test.py → ...obilenet_v1_ppn_feature_extractor_test.py b/...obilenet_v1_ppn_feature_extractor_test.py → ...obilenet_v1_ppn_feature_extractor_test.py
diff --git a/...els/ssd_mobilenet_v2_feature_extractor.py → ...els/ssd_mobilenet_v2_feature_extractor.py b/...els/ssd_mobilenet_v2_feature_extractor.py → ...els/ssd_mobilenet_v2_feature_extractor.py
@@ -22,8 +22,8 @@
 from object_detection.utils import context_manager
 from object_detection.utils import ops
 from object_detection.utils import shape_utils
-from nets.mobilenet import mobilenet
-from nets.mobilenet import mobilenet_v2
+from slim.nets.mobilenet import mobilenet
+from slim.nets.mobilenet import mobilenet_v2
 
 slim = tf.contrib.slim
 

diff --git a/...sd_mobilenet_v2_feature_extractor_test.py → ...sd_mobilenet_v2_feature_extractor_test.py b/...sd_mobilenet_v2_feature_extractor_test.py → ...sd_mobilenet_v2_feature_extractor_test.py
diff --git a/...ls/ssd_resnet_v1_fpn_feature_extractor.py → ...ls/ssd_resnet_v1_fpn_feature_extractor.py b/...ls/ssd_resnet_v1_fpn_feature_extractor.py → ...ls/ssd_resnet_v1_fpn_feature_extractor.py
@@ -24,7 +24,7 @@
 from object_detection.utils import context_manager
 from object_detection.utils import ops
 from object_detection.utils import shape_utils
-from nets import resnet_v1
+from slim.nets import resnet_v1
 
 slim = tf.contrib.slim
 

diff --git a/...d_resnet_v1_fpn_feature_extractor_test.py → ...d_resnet_v1_fpn_feature_extractor_test.py b/...d_resnet_v1_fpn_feature_extractor_test.py → ...d_resnet_v1_fpn_feature_extractor_test.py
diff --git a/...snet_v1_fpn_feature_extractor_testbase.py → ...snet_v1_fpn_feature_extractor_testbase.py b/...snet_v1_fpn_feature_extractor_testbase.py → ...snet_v1_fpn_feature_extractor_testbase.py
diff --git a/...ls/ssd_resnet_v1_ppn_feature_extractor.py → ...ls/ssd_resnet_v1_ppn_feature_extractor.py b/...ls/ssd_resnet_v1_ppn_feature_extractor.py → ...ls/ssd_resnet_v1_ppn_feature_extractor.py
@@ -21,7 +21,7 @@
 from object_detection.utils import context_manager
 from object_detection.utils import ops
 from object_detection.utils import shape_utils
-from nets import resnet_v1
+from slim.nets import resnet_v1
 
 slim = tf.contrib.slim
 

diff --git a/...d_resnet_v1_ppn_feature_extractor_test.py → ...d_resnet_v1_ppn_feature_extractor_test.py b/...d_resnet_v1_ppn_feature_extractor_test.py → ...d_resnet_v1_ppn_feature_extractor_test.py
diff --git a/...snet_v1_ppn_feature_extractor_testbase.py → ...snet_v1_ppn_feature_extractor_testbase.py b/...snet_v1_ppn_feature_extractor_testbase.py → ...snet_v1_ppn_feature_extractor_testbase.py
diff --git a/research/object_detection/protos/__init__.py → ...ction/object_detection/protos/__init__.py b/research/object_detection/protos/__init__.py → ...ction/object_detection/protos/__init__.py
diff --git a/...t_detection/protos/anchor_generator.proto → ...t_detection/protos/anchor_generator.proto b/...t_detection/protos/anchor_generator.proto → ...t_detection/protos/anchor_generator.proto
diff --git a/research/object_detection/object_detection/protos/anchor_generator_pb2.py b/research/object_detection/object_detection/protos/anchor_generator_pb2.py
diff --git a/...ect_detection/protos/argmax_matcher.proto → ...ect_detection/protos/argmax_matcher.proto b/...ect_detection/protos/argmax_matcher.proto → ...ect_detection/protos/argmax_matcher.proto