remove build_caffe2_model from runner

Reviewed By: zhanghang1989

Differential Revision: D28243043

fbshipit-source-id: fae5491d8978bcdb096fcee69846c707cda0ac00

d2go/export/caffe2_model_helper.py

@@ -3,6 +3,7 @@
 
 
 import logging
+from functools import partial
 
 from detectron2.export.caffe2_inference import ProtobufDetectionModel
 from d2go.config import temp_defrost
@@ -63,3 +64,12 @@ def update_cfg_from_pb_model(cfg, model):
         _update_if_true(cfg, "MODEL.KEYPOINT_ON", infer_keypoint_on(model))
         _update_if_true(cfg, "MODEL.DENSEPOSE_ON", infer_densepose_on(model))
     return cfg
+
+
+def _deprecated_build_caffe2_model(runner, predict_net, init_net):
+    if hasattr(runner, "_deprecated_build_caffe2_model"):
+        return runner._deprecated_build_caffe2_model(predict_net, init_net)
+
+    pb_model = ProtobufDetectionModel(predict_net, init_net)
+    pb_model.validate_cfg = partial(update_cfg_from_pb_model, model=pb_model)
+    return pb_model

d2go/runner/default_runner.py

@@ -7,7 +7,7 @@ import logging
 import math
 import os
 from collections import OrderedDict
-from functools import lru_cache, partial
+from functools import lru_cache
 from typing import Type, Optional, List
 
 import d2go.utils.abnormal_checker as abnormal_checker
@@ -28,7 +28,6 @@ from d2go.data.utils import (
     maybe_subsample_n_images,
     update_cfg_if_using_adhoc_dataset,
 )
-from d2go.export.caffe2_model_helper import update_cfg_from_pb_model
 from d2go.export.d2_meta_arch import patch_d2_meta_arch
 from d2go.modeling import kmeans_anchors, model_ema
 from d2go.modeling.model_freezing_utils import (
@@ -61,7 +60,6 @@ from detectron2.evaluation import (
     print_csv_format,
     verify_results,
 )
-from detectron2.export.caffe2_inference import ProtobufDetectionModel
 from detectron2.export.caffe2_modeling import META_ARCH_CAFFE2_EXPORT_TYPE_MAP
 from detectron2.modeling import GeneralizedRCNNWithTTA, build_model
 from detectron2.solver import (
@@ -202,12 +200,6 @@ class BaseRunner(object):
         """
         return built_model
 
-    def build_caffe2_model(self, predict_net, init_net):
-        """
-        Return a nn.Module which should behave the same as a normal D2 model.
-        """
-        raise NotImplementedError()
-
     def do_test(self, *args, **kwargs):
         raise NotImplementedError()
 
@@ -693,8 +685,3 @@ class GeneralizedRCNNRunner(Detectron2GoRunner):
 
         Caffe2ModelType = META_ARCH_CAFFE2_EXPORT_TYPE_MAP[cfg.MODEL.META_ARCHITECTURE]
         return Caffe2ModelType(cfg, torch_model=built_model)
-
-    def build_caffe2_model(self, predict_net, init_net):
-        pb_model = ProtobufDetectionModel(predict_net, init_net)
-        pb_model.validate_cfg = partial(update_cfg_from_pb_model, model=pb_model)
-        return pb_model