[Refactor] Modify the importing path due to mmengine changes (#2224)

mmcv/cnn/bricks/activation.py

@@ -5,7 +5,8 @@ import torch
 import torch.nn as nn
 import torch.nn.functional as F
 from mmengine.registry import MODELS
-from mmengine.utils import TORCH_VERSION, digit_version
+from mmengine.utils import digit_version
+from mmengine.utils.dl_utils import TORCH_VERSION
 
 for module in [
         nn.ReLU, nn.LeakyReLU, nn.PReLU, nn.RReLU, nn.ReLU6, nn.ELU,

mmcv/cnn/bricks/context_block.py

@@ -2,7 +2,7 @@
 from typing import Union
 
 import torch
-from mmengine.model.utils import constant_init, kaiming_init
+from mmengine.model import constant_init, kaiming_init
 from mmengine.registry import MODELS
 from torch import nn
 

mmcv/cnn/bricks/conv_module.py

@@ -4,9 +4,9 @@ from typing import Dict, Optional, Tuple, Union
 
 import torch
 import torch.nn as nn
-from mmengine.model.utils import constant_init, kaiming_init
+from mmengine.model import constant_init, kaiming_init
 from mmengine.registry import MODELS
-from mmengine.utils.parrots_wrapper import _BatchNorm, _InstanceNorm
+from mmengine.utils.dl_utils.parrots_wrapper import _BatchNorm, _InstanceNorm
 
 from .activation import build_activation_layer
 from .conv import build_conv_layer

mmcv/cnn/bricks/generalized_attention.py

@@ -5,7 +5,7 @@ import numpy as np
 import torch
 import torch.nn as nn
 import torch.nn.functional as F
-from mmengine.model.utils import kaiming_init
+from mmengine.model import kaiming_init
 from mmengine.registry import MODELS
 
 

mmcv/cnn/bricks/hswish.py

@@ -2,7 +2,8 @@
 import torch
 import torch.nn as nn
 from mmengine.registry import MODELS
-from mmengine.utils import TORCH_VERSION, digit_version
+from mmengine.utils import digit_version
+from mmengine.utils.dl_utils import TORCH_VERSION
 
 
 class HSwish(nn.Module):

mmcv/cnn/bricks/non_local.py

@@ -4,7 +4,7 @@ from typing import Dict, Optional
 
 import torch
 import torch.nn as nn
-from mmengine.model.utils import constant_init, normal_init
+from mmengine.model import constant_init, normal_init
 from mmengine.registry import MODELS
 
 from .conv_module import ConvModule

mmcv/cnn/bricks/norm.py

@@ -5,7 +5,7 @@ from typing import Dict, Tuple, Union
 import torch.nn as nn
 from mmengine.registry import MODELS
 from mmengine.utils import is_tuple_of
-from mmengine.utils.parrots_wrapper import (SyncBatchNorm, _BatchNorm,
+from mmengine.utils.dl_utils.parrots_wrapper import (SyncBatchNorm, _BatchNorm,
                                                      _InstanceNorm)
 
 MODELS.register_module('BN', module=nn.BatchNorm2d)

mmcv/cnn/bricks/transformer.py

@@ -7,7 +7,7 @@ from typing import Sequence
 import torch
 import torch.nn as nn
 import torch.nn.functional as F
-from mmengine import ConfigDict
+from mmengine.config import ConfigDict
 from mmengine.model import BaseModule, ModuleList, Sequential
 from mmengine.registry import MODELS
 from mmengine.utils import deprecated_api_warning, to_2tuple

mmcv/cnn/bricks/upsample.py

@@ -4,7 +4,7 @@ from typing import Dict
 import torch
 import torch.nn as nn
 import torch.nn.functional as F
-from mmengine.model.utils import xavier_init
+from mmengine.model import xavier_init
 from mmengine.registry import MODELS
 
 MODELS.register_module('nearest', module=nn.Upsample)

mmcv/cnn/resnet.py

@@ -4,7 +4,7 @@ from typing import Optional, Sequence, Tuple, Union
 
 import torch.nn as nn
 import torch.utils.checkpoint as cp
-from mmengine.model.utils import constant_init, kaiming_init
+from mmengine.model import constant_init, kaiming_init
 from mmengine.runner import load_checkpoint
 from torch import Tensor
 

mmcv/cnn/vgg.py

@@ -3,7 +3,7 @@ import logging
 from typing import List, Optional, Sequence, Tuple, Union
 
 import torch.nn as nn
-from mmengine.model.utils import constant_init, kaiming_init, normal_init
+from mmengine.model import constant_init, kaiming_init, normal_init
 from mmengine.runner import load_checkpoint
 from torch import Tensor
 

mmcv/ops/carafe.py

@@ -4,7 +4,7 @@ from typing import Tuple
 import torch
 import torch.nn as nn
 import torch.nn.functional as F
-from mmengine.model.utils import normal_init, xavier_init
+from mmengine.model import normal_init, xavier_init
 from mmengine.registry import MODELS
 from torch import Tensor
 from torch.autograd import Function

mmcv/ops/deform_conv.py

@@ -4,7 +4,7 @@ from typing import Optional, Tuple, Union
 import torch
 import torch.nn as nn
 import torch.nn.functional as F
-from mmengine import print_log
+from mmengine.logging import print_log
 from mmengine.registry import MODELS
 from mmengine.utils import deprecated_api_warning
 from torch import Tensor

mmcv/ops/modulated_deform_conv.py

@@ -4,7 +4,7 @@ from typing import Optional, Tuple, Union
 
 import torch
 import torch.nn as nn
-from mmengine import print_log
+from mmengine.logging import print_log
 from mmengine.registry import MODELS
 from mmengine.utils import deprecated_api_warning
 from torch.autograd import Function

mmcv/ops/multi_scale_deform_attn.py

@@ -7,8 +7,7 @@ import mmengine
 import torch
 import torch.nn as nn
 import torch.nn.functional as F
-from mmengine.model import BaseModule
-from mmengine.model.utils import constant_init, xavier_init
+from mmengine.model import BaseModule, constant_init, xavier_init
 from mmengine.registry import MODELS
 from mmengine.utils import deprecated_api_warning
 from torch.autograd.function import Function, once_differentiable

mmcv/ops/saconv.py

@@ -2,9 +2,10 @@
 import torch
 import torch.nn as nn
 import torch.nn.functional as F
-from mmengine.model.utils import constant_init
+from mmengine.model import constant_init
 from mmengine.registry import MODELS
-from mmengine.utils import TORCH_VERSION, digit_version
+from mmengine.utils import digit_version
+from mmengine.utils.dl_utils import TORCH_VERSION
 
 from mmcv.cnn import ConvAWS2d
 from mmcv.ops.deform_conv import deform_conv2d

mmcv/utils/env.py

 # Copyright (c) OpenMMLab. All rights reserved.
 """This file holding some environment constant for sharing by other files."""
 
-from mmengine.utils import collect_env as mmengine_collect_env
+from mmengine.utils.dl_utils import collect_env as mmengine_collect_env
 
 import mmcv
 

mmcv/utils/parrots_jit.py

 # Copyright (c) OpenMMLab. All rights reserved.
 import os
 
-from mmengine.utils.parrots_wrapper import TORCH_VERSION
+from mmengine.utils.dl_utils.parrots_wrapper import TORCH_VERSION
 
 parrots_jit_option = os.getenv('PARROTS_JIT_OPTION')
 

tests/test_cnn/test_build_layers.py

@@ -6,7 +6,7 @@ import pytest
 import torch
 import torch.nn as nn
 from mmengine.registry import MODELS
-from mmengine.utils.parrots_wrapper import _BatchNorm
+from mmengine.utils.dl_utils.parrots_wrapper import _BatchNorm
 
 from mmcv.cnn.bricks import (build_activation_layer, build_conv_layer,
                              build_norm_layer, build_padding_layer,

tests/test_cnn/test_conv_module.py

@@ -6,7 +6,8 @@ import pytest
 import torch
 import torch.nn as nn
 from mmengine.registry import MODELS
-from mmengine.utils import TORCH_VERSION, digit_version
+from mmengine.utils import digit_version
+from mmengine.utils.dl_utils import TORCH_VERSION
 
 from mmcv.cnn.bricks import ConvModule, HSigmoid, HSwish