Rename: ChannelGroup -> ChannelUnit

configs/pruning/mmcls/autoslim/autoslim_mbv2_1.5x_slimmable_subnet_8xb256_in1k.py

@@ -30,9 +30,9 @@
     data_preprocessor=data_preprocessor,
     mutator=dict(
         type='SlimmableChannelMutator',
-        channel_group_cfg=dict(
-            type='SlimmableChannelGroup',
-            groups='tests/data/MBV2_slimmable_config.json'),
+        channel_unit_cfg=dict(
+            type='SlimmableChannelUnit',
+            units='tests/data/MBV2_slimmable_config.json'),
         parse_cfg=dict(
             type='BackwardTracer',
             loss_calculator=dict(type='ImageClassifierPseudoLoss'))))

configs/pruning/mmcls/autoslim/autoslim_mbv2_1.5x_supernet_8xb256_in1k.py

@@ -43,8 +43,8 @@
                 preds_T=dict(recorder='fc', from_student=False)))),
     mutator=dict(
         type='OneShotChannelMutator',
-        channel_group_cfg=dict(
-            type='OneShotMutableChannelGroup',
+        channel_unit_cfg=dict(
+            type='OneShotMutableChannelUnit',
             default_args=dict(
                 candidate_choices=list(i / 12 for i in range(2, 13)),
                 candidate_mode='ratio',

configs/pruning/mmcls/l1-norm/README.md

@@ -8,4 +8,4 @@
 
 L1-norm pruning is a classical filter pruning algorithm. It prunes filers(channels) according to the l1-norm of the weight of a conv layer.
 
-We use ItePruneAlgorithm and L1MutableChannelGroup to implement l1-norm pruning. Please refer to xxxx for more configuration detail.
+We use ItePruneAlgorithm and L1MutableChannelUnit to implement l1-norm pruning. Please refer to xxxx for more configuration detail.

configs/pruning/mmcls/l1-norm/l1-norm_resnet34_8xb32_in1k.py

@@ -6,7 +6,7 @@
 stage_ratio_4 = 1.0
 
 # the config template of target_pruning_ratio can be got by
-# python ./tools/get_channel_groups.py {config_file} --choice
+# python ./tools/get_channel_units.py {config_file} --choice
 target_pruning_ratio = {
     'backbone.layer1.2.conv2_(0, 64)_64': stage_ratio_1,
     'backbone.layer1.0.conv1_(0, 64)_64': stage_ratio_1,
@@ -47,8 +47,8 @@
     architecture=architecture,
     mutator_cfg=dict(
         type='ChannelMutator',
-        channel_group_cfg=dict(
-            type='L1MutableChannelGroup',
+        channel_unit_cfg=dict(
+            type='L1MutableChannelUnit',
             default_args=dict(choice_mode='ratio'))),
     target_pruning_ratio=target_pruning_ratio,
     step_epoch=1,

mmrazor/models/algorithms/pruning/ite_prune_algorithm.py

@@ -87,7 +87,7 @@ class ItePruneAlgorithm(BaseAlgorithm):
         architecture (Union[BaseModel, Dict]): The model to be pruned.
         mutator_cfg (Union[Dict, ChannelMutator], optional): The config
             of a mutator. Defaults to dict( type='ChannelMutator',
-            channel_group_cfg=dict( type='SequentialMutableChannelGroup')).
+            channel_unit_cfg=dict( type='SequentialMutableChannelUnit')).
         data_preprocessor (Optional[Union[Dict, nn.Module]], optional):
             Defaults to None.
         target_pruning_ratio (dict, optional): The prune-target. The template
@@ -104,8 +104,8 @@ def __init__(self,
                  architecture: Union[BaseModel, Dict],
                  mutator_cfg: Union[Dict, ChannelMutator] = dict(
                      type='ChannelMutator',
-                     channel_group_cfg=dict(
-                         type='SequentialMutableChannelGroup')),
+                     channel_unit_cfg=dict(
+                         type='SequentialMutableChannelUnit')),
                  data_preprocessor: Optional[Union[Dict, nn.Module]] = None,
                  target_pruning_ratio={},
                  step_epoch=1,

mmrazor/models/mutables/__init__.py

@@ -3,21 +3,21 @@
 from .derived_mutable import DerivedMutable
 from .mutable_channel import (BaseMutableChannel, MutableChannelContainer,
                               SimpleMutableChannel, SquentialMutableChannel)
-from .mutable_channel.groups import (ChannelGroupType, L1MutableChannelGroup,
-                                     MutableChannelGroup,
-                                     OneShotMutableChannelGroup,
-                                     SequentialMutableChannelGroup,
-                                     SlimmableChannelGroup)
+from .mutable_channel.units import (ChannelUnitType, L1MutableChannelUnit,
+                                     MutableChannelUnit,
+                                     OneShotMutableChannelUnit,
+                                     SequentialMutableChannelUnit,
+                                     SlimmableChannelUnit)
 from .mutable_module import (DiffChoiceRoute, DiffMutableModule, DiffMutableOP,
                              OneShotMutableModule, OneShotMutableOP)
 from .mutable_value import MutableValue, OneShotMutableValue
 
 __all__ = [
     'OneShotMutableOP', 'OneShotMutableModule', 'DiffMutableOP',
     'DiffChoiceRoute', 'DiffMutableModule', 'DerivedMutable', 'MutableValue',
-    'OneShotMutableValue', 'SequentialMutableChannelGroup',
-    'L1MutableChannelGroup', 'OneShotMutableChannelGroup',
-    'SimpleMutableChannel', 'MutableChannelGroup', 'SlimmableChannelGroup',
-    'BaseMutableChannel', 'MutableChannelContainer', 'ChannelGroupType',
+    'OneShotMutableValue', 'SequentialMutableChannelUnit',
+    'L1MutableChannelUnit', 'OneShotMutableChannelUnit',
+    'SimpleMutableChannel', 'MutableChannelUnit', 'SlimmableChannelUnit',
+    'BaseMutableChannel', 'MutableChannelContainer', 'ChannelUnitType',
     'SquentialMutableChannel', 'BaseMutable'
 ]

mmrazor/models/mutables/mutable_channel/__init__.py

@@ -1,16 +1,16 @@
 # Copyright (c) OpenMMLab. All rights reserved.
 from .base_mutable_channel import BaseMutableChannel
-from .groups import (ChannelGroupType, L1MutableChannelGroup,
-                     MutableChannelGroup, OneShotMutableChannelGroup,
-                     SequentialMutableChannelGroup, SlimmableChannelGroup)
+from .units import (ChannelUnitType, L1MutableChannelUnit,
+                     MutableChannelUnit, OneShotMutableChannelUnit,
+                     SequentialMutableChannelUnit, SlimmableChannelUnit)
 from .mutable_channel_container import MutableChannelContainer
 from .sequential_mutable_channel import SquentialMutableChannel
 from .simple_mutable_channel import SimpleMutableChannel
 
 __all__ = [
-    'SimpleMutableChannel', 'L1MutableChannelGroup',
-    'SequentialMutableChannelGroup', 'MutableChannelGroup',
-    'OneShotMutableChannelGroup', 'SlimmableChannelGroup',
+    'SimpleMutableChannel', 'L1MutableChannelUnit',
+    'SequentialMutableChannelUnit', 'MutableChannelUnit',
+    'OneShotMutableChannelUnit', 'SlimmableChannelUnit',
     'BaseMutableChannel', 'MutableChannelContainer', 'SquentialMutableChannel',
-    'ChannelGroupType'
+    'ChannelUnitType'
 ]

mmrazor/models/mutables/mutable_channel/units/__init__.py

@@ -0,0 +1,13 @@
+# Copyright (c) OpenMMLab. All rights reserved.
+
+from .l1_mutable_channel_unit import L1MutableChannelUnit
+from .mutable_channel_unit import ChannelUnitType, MutableChannelUnit
+from .one_shot_mutable_channel_unit import OneShotMutableChannelUnit
+from .sequential_mutable_channel_unit import SequentialMutableChannelUnit
+from .slimmable_channel_unit import SlimmableChannelUnit
+
+__all__ = [
+    'L1MutableChannelUnit', 'MutableChannelUnit',
+    'SequentialMutableChannelUnit', 'OneShotMutableChannelUnit',
+    'SlimmableChannelUnit', 'ChannelUnitType'
+]