fix import order

README.md

@@ -89,6 +89,9 @@ MMYOLO relies on PyTorch, MMCV, MMEngine, and MMDetection. Below are quick steps
 conda create -n open-mmlab python=3.8 pytorch==1.10.1 torchvision==0.11.2 cudatoolkit=11.3 -c pytorch -y
 conda activate open-mmlab
 pip install openmim
+mim install mmengine
+mim install "mmcv>=2.0.0rc1"
+mim install "mmdet>=3.0.0rc0"
 git clone -b 1.x https://github.com/open-mmlab/mmyolo.git
 cd mmyolo
 mim install -e .

README_zh-CN.md

@@ -89,6 +89,9 @@ MMYOLO 依赖 PyTorch, MMCV, MMEngine 和 MMDetection，以下是安装的简要
 conda create -n open-mmlab python=3.8 pytorch==1.10.1 torchvision==0.11.2 cudatoolkit=11.3 -c pytorch -y
 conda activate open-mmlab
 pip install openmim
+mim install mmengine
+mim install "mmcv>=2.0.0rc1"
+mim install "mmdet>=3.0.0rc0"
 git clone https://github.com/open-mmlab/mmyolo.git
 cd mmyolo
 mim install -e .

demo/featmap_vis_demo.py

@@ -4,9 +4,9 @@ from typing import Sequence
 
 import mmcv
 import numpy as np
+from mmdet.apis import inference_detector, init_detector
 from mmengine import Config, DictAction
 
-from mmdet.apis import inference_detector, init_detector
 from mmyolo.registry import VISUALIZERS
 from mmyolo.utils import register_all_modules
 

demo/image_demo.py

@@ -2,8 +2,8 @@
 from argparse import ArgumentParser
 
 import mmcv
-
 from mmdet.apis import inference_detector, init_detector
+
 from mmyolo.registry import VISUALIZERS
 from mmyolo.utils import register_all_modules
 

mmyolo/__init__.py

 # Copyright (c) OpenMMLab. All rights reserved.
 import mmcv
+import mmdet
 import mmengine
 from mmengine.utils import digit_version
 
-import mmdet
 from .version import __version__, version_info
 
 mmcv_minimum_version = '2.0.0rc0'

mmyolo/datasets/transforms/mix_img_transforms.py

@@ -7,11 +7,11 @@ from typing import List, Optional, Sequence, Tuple, Union
 import mmcv
 import numpy as np
 from mmcv.transforms import BaseTransform
+from mmdet.structures.bbox import autocast_box_type
 from mmengine.dataset import BaseDataset
 from mmengine.dataset.base_dataset import Compose
 from numpy import random
 
-from mmdet.structures.bbox import autocast_box_type
 from mmyolo.registry import TRANSFORMS
 
 

mmyolo/datasets/transforms/transforms.py

@@ -8,11 +8,11 @@ import numpy as np
 import torch
 from mmcv.transforms import BaseTransform
 from mmcv.transforms.utils import cache_randomness
-from numpy import random
-
 from mmdet.datasets.transforms import LoadAnnotations as MMDET_LoadAnnotations
 from mmdet.datasets.transforms import Resize as MMDET_Resize
 from mmdet.structures.bbox import autocast_box_type, get_box_type
+from numpy import random
+
 from mmyolo.registry import TRANSFORMS
 
 

mmyolo/datasets/yolov5_coco.py

@@ -2,6 +2,7 @@
 from typing import Any, Optional
 
 from mmdet.datasets import CocoDataset
+
 from ..registry import DATASETS, TASK_UTILS
 
 

mmyolo/models/backbones/base_backbone.py

@@ -4,10 +4,10 @@ from typing import Sequence
 
 import torch
 import torch.nn as nn
+from mmdet.utils import ConfigType, OptMultiConfig
 from mmengine.model import BaseModule
 from torch.nn.modules.batchnorm import _BatchNorm
 
-from mmdet.utils import ConfigType, OptMultiConfig
 from mmyolo.registry import MODELS
 
 

mmyolo/models/backbones/csp_darknet.py

@@ -4,9 +4,9 @@ from typing import Tuple
 import torch
 import torch.nn as nn
 from mmcv.cnn import ConvModule
-
 from mmdet.models.backbones.csp_darknet import CSPLayer, Focus
 from mmdet.utils import ConfigType, OptMultiConfig
+
 from mmyolo.registry import MODELS
 from ..layers import SPPFBottleneck
 from ..utils import make_divisible, make_round

mmyolo/models/backbones/efficient_rep.py

@@ -3,8 +3,8 @@ from typing import Tuple
 
 import torch
 import torch.nn as nn
-
 from mmdet.utils import ConfigType, OptMultiConfig
+
 from mmyolo.models.layers.yolo_bricks import SPPFBottleneck
 from mmyolo.registry import MODELS
 from ..layers import RepStageBlock, RepVGGBlock

mmyolo/models/data_preprocessors/data_preprocessor.py

 # Copyright (c) OpenMMLab. All rights reserved.
 import torch
-
 from mmdet.models.data_preprocessors import DetDataPreprocessor
+
 from mmyolo.registry import MODELS
 
 

mmyolo/models/dense_heads/yolov5_head.py

@@ -5,6 +5,10 @@ from typing import List, Optional, Sequence, Tuple, Union
 
 import torch
 import torch.nn as nn
+from mmdet.models.dense_heads.base_dense_head import BaseDenseHead
+from mmdet.models.utils import filter_scores_and_topk, multi_apply
+from mmdet.utils import (ConfigType, OptConfigType, OptInstanceList,
+                         OptMultiConfig)
 from mmengine.config import ConfigDict
 from mmengine.dist import get_dist_info
 from mmengine.logging import print_log
@@ -12,10 +16,6 @@ from mmengine.model import BaseModule
 from mmengine.structures import InstanceData
 from torch import Tensor
 
-from mmdet.models.dense_heads.base_dense_head import BaseDenseHead
-from mmdet.models.utils import filter_scores_and_topk, multi_apply
-from mmdet.utils import (ConfigType, OptConfigType, OptInstanceList,
-                         OptMultiConfig)
 from mmyolo.registry import MODELS, TASK_UTILS
 from ..utils import make_divisible
 

mmyolo/models/dense_heads/yolov6_head.py

@@ -4,13 +4,13 @@ from typing import Sequence, Union
 import torch
 import torch.nn as nn
 from mmcv.cnn import ConvModule
+from mmdet.models.utils import multi_apply
+from mmdet.utils import (ConfigType, OptConfigType, OptInstanceList,
+                         OptMultiConfig)
 from mmengine.model import BaseModule, bias_init_with_prob
 from mmengine.structures import InstanceData
 from torch import Tensor
 
-from mmdet.models.utils import multi_apply
-from mmdet.utils import (ConfigType, OptConfigType, OptInstanceList,
-                         OptMultiConfig)
 from mmyolo.registry import MODELS
 from ..utils import make_divisible
 from .yolov5_head import YOLOv5Head

mmyolo/models/dense_heads/yolox_head.py

@@ -5,15 +5,15 @@ import torch
 import torch.nn as nn
 import torch.nn.functional as F
 from mmcv.cnn import ConvModule, DepthwiseSeparableConvModule
-from mmengine.model import BaseModule, bias_init_with_prob
-from mmengine.structures import InstanceData
-from torch import Tensor
-
 from mmdet.models.task_modules.samplers import PseudoSampler
 from mmdet.models.utils import multi_apply
 from mmdet.structures.bbox import bbox_xyxy_to_cxcywh
 from mmdet.utils import (ConfigType, OptConfigType, OptInstanceList,
                          OptMultiConfig, reduce_mean)
+from mmengine.model import BaseModule, bias_init_with_prob
+from mmengine.structures import InstanceData
+from torch import Tensor
+
 from mmyolo.registry import MODELS, TASK_UTILS
 from .yolov5_head import YOLOv5Head
 

mmyolo/models/detectors/yolo_detector.py

 # Copyright (c) OpenMMLab. All rights reserved.
 import torch
+from mmdet.models.detectors.single_stage import SingleStageDetector
+from mmdet.utils import ConfigType, OptConfigType, OptMultiConfig
 from mmengine.dist import get_world_size
 from mmengine.logging import print_log
 
-from mmdet.models.detectors.single_stage import SingleStageDetector
-from mmdet.utils import ConfigType, OptConfigType, OptMultiConfig
 from mmyolo.registry import MODELS
 
 

mmyolo/models/layers/ema.py

@@ -4,9 +4,9 @@ from typing import Optional
 
 import torch
 import torch.nn as nn
+from mmdet.models.layers import ExpMomentumEMA as MMDET_ExpMomentumEMA
 from torch import Tensor
 
-from mmdet.models.layers import ExpMomentumEMA as MMDET_ExpMomentumEMA
 from mmyolo.registry import MODELS
 
 

mmyolo/models/layers/yolo_bricks.py

@@ -5,10 +5,10 @@ import numpy as np
 import torch
 import torch.nn as nn
 from mmcv.cnn import ConvModule
+from mmdet.utils import ConfigType, OptMultiConfig
 from mmengine.model import BaseModule
 from mmengine.utils import digit_version
 
-from mmdet.utils import ConfigType, OptMultiConfig
 from mmyolo.registry import MODELS
 
 if digit_version(torch.__version__) >= digit_version('1.7.0'):

mmyolo/models/losses/iou_loss.py

@@ -4,9 +4,9 @@ from typing import Optional, Tuple, Union
 
 import torch
 import torch.nn as nn
-
 from mmdet.models.losses.utils import weight_reduce_loss
 from mmdet.structures.bbox import HorizontalBoxes
+
 from mmyolo.registry import MODELS
 
 

mmyolo/models/necks/base_yolo_neck.py

@@ -4,10 +4,10 @@ from typing import List
 
 import torch
 import torch.nn as nn
+from mmdet.utils import ConfigType, OptMultiConfig
 from mmengine.model import BaseModule
 from torch.nn.modules.batchnorm import _BatchNorm
 
-from mmdet.utils import ConfigType, OptMultiConfig
 from mmyolo.registry import MODELS
 
 

mmyolo/models/necks/yolov5_pafpn.py

@@ -4,9 +4,9 @@ from typing import List
 import torch
 import torch.nn as nn
 from mmcv.cnn import ConvModule
-
 from mmdet.models.backbones.csp_darknet import CSPLayer
 from mmdet.utils import ConfigType, OptMultiConfig
+
 from mmyolo.registry import MODELS
 from ..utils import make_divisible, make_round
 from .base_yolo_neck import BaseYOLONeck

mmyolo/models/necks/yolov6_pafpn.py

@@ -4,8 +4,8 @@ from typing import List
 import torch
 import torch.nn as nn
 from mmcv.cnn import ConvModule
-
 from mmdet.utils import ConfigType, OptMultiConfig
+
 from mmyolo.registry import MODELS
 from ..layers import RepStageBlock, RepVGGBlock
 from ..utils import make_divisible, make_round

mmyolo/models/necks/yolox_pafpn.py

@@ -3,9 +3,9 @@ from typing import List
 
 import torch.nn as nn
 from mmcv.cnn import ConvModule
-
 from mmdet.models.backbones.csp_darknet import CSPLayer
 from mmdet.utils import ConfigType, OptMultiConfig
+
 from mmyolo.registry import MODELS
 from .base_yolo_neck import BaseYOLONeck
 

mmyolo/models/task_modules/coders/distance_point_bbox_coder.py

@@ -2,10 +2,10 @@
 from typing import Optional, Sequence, Union
 
 import torch
-
 from mmdet.models.task_modules.coders import \
     DistancePointBBoxCoder as MMDET_DistancePointBBoxCoder
 from mmdet.structures.bbox import distance2bbox
+
 from mmyolo.registry import TASK_UTILS
 
 

mmyolo/models/task_modules/coders/yolov5_bbox_coder.py

@@ -2,8 +2,8 @@
 from typing import Union
 
 import torch
-
 from mmdet.models.task_modules.coders.base_bbox_coder import BaseBBoxCoder
+
 from mmyolo.registry import TASK_UTILS
 
 

mmyolo/models/task_modules/coders/yolox_bbox_coder.py

@@ -2,8 +2,8 @@
 from typing import Union
 
 import torch
-
 from mmdet.models.task_modules.coders.base_bbox_coder import BaseBBoxCoder
+
 from mmyolo.registry import TASK_UTILS
 
 

mmyolo/utils/collect_env.py

 # Copyright (c) OpenMMLab. All rights reserved.
 import mmcv
+import mmdet
 from mmengine.utils import get_git_hash
 from mmengine.utils.dl_utils import collect_env as collect_base_env
 
-import mmdet
 import mmyolo
 
 

mmyolo/utils/setup_env.py

@@ -18,6 +18,7 @@ def register_all_modules(init_default_scope: bool = True):
     """  # noqa
     import mmdet.engine  # noqa: F401,F403
     import mmdet.visualization  # noqa: F401,F403
+
     import mmyolo.datasets  # noqa: F401,F403
     import mmyolo.engine  # noqa: F401,F403
     import mmyolo.models  # noqa: F401,F403

requirements/mminstall.txt

 mmcv>=2.0.0rc1,<2.1.0
+mmdet>=3.0.0rc0
 mmengine

setup.cfg

@@ -3,7 +3,7 @@ line_length = 79
 multi_line_output = 0
 extra_standard_library = setuptools
 known_first_party = mmyolo
-known_third_party = PIL,asynctest,cityscapesscripts,cv2,gather_models,matplotlib,mmcv,numpy,onnx,onnxruntime,pycocotools,pytest,parameterized,pytorch_sphinx_theme,requests,scipy,seaborn,six,terminaltables,torch,ts,yaml,mmengine
+known_third_party = PIL,asynctest,cityscapesscripts,cv2,gather_models,matplotlib,mmcv,numpy,onnx,onnxruntime,pycocotools,pytest,parameterized,pytorch_sphinx_theme,requests,scipy,seaborn,six,terminaltables,torch,ts,yaml,mmengine,mmdet
 no_lines_before = STDLIB,LOCALFOLDER
 default_section = THIRDPARTY
 

tests/test_datasets/test_transforms/test_mix_img_transforms.py

@@ -5,9 +5,9 @@ import unittest
 
 import numpy as np
 import torch
-
 from mmdet.structures.bbox import HorizontalBoxes
 from mmdet.structures.mask import BitmapMasks
+
 from mmyolo.datasets import YOLOv5CocoDataset
 from mmyolo.datasets.transforms import Mosaic, YOLOv5MixUp, YOLOXMixUp
 

tests/test_datasets/test_transforms/test_transforms.py

@@ -6,9 +6,9 @@ import unittest
 import mmcv
 import numpy as np
 import torch
-
 from mmdet.structures.bbox import HorizontalBoxes
 from mmdet.structures.mask import BitmapMasks
+
 from mmyolo.datasets.transforms import (LetterResize, LoadAnnotations,
                                         YOLOv5HSVRandomAug,
                                         YOLOv5KeepRatioResize,

tests/test_datasets/test_utils.py

@@ -3,10 +3,10 @@ import unittest
 
 import numpy as np
 import torch
-from mmengine.structures import InstanceData
-
 from mmdet.structures import DetDataSample
 from mmdet.structures.bbox import HorizontalBoxes
+from mmengine.structures import InstanceData
+
 from mmyolo.datasets import BatchShapePolicy, yolov5_collate
 
 

tests/test_models/test_backbone/utils.py

 # Copyright (c) OpenMMLab. All rights reserved.
-from torch.nn.modules import GroupNorm
-from torch.nn.modules.batchnorm import _BatchNorm
-
 from mmdet.models.backbones.res2net import Bottle2neck
 from mmdet.models.backbones.resnet import BasicBlock, Bottleneck
 from mmdet.models.backbones.resnext import Bottleneck as BottleneckX
 from mmdet.models.layers import SimplifiedBasicBlock
+from torch.nn.modules import GroupNorm
+from torch.nn.modules.batchnorm import _BatchNorm
 
 
 def is_block(modules):

tests/test_models/test_data_preprocessor/test_data_preprocessor.py

@@ -2,8 +2,8 @@
 from unittest import TestCase
 
 import torch
-
 from mmdet.structures import DetDataSample
+
 from mmyolo.models.data_preprocessors import YOLOv5DetDataPreprocessor
 
 

tests/test_models/test_detectors/test_yolo_detector.py

@@ -4,11 +4,11 @@ import unittest
 from unittest import TestCase
 
 import torch
+from mmdet.structures import DetDataSample
+from mmdet.testing import demo_mm_inputs, get_detector_cfg
 from mmengine.logging import MessageHub
 from parameterized import parameterized
 
-from mmdet.structures import DetDataSample
-from mmdet.testing import demo_mm_inputs, get_detector_cfg
 from mmyolo.utils import register_all_modules
 
 

tests/test_utils/test_collect_env.py

@@ -3,9 +3,9 @@ import sys
 from unittest import TestCase
 
 import mmcv
+import mmdet
 import mmengine
 
-import mmdet
 from mmyolo.utils import collect_env
 
 

tools/analysis_tools/benchmark.py

@@ -5,6 +5,7 @@ import os
 import time
 
 import torch
+from mmdet.models import build_detector
 from mmengine import Config, DictAction
 from mmengine.dist import get_world_size, init_dist
 from mmengine.logging import MMLogger, print_log
@@ -12,7 +13,6 @@ from mmengine.runner import Runner, load_checkpoint
 from mmengine.utils import mkdir_or_exist
 from mmengine.utils.dl_utils import set_multi_processing
 
-from mmdet.models import build_detector
 from mmyolo.utils import register_all_modules
 
 register_all_modules()

tools/analysis_tools/browse_dataset.py

@@ -3,11 +3,11 @@ import argparse
 import os.path as osp
 
 import numpy as np
+from mmdet.models.utils import mask2ndarray
+from mmdet.structures.bbox import BaseBoxes
 from mmengine.config import Config, DictAction
 from mmengine.utils import ProgressBar
 
-from mmdet.models.utils import mask2ndarray
-from mmdet.structures.bbox import BaseBoxes
 from mmyolo.registry import DATASETS, VISUALIZERS
 from mmyolo.utils import register_all_modules