From 9f128f9e11ad42cf2155c780a4d6e558987546be Mon Sep 17 00:00:00 2001 From: johnzja Date: Mon, 17 Aug 2020 13:30:42 +0800 Subject: [PATCH] Move InvertedResidual module into mmseg/utils. --- mmseg/models/backbones/fast_scnn.py | 3 ++- mmseg/ops/__init__.py | 5 +---- mmseg/utils/__init__.py | 6 ++---- mmseg/{ops => utils}/inverted_residual_module.py | 0 4 files changed, 5 insertions(+), 9 deletions(-) rename mmseg/{ops => utils}/inverted_residual_module.py (100%) diff --git a/mmseg/models/backbones/fast_scnn.py b/mmseg/models/backbones/fast_scnn.py index eaac9f818..d94f52cb7 100644 --- a/mmseg/models/backbones/fast_scnn.py +++ b/mmseg/models/backbones/fast_scnn.py @@ -4,7 +4,8 @@ from mmcv.cnn import ConvModule, constant_init, kaiming_init from torch.nn.modules.batchnorm import _BatchNorm from mmseg.models.decode_heads.psp_head import PPM -from mmseg.ops import DepthwiseSeparableConvModule, InvertedResidual, resize +from mmseg.ops import DepthwiseSeparableConvModule, resize +from mmseg.utils import InvertedResidual from ..builder import BACKBONES diff --git a/mmseg/ops/__init__.py b/mmseg/ops/__init__.py index 29a148b45..54b0d0b79 100644 --- a/mmseg/ops/__init__.py +++ b/mmseg/ops/__init__.py @@ -1,8 +1,5 @@ from .encoding import Encoding -from .inverted_residual_module import InvertedResidual from .separable_conv_module import DepthwiseSeparableConvModule from .wrappers import resize -__all__ = [ - 'resize', 'DepthwiseSeparableConvModule', 'InvertedResidual', 'Encoding' -] +__all__ = ['resize', 'DepthwiseSeparableConvModule', 'Encoding'] diff --git a/mmseg/utils/__init__.py b/mmseg/utils/__init__.py index e7d28670e..5b5405956 100644 --- a/mmseg/utils/__init__.py +++ b/mmseg/utils/__init__.py @@ -1,7 +1,5 @@ from .collect_env import collect_env +from .inverted_residual_module import InvertedResidual from .logger import get_root_logger -__all__ = [ - 'get_root_logger', - 'collect_env', -] +__all__ = ['get_root_logger', 'collect_env', 'InvertedResidual'] diff --git a/mmseg/ops/inverted_residual_module.py b/mmseg/utils/inverted_residual_module.py similarity index 100% rename from mmseg/ops/inverted_residual_module.py rename to mmseg/utils/inverted_residual_module.py