mmcv.runner -> mmengine.runner

.dev_scripts/benchmark_inference_fps.py

@@ -5,7 +5,7 @@
 
 import mmcv
 from mmengine.config import Config, DictAction
-from mmcv.runner import init_dist
+from mmengine.runner import init_dist
 from terminaltables import GithubFlavoredMarkdownTable
 
 from tools.analysis_tools.benchmark import repeat_measure_inference_speed

.dev_scripts/test_init_backbone.py

@@ -6,7 +6,7 @@
 
 import pytest
 from mmengine.config import Config, ProgressBar
-from mmcv.runner import _load_checkpoint
+from mmengine.runner import _load_checkpoint
 
 from mmdet.models import build_detector
 

demo/MMDet_InstanceSeg_Tutorial.ipynb

@@ -536,7 +536,7 @@
       ],
       "source": [
         "import mmcv\n",
-        "from mmcv.runner import load_checkpoint\n",
+        "from mmengine.runner import load_checkpoint\n",
         "\n",
         "from mmdet.apis import inference_detector, show_result_pyplot\n",
         "from mmdet.models import build_detector\n",

demo/MMDet_Tutorial.ipynb

@@ -577,7 +577,7 @@
       ],
       "source": [
         "import mmcv\n",
-        "from mmcv.runner import load_checkpoint\n",
+        "from mmengine.runner import load_checkpoint\n",
         "\n",
         "from mmdet.apis import inference_detector, show_result_pyplot\n",
         "from mmdet.models import build_detector\n",

mmdet/apis/inference.py

@@ -7,7 +7,7 @@
 import torch
 from mmcv.ops import RoIPool
 from mmcv.parallel import collate, scatter
-from mmcv.runner import load_checkpoint
+from mmengine.runner import load_checkpoint
 
 from mmdet.core import get_classes
 from mmdet.datasets import replace_ImageToTensor

mmdet/apis/test.py

@@ -9,7 +9,7 @@
 import torch
 import torch.distributed as dist
 from mmcv.image import tensor2imgs
-from mmcv.runner import get_dist_info
+from mmengine.runner import get_dist_info
 
 from mmdet.core import encode_mask_results
 

mmdet/apis/train.py

@@ -5,7 +5,7 @@
 import numpy as np
 import torch
 import torch.distributed as dist
-from mmcv.runner import (DistSamplerSeedHook, EpochBasedRunner,
+from mmengine.runner import (DistSamplerSeedHook, EpochBasedRunner,
                          Fp16OptimizerHook, OptimizerHook, build_optimizer,
                          build_runner, get_dist_info)
 

mmdet/core/evaluation/eval_hooks.py

@@ -4,8 +4,8 @@
 
 import mmcv
 import torch.distributed as dist
-from mmcv.runner import DistEvalHook as BaseDistEvalHook
-from mmcv.runner import EvalHook as BaseEvalHook
+from mmengine.runner import DistEvalHook as BaseDistEvalHook
+from mmengine.runner import EvalHook as BaseEvalHook
 from torch.nn.modules.batchnorm import _BatchNorm
 
 

mmdet/core/export/pytorch2onnx.py

@@ -4,7 +4,7 @@
 import mmcv
 import numpy as np
 import torch
-from mmcv.runner import load_checkpoint
+from mmengine.runner import load_checkpoint
 
 
 def generate_inputs_and_wrap_model(config_path,

mmdet/core/hook/checkloss_hook.py

@@ -1,6 +1,6 @@
 # Copyright (c) OpenMMLab. All rights reserved.
 import torch
-from mmcv.runner.hooks import HOOKS, Hook
+from mmengine.runner.hooks import HOOKS, Hook
 
 
 @HOOKS.register_module()

mmdet/core/hook/ema.py

@@ -2,7 +2,7 @@
 import math
 
 from mmcv.parallel import is_module_wrapper
-from mmcv.runner.hooks import HOOKS, Hook
+from mmengine.runner.hooks import HOOKS, Hook
 
 
 class BaseEMAHook(Hook):

mmdet/core/hook/memory_profiler_hook.py

@@ -1,5 +1,5 @@
 # Copyright (c) OpenMMLab. All rights reserved.
-from mmcv.runner.hooks import HOOKS, Hook
+from mmengine.runner.hooks import HOOKS, Hook
 
 
 @HOOKS.register_module()

mmdet/core/hook/set_epoch_info_hook.py

@@ -1,6 +1,6 @@
 # Copyright (c) OpenMMLab. All rights reserved.
 from mmcv.parallel import is_module_wrapper
-from mmcv.runner import HOOKS, Hook
+from mmengine.runner import HOOKS, Hook
 
 
 @HOOKS.register_module()

mmdet/core/hook/sync_norm_hook.py

@@ -1,8 +1,8 @@
 # Copyright (c) OpenMMLab. All rights reserved.
 from collections import OrderedDict
 
-from mmcv.runner import get_dist_info
-from mmcv.runner.hooks import HOOKS, Hook
+from mmengine.runner import get_dist_info
+from mmengine.runner.hooks import HOOKS, Hook
 from torch import nn
 
 from ..utils.dist_utils import all_reduce_dict

mmdet/core/hook/sync_random_size_hook.py

@@ -3,8 +3,8 @@
 import warnings
 
 import torch
-from mmcv.runner import get_dist_info
-from mmcv.runner.hooks import HOOKS, Hook
+from mmengine.runner import get_dist_info
+from mmengine.runner.hooks import HOOKS, Hook
 from torch import distributed as dist
 
 

mmdet/core/hook/yolox_lrupdater_hook.py

@@ -1,6 +1,6 @@
 # Copyright (c) OpenMMLab. All rights reserved.
-from mmcv.runner.hooks import HOOKS
-from mmcv.runner.hooks.lr_updater import (CosineAnnealingLrUpdaterHook,
+from mmengine.runner.hooks import HOOKS
+from mmengine.runner.hooks.lr_updater import (CosineAnnealingLrUpdaterHook,
                                           annealing_cos)
 
 

mmdet/core/hook/yolox_mode_switch_hook.py

@@ -1,6 +1,6 @@
 # Copyright (c) OpenMMLab. All rights reserved.
 from mmcv.parallel import is_module_wrapper
-from mmcv.runner.hooks import HOOKS, Hook
+from mmengine.runner.hooks import HOOKS, Hook
 
 
 @HOOKS.register_module()

mmdet/core/utils/dist_utils.py

@@ -7,7 +7,7 @@
 import numpy as np
 import torch
 import torch.distributed as dist
-from mmcv.runner import OptimizerHook, get_dist_info
+from mmengine.runner import OptimizerHook, get_dist_info
 from torch._utils import (_flatten_dense_tensors, _take_tensors,
                           _unflatten_dense_tensors)
 
@@ -61,7 +61,7 @@ class DistOptimizerHook(OptimizerHook):
 
     def __init__(self, *args, **kwargs):
         warnings.warn('"DistOptimizerHook" is deprecated, please switch to'
-                      '"mmcv.runner.OptimizerHook".')
+                      '"mmengine.runner.OptimizerHook".')
         super().__init__(*args, **kwargs)
 
 

mmdet/datasets/builder.py

@@ -8,7 +8,7 @@
 import numpy as np
 import torch
 from mmcv.parallel import collate
-from mmcv.runner import get_dist_info
+from mmengine.runner import get_dist_info
 from mmcv.utils import TORCH_VERSION, Registry, build_from_cfg, digit_version
 from torch.utils.data import DataLoader
 

mmdet/datasets/openimages.py

@@ -9,7 +9,7 @@
 import mmcv
 import numpy as np
 import torch.distributed as dist
-from mmcv.runner import get_dist_info
+from mmengine.runner import get_dist_info
 from mmcv.utils import print_log
 
 from mmdet.core import eval_map

mmdet/datasets/samplers/class_aware_sampler.py

@@ -2,7 +2,7 @@
 import math
 
 import torch
-from mmcv.runner import get_dist_info
+from mmengine.runner import get_dist_info
 from torch.utils.data import Sampler
 
 from mmdet.core.utils import sync_random_seed

mmdet/datasets/samplers/group_sampler.py

@@ -3,7 +3,7 @@
 
 import numpy as np
 import torch
-from mmcv.runner import get_dist_info
+from mmengine.runner import get_dist_info
 from torch.utils.data import Sampler
 
 

mmdet/datasets/samplers/infinite_sampler.py

@@ -3,7 +3,7 @@
 
 import numpy as np
 import torch
-from mmcv.runner import get_dist_info
+from mmengine.runner import get_dist_info
 from torch.utils.data.sampler import Sampler
 
 from mmdet.core.utils import sync_random_seed

mmdet/datasets/utils.py

@@ -3,7 +3,7 @@
 import warnings
 
 from mmcv.cnn import VGG
-from mmcv.runner.hooks import HOOKS, Hook
+from mmengine.runner.hooks import HOOKS, Hook
 
 from mmdet.datasets.builder import PIPELINES
 from mmdet.datasets.pipelines import (LoadAnnotations, LoadImageFromFile,

mmdet/models/backbones/csp_darknet.py

@@ -4,7 +4,7 @@
 import torch
 import torch.nn as nn
 from mmcv.cnn import ConvModule, DepthwiseSeparableConvModule
-from mmcv.runner import BaseModule
+from mmengine.runner import BaseModule
 from torch.nn.modules.batchnorm import _BatchNorm
 
 from ..builder import BACKBONES

mmdet/models/backbones/darknet.py

@@ -5,7 +5,7 @@
 
 import torch.nn as nn
 from mmcv.cnn import ConvModule
-from mmcv.runner import BaseModule
+from mmengine.runner import BaseModule
 from torch.nn.modules.batchnorm import _BatchNorm
 
 from ..builder import BACKBONES

mmdet/models/backbones/detectors_resnet.py

@@ -3,7 +3,7 @@
 import torch.utils.checkpoint as cp
 from mmcv.cnn import (build_conv_layer, build_norm_layer, constant_init,
                       kaiming_init)
-from mmcv.runner import Sequential, load_checkpoint
+from mmengine.runner import Sequential, load_checkpoint
 from torch.nn.modules.batchnorm import _BatchNorm
 
 from mmdet.utils import get_root_logger

mmdet/models/backbones/efficientnet.py

@@ -7,7 +7,7 @@
 import torch.nn as nn
 import torch.utils.checkpoint as cp
 from mmcv.cnn.bricks import ConvModule, DropPath
-from mmcv.runner import BaseModule, Sequential
+from mmengine.runner import BaseModule, Sequential
 
 from ..builder import BACKBONES
 from ..utils import InvertedResidual, SELayer, make_divisible

mmdet/models/backbones/hourglass.py

@@ -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
+from mmengine.runner import BaseModule
 
 from ..builder import BACKBONES
 from ..utils import ResLayer

mmdet/models/backbones/hrnet.py

@@ -3,7 +3,7 @@
 
 import torch.nn as nn
 from mmcv.cnn import build_conv_layer, build_norm_layer
-from mmcv.runner import BaseModule, ModuleList, Sequential
+from mmengine.runner import BaseModule, ModuleList, Sequential
 from torch.nn.modules.batchnorm import _BatchNorm
 
 from ..builder import BACKBONES

mmdet/models/backbones/mobilenet_v2.py

@@ -3,7 +3,7 @@
 
 import torch.nn as nn
 from mmcv.cnn import ConvModule
-from mmcv.runner import BaseModule
+from mmengine.runner import BaseModule
 from torch.nn.modules.batchnorm import _BatchNorm
 
 from ..builder import BACKBONES

mmdet/models/backbones/pvt.py

@@ -11,7 +11,7 @@
 from mmcv.cnn.bricks.drop import build_dropout
 from mmcv.cnn.bricks.transformer import MultiheadAttention
 from mmcv.cnn.utils.weight_init import trunc_normal_
-from mmcv.runner import (BaseModule, ModuleList, Sequential, _load_checkpoint,
+from mmengine.runner import (BaseModule, ModuleList, Sequential, _load_checkpoint,
                          load_state_dict)
 from torch.nn.modules.utils import _pair as to_2tuple
 

mmdet/models/backbones/res2net.py

@@ -5,7 +5,7 @@
 import torch.nn as nn
 import torch.utils.checkpoint as cp
 from mmcv.cnn import build_conv_layer, build_norm_layer
-from mmcv.runner import Sequential
+from mmengine.runner import Sequential
 
 from ..builder import BACKBONES
 from .resnet import Bottleneck as _Bottleneck

mmdet/models/backbones/resnest.py

@@ -6,7 +6,7 @@
 import torch.nn.functional as F
 import torch.utils.checkpoint as cp
 from mmcv.cnn import build_conv_layer, build_norm_layer
-from mmcv.runner import BaseModule
+from mmengine.runner import BaseModule
 
 from ..builder import BACKBONES
 from ..utils import ResLayer

mmdet/models/backbones/resnet.py

@@ -4,7 +4,7 @@
 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 mmengine.runner import BaseModule
 from torch.nn.modules.batchnorm import _BatchNorm
 
 from ..builder import BACKBONES

mmdet/models/backbones/ssd_vgg.py

@@ -3,7 +3,7 @@
 
 import torch.nn as nn
 from mmcv.cnn import VGG
-from mmcv.runner import BaseModule
+from mmengine.runner import BaseModule
 
 from ..builder import BACKBONES
 from ..necks import ssd_neck

mmdet/models/backbones/swin.py

@@ -10,7 +10,7 @@
 from mmcv.cnn import build_norm_layer, constant_init, trunc_normal_init
 from mmcv.cnn.bricks.transformer import FFN, build_dropout
 from mmcv.cnn.utils.weight_init import trunc_normal_
-from mmcv.runner import BaseModule, ModuleList, _load_checkpoint
+from mmengine.runner import BaseModule, ModuleList, _load_checkpoint
 from mmcv.utils import to_2tuple
 
 from ...utils import get_root_logger

mmdet/models/backbones/trident_resnet.py

@@ -4,7 +4,7 @@
 import torch.nn.functional as F
 import torch.utils.checkpoint as cp
 from mmcv.cnn import build_conv_layer, build_norm_layer
-from mmcv.runner import BaseModule
+from mmengine.runner import BaseModule
 from torch.nn.modules.utils import _pair
 
 from mmdet.models.backbones.resnet import Bottleneck, ResNet

mmdet/models/dense_heads/anchor_free_head.py

@@ -5,7 +5,7 @@
 import torch
 import torch.nn as nn
 from mmcv.cnn import ConvModule
-from mmcv.runner import force_fp32
+from mmengine.runner import force_fp32
 
 from mmdet.core import build_bbox_coder, multi_apply
 from mmdet.core.anchor.point_generator import MlvlPointGenerator

mmdet/models/dense_heads/anchor_head.py

@@ -3,7 +3,7 @@
 
 import torch
 import torch.nn as nn
-from mmcv.runner import force_fp32
+from mmengine.runner import force_fp32
 
 from mmdet.core import (anchor_inside_flags, build_assigner, build_bbox_coder,
                         build_prior_generator, build_sampler, images_to_levels,

mmdet/models/dense_heads/atss_head.py

@@ -2,7 +2,7 @@
 import torch
 import torch.nn as nn
 from mmcv.cnn import ConvModule, Scale
-from mmcv.runner import force_fp32
+from mmengine.runner import force_fp32
 
 from mmdet.core import (anchor_inside_flags, build_assigner, build_sampler,
                         images_to_levels, multi_apply, reduce_mean, unmap)

mmdet/models/dense_heads/autoassign_head.py

@@ -5,7 +5,7 @@
 import torch.nn as nn
 import torch.nn.functional as F
 from mmcv.cnn import bias_init_with_prob, normal_init
-from mmcv.runner import force_fp32
+from mmengine.runner import force_fp32
 
 from mmdet.core import multi_apply
 from mmdet.core.anchor.point_generator import MlvlPointGenerator

mmdet/models/dense_heads/base_dense_head.py

@@ -4,7 +4,7 @@
 import torch
 from mmcv.cnn.utils.weight_init import constant_init
 from mmcv.ops import batched_nms
-from mmcv.runner import BaseModule, force_fp32
+from mmengine.runner import BaseModule, force_fp32
 
 from mmdet.core.utils import filter_scores_and_topk, select_single_mlvl