[fix] fix mmcv mmengine (#242)

* align_with_mmcv_and_mmengine

* fix_mmcv.fileio

.dev_scripts/benchmark_test.py

@@ -5,7 +5,7 @@ import re
 from collections import OrderedDict
 from pathlib import Path
 
-import mmcv
+import mmengine
 import wget
 from modelindex.load_model_index import load
 from rich.console import Console
@@ -75,7 +75,7 @@ def create_test_job_batch(commands, model_info, args, port):
 
     http_prefix = 'https://download.openmmlab.com/mmrazor/'
     if 's3://' in args.checkpoint_root:
-        from mmcv.fileio import FileClient
+        from mmengine.fileio import FileClient
         from petrel_client.common.exception import AccessDeniedError
         file_client = FileClient.infer_client(uri=args.checkpoint_root)
         checkpoint = file_client.join_path(
@@ -171,7 +171,7 @@ def summary(args):
         if not latest_json.exists():
             print(f'{model_name} has no results.')
             continue
-        latest_result = mmcv.load(latest_json, 'json')
+        latest_result = mmengine.load(latest_json, 'json')
 
         expect_result = model_info.results[0].metrics
         summary_result = {
@@ -182,8 +182,8 @@ def summary(args):
         }
         model_results[model_name] = summary_result
 
-    mmcv.fileio.dump(model_results,
+    mmengine.fileio.dump(model_results,
-                     Path(args.work_dir) / 'summary.yml', 'yaml')
+                         Path(args.work_dir) / 'summary.yml', 'yaml')
     print(f'Summary results saved in {Path(args.work_dir)}/summary.yml')
 
 

.dev_scripts/benchmark_train.py

@@ -5,7 +5,7 @@ import re
 from collections import OrderedDict
 from pathlib import Path
 
-import mmcv
+import mmengine
 from modelindex.load_model_index import load
 from rich.console import Console
 from rich.syntax import Syntax
@@ -145,7 +145,7 @@ def summary(args):
         if not latest_json.exists():
             print(f'{model_name} has no results.')
             continue
-        latest_result = mmcv.load(latest_json, 'json')
+        latest_result = mmengine.load(latest_json, 'json')
 
         expect_result = model_info.results[0].metrics
         summary_result = {
@@ -156,8 +156,8 @@ def summary(args):
         }
         model_results[model_name] = summary_result
 
-    mmcv.fileio.dump(model_results,
+    mmengine.fileio.dump(model_results,
-                     Path(args.work_dir) / 'summary.yml', 'yaml')
+                         Path(args.work_dir) / 'summary.yml', 'yaml')
     print(f'Summary results saved in {Path(args.work_dir)}/summary.yml')
 
 

mmrazor/models/algorithms/distill/configurable/datafree_distillation.py

@@ -3,8 +3,8 @@ from typing import Dict, List, Tuple
 
 import torch
 import torch.nn as nn
-from mmcv.runner import load_checkpoint
 from mmengine.optim import OPTIMIZERS, OptimWrapper
+from mmengine.runner import load_checkpoint
 
 from mmrazor.models.utils import add_prefix, set_requires_grad
 from mmrazor.registry import MODELS

mmrazor/models/algorithms/distill/configurable/single_teacher_distill.py

@@ -2,9 +2,9 @@
 from typing import Dict, List, Optional, Union
 
 import torch
-from mmcv.runner import load_checkpoint
 from mmengine import BaseDataElement
 from mmengine.model import BaseModel
+from mmengine.runner import load_checkpoint
 from torch import nn
 from torch.nn.modules.batchnorm import _BatchNorm
 

mmrazor/models/architectures/backbones/searchable_mobilenet.py

@@ -5,7 +5,7 @@ from typing import Dict, List, Optional, Sequence, Tuple, Union
 from mmcls.models.backbones.base_backbone import BaseBackbone
 from mmcls.models.utils import make_divisible
 from mmcv.cnn import ConvModule
-from mmcv.runner import Sequential
+from mmengine.model import Sequential
 from torch import Tensor
 from torch.nn.modules.batchnorm import _BatchNorm
 
@@ -166,7 +166,7 @@ class SearchableMobileNet(BaseBackbone):
             mutable_cfg (dict): Config of mutable.
 
         Returns:
-            mmcv.runner.Sequential: The layer made.
+            mmengine.model.Sequential: The layer made.
         """
         layers = []
         for i in range(num_blocks):

mmrazor/models/architectures/backbones/searchable_shufflenet_v2.py

@@ -4,8 +4,9 @@ from typing import Dict, List, Optional, Sequence, Tuple, Union
 
 import torch.nn as nn
 from mmcls.models.backbones.base_backbone import BaseBackbone
-from mmcv.cnn import ConvModule, constant_init, normal_init
+from mmcv.cnn import ConvModule
-from mmcv.runner import ModuleList, Sequential
+from mmengine.model import ModuleList, Sequential
+from mmengine.model.utils import constant_init, normal_init
 from torch import Tensor
 from torch.nn.modules.batchnorm import _BatchNorm
 
@@ -143,7 +144,7 @@ class SearchableShuffleNetV2(BaseBackbone):
             mutable_cfg (dict): Config of mutable.
 
         Returns:
-            mmcv.runner.Sequential: The layer made.
+            mmengine.model.Sequential: The layer made.
         """
         layers = []
         for i in range(num_blocks):

mmrazor/models/architectures/connectors/base_connector.py

@@ -3,7 +3,7 @@ from abc import ABCMeta, abstractmethod
 from typing import Dict, Optional
 
 import torch
-from mmcv.runner import BaseModule
+from mmengine.model import BaseModule
 
 
 class BaseConnector(BaseModule, metaclass=ABCMeta):

mmrazor/models/architectures/dynamic_op/bricks/dynamic_conv.py

@@ -3,7 +3,6 @@ from typing import Callable, Dict
 
 import torch.nn as nn
 import torch.nn.functional as F
-from mmcv.cnn.bricks.registry import CONV_LAYERS
 from torch import Tensor
 
 from mmrazor.models.mutables.base_mutable import BaseMutable
@@ -12,7 +11,6 @@ from .dynamic_conv_mixins import (BigNasConvMixin, DynamicConvMixin,
                                   OFAConvMixin)
 
 
-@CONV_LAYERS.register_module()
 @MODELS.register_module()
 class DynamicConv2d(nn.Conv2d, DynamicConvMixin):
     """Dynamic Conv2d OP.
@@ -65,7 +63,6 @@ class DynamicConv2d(nn.Conv2d, DynamicConvMixin):
         return self.forward_mixin(x)
 
 
-@CONV_LAYERS.register_module()
 @MODELS.register_module()
 class BigNasConv2d(nn.Conv2d, BigNasConvMixin):
     """Conv2d used in BigNas.
@@ -118,7 +115,6 @@ class BigNasConv2d(nn.Conv2d, BigNasConvMixin):
         return self.forward_mixin(x)
 
 
-@CONV_LAYERS.register_module()
 @MODELS.register_module()
 class OFAConv2d(nn.Conv2d, OFAConvMixin):
     """Conv2d used in `Once-for-All`.

mmrazor/models/architectures/dynamic_op/bricks/dynamic_norm.py

@@ -3,11 +3,11 @@ from typing import Dict, Optional
 
 import torch.nn as nn
 import torch.nn.functional as F
-from mmcv.cnn.bricks.registry import NORM_LAYERS
 from torch import Tensor
 from torch.nn.modules.batchnorm import _BatchNorm
 
 from mmrazor.models.mutables.base_mutable import BaseMutable
+from mmrazor.registry import MODELS
 from .dynamic_mixins import DynamicBatchNormMixin
 
 
@@ -85,7 +85,7 @@ class _DynamicBatchNorm(_BatchNorm, DynamicBatchNormMixin):
         return out
 
 
-@NORM_LAYERS.register_module()
+@MODELS.register_module()
 class DynamicBatchNorm1d(_DynamicBatchNorm):
     """Dynamic BatchNorm1d OP."""
 
@@ -100,7 +100,7 @@ class DynamicBatchNorm1d(_DynamicBatchNorm):
                 input.dim()))
 
 
-@NORM_LAYERS.register_module()
+@MODELS.register_module()
 class DynamicBatchNorm2d(_DynamicBatchNorm):
     """Dynamic BatchNorm2d OP."""
 
@@ -115,7 +115,7 @@ class DynamicBatchNorm2d(_DynamicBatchNorm):
                 input.dim()))
 
 
-@NORM_LAYERS.register_module()
+@MODELS.register_module()
 class DynamicBatchNorm3d(_DynamicBatchNorm):
     """Dynamic BatchNorm3d OP."""
 

mmrazor/models/architectures/generators/base_generator.py

@@ -2,7 +2,7 @@
 from typing import Dict, Optional
 
 import torch
-from mmcv.runner import BaseModule
+from mmengine.model import BaseModule
 
 from mmrazor.models.utils import get_module_device
 

mmrazor/models/architectures/heads/darts_subnet_head.py

@@ -2,9 +2,9 @@
 from typing import List, Tuple
 
 import torch
+from mmcls.data import ClsDataSample
 from mmcls.evaluation import Accuracy
 from mmcls.models.heads import LinearClsHead
-from mmcls.structures import ClsDataSample
 from torch import nn
 
 from mmrazor.models.utils import add_prefix

mmrazor/models/losses/dafl_loss.py

@@ -2,7 +2,7 @@
 import torch
 import torch.nn as nn
 import torch.nn.functional as F
-from mmcv.runner import get_dist_info
+from mmengine.dist import get_dist_info
 
 from mmrazor.registry import MODELS
 from ..ops import GatherTensors

mmrazor/models/mutables/base_mutable.py

@@ -2,7 +2,7 @@
 from abc import ABC, abstractmethod
 from typing import Dict, Generic, Optional, TypeVar
 
-from mmcv.runner import BaseModule
+from mmengine.model import BaseModule
 
 CHOICE_TYPE = TypeVar('CHOICE_TYPE')
 CHOSEN_TYPE = TypeVar('CHOSEN_TYPE')

mmrazor/models/mutators/base_mutator.py

@@ -2,7 +2,7 @@
 from abc import ABC, abstractmethod
 from typing import Dict, Generic, Optional, Type, TypeVar
 
-from mmcv.runner import BaseModule
+from mmengine.model import BaseModule
 from torch.nn import Module
 
 from ..mutables.base_mutable import BaseMutable

mmrazor/models/ops/base.py

@@ -1,5 +1,5 @@
 # Copyright (c) OpenMMLab. All rights reserved.
-from mmcv.runner import BaseModule
+from mmengine.model import BaseModule
 
 
 class BaseOP(BaseModule):

mmrazor/structures/delivery/function_outputs_delivery.py

@@ -3,7 +3,7 @@ import functools
 from types import FunctionType
 from typing import Callable
 
-from mmcv.utils import import_modules_from_strings
+from mmengine.utils import import_modules_from_strings
 
 from mmrazor.registry import TASK_UTILS
 from .distill_delivery import DistillDelivery

mmrazor/structures/delivery/method_outputs_delivery.py

@@ -3,7 +3,7 @@ import functools
 from types import FunctionType, ModuleType
 from typing import Callable
 
-from mmcv.utils import import_modules_from_strings
+from mmengine.utils import import_modules_from_strings
 
 from mmrazor.registry import TASK_UTILS
 from .distill_delivery import DistillDelivery

mmrazor/structures/recorder/function_outputs_recorder.py

@@ -3,7 +3,7 @@ import functools
 from types import FunctionType, ModuleType
 from typing import Callable, List, Optional
 
-from mmcv.utils import import_modules_from_strings
+from mmengine.utils import import_modules_from_strings
 from torch import nn
 
 from mmrazor.registry import TASK_UTILS

mmrazor/structures/recorder/method_outputs_recorder.py

@@ -3,7 +3,7 @@ import functools
 from types import FunctionType, ModuleType
 from typing import Callable, List, Optional
 
-from mmcv.utils import import_modules_from_strings
+from mmengine.utils import import_modules_from_strings
 from torch import nn
 
 from mmrazor.registry import TASK_UTILS

mmrazor/structures/tracer/backward_tracer.py

@@ -3,7 +3,7 @@ import copy
 import re
 from collections import OrderedDict
 
-from mmcv import ConfigDict
+from mmengine import ConfigDict
 from torch.nn import Conv2d, Linear
 from torch.nn.modules import GroupNorm
 from torch.nn.modules.batchnorm import _NormBase

requirements/mminstall.txt

@@ -1,2 +1,2 @@
 mmcls
-mmcv-full>=1.3.13
+mmcv-full>=2.0.0rc0

tests/test_core/test_delivers/test_deliver_manager.py

@@ -1,7 +1,7 @@
 # Copyright (c) OpenMMLab. All rights reserved.
 from unittest import TestCase
 
-from mmcv import ConfigDict
+from mmengine import ConfigDict
 
 from mmrazor.structures import DistillDeliveryManager
 

tests/test_core/test_graph/test_graph.py

@@ -5,8 +5,8 @@ from unittest import TestCase
 import torch
 
 from mmrazor.structures.graph import ModuleGraph
-from ...data.models import (AddCatModel, ConcatModel, LineModel,
+from tests.data.models import (AddCatModel, ConcatModel, LineModel,
-                            MultiConcatModel, MultiConcatModel2, ResBlock)
+                               MultiConcatModel, MultiConcatModel2, ResBlock)
 
 sys.setrecursionlimit(int(1e8))
 

tests/test_core/test_recorders/test_recorder_manager.py

@@ -2,7 +2,7 @@
 from unittest import TestCase
 
 import torch
-from mmcv import ConfigDict
+from mmengine import ConfigDict
 from torch import nn
 from toy_mod import Toy
 

tests/test_models/test_algorithms/test_autoslim.py

@@ -8,7 +8,7 @@ from unittest.mock import Mock
 import pytest
 import torch
 import torch.distributed as dist
-from mmcls.structures import ClsDataSample
+from mmcls.data import ClsDataSample
 from mmengine.optim import build_optim_wrapper
 
 from mmrazor import digit_version

tests/test_models/test_algorithms/test_datafree_distill.py

@@ -3,7 +3,7 @@ import copy
 from unittest import TestCase
 
 import torch
-from mmcv import ConfigDict
+from mmengine import ConfigDict
 from mmengine.optim import build_optim_wrapper
 
 from mmrazor.models import DAFLDataFreeDistillation, DataFreeDistillation

tests/test_models/test_algorithms/test_self_distill.py

@@ -2,7 +2,7 @@
 from unittest import TestCase
 
 import torch
-from mmcv import ConfigDict
+from mmengine import ConfigDict
 
 from mmrazor.models import SelfDistill
 

tests/test_models/test_algorithms/test_single_teacher_distill.py

@@ -3,7 +3,7 @@ import copy
 from unittest import TestCase
 
 import torch
-from mmcv import ConfigDict
+from mmengine import ConfigDict
 from toy_models import ToyStudent
 
 from mmrazor.models import SingleTeacherDistill

tests/test_models/test_algorithms/test_slimmable_network.py

@@ -8,7 +8,7 @@ from unittest.mock import Mock
 import pytest
 import torch
 import torch.distributed as dist
-from mmcls.structures import ClsDataSample
+from mmcls.data import ClsDataSample
 from mmengine import fileio
 from mmengine.optim import build_optim_wrapper
 

tests/test_models/test_distillers/test_byot_distill.py

@@ -2,7 +2,7 @@
 import copy
 from unittest import TestCase
 
-from mmcv import ConfigDict
+from mmengine import ConfigDict
 
 from mmrazor.models import BYOTDistiller
 

tests/test_models/test_distillers/test_configurable_distill.py

@@ -2,7 +2,7 @@
 import copy
 from unittest import TestCase
 
-from mmcv import ConfigDict
+from mmengine import ConfigDict
 
 from mmrazor.models import ConfigurableDistiller
 

tests/test_models/test_mutators/test_classical_models/test_mbv2_channel_mutator.py

@@ -4,8 +4,8 @@ import unittest
 from os.path import dirname
 
 import torch
+from mmcls.data import ClsDataSample
 from mmcls.models import *  # noqa: F401,F403
-from mmcls.structures import ClsDataSample
 
 from mmrazor import digit_version
 from mmrazor.models.mutables import SlimmableMutableChannel

tools/misc/print_config.py

@@ -2,7 +2,7 @@
 import argparse
 import warnings
 
-from mmcv import Config, DictAction
+from mmengine import Config, DictAction
 
 
 def parse_args():

tools/model_converters/publish_model.py

@@ -4,9 +4,9 @@ import datetime
 from pathlib import Path
 from typing import Optional
 
-import mmcv
+import mmengine
 import torch
-from mmcv import digit_version
+from mmengine import digit_version
 
 
 def parse_args():
@@ -70,9 +70,9 @@ def process_checkpoint(in_file: str,
     print(f'Successfully generated the publish-ckpt as {final_ckpt_file}.')
 
     if subnet_cfg_file is not None:
-        subnet_cfg = mmcv.fileio.load(subnet_cfg_file)
+        subnet_cfg = mmengine.fileio.load(subnet_cfg_file)
         final_subnet_cfg_file = f'{final_file_prefix}_subnet_cfg.yaml'
-        mmcv.fileio.dump(subnet_cfg, final_subnet_cfg_file)
+        mmengine.fileio.dump(subnet_cfg, final_subnet_cfg_file)
         print(f'Successfully generated the publish-subnet-cfg as \
                 {final_subnet_cfg_file}.')