Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean old codes. #296

Merged
merged 10 commits into from
Sep 23, 2022
Merged

Clean old codes. #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b9ee1c9
remove old dynamic ops
Sep 22, 2022
c1ffacb
move dynamic ops
Sep 22, 2022
63fd1f6
clean old mutable_channels
Sep 22, 2022
59f9746
rm OneShotMutableChannel
Sep 22, 2022
eccf23f
rm MutableChannel
Sep 22, 2022
a5caf66
refine
Sep 22, 2022
96da57d
refine
Sep 22, 2022
8c9e4f2
use SquentialMutableChannel to replace OneshotMutableChannel
Sep 22, 2022
f465e24
refactor dynamicops folder
Sep 23, 2022
6b8d182
let SquentialMutableChannel support float
Sep 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions mmrazor/models/architectures/dynamic_ops/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
# Copyright (c) OpenMMLab. All rights reserved.
from .base import DynamicOP
from .default_dynamic_ops import (DynamicBatchNorm, DynamicConv2d,
DynamicGroupNorm, DynamicInstanceNorm,
DynamicLinear)
from .slimmable_dynamic_ops import SwitchableBatchNorm2d
from .bricks.dynamic_conv import BigNasConv2d, DynamicConv2d, OFAConv2d
from .bricks.dynamic_linear import DynamicLinear
from .bricks.dynamic_norm import (DynamicBatchNorm1d, DynamicBatchNorm2d,
DynamicBatchNorm3d, SwitchableBatchNorm2d)
from .mixins.dynamic_conv_mixins import DynamicConvMixin
from .mixins.dynamic_mixins import (DynamicBatchNormMixin, DynamicChannelMixin,
DynamicLinearMixin, DynamicMixin)

__all__ = [
'DynamicConv2d', 'DynamicLinear', 'DynamicBatchNorm',
'DynamicInstanceNorm', 'DynamicGroupNorm', 'SwitchableBatchNorm2d',
'DynamicOP'
'BigNasConv2d', 'DynamicConv2d', 'OFAConv2d', 'DynamicLinear',
'DynamicBatchNorm1d', 'DynamicBatchNorm2d', 'DynamicBatchNorm3d',
'DynamicMixin', 'DynamicChannelMixin', 'DynamicBatchNormMixin',
'DynamicLinearMixin', 'SwitchableBatchNorm2d', 'DynamicConvMixin'
]
106 changes: 0 additions & 106 deletions mmrazor/models/architectures/dynamic_ops/base.py
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions mmrazor/models/architectures/dynamic_ops/bricks/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1 @@
# Copyright (c) OpenMMLab. All rights reserved.
from .dynamic_conv import BigNasConv2d, DynamicConv2d, OFAConv2d
from .dynamic_linear import DynamicLinear
from .dynamic_mixins import (DynamicBatchNormMixin, DynamicChannelMixin,
DynamicLinearMixin, DynamicMixin)
from .dynamic_norm import (DynamicBatchNorm1d, DynamicBatchNorm2d,
DynamicBatchNorm3d, SwitchableBatchNorm2d)

__all__ = [
'BigNasConv2d', 'DynamicConv2d', 'OFAConv2d', 'DynamicLinear',
'DynamicBatchNorm1d', 'DynamicBatchNorm2d', 'DynamicBatchNorm3d',
'DynamicMixin', 'DynamicChannelMixin', 'DynamicBatchNormMixin',
'DynamicLinearMixin', 'SwitchableBatchNorm2d'
]
4 changes: 2 additions & 2 deletions mmrazor/models/architectures/dynamic_ops/bricks/dynamic_conv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

from mmrazor.models.mutables.base_mutable import BaseMutable
from mmrazor.registry import MODELS
from .dynamic_conv_mixins import (BigNasConvMixin, DynamicConvMixin,
OFAConvMixin)
from ..mixins.dynamic_conv_mixins import (BigNasConvMixin, DynamicConvMixin,
OFAConvMixin)

GroupWiseConvWarned = False

Expand Down
2 changes: 1 addition & 1 deletion mmrazor/models/architectures/dynamic_ops/bricks/dynamic_linear.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from torch import Tensor

from mmrazor.models.mutables.base_mutable import BaseMutable
from .dynamic_mixins import DynamicLinearMixin
from ..mixins import DynamicLinearMixin


class DynamicLinear(nn.Linear, DynamicLinearMixin):
Expand Down
2 changes: 1 addition & 1 deletion mmrazor/models/architectures/dynamic_ops/bricks/dynamic_norm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

from mmrazor.models.mutables.base_mutable import BaseMutable
from mmrazor.registry import MODELS
from .dynamic_mixins import DynamicBatchNormMixin
from ..mixins.dynamic_mixins import DynamicBatchNormMixin


class _DynamicBatchNorm(_BatchNorm, DynamicBatchNormMixin):
Expand Down
Loading