mirror of
https://github.com/open-mmlab/mmsegmentation.git
synced 2025-06-03 22:03:48 +08:00
Merge branch 'zhengmiao/add-default' into 'refactor_dev'
[Feature] Add default scope and register modules See merge request openmmlab-enterprise/openmmlab-ce/mmsegmentation!19
This commit is contained in:
commit
15cd0bb223
@ -2,9 +2,9 @@
|
|||||||
from .collect_env import collect_env
|
from .collect_env import collect_env
|
||||||
from .logger import get_root_logger
|
from .logger import get_root_logger
|
||||||
from .misc import find_latest_checkpoint
|
from .misc import find_latest_checkpoint
|
||||||
from .set_env import setup_multi_processes
|
from .set_env import register_all_modules, setup_multi_processes
|
||||||
|
|
||||||
__all__ = [
|
__all__ = [
|
||||||
'get_root_logger', 'collect_env', 'find_latest_checkpoint',
|
'get_root_logger', 'collect_env', 'find_latest_checkpoint',
|
||||||
'setup_multi_processes'
|
'setup_multi_processes', 'register_all_modules'
|
||||||
]
|
]
|
||||||
|
@ -1,9 +1,12 @@
|
|||||||
# Copyright (c) OpenMMLab. All rights reserved.
|
# Copyright (c) OpenMMLab. All rights reserved.
|
||||||
|
import datetime
|
||||||
import os
|
import os
|
||||||
import platform
|
import platform
|
||||||
|
import warnings
|
||||||
|
|
||||||
import cv2
|
import cv2
|
||||||
import torch.multiprocessing as mp
|
import torch.multiprocessing as mp
|
||||||
|
from mmengine import DefaultScope
|
||||||
|
|
||||||
from ..utils import get_root_logger
|
from ..utils import get_root_logger
|
||||||
|
|
||||||
@ -53,3 +56,36 @@ def setup_multi_processes(cfg):
|
|||||||
os.environ['MKL_NUM_THREADS'] = str(mkl_num_threads)
|
os.environ['MKL_NUM_THREADS'] = str(mkl_num_threads)
|
||||||
else:
|
else:
|
||||||
logger.info(f'MKL num threads is {os.environ["MKL_NUM_THREADS"]}')
|
logger.info(f'MKL num threads is {os.environ["MKL_NUM_THREADS"]}')
|
||||||
|
|
||||||
|
|
||||||
|
def register_all_modules(init_default_scope: bool = True) -> None:
|
||||||
|
"""Register all modules in mmseg into the registries.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
init_default_scope (bool): Whether initialize the mmseg default scope.
|
||||||
|
When `init_default_scope=True`, the global default scope will be
|
||||||
|
set to `mmseg`, and all registries will build modules from mmseg's
|
||||||
|
registry node. To understand more about the registry, please refer
|
||||||
|
to https://github.com/open-mmlab/mmengine/blob/main/docs/en/tutorials/registry.md
|
||||||
|
Defaults to True.
|
||||||
|
""" # noqa
|
||||||
|
import mmseg.core # noqa: F401,F403
|
||||||
|
import mmseg.datasets # noqa: F401,F403
|
||||||
|
import mmseg.models # noqa: F401,F403
|
||||||
|
|
||||||
|
if init_default_scope:
|
||||||
|
never_created = DefaultScope.get_current_instance() is None \
|
||||||
|
or not DefaultScope.check_instance_created('mmseg')
|
||||||
|
if never_created:
|
||||||
|
DefaultScope.get_instance('mmseg', scope_name='mmseg')
|
||||||
|
return
|
||||||
|
current_scope = DefaultScope.get_current_instance()
|
||||||
|
if current_scope.scope_name != 'mmseg':
|
||||||
|
warnings.warn('The current default scope '
|
||||||
|
f'"{current_scope.scope_name}" is not "mmseg", '
|
||||||
|
'`register_all_modules` will force the current'
|
||||||
|
'default scope to be "mmseg". If this is not '
|
||||||
|
'expected, please set `init_default_scope=False`.')
|
||||||
|
# avoid name conflict
|
||||||
|
new_instance_name = f'mmseg-{datetime.datetime.now()}'
|
||||||
|
DefaultScope.get_instance(new_instance_name, scope_name='mmseg')
|
||||||
|
@ -1,13 +1,17 @@
|
|||||||
# Copyright (c) OpenMMLab. All rights reserved.
|
# Copyright (c) OpenMMLab. All rights reserved.
|
||||||
|
import datetime
|
||||||
import multiprocessing as mp
|
import multiprocessing as mp
|
||||||
import os
|
import os
|
||||||
import platform
|
import platform
|
||||||
|
import sys
|
||||||
|
from unittest import TestCase
|
||||||
|
|
||||||
import cv2
|
import cv2
|
||||||
import pytest
|
import pytest
|
||||||
from mmcv import Config
|
from mmcv import Config
|
||||||
|
from mmengine import DefaultScope
|
||||||
|
|
||||||
from mmseg.utils import setup_multi_processes
|
from mmseg.utils import register_all_modules, setup_multi_processes
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize('workers_per_gpu', (0, 2))
|
@pytest.mark.parametrize('workers_per_gpu', (0, 2))
|
||||||
@ -83,3 +87,34 @@ def test_setup_multi_processes(workers_per_gpu, valid, env_cfg):
|
|||||||
assert cv2.getNumThreads() == sys_cv_threads
|
assert cv2.getNumThreads() == sys_cv_threads
|
||||||
assert 'OMP_NUM_THREADS' not in os.environ
|
assert 'OMP_NUM_THREADS' not in os.environ
|
||||||
assert 'MKL_NUM_THREADS' not in os.environ
|
assert 'MKL_NUM_THREADS' not in os.environ
|
||||||
|
|
||||||
|
|
||||||
|
class TestSetupEnv(TestCase):
|
||||||
|
|
||||||
|
def test_register_all_modules(self):
|
||||||
|
from mmseg.registry import DATASETS
|
||||||
|
|
||||||
|
# not init default scope
|
||||||
|
sys.modules.pop('mmseg.datasets', None)
|
||||||
|
sys.modules.pop('mmseg.datasets.ade', None)
|
||||||
|
DATASETS._module_dict.pop('ADE20KDataset', None)
|
||||||
|
self.assertFalse('ADE20KDataset' in DATASETS.module_dict)
|
||||||
|
register_all_modules(init_default_scope=False)
|
||||||
|
self.assertTrue('ADE20KDataset' in DATASETS.module_dict)
|
||||||
|
|
||||||
|
# init default scope
|
||||||
|
sys.modules.pop('mmseg.datasets')
|
||||||
|
sys.modules.pop('mmseg.datasets.ade')
|
||||||
|
DATASETS._module_dict.pop('ADE20KDataset', None)
|
||||||
|
self.assertFalse('ADE20KDataset' in DATASETS.module_dict)
|
||||||
|
register_all_modules(init_default_scope=True)
|
||||||
|
self.assertTrue('ADE20KDataset' in DATASETS.module_dict)
|
||||||
|
self.assertEqual(DefaultScope.get_current_instance().scope_name,
|
||||||
|
'mmseg')
|
||||||
|
|
||||||
|
# init default scope when another scope is init
|
||||||
|
name = f'test-{datetime.datetime.now()}'
|
||||||
|
DefaultScope.get_instance(name, scope_name='test')
|
||||||
|
with self.assertWarnsRegex(
|
||||||
|
Warning, 'The current default scope "test" is not "mmseg"'):
|
||||||
|
register_all_modules(init_default_scope=True)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user