suppress mmengine scope warning (#1450)
parent
a964790468
commit
9449178cf0
mmdeploy/codebase
mmcls/deploy
mmdet/deploy
mmpose/deploy
mmseg/deploy
|
@ -47,7 +47,8 @@ class MMCodebase(metaclass=ABCMeta):
|
|||
type=task.value,
|
||||
model_cfg=model_cfg,
|
||||
deploy_cfg=deploy_cfg,
|
||||
device=device))
|
||||
device=device,
|
||||
_scope_='mmdeploy'))
|
||||
|
||||
@classmethod
|
||||
def register_deploy_modules(cls):
|
||||
|
@ -83,4 +84,4 @@ def get_codebase_class(codebase: Codebase) -> MMCodebase:
|
|||
logger.warn(f'Import mmdeploy.codebase.{codebase.value}.deploy failed'
|
||||
'Please check whether the module is the custom module.'
|
||||
f'{e}')
|
||||
return CODEBASE.build({'type': codebase.value})
|
||||
return CODEBASE.build({'type': codebase.value, '_scope_': 'mmdeploy'})
|
||||
|
|
|
@ -13,7 +13,6 @@ from torch.utils.data import DataLoader, Dataset
|
|||
|
||||
from mmdeploy.utils import (get_backend_config, get_codebase,
|
||||
get_codebase_config, get_root_logger)
|
||||
from mmdeploy.utils.config_utils import get_codebase_external_module
|
||||
from mmdeploy.utils.dataset import is_can_sort_dataset, sort_dataset
|
||||
|
||||
|
||||
|
@ -24,36 +23,15 @@ class BaseTask(metaclass=ABCMeta):
|
|||
model_cfg (str | Config): Model config file.
|
||||
deploy_cfg (str | Config): Deployment config file.
|
||||
device (str): A string specifying device type.
|
||||
experiment_name (str, optional): Name of current experiment.
|
||||
If not specified, timestamp will be used as
|
||||
``experiment_name``. Defaults to ``None``.
|
||||
"""
|
||||
|
||||
def __init__(self,
|
||||
model_cfg: Config,
|
||||
deploy_cfg: Config,
|
||||
device: str,
|
||||
experiment_name: str = 'BaseTask'):
|
||||
def __init__(self, model_cfg: Config, deploy_cfg: Config, device: str):
|
||||
|
||||
self.model_cfg = model_cfg
|
||||
self.deploy_cfg = deploy_cfg
|
||||
self.device = device
|
||||
|
||||
self.codebase = get_codebase(deploy_cfg)
|
||||
self.experiment_name = experiment_name
|
||||
|
||||
# init scope
|
||||
from .. import import_codebase
|
||||
custom_module_list = get_codebase_external_module(deploy_cfg)
|
||||
import_codebase(self.codebase, custom_module_list)
|
||||
|
||||
from mmengine.registry import DefaultScope
|
||||
if not DefaultScope.check_instance_created(self.experiment_name):
|
||||
self.scope = DefaultScope.get_instance(
|
||||
self.experiment_name,
|
||||
scope_name=self.model_cfg.get('default_scope'))
|
||||
else:
|
||||
self.scope = DefaultScope.get_instance(self.experiment_name)
|
||||
|
||||
# lazy build visualizer
|
||||
self.visualizer = self.model_cfg.get('visualizer', None)
|
||||
|
|
|
@ -118,17 +118,10 @@ class Classification(BaseTask):
|
|||
deploy_cfg (Config): Deployment config file or loaded Config
|
||||
object.
|
||||
device (str): A string represents device type.
|
||||
experiment_name (str, optional): The experiment name used to create
|
||||
runner. Defaults to 'Classification'.
|
||||
"""
|
||||
|
||||
def __init__(self,
|
||||
model_cfg: Config,
|
||||
deploy_cfg: Config,
|
||||
device: str,
|
||||
experiment_name: str = 'Classification'):
|
||||
super(Classification, self).__init__(model_cfg, deploy_cfg, device,
|
||||
experiment_name)
|
||||
def __init__(self, model_cfg: Config, deploy_cfg: Config, device: str):
|
||||
super(Classification, self).__init__(model_cfg, deploy_cfg, device)
|
||||
|
||||
def build_data_preprocessor(self):
|
||||
"""Build data preprocessor.
|
||||
|
|
|
@ -122,16 +122,11 @@ class ObjectDetection(BaseTask):
|
|||
model_cfg (Config): The config of the model in mmdet.
|
||||
deploy_cfg (Config): The config of deployment.
|
||||
device (str): Device name.
|
||||
experiment_name (str, optional): The experiment name used to create
|
||||
runner. Defaults to 'ObjectDetection'.
|
||||
"""
|
||||
|
||||
def __init__(self,
|
||||
model_cfg: Config,
|
||||
deploy_cfg: Config,
|
||||
device: str,
|
||||
experiment_name: str = 'ObjectDetection') -> None:
|
||||
super().__init__(model_cfg, deploy_cfg, device, experiment_name)
|
||||
def __init__(self, model_cfg: Config, deploy_cfg: Config,
|
||||
device: str) -> None:
|
||||
super().__init__(model_cfg, deploy_cfg, device)
|
||||
|
||||
def build_backend_model(self,
|
||||
model_files: Optional[str] = None,
|
||||
|
|
|
@ -14,11 +14,6 @@ from mmdeploy.codebase.base import BaseBackendModel
|
|||
from mmdeploy.utils import (Backend, get_backend, get_codebase_config,
|
||||
load_config)
|
||||
|
||||
|
||||
def __build_backend_model(cls_name: str, registry: Registry, *args, **kwargs):
|
||||
return registry.module_dict[cls_name](*args, **kwargs)
|
||||
|
||||
|
||||
__BACKEND_MODEL = Registry('backend_segmentors')
|
||||
|
||||
|
||||
|
|
|
@ -12,11 +12,6 @@ from mmdeploy.codebase.base import BaseBackendModel
|
|||
from mmdeploy.utils import (Backend, get_backend, get_codebase_config,
|
||||
get_root_logger, load_config)
|
||||
|
||||
|
||||
def __build_backend_model(cls_name: str, registry: Registry, *args, **kwargs):
|
||||
return registry.module_dict[cls_name](*args, **kwargs)
|
||||
|
||||
|
||||
__BACKEND_MODEL = Registry('backend_segmentors')
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue