[Refactor] Support MMEngine-based & MMCV-based (#108)

Support MMEngine-based Frameworks manually Support MMCV-based Frameworks Replace MMCV utils with MMEngine utils Signed-off-by: Hakjin Lee <[email protected]> Co-authored-by: Junhwa Song <[email protected]>
SIAnalytics · Dec 29, 2022 · 68d479d · 68d479d
1 parent 36ca780
commit 68d479d
Show file tree

Hide file tree

Showing 26 changed files with 1,984 additions and 1,122 deletions.
diff --git a/configs/mmdet/mmdet_asynchb_nevergrad_pso.py b/configs/mmdet/mmdet_asynchb_nevergrad_pso.py
@@ -11,4 +11,4 @@
 }
 
 task = dict(type='MMDetection')
-tune_cfg = dict(num_samples=8, metric='val/AP', mode='max')
+tune_cfg = dict(num_samples=8, metric='val/bbox_mAP', mode='max')
diff --git a/requirements/runtime.txt b/requirements/runtime.txt
@@ -1,2 +1,3 @@
+mmengine
 ray[data]==2.2.0
 ray[tune]==2.2.0
diff --git a/siatune/apis/analysis.py b/siatune/apis/analysis.py
@@ -5,11 +5,11 @@
 from pprint import pformat
 from typing import Optional
 
-import mmcv
-from mmcv.utils import get_logger
+import mmengine
 from ray.tune import ResultGrid
 
 from siatune.utils import ImmutableContainer
+from siatune.utils.logger import get_root_logger
 
 
 def log_analysis(results: ResultGrid, log_dir: Optional[str] = None) -> None:
@@ -21,10 +21,9 @@ def log_analysis(results: ResultGrid, log_dir: Optional[str] = None) -> None:
     """
 
     log_dir = osp.join(log_dir or os.getcwd(), 'best_trial')
-    mmcv.mkdir_or_exist(log_dir)
+    mmengine.mkdir_or_exist(log_dir)
 
-    logger = get_logger(
-        'siatune', log_file=osp.join(log_dir, 'best_trial.log'))
+    logger = get_root_logger(log_file=osp.join(log_dir, 'best_trial.log'))
     result = results.get_best_result()
 
     logger.info(f'Best Logdir: {result.log_dir}')

diff --git a/siatune/codebase/builder.py b/siatune/codebase/builder.py
@@ -1,7 +1,7 @@
 # Copyright (c) SI-Analytics. All rights reserved.
 from typing import Dict
 
-from mmcv.utils import Registry
+from mmengine.registry import Registry
 
 from .base import BaseTask
 

diff --git a/siatune/codebase/cont_test_func.py b/siatune/codebase/cont_test_func.py
@@ -10,7 +10,7 @@
 
 import numpy as np
 import ray
-from mmcv.utils import Config
+from mmengine.config import Config
 
 from .blackbox import BlackBoxTask
 from .builder import TASKS

diff --git a/siatune/codebase/disc_test_func.py b/siatune/codebase/disc_test_func.py
@@ -9,7 +9,7 @@
 
 import numpy as np
 import ray
-from mmcv.utils import Config
+from mmengine.config import Config
 
 from .blackbox import BlackBoxTask
 from .builder import TASKS