Commit b87ee53a authored by Yanghan Wang's avatar Yanghan Wang Committed by Facebook GitHub Bot
Browse files

remove build_traceable_model from runner

Summary: build_traceable_model is deprecated, remove it from default runner.

Reviewed By: zhanghang1989

Differential Revision: D28243469

fbshipit-source-id: e09729dcc083dc273329e1c2f731065578d8ea42
parent 2366ab94
...@@ -60,7 +60,6 @@ from detectron2.evaluation import ( ...@@ -60,7 +60,6 @@ from detectron2.evaluation import (
print_csv_format, print_csv_format,
verify_results, verify_results,
) )
from detectron2.export.caffe2_modeling import META_ARCH_CAFFE2_EXPORT_TYPE_MAP
from detectron2.modeling import GeneralizedRCNNWithTTA, build_model from detectron2.modeling import GeneralizedRCNNWithTTA, build_model
from detectron2.solver import ( from detectron2.solver import (
build_lr_scheduler as d2_build_lr_scheduler, build_lr_scheduler as d2_build_lr_scheduler,
...@@ -190,16 +189,6 @@ class BaseRunner(object): ...@@ -190,16 +189,6 @@ class BaseRunner(object):
return model return model
def build_traceable_model(self, cfg, built_model=None):
"""
Return a traceable model. The returned model has to be a
`Caffe2MetaArch` which provides the following two member methods:
- get_caffe2_inputs: it'll be called when exporting the model
to convert D2's batched_input to a list of Tensors.
- encode_additional_info: this allow editing exported predict_net/init_net.
"""
return built_model
def do_test(self, *args, **kwargs): def do_test(self, *args, **kwargs):
raise NotImplementedError() raise NotImplementedError()
...@@ -675,13 +664,3 @@ class GeneralizedRCNNRunner(Detectron2GoRunner): ...@@ -675,13 +664,3 @@ class GeneralizedRCNNRunner(Detectron2GoRunner):
_C.EXPORT_CAFFE2 = CN() _C.EXPORT_CAFFE2 = CN()
_C.EXPORT_CAFFE2.USE_HEATMAP_MAX_KEYPOINT = False _C.EXPORT_CAFFE2.USE_HEATMAP_MAX_KEYPOINT = False
return _C return _C
def build_traceable_model(self, cfg, built_model=None):
if built_model is not None:
logger.warning("The given built_model will be modified")
else:
built_model = self.build_model(cfg, eval_only=True)
logger.info("Model:\n{}".format(built_model))
Caffe2ModelType = META_ARCH_CAFFE2_EXPORT_TYPE_MAP[cfg.MODEL.META_ARCHITECTURE]
return Caffe2ModelType(cfg, torch_model=built_model)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment