mirror of
https://github.com/open-mmlab/mmsegmentation.git
synced 2025-06-03 22:03:48 +08:00
[Fix] Use MMEngine BaseModule (#1829)
* [Fix] Use MMEngine BaseModule * delete auto_fp16
This commit is contained in:
parent
6758b148b3
commit
4079d6dfed
@ -9,7 +9,8 @@ from mmcv.cnn import build_norm_layer
|
|||||||
from mmcv.cnn.bricks.drop import build_dropout
|
from mmcv.cnn.bricks.drop import build_dropout
|
||||||
from mmcv.cnn.utils.weight_init import (constant_init, kaiming_init,
|
from mmcv.cnn.utils.weight_init import (constant_init, kaiming_init,
|
||||||
trunc_normal_)
|
trunc_normal_)
|
||||||
from mmcv.runner import BaseModule, ModuleList, _load_checkpoint
|
from mmengine.model import BaseModule, ModuleList
|
||||||
|
from mmengine.runner.checkpoint import _load_checkpoint
|
||||||
from torch.nn.modules.batchnorm import _BatchNorm
|
from torch.nn.modules.batchnorm import _BatchNorm
|
||||||
from torch.nn.modules.utils import _pair as to_2tuple
|
from torch.nn.modules.utils import _pair as to_2tuple
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
import torch
|
import torch
|
||||||
import torch.nn as nn
|
import torch.nn as nn
|
||||||
from mmcv.cnn import ConvModule
|
from mmcv.cnn import ConvModule
|
||||||
from mmcv.runner import BaseModule
|
from mmengine.model import BaseModule
|
||||||
|
|
||||||
from mmseg.ops import resize
|
from mmseg.ops import resize
|
||||||
from mmseg.registry import MODELS
|
from mmseg.registry import MODELS
|
||||||
|
@ -3,7 +3,7 @@ import torch
|
|||||||
import torch.nn as nn
|
import torch.nn as nn
|
||||||
from mmcv.cnn import (ConvModule, DepthwiseSeparableConvModule,
|
from mmcv.cnn import (ConvModule, DepthwiseSeparableConvModule,
|
||||||
build_activation_layer, build_norm_layer)
|
build_activation_layer, build_norm_layer)
|
||||||
from mmcv.runner import BaseModule
|
from mmengine.model import BaseModule
|
||||||
|
|
||||||
from mmseg.ops import resize
|
from mmseg.ops import resize
|
||||||
from mmseg.registry import MODELS
|
from mmseg.registry import MODELS
|
||||||
|
@ -5,8 +5,8 @@ import torch
|
|||||||
import torch.nn as nn
|
import torch.nn as nn
|
||||||
import torch.utils.checkpoint as cp
|
import torch.utils.checkpoint as cp
|
||||||
from mmcv.cnn import ConvModule, build_conv_layer, build_norm_layer
|
from mmcv.cnn import ConvModule, build_conv_layer, build_norm_layer
|
||||||
from mmcv.runner import BaseModule
|
|
||||||
from mmcv.utils.parrots_wrapper import _BatchNorm
|
from mmcv.utils.parrots_wrapper import _BatchNorm
|
||||||
|
from mmengine.model import BaseModule
|
||||||
|
|
||||||
from mmseg.registry import MODELS
|
from mmseg.registry import MODELS
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
import torch
|
import torch
|
||||||
import torch.nn as nn
|
import torch.nn as nn
|
||||||
from mmcv.cnn import build_activation_layer, build_conv_layer, build_norm_layer
|
from mmcv.cnn import build_activation_layer, build_conv_layer, build_norm_layer
|
||||||
from mmcv.runner import BaseModule
|
from mmengine.model import BaseModule
|
||||||
|
|
||||||
from mmseg.ops import resize
|
from mmseg.ops import resize
|
||||||
from mmseg.registry import MODELS
|
from mmseg.registry import MODELS
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
import torch
|
import torch
|
||||||
import torch.nn as nn
|
import torch.nn as nn
|
||||||
from mmcv.cnn import ConvModule, DepthwiseSeparableConvModule
|
from mmcv.cnn import ConvModule, DepthwiseSeparableConvModule
|
||||||
from mmcv.runner import BaseModule
|
from mmengine.model import BaseModule
|
||||||
|
|
||||||
from mmseg.models.decode_heads.psp_head import PPM
|
from mmseg.models.decode_heads.psp_head import PPM
|
||||||
from mmseg.ops import resize
|
from mmseg.ops import resize
|
||||||
|
@ -3,8 +3,8 @@ import warnings
|
|||||||
|
|
||||||
import torch.nn as nn
|
import torch.nn as nn
|
||||||
from mmcv.cnn import build_conv_layer, build_norm_layer
|
from mmcv.cnn import build_conv_layer, build_norm_layer
|
||||||
from mmcv.runner import BaseModule, ModuleList, Sequential
|
|
||||||
from mmcv.utils.parrots_wrapper import _BatchNorm
|
from mmcv.utils.parrots_wrapper import _BatchNorm
|
||||||
|
from mmengine.model import BaseModule, ModuleList, Sequential
|
||||||
|
|
||||||
from mmseg.ops import Upsample, resize
|
from mmseg.ops import Upsample, resize
|
||||||
from mmseg.registry import MODELS
|
from mmseg.registry import MODELS
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
import torch
|
import torch
|
||||||
import torch.nn as nn
|
import torch.nn as nn
|
||||||
from mmcv.cnn import ConvModule
|
from mmcv.cnn import ConvModule
|
||||||
from mmcv.runner import BaseModule
|
from mmengine.model import BaseModule
|
||||||
|
|
||||||
from mmseg.ops import resize
|
from mmseg.ops import resize
|
||||||
from mmseg.registry import MODELS
|
from mmseg.registry import MODELS
|
||||||
|
@ -10,7 +10,7 @@ from mmcv.cnn.bricks.drop import build_dropout
|
|||||||
from mmcv.cnn.bricks.transformer import MultiheadAttention
|
from mmcv.cnn.bricks.transformer import MultiheadAttention
|
||||||
from mmcv.cnn.utils.weight_init import (constant_init, normal_init,
|
from mmcv.cnn.utils.weight_init import (constant_init, normal_init,
|
||||||
trunc_normal_init)
|
trunc_normal_init)
|
||||||
from mmcv.runner import BaseModule, ModuleList, Sequential
|
from mmengine.model import BaseModule, ModuleList, Sequential
|
||||||
|
|
||||||
from mmseg.registry import MODELS
|
from mmseg.registry import MODELS
|
||||||
from ..utils import PatchEmbed, nchw_to_nlc, nlc_to_nchw
|
from ..utils import PatchEmbed, nchw_to_nlc, nlc_to_nchw
|
||||||
|
@ -3,7 +3,7 @@ import warnings
|
|||||||
|
|
||||||
import torch.nn as nn
|
import torch.nn as nn
|
||||||
from mmcv.cnn import ConvModule
|
from mmcv.cnn import ConvModule
|
||||||
from mmcv.runner import BaseModule
|
from mmengine.model import BaseModule
|
||||||
from torch.nn.modules.batchnorm import _BatchNorm
|
from torch.nn.modules.batchnorm import _BatchNorm
|
||||||
|
|
||||||
from mmseg.registry import MODELS
|
from mmseg.registry import MODELS
|
||||||
|
@ -4,7 +4,7 @@ import warnings
|
|||||||
import mmcv
|
import mmcv
|
||||||
from mmcv.cnn import ConvModule
|
from mmcv.cnn import ConvModule
|
||||||
from mmcv.cnn.bricks import Conv2dAdaptivePadding
|
from mmcv.cnn.bricks import Conv2dAdaptivePadding
|
||||||
from mmcv.runner import BaseModule
|
from mmengine.model import BaseModule
|
||||||
from torch.nn.modules.batchnorm import _BatchNorm
|
from torch.nn.modules.batchnorm import _BatchNorm
|
||||||
|
|
||||||
from mmseg.registry import MODELS
|
from mmseg.registry import MODELS
|
||||||
|
@ -4,8 +4,8 @@ import warnings
|
|||||||
import torch.nn as nn
|
import torch.nn as nn
|
||||||
import torch.utils.checkpoint as cp
|
import torch.utils.checkpoint as cp
|
||||||
from mmcv.cnn import build_conv_layer, build_norm_layer, build_plugin_layer
|
from mmcv.cnn import build_conv_layer, build_norm_layer, build_plugin_layer
|
||||||
from mmcv.runner import BaseModule
|
|
||||||
from mmcv.utils.parrots_wrapper import _BatchNorm
|
from mmcv.utils.parrots_wrapper import _BatchNorm
|
||||||
|
from mmengine.model import BaseModule
|
||||||
|
|
||||||
from mmseg.registry import MODELS
|
from mmseg.registry import MODELS
|
||||||
from ..utils import ResLayer
|
from ..utils import ResLayer
|
||||||
|
@ -5,7 +5,7 @@ except ImportError:
|
|||||||
timm = None
|
timm = None
|
||||||
|
|
||||||
from mmcv.cnn.bricks.registry import NORM_LAYERS
|
from mmcv.cnn.bricks.registry import NORM_LAYERS
|
||||||
from mmcv.runner import BaseModule
|
from mmengine.model import BaseModule
|
||||||
|
|
||||||
from mmseg.registry import MODELS
|
from mmseg.registry import MODELS
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@ from mmcv.cnn.bricks.drop import build_dropout
|
|||||||
from mmcv.cnn.bricks.transformer import FFN
|
from mmcv.cnn.bricks.transformer import FFN
|
||||||
from mmcv.cnn.utils.weight_init import (constant_init, normal_init,
|
from mmcv.cnn.utils.weight_init import (constant_init, normal_init,
|
||||||
trunc_normal_init)
|
trunc_normal_init)
|
||||||
from mmcv.runner import BaseModule, ModuleList
|
from mmengine.model import BaseModule, ModuleList
|
||||||
from torch.nn.modules.batchnorm import _BatchNorm
|
from torch.nn.modules.batchnorm import _BatchNorm
|
||||||
|
|
||||||
from mmseg.models.backbones.mit import EfficientMultiheadAttention
|
from mmseg.models.backbones.mit import EfficientMultiheadAttention
|
||||||
|
@ -5,8 +5,8 @@ import torch.nn as nn
|
|||||||
import torch.utils.checkpoint as cp
|
import torch.utils.checkpoint as cp
|
||||||
from mmcv.cnn import (UPSAMPLE_LAYERS, ConvModule, build_activation_layer,
|
from mmcv.cnn import (UPSAMPLE_LAYERS, ConvModule, build_activation_layer,
|
||||||
build_norm_layer)
|
build_norm_layer)
|
||||||
from mmcv.runner import BaseModule
|
|
||||||
from mmcv.utils.parrots_wrapper import _BatchNorm
|
from mmcv.utils.parrots_wrapper import _BatchNorm
|
||||||
|
from mmengine.model import BaseModule
|
||||||
|
|
||||||
from mmseg.ops import Upsample
|
from mmseg.ops import Upsample
|
||||||
from mmseg.registry import MODELS
|
from mmseg.registry import MODELS
|
||||||
|
@ -4,7 +4,7 @@ from typing import List, Tuple
|
|||||||
|
|
||||||
import torch
|
import torch
|
||||||
import torch.nn as nn
|
import torch.nn as nn
|
||||||
from mmcv.runner import BaseModule
|
from mmengine.model import BaseModule
|
||||||
from torch import Tensor
|
from torch import Tensor
|
||||||
|
|
||||||
from mmseg.data import build_pixel_sampler
|
from mmseg.data import build_pixel_sampler
|
||||||
|
@ -4,7 +4,7 @@ import math
|
|||||||
import torch
|
import torch
|
||||||
import torch.nn as nn
|
import torch.nn as nn
|
||||||
from mmcv.cnn import ConvModule, Linear, build_activation_layer
|
from mmcv.cnn import ConvModule, Linear, build_activation_layer
|
||||||
from mmcv.runner import BaseModule
|
from mmengine.model import BaseModule
|
||||||
|
|
||||||
from mmseg.ops import resize
|
from mmseg.ops import resize
|
||||||
from mmseg.registry import MODELS
|
from mmseg.registry import MODELS
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
import torch.nn as nn
|
import torch.nn as nn
|
||||||
import torch.nn.functional as F
|
import torch.nn.functional as F
|
||||||
from mmcv.cnn import ConvModule
|
from mmcv.cnn import ConvModule
|
||||||
from mmcv.runner import BaseModule, auto_fp16
|
from mmengine.model import BaseModule
|
||||||
|
|
||||||
from mmseg.ops import resize
|
from mmseg.ops import resize
|
||||||
from mmseg.registry import MODELS
|
from mmseg.registry import MODELS
|
||||||
@ -159,7 +159,6 @@ class FPN(BaseModule):
|
|||||||
inplace=False)
|
inplace=False)
|
||||||
self.fpn_convs.append(extra_fpn_conv)
|
self.fpn_convs.append(extra_fpn_conv)
|
||||||
|
|
||||||
@auto_fp16()
|
|
||||||
def forward(self, inputs):
|
def forward(self, inputs):
|
||||||
assert len(inputs) == len(self.in_channels)
|
assert len(inputs) == len(self.in_channels)
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# Copyright (c) OpenMMLab. All rights reserved.
|
# Copyright (c) OpenMMLab. All rights reserved.
|
||||||
import torch.nn.functional as F
|
import torch.nn.functional as F
|
||||||
from mmcv.cnn import ConvModule
|
from mmcv.cnn import ConvModule
|
||||||
from mmcv.runner import BaseModule
|
from mmengine.model import BaseModule
|
||||||
|
|
||||||
from mmseg.ops import resize
|
from mmseg.ops import resize
|
||||||
from mmseg.registry import MODELS
|
from mmseg.registry import MODELS
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
import torch
|
import torch
|
||||||
import torch.nn as nn
|
import torch.nn as nn
|
||||||
from mmcv.cnn import ConvModule, DepthwiseSeparableConvModule
|
from mmcv.cnn import ConvModule, DepthwiseSeparableConvModule
|
||||||
from mmcv.runner import BaseModule
|
from mmengine.model import BaseModule
|
||||||
|
|
||||||
from mmseg.ops import resize
|
from mmseg.ops import resize
|
||||||
from mmseg.registry import MODELS
|
from mmseg.registry import MODELS
|
||||||
|
Loading…
x
Reference in New Issue
Block a user