[Fix] Fix mmcls import error (#206)

* fix mmcls import error * fix __init__.py
open-mmlab · Jul 26, 2022 · 6987511 · 6987511
1 parent 5495acc
commit 6987511
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 19 deletions.
diff --git a/mmrazor/__init__.py b/mmrazor/__init__.py
@@ -47,8 +47,8 @@ def digit_version(version_str: str, length: int = 4):
     return tuple(release)
 
 
-mmcv_minimum_version = '1.3.8'
-mmcv_maximum_version = '1.6.0'
+mmcv_minimum_version = '2.0.0rc0'
+mmcv_maximum_version = '2.0.0'
 mmcv_version = digit_version(mmcv.__version__)
 
 

diff --git a/mmrazor/models/architectures/heads/darts_subnet_head.py b/mmrazor/models/architectures/heads/darts_subnet_head.py
@@ -2,8 +2,8 @@
 from typing import List, Tuple
 
 import torch
-from mmcls.core.data_structures.cls_data_sample import ClsDataSample
-from mmcls.metrics import Accuracy
+from mmcls.data import ClsDataSample
+from mmcls.evaluation import Accuracy
 from mmcls.models.heads import LinearClsHead
 from torch import nn
 

diff --git a/mmrazor/structures/subnet/fix_subnet.py b/mmrazor/structures/subnet/fix_subnet.py
@@ -2,7 +2,6 @@
 import mmcv
 from torch import nn
 
-
 from mmrazor.utils import FixMutable, ValidFixMutable
 
 

diff --git a/tests/test_models/test_algorithms/test_autoslim.py b/tests/test_models/test_algorithms/test_autoslim.py
@@ -8,7 +8,7 @@
 import pytest
 import torch
 import torch.distributed as dist
-from mmcls.core import ClsDataSample
+from mmcls.data import ClsDataSample
 from mmengine.optim import build_optim_wrapper
 
 from mmrazor import digit_version

diff --git a/tests/test_models/test_algorithms/test_slimmable_network.py b/tests/test_models/test_algorithms/test_slimmable_network.py
@@ -8,7 +8,7 @@
 import pytest
 import torch
 import torch.distributed as dist
-from mmcls.core import ClsDataSample
+from mmcls.data import ClsDataSample
 from mmcv import fileio
 from mmengine.optim import build_optim_wrapper
 

diff --git a/tests/test_models/test_mutators/test_classical_models/test_mbv2_channel_mutator.py b/tests/test_models/test_mutators/test_classical_models/test_mbv2_channel_mutator.py
@@ -4,7 +4,7 @@
 from os.path import dirname
 
 import torch
-from mmcls.core import ClsDataSample
+from mmcls.data import ClsDataSample
 from mmcls.models import *  # noqa: F401,F403
 
 from mmrazor import digit_version

diff --git a/tools/test.py b/tools/test.py
@@ -3,20 +3,10 @@
 import os
 import os.path as osp
 
-from mmcls.core import *  # noqa: F401,F403
-from mmcls.datasets import *  # noqa: F401,F403
-from mmcls.metrics import *  # noqa: F401,F403
-from mmcls.models import *  # noqa: F401,F403
-# TODO import mmcls and mmseg
-from mmdet.core import *  # noqa: F401,F403
-from mmdet.datasets import *  # noqa: F401,F403
-from mmdet.metrics import *  # noqa: F401,F403
-from mmdet.models import *  # noqa: F401,F403
 from mmengine.config import Config, DictAction
 from mmengine.runner import Runner
 
-from mmrazor.core import *  # noqa: F401,F403
-from mmrazor.models import *  # noqa: F401,F403
+from mmrazor.utils import register_all_modules
 
 
 # TODO: support fuse_conv_bn, visualization, and format_only
@@ -51,6 +41,7 @@ def parse_args():
 
 
 def main():
+    register_all_modules(False)
     args = parse_args()
 
     # load config