use mmengine config

.dev_scripts/benchmark_inference_fps.py

@@ -4,7 +4,7 @@
 import os.path as osp
 
 import mmcv
-from mmcv import Config, DictAction
+from mmengine.config import Config, DictAction
 from mmcv.runner import init_dist
 from terminaltables import GithubFlavoredMarkdownTable
 

.dev_scripts/benchmark_test_image.py

@@ -3,7 +3,7 @@
 import os.path as osp
 from argparse import ArgumentParser
 
-from mmcv import Config
+from mmengine.config import Config
 
 from mmdet.apis import inference_detector, init_detector, show_result_pyplot
 from mmdet.utils import get_root_logger

.dev_scripts/convert_test_benchmark_script.py

@@ -3,7 +3,7 @@
 import os
 import os.path as osp
 
-from mmcv import Config
+from mmengine.config import Config
 
 
 def parse_args():

.dev_scripts/gather_test_benchmark_metric.py

@@ -4,7 +4,7 @@
 import os.path as osp
 
 import mmcv
-from mmcv import Config
+from mmengine.config import Config
 
 
 def parse_args():

.dev_scripts/test_init_backbone.py

@@ -5,7 +5,7 @@
 from os.path import dirname, exists, join
 
 import pytest
-from mmcv import Config, ProgressBar
+from mmengine.config import Config, ProgressBar
 from mmcv.runner import _load_checkpoint
 
 from mmdet.models import build_detector
@@ -28,7 +28,7 @@ def _get_config_directory():
 
 def _get_config_module(fname):
     """Load a configuration as a python module."""
-    from mmcv import Config
+    from mmengine.config import Config
     config_dpath = _get_config_directory()
     config_fpath = join(config_dpath, fname)
     config_mod = Config.fromfile(config_fpath)

demo/MMDet_InstanceSeg_Tutorial.ipynb

@@ -1189,7 +1189,7 @@
       },
       "outputs": [],
       "source": [
-        "from mmcv import Config\n",
+        "from mmengine.config import Config\n",
         "cfg = Config.fromfile('./configs/mask_rcnn/mask_rcnn_r50_caffe_fpn_mstrain-poly_1x_coco.py')"
       ]
     },

demo/MMDet_Tutorial.ipynb

@@ -1181,7 +1181,7 @@
       },
       "outputs": [],
       "source": [
-        "from mmcv import Config\n",
+        "from mmengine.config import Config\n",
         "cfg = Config.fromfile('./configs/faster_rcnn/faster_rcnn_r50_caffe_fpn_mstrain_1x_coco.py')"
       ]
     },

mmdet/core/post_processing/merge_augs.py

@@ -4,7 +4,7 @@
 
 import numpy as np
 import torch
-from mmcv import ConfigDict
+from mmengine.config import ConfigDict
 from mmcv.ops import nms
 
 from ..bbox import bbox_mapping_back

mmdet/models/dense_heads/cascade_rpn_head.py

@@ -5,7 +5,7 @@
 
 import torch
 import torch.nn as nn
-from mmcv import ConfigDict
+from mmengine.config import ConfigDict
 from mmcv.ops import DeformConv2d, batched_nms
 from mmcv.runner import BaseModule, ModuleList
 

mmdet/models/dense_heads/ga_rpn_head.py

@@ -5,7 +5,7 @@
 import torch
 import torch.nn as nn
 import torch.nn.functional as F
-from mmcv import ConfigDict
+from mmengine.config import ConfigDict
 from mmcv.ops import nms
 
 from ..builder import HEADS

mmdet/utils/compat_config.py

@@ -2,7 +2,7 @@
 import copy
 import warnings
 
-from mmcv import ConfigDict
+from mmengine.config import ConfigDict
 
 
 def compat_cfg(cfg):

requirements/mminstall.txt

@@ -1 +1,2 @@
-mmcv-full>=1.3.17
+mmcv==2.2.0
+mmengine==0.10.5

tests/test_downstream/test_mmtrack.py

@@ -5,7 +5,7 @@
 import numpy as np
 import pytest
 import torch
-from mmcv import Config
+from mmengine.config import Config
 
 
 @pytest.mark.parametrize(

tests/test_models/test_dense_heads/test_centernet_head.py

@@ -1,7 +1,7 @@
 # Copyright (c) OpenMMLab. All rights reserved.
 import numpy as np
 import torch
-from mmcv import ConfigDict
+from mmengine.config import ConfigDict
 
 from mmdet.models.dense_heads import CenterNetHead
 

tests/test_models/test_dense_heads/test_detr_head.py

@@ -1,6 +1,6 @@
 # Copyright (c) OpenMMLab. All rights reserved.
 import torch
-from mmcv import ConfigDict
+from mmengine.config import ConfigDict
 
 from mmdet.models.dense_heads import DETRHead
 

tests/test_models/test_dense_heads/test_mask2former_head.py

@@ -1,6 +1,6 @@
 import numpy as np
 import torch
-from mmcv import ConfigDict
+from mmengine.config import ConfigDict
 
 from mmdet.core.mask import BitmapMasks
 from mmdet.models.dense_heads import Mask2FormerHead

tests/test_models/test_dense_heads/test_maskformer_head.py

@@ -1,6 +1,6 @@
 import numpy as np
 import torch
-from mmcv import ConfigDict
+from mmengine.config import ConfigDict
 
 from mmdet.core.mask import BitmapMasks
 from mmdet.models.dense_heads import MaskFormerHead

tests/test_models/test_forward.py

@@ -25,7 +25,7 @@ def _get_config_directory():
 
 def _get_config_module(fname):
     """Load a configuration as a python module."""
-    from mmcv import Config
+    from mmengine.config import Config
     config_dpath = _get_config_directory()
     config_fpath = join(config_dpath, fname)
     config_mod = Config.fromfile(config_fpath)
@@ -616,7 +616,7 @@ def test_detr_forward():
 
 
 def test_inference_detector():
-    from mmcv import ConfigDict
+    from mmengine.config import ConfigDict
 
     from mmdet.apis import inference_detector
     from mmdet.models import build_detector

tests/test_models/test_loss_compatibility.py

@@ -25,7 +25,7 @@ def _get_config_directory():
 
 def _get_config_module(fname):
     """Load a configuration as a python module."""
-    from mmcv import Config
+    from mmengine.config import Config
     config_dpath = _get_config_directory()
     config_fpath = join(config_dpath, fname)
     config_mod = Config.fromfile(config_fpath)

tests/test_models/test_plugins.py

@@ -1,7 +1,7 @@
 # Copyright (c) OpenMMLab. All rights reserved.
 import pytest
 import torch
-from mmcv import ConfigDict
+from mmengine.config import ConfigDict
 from mmcv.cnn import build_plugin_layer
 
 from mmdet.models.plugins import DropBlock

tests/test_models/test_seg_heads/test_maskformer_fusion_head.py

@@ -1,6 +1,6 @@
 import pytest
 import torch
-from mmcv import ConfigDict
+from mmengine.config import ConfigDict
 
 from mmdet.models.seg_heads.panoptic_fusion_heads import MaskFormerFusionHead
 

tests/test_runtime/test_config.py

@@ -261,7 +261,7 @@ def test_config_data_pipeline(config_rpath):
             test_config.py test_config_build_data_pipeline
     """
     import numpy as np
-    from mmcv import Config
+    from mmengine.config import Config
 
     from mmdet.datasets.pipelines import Compose
 

tests/test_utils/test_compat_config.py

@@ -1,5 +1,5 @@
 import pytest
-from mmcv import ConfigDict
+from mmengine.config import ConfigDict
 
 from mmdet.utils.compat_config import (compat_imgs_per_gpu, compat_loader_args,
                                        compat_runner_args)

tests/test_utils/test_setup_env.py

@@ -4,7 +4,7 @@
 import platform
 
 import cv2
-from mmcv import Config
+from mmengine.config import Config
 
 from mmdet.utils import setup_multi_processes
 

tools/analysis_tools/analyze_results.py

@@ -4,7 +4,7 @@
 
 import mmcv
 import numpy as np
-from mmcv import Config, DictAction
+from mmengine.config import Config, DictAction
 
 from mmdet.core.evaluation import eval_map
 from mmdet.core.visualization import imshow_gt_det_bboxes

tools/analysis_tools/benchmark.py

@@ -5,7 +5,7 @@
 import time
 
 import torch
-from mmcv import Config, DictAction
+from mmengine.config import Config, DictAction
 from mmcv.cnn import fuse_conv_bn
 from mmcv.parallel import MMDistributedDataParallel
 from mmcv.runner import init_dist, load_checkpoint, wrap_fp16_model

tools/analysis_tools/confusion_matrix.py

@@ -5,7 +5,7 @@
 import mmcv
 import numpy as np
 from matplotlib.ticker import MultipleLocator
-from mmcv import Config, DictAction
+from mmengine.config import Config, DictAction
 from mmcv.ops import nms
 
 from mmdet.core.evaluation.bbox_overlaps import bbox_overlaps

tools/analysis_tools/eval_metric.py

@@ -2,7 +2,7 @@
 import argparse
 
 import mmcv
-from mmcv import Config, DictAction
+from mmengine.config import Config, DictAction
 
 from mmdet.datasets import build_dataset
 from mmdet.utils import update_data_root

tools/analysis_tools/get_flops.py

@@ -3,7 +3,7 @@
 
 import numpy as np
 import torch
-from mmcv import Config, DictAction
+from mmengine.config import Config, DictAction
 
 from mmdet.models import build_detector
 

tools/analysis_tools/optimize_anchors.py

@@ -24,7 +24,7 @@
 import mmcv
 import numpy as np
 import torch
-from mmcv import Config
+from mmengine.config import Config
 from scipy.optimize import differential_evolution
 
 from mmdet.core import bbox_cxcywh_to_xyxy, bbox_overlaps, bbox_xyxy_to_cxcywh

tools/deployment/onnx2tensorrt.py

@@ -7,7 +7,7 @@
 import numpy as np
 import onnx
 import torch
-from mmcv import Config
+from mmengine.config import Config
 from mmcv.tensorrt import is_tensorrt_plugin_loaded, onnx2trt, save_trt_engine
 
 from mmdet.core.export import preprocess_example_input

tools/deployment/pytorch2onnx.py

@@ -7,7 +7,7 @@
 import numpy as np
 import onnx
 import torch
-from mmcv import Config, DictAction
+from mmengine.config import Config, DictAction
 
 from mmdet.core.export import build_model_from_cfg, preprocess_example_input
 from mmdet.core.export.model_wrappers import ONNXRuntimeDetector

tools/deployment/test.py

@@ -3,7 +3,7 @@
 import warnings
 
 import mmcv
-from mmcv import Config, DictAction
+from mmengine.config import Config, DictAction
 from mmcv.parallel import MMDataParallel
 
 from mmdet.apis import single_gpu_test

tools/misc/browse_dataset.py

@@ -6,7 +6,7 @@
 
 import mmcv
 import numpy as np
-from mmcv import Config, DictAction
+from mmengine.config import Config, DictAction
 
 from mmdet.core.utils import mask2ndarray
 from mmdet.core.visualization import imshow_det_bboxes

tools/misc/get_image_metas.py

@@ -13,7 +13,7 @@
 from multiprocessing import Pool
 
 import mmcv
-from mmcv import Config
+from mmengine.config import Config
 
 
 def parse_args():

tools/misc/print_config.py

@@ -2,7 +2,7 @@
 import argparse
 import warnings
 
-from mmcv import Config, DictAction
+from mmengine.config import Config, DictAction
 
 from mmdet.utils import update_data_root
 

tools/model_converters/upgrade_model_version.py

@@ -5,7 +5,7 @@
 from collections import OrderedDict
 
 import torch
-from mmcv import Config
+from mmengine.config import Config
 
 
 def is_head(key):

tools/model_converters/upgrade_ssd_version.py

@@ -4,7 +4,7 @@
 from collections import OrderedDict
 
 import torch
-from mmcv import Config
+from mmengine.config import Config
 
 
 def parse_config(config_strings):

tools/test.py

@@ -7,7 +7,7 @@
 
 import mmcv
 import torch
-from mmcv import Config, DictAction
+from mmengine.config import Config, DictAction
 from mmcv.cnn import fuse_conv_bn
 from mmcv.runner import (get_dist_info, init_dist, load_checkpoint,
                          wrap_fp16_model)

tools/train.py

@@ -9,7 +9,7 @@
 import mmcv
 import torch
 import torch.distributed as dist
-from mmcv import Config, DictAction
+from mmengine.config import Config, DictAction
 from mmcv.runner import get_dist_info, init_dist
 from mmcv.utils import get_git_hash