[Fix] Use MMEngine BaseModule (#1829)

* [Fix] Use MMEngine BaseModule

* delete auto_fp16
This commit is contained in:
MengzhangLI 2022-07-27 15:35:12 +08:00 committed by GitHub
parent 6758b148b3
commit 4079d6dfed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 21 additions and 21 deletions

View File

@ -9,7 +9,8 @@ from mmcv.cnn import build_norm_layer
from mmcv.cnn.bricks.drop import build_dropout
from mmcv.cnn.utils.weight_init import (constant_init, kaiming_init,
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.utils import _pair as to_2tuple

View File

@ -2,7 +2,7 @@
import torch
import torch.nn as nn
from mmcv.cnn import ConvModule
from mmcv.runner import BaseModule
from mmengine.model import BaseModule
from mmseg.ops import resize
from mmseg.registry import MODELS

View File

@ -3,7 +3,7 @@ import torch
import torch.nn as nn
from mmcv.cnn import (ConvModule, DepthwiseSeparableConvModule,
build_activation_layer, build_norm_layer)
from mmcv.runner import BaseModule
from mmengine.model import BaseModule
from mmseg.ops import resize
from mmseg.registry import MODELS

View File

@ -5,8 +5,8 @@ import torch
import torch.nn as nn
import torch.utils.checkpoint as cp
from mmcv.cnn import ConvModule, build_conv_layer, build_norm_layer
from mmcv.runner import BaseModule
from mmcv.utils.parrots_wrapper import _BatchNorm
from mmengine.model import BaseModule
from mmseg.registry import MODELS

View File

@ -2,7 +2,7 @@
import torch
import torch.nn as nn
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.registry import MODELS

View File

@ -2,7 +2,7 @@
import torch
import torch.nn as nn
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.ops import resize

View File

@ -3,8 +3,8 @@ import warnings
import torch.nn as nn
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 mmengine.model import BaseModule, ModuleList, Sequential
from mmseg.ops import Upsample, resize
from mmseg.registry import MODELS

View File

@ -2,7 +2,7 @@
import torch
import torch.nn as nn
from mmcv.cnn import ConvModule
from mmcv.runner import BaseModule
from mmengine.model import BaseModule
from mmseg.ops import resize
from mmseg.registry import MODELS

View File

@ -10,7 +10,7 @@ from mmcv.cnn.bricks.drop import build_dropout
from mmcv.cnn.bricks.transformer import MultiheadAttention
from mmcv.cnn.utils.weight_init import (constant_init, 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 ..utils import PatchEmbed, nchw_to_nlc, nlc_to_nchw

View File

@ -3,7 +3,7 @@ import warnings
import torch.nn as nn
from mmcv.cnn import ConvModule
from mmcv.runner import BaseModule
from mmengine.model import BaseModule
from torch.nn.modules.batchnorm import _BatchNorm
from mmseg.registry import MODELS

View File

@ -4,7 +4,7 @@ import warnings
import mmcv
from mmcv.cnn import ConvModule
from mmcv.cnn.bricks import Conv2dAdaptivePadding
from mmcv.runner import BaseModule
from mmengine.model import BaseModule
from torch.nn.modules.batchnorm import _BatchNorm
from mmseg.registry import MODELS

View File

@ -4,8 +4,8 @@ import warnings
import torch.nn as nn
import torch.utils.checkpoint as cp
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 mmengine.model import BaseModule
from mmseg.registry import MODELS
from ..utils import ResLayer

View File

@ -5,7 +5,7 @@ except ImportError:
timm = None
from mmcv.cnn.bricks.registry import NORM_LAYERS
from mmcv.runner import BaseModule
from mmengine.model import BaseModule
from mmseg.registry import MODELS

View File

@ -10,7 +10,7 @@ from mmcv.cnn.bricks.drop import build_dropout
from mmcv.cnn.bricks.transformer import FFN
from mmcv.cnn.utils.weight_init import (constant_init, 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 mmseg.models.backbones.mit import EfficientMultiheadAttention

View File

@ -5,8 +5,8 @@ import torch.nn as nn
import torch.utils.checkpoint as cp
from mmcv.cnn import (UPSAMPLE_LAYERS, ConvModule, build_activation_layer,
build_norm_layer)
from mmcv.runner import BaseModule
from mmcv.utils.parrots_wrapper import _BatchNorm
from mmengine.model import BaseModule
from mmseg.ops import Upsample
from mmseg.registry import MODELS

View File

@ -4,7 +4,7 @@ from typing import List, Tuple
import torch
import torch.nn as nn
from mmcv.runner import BaseModule
from mmengine.model import BaseModule
from torch import Tensor
from mmseg.data import build_pixel_sampler

View File

@ -4,7 +4,7 @@ import math
import torch
import torch.nn as nn
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.registry import MODELS

View File

@ -2,7 +2,7 @@
import torch.nn as nn
import torch.nn.functional as F
from mmcv.cnn import ConvModule
from mmcv.runner import BaseModule, auto_fp16
from mmengine.model import BaseModule
from mmseg.ops import resize
from mmseg.registry import MODELS
@ -159,7 +159,6 @@ class FPN(BaseModule):
inplace=False)
self.fpn_convs.append(extra_fpn_conv)
@auto_fp16()
def forward(self, inputs):
assert len(inputs) == len(self.in_channels)

View File

@ -1,7 +1,7 @@
# Copyright (c) OpenMMLab. All rights reserved.
import torch.nn.functional as F
from mmcv.cnn import ConvModule
from mmcv.runner import BaseModule
from mmengine.model import BaseModule
from mmseg.ops import resize
from mmseg.registry import MODELS

View File

@ -2,7 +2,7 @@
import torch
import torch.nn as nn
from mmcv.cnn import ConvModule, DepthwiseSeparableConvModule
from mmcv.runner import BaseModule
from mmengine.model import BaseModule
from mmseg.ops import resize
from mmseg.registry import MODELS