revert a fix lint commit

mmrazor/engine/optimizers/optimizer_constructor.py

@@ -3,8 +3,8 @@
 from typing import Optional
 
 import torch.nn as nn
-
 from mmengine.optim import DefaultOptimWrapperConstructor, OptimWrapperDict
+
 from mmrazor.registry import OPTIM_WRAPPER_CONSTRUCTORS
 
 

mmrazor/engine/runner/autoslim_val_loop.py

@@ -1,10 +1,10 @@
 # Copyright (c) OpenMMLab. All rights reserved.
 from typing import Dict, List, Union
 
-from torch.utils.data import DataLoader
-
 from mmengine.evaluator import Evaluator
 from mmengine.runner import ValLoop
+from torch.utils.data import DataLoader
+
 from mmrazor.models.utils import add_prefix
 from mmrazor.registry import LOOPS
 
@@ -27,7 +27,7 @@ def __init__(self,
         # just for convenience
         self._model = model
 
-    def run(self):
+    def run(self) -> None:
         """Launch validation."""
         self.runner.call_hook('before_val')
 

mmrazor/engine/runner/darts_loop.py

@@ -1,9 +1,9 @@
 # Copyright (c) OpenMMLab. All rights reserved.
 from typing import Dict, List, Union
 
+from mmengine.runner import EpochBasedTrainLoop, IterBasedTrainLoop
 from torch.utils.data import DataLoader
 
-from mmengine.runner import EpochBasedTrainLoop, IterBasedTrainLoop
 from mmrazor.registry import LOOPS
 
 

mmrazor/engine/runner/distill_val_loop.py

@@ -2,10 +2,10 @@
 from typing import Dict, List, Sequence, Union
 
 import torch
-from torch.utils.data import DataLoader
-
 from mmengine.evaluator import Evaluator
 from mmengine.runner import ValLoop, autocast
+from torch.utils.data import DataLoader
+
 from mmrazor.registry import LOOPS
 
 

mmrazor/engine/runner/evolution_search_loop.py

@@ -8,12 +8,12 @@
 
 import mmcv
 import torch
-from torch.utils.data import DataLoader
-
 from mmengine.dist import broadcast_object_list
 from mmengine.evaluator import Evaluator
 from mmengine.runner import EpochBasedTrainLoop
 from mmengine.utils import is_list_of
+from torch.utils.data import DataLoader
+
 from mmrazor.registry import LOOPS
 from mmrazor.structures import Candidates, export_fix_subnet, load_fix_subnet
 from mmrazor.structures.estimator import ResourceEstimator

mmrazor/engine/runner/slimmable_val_loop.py

@@ -1,10 +1,10 @@
 # Copyright (c) OpenMMLab. All rights reserved.
 from typing import Dict, List, Union
 
-from torch.utils.data import DataLoader
-
 from mmengine.evaluator import Evaluator
 from mmengine.runner import ValLoop
+from torch.utils.data import DataLoader
+
 from mmrazor.models.utils import add_prefix
 from mmrazor.registry import LOOPS
 
@@ -38,7 +38,7 @@ def __init__(self,
         # just for convenience
         self._model = model
 
-    def run(self):
+    def run(self) -> None:
         """Launch validation."""
         self.runner.call_hook('before_val')
 

mmrazor/engine/runner/subnet_sampler_loop.py

@@ -8,11 +8,11 @@
 
 import mmcv
 import torch
-from torch.utils.data import DataLoader
-
 from mmengine.evaluator import Evaluator
 from mmengine.runner import IterBasedTrainLoop
 from mmengine.utils import is_list_of
+from torch.utils.data import DataLoader
+
 from mmrazor.registry import LOOPS
 from mmrazor.structures import Candidates, export_fix_subnet, load_fix_subnet
 from mmrazor.structures.estimator import ResourceEstimator

mmrazor/models/algorithms/base.py

@@ -3,9 +3,9 @@
 
 import torch
 import torch.nn as nn
-
 from mmengine import BaseDataElement
 from mmengine.model import BaseModel
+
 from mmrazor.registry import MODELS
 
 LossResults = Dict[str, torch.Tensor]

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

@@ -2,8 +2,8 @@
 from typing import List, Optional
 
 import torch
-
 from mmengine import BaseDataElement
+
 from mmrazor.models.utils import add_prefix
 from mmrazor.registry import MODELS
 from ...base import LossResults

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

@@ -3,11 +3,11 @@
 
 import torch
 from mmcv.runner import load_checkpoint
+from mmengine import BaseDataElement
+from mmengine.model import BaseModel
 from torch import nn
 from torch.nn.modules.batchnorm import _BatchNorm
 
-from mmengine import BaseDataElement
-from mmengine.model import BaseModel
 from mmrazor.models.utils import add_prefix
 from mmrazor.registry import MODELS
 from ...base import BaseAlgorithm, LossResults

mmrazor/models/algorithms/nas/autoslim.py

@@ -4,11 +4,11 @@
 from typing import Dict, List, Optional, Union
 
 import torch
-from torch import nn
-
 from mmengine import BaseDataElement
 from mmengine.model import BaseModel, MMDistributedDataParallel
 from mmengine.optim import OptimWrapper
+from torch import nn
+
 from mmrazor.models.distillers import ConfigurableDistiller
 from mmrazor.models.mutators import OneShotChannelMutator
 from mmrazor.models.utils import (add_prefix,

mmrazor/models/algorithms/nas/darts.py

@@ -3,11 +3,11 @@
 from typing import Dict, List, Optional, Union
 
 import torch
+from mmengine.model import BaseModel, MMDistributedDataParallel
+from mmengine.optim import OptimWrapper, OptimWrapperDict
 from torch import nn
 from torch.nn.modules.batchnorm import _BatchNorm
 
-from mmengine.model import BaseModel, MMDistributedDataParallel
-from mmengine.optim import OptimWrapper, OptimWrapperDict
 from mmrazor.models.mutators import DiffModuleMutator
 from mmrazor.models.utils import add_prefix
 from mmrazor.registry import MODEL_WRAPPERS, MODELS

mmrazor/models/algorithms/nas/spos.py

@@ -2,11 +2,11 @@
 from typing import Dict, List, Optional, Union
 
 import torch
+from mmengine import BaseDataElement
+from mmengine.model import BaseModel
 from torch import nn
 from torch.nn.modules.batchnorm import _BatchNorm
 
-from mmengine import BaseDataElement
-from mmengine.model import BaseModel
 from mmrazor.models.mutators import OneShotModuleMutator
 from mmrazor.registry import MODELS
 from mmrazor.utils import SingleMutatorRandomSubnet, ValidFixMutable

mmrazor/models/algorithms/pruning/slimmable_network.py

@@ -6,11 +6,11 @@
 
 import mmcv
 import torch
-from torch import nn
-
 from mmengine import BaseDataElement
 from mmengine.model import BaseModel, MMDistributedDataParallel
 from mmengine.optim import OptimWrapper
+from torch import nn
+
 from mmrazor.models.mutators import SlimmableChannelMutator
 from mmrazor.models.utils import (add_prefix,
                                   reinitialize_optim_wrapper_count_status)

mmrazor/models/architectures/connectors/convmodule_connector.py

@@ -53,10 +53,10 @@ def __init__(
         self,
         in_channel: int,
         out_channel: int,
-        kernel_size: Union[int, Tuple[int, int]] = 1,
-        stride: Union[int, Tuple[int, int]] = 1,
-        padding: Union[int, Tuple[int, int]] = 0,
-        dilation: Union[int, Tuple[int, int]] = 1,
+        kernel_size: Union[int, Tuple[int]] = 1,
+        stride: Union[int, Tuple[int]] = 1,
+        padding: Union[int, Tuple[int]] = 0,
+        dilation: Union[int, Tuple[int]] = 1,
         groups: int = 1,
         bias: Union[str, bool] = 'auto',
         conv_cfg: Optional[Dict] = None,

mmrazor/models/distillers/base_distiller.py

@@ -3,6 +3,7 @@
 from typing import Dict, Optional
 
 from mmengine.model import BaseModule
+
 from ..algorithms.base import LossResults
 
 

mmrazor/models/distillers/configurable_distiller.py

@@ -3,9 +3,9 @@
 from inspect import signature
 from typing import Dict, List, Optional
 
+from mmengine.model import BaseModel
 from torch import nn
 
-from mmengine.model import BaseModel
 from mmrazor.registry import MODELS
 from mmrazor.structures import DistillDeliveryManager, RecorderManager
 from ..algorithms.base import LossResults

mmrazor/models/mutables/derived_mutable.py

@@ -12,9 +12,9 @@
 from typing import Any, Callable, Dict, Optional, Set, Union
 
 import torch
+from mmengine.logging import print_log
 from torch import Tensor
 
-from mmengine.logging import print_log
 from ..utils import make_divisible
 from .base_mutable import CHOICE_TYPE, BaseMutable
 

mmrazor/models/utils/optim_wrapper.py

@@ -1,8 +1,7 @@
 # Copyright (c) OpenMMLab. All rights reserved.
-from torch.nn import Module
-
 from mmengine.logging import MMLogger
 from mmengine.optim import OptimWrapper
+from torch.nn import Module
 
 
 def reinitialize_optim_wrapper_count_status(model: Module,

mmrazor/structures/subnet/fix_subnet.py

@@ -2,9 +2,9 @@
 import logging
 
 import mmcv
+from mmengine.logging import print_log
 from torch import nn
 
-from mmengine.logging import print_log
 from mmrazor.utils import FixMutable, ValidFixMutable
 
 

mmrazor/utils/setup_env.py

@@ -6,7 +6,6 @@
 
 import cv2
 import torch.multiprocessing as mp
-
 from mmengine import DefaultScope
 
 
@@ -72,13 +71,12 @@ def register_all_modules(init_default_scope: bool = True) -> None:
             DefaultScope.get_instance('mmrazor', scope_name='mmrazor')
             return
         current_scope = DefaultScope.get_current_instance()
-        if current_scope.scope_name != 'mmrazor':  # type: ignore
-            warnings.warn(
-                'The current default scope '  # type: ignore
-                f'"{current_scope.scope_name}" is not '
-                '"mmrazor", `register_all_modules` will force the current'
-                'default scope to be "mmrazor". If this is not expected, '
-                'please set `init_default_scope=False`.')
+        if current_scope.scope_name != 'mmrazor':
+            warnings.warn('The current default scope '
+                          f'"{current_scope.scope_name}" is not "mmrazor", '
+                          '`register_all_modules` will force the current'
+                          'default scope to be "mmrazor". If this is not '
+                          'expected, please set `init_default_scope=False`.')
             # avoid name conflict
             new_instance_name = f'mmrazor-{datetime.datetime.now()}'
             DefaultScope.get_instance(new_instance_name, scope_name='mmrazor')

tests/test_models/test_algorithms/test_autoslim.py

@@ -9,8 +9,8 @@
 import torch
 import torch.distributed as dist
 from mmcls.structures import ClsDataSample
-
 from mmengine.optim import build_optim_wrapper
+
 from mmrazor import digit_version
 from mmrazor.models.algorithms import AutoSlim, AutoSlimDDP
 

tests/test_models/test_algorithms/test_base_algorithm.py

@@ -3,8 +3,8 @@
 
 import torch
 import torch.nn as nn
-
 from mmengine.model import BaseDataPreprocessor, BaseModel
+
 from mmrazor.models import BaseAlgorithm
 from mmrazor.registry import MODELS
 

tests/test_models/test_algorithms/test_slimmable_network.py

@@ -10,8 +10,8 @@
 import torch.distributed as dist
 from mmcls.structures import ClsDataSample
 from mmcv import fileio
-
 from mmengine.optim import build_optim_wrapper
+
 from mmrazor.models.algorithms import SlimmableNetwork, SlimmableNetworkDDP
 
 MODEL_CFG = dict(

tests/test_models/test_algorithms/test_spos.py

@@ -3,8 +3,8 @@
 
 import torch
 import torch.nn as nn
-
 from mmengine.model import BaseModel
+
 from mmrazor.models import SPOS, OneShotModuleMutator, OneShotMutableOP
 from mmrazor.registry import MODELS
 

tests/test_models/test_algorithms/toy_models.py

@@ -1,8 +1,8 @@
 # Copyright (c) OpenMMLab. All rights reserved.
 
+from mmengine.model import BaseModel
 from torch import nn
 
-from mmengine.model import BaseModel
 from mmrazor.registry import MODELS
 
 

tests/test_registry/test_registry.py

@@ -4,9 +4,9 @@
 from unittest import TestCase
 
 import torch.nn as nn
-
 from mmengine.config import Config
 from mmengine.model import BaseModel
+
 from mmrazor.models import *  # noqa: F403, F401
 from mmrazor.models.algorithms.base import BaseAlgorithm
 from mmrazor.models.mutables import OneShotMutableOP

tests/test_runners/test_darts_loop.py

@@ -6,12 +6,12 @@
 
 import torch
 import torch.nn as nn
-from torch.utils.data import DataLoader, Dataset
-
 from mmengine.config import Config
 from mmengine.hooks import Hook
 from mmengine.model import BaseDataPreprocessor, BaseModel
 from mmengine.runner import Runner
+from torch.utils.data import DataLoader, Dataset
+
 from mmrazor.engine import DartsEpochBasedTrainLoop  # noqa: F401
 from mmrazor.engine import DartsIterBasedTrainLoop  # noqa: F401
 from mmrazor.registry import DATASETS, HOOKS, MODELS

tests/test_runners/test_distill_val_loop.py

@@ -7,12 +7,12 @@
 
 import torch
 import torch.nn as nn
-from torch.utils.data import Dataset
-
 from mmengine.config import Config
 from mmengine.evaluator import BaseMetric
 from mmengine.model import BaseModel
 from mmengine.runner import Runner
+from torch.utils.data import Dataset
+
 from mmrazor.engine import SingleTeacherDistillValLoop  # noqa: F401
 from mmrazor.registry import DATASETS, METRICS, MODELS
 

tests/test_runners/test_evolution_search_loop.py

@@ -8,9 +8,9 @@
 
 import mmcv
 import torch
+from mmengine.config import Config
 from torch.utils.data import DataLoader, Dataset
 
-from mmengine.config import Config
 from mmrazor.engine import EvolutionSearchLoop
 from mmrazor.registry import LOOPS
 from mmrazor.structures import Candidates