update to use D2Go's META_ARCH_REGISTRY and build_model

Summary: Pull Request resolved: https://github.com/facebookresearch/d2go/pull/298

Reviewed By: tglik, newstzpz

Differential Revision: D37152248

fbshipit-source-id: 58a6899c5f6465f36961a2ebf60a64f20509cec2

d2go/modeling/meta_arch/fcos.py

 from d2go.config import CfgNode as CN
+from d2go.registry.builtin import META_ARCH_REGISTRY
 from detectron2.config import configurable
 from detectron2.modeling.backbone import build_backbone
-from detectron2.modeling.meta_arch import META_ARCH_REGISTRY
 from detectron2.modeling.meta_arch.fcos import FCOS as d2_FCOS, FCOSHead
 
 

d2go/modeling/meta_arch/rcnn.py

@@ -499,9 +499,10 @@ class D2RCNNInferenceWrapper(nn.Module):
 # TODO: model.to(device) might not work for detection meta-arch, this function is the
 # workaround, in general, we might need a meta-arch API for this if needed.
 def _cast_detection_model(model, device):
+    from d2go.registry.builtin import META_ARCH_REGISTRY
+
     # check model is an instance of one of the meta arch
     from detectron2.export.caffe2_modeling import Caffe2MetaArch
-    from detectron2.modeling import META_ARCH_REGISTRY
 
     if isinstance(model, Caffe2MetaArch):
         model._wrapped_model = _cast_detection_model(model._wrapped_model, device)

d2go/utils/testing/meta_arch_helper.py

@@ -4,8 +4,8 @@
 
 import torch
 from d2go.quantization.modeling import set_backend_and_create_qconfig
+from d2go.registry.builtin import META_ARCH_REGISTRY
 from d2go.utils.testing.data_loader_helper import create_local_dataset
-from detectron2.modeling import META_ARCH_REGISTRY
 from detectron2.structures import Boxes, ImageList, Instances
 from torch.ao.quantization.quantize_fx import convert_fx, prepare_qat_fx
 

d2go/utils/visualization.py

@@ -4,9 +4,10 @@
 
 from typing import Optional, Type
 
+from d2go.registry.builtin import META_ARCH_REGISTRY
+
 from detectron2.data import DatasetCatalog, detection_utils as utils, MetadataCatalog
 from detectron2.evaluation import DatasetEvaluator
-from detectron2.modeling import META_ARCH_REGISTRY
 from detectron2.utils.events import get_event_storage
 from detectron2.utils.visualizer import Visualizer
 

projects_oss/detr/detr/d2/detr.py

@@ -3,7 +3,8 @@
 import numpy as np
 import torch
 import torch.nn.functional as F
-from detectron2.modeling import detector_postprocess, META_ARCH_REGISTRY
+from d2go.registry.builtin import META_ARCH_REGISTRY
+from detectron2.modeling import detector_postprocess
 from detectron2.structures import BitMasks, Boxes, ImageList, Instances
 from detr.datasets.coco import convert_coco_poly_to_mask
 from detr.models.backbone import Joiner

tests/misc/test_registration.py

@@ -59,7 +59,7 @@ class TestMetaArchRegistryPopulation(unittest.TestCase, BaseRegistryPopulationTe
         self._package = d2go.modeling
 
     def get_registered_items(self):
-        from detectron2.modeling import META_ARCH_REGISTRY
+        from d2go.registry.builtin import META_ARCH_REGISTRY
 
         return [k for k, v in META_ARCH_REGISTRY]
 

tests/modeling/test_modeling_meta_arch_modeling_hook.py

@@ -10,7 +10,7 @@ import torch
 from d2go.config import CfgNode
 from d2go.modeling import build_model
 from d2go.modeling.meta_arch import modeling_hook as mh
-from detectron2.modeling import META_ARCH_REGISTRY
+from d2go.registry.builtin import META_ARCH_REGISTRY
 
 
 @META_ARCH_REGISTRY.register()

tests/runner/test_runner_default_runner.py

@@ -9,12 +9,12 @@ import unittest
 
 import d2go.runner.default_runner as default_runner
 import torch
+from d2go.registry.builtin import META_ARCH_REGISTRY
 from d2go.runner import create_runner
 from d2go.runner.training_hooks import TRAINER_HOOKS_REGISTRY
 from d2go.utils.testing import helper
 from d2go.utils.testing.data_loader_helper import create_local_dataset
 from detectron2.evaluation import COCOEvaluator, RotatedCOCOEvaluator
-from detectron2.modeling import META_ARCH_REGISTRY
 from detectron2.structures import Boxes, ImageList, Instances
 from mobile_cv.arch.quantization.qconfig import (
     updateable_symmetric_moving_avg_minmax_config,

tests/runner/test_runner_lightning_task.py

@@ -11,12 +11,12 @@ import pytorch_lightning as pl  # type: ignore
 import torch
 from d2go.config import CfgNode, temp_defrost
 from d2go.quantization.modeling import set_backend_and_create_qconfig
+from d2go.registry.builtin import META_ARCH_REGISTRY
 from d2go.runner import create_runner
 from d2go.runner.callbacks.quantization import QuantizationAwareTraining
 from d2go.runner.lightning_task import GeneralizedRCNNTask
 from d2go.utils.testing import meta_arch_helper as mah
 from d2go.utils.testing.helper import tempdir
-from detectron2.modeling import META_ARCH_REGISTRY
 from detectron2.utils.events import EventStorage
 from pytorch_lightning.callbacks.model_checkpoint import ModelCheckpoint
 from torch import Tensor

tests/utils/test_visualization.py

@@ -11,6 +11,7 @@ from typing import Dict, List, Optional, Tuple
 import d2go.runner.default_runner as default_runner
 import numpy as np
 import torch
+from d2go.registry.builtin import META_ARCH_REGISTRY
 from d2go.utils.testing.data_loader_helper import (
     create_toy_dataset,
     LocalImageGenerator,
@@ -18,7 +19,6 @@ from d2go.utils.testing.data_loader_helper import (
 from d2go.utils.testing.helper import tempdir
 from d2go.utils.visualization import DataLoaderVisWrapper, VisualizerWrapper
 from detectron2.data import DatasetCatalog, MetadataCatalog
-from detectron2.modeling import META_ARCH_REGISTRY
 from detectron2.structures import Boxes, Instances
 from detectron2.utils.events import EventStorage