Fix CI bug

.dev_scripts/gather_models.py

@@ -2,14 +2,13 @@
 import argparse
 import glob
 import json
+import mmcv
 import os.path as osp
 import shutil
 import subprocess
-from collections import OrderedDict
-
-import mmcv
 import torch
 import yaml
+from collections import OrderedDict
 
 
 def ordered_yaml_dump(data, stream=None, Dumper=yaml.SafeDumper, **kwds):

.pre-commit-config-zh-cn.yaml

@@ -5,7 +5,7 @@ repos:
     hooks:
       - id: flake8
   - repo: https://gitee.com/openmmlab/mirrors-isort
-    rev: 5.10.1
+    rev: 5.11.5
     hooks:
       - id: isort
   - repo: https://gitee.com/openmmlab/mirrors-yapf

.pre-commit-config.yaml

@@ -3,12 +3,8 @@ repos:
     rev: 5.0.4
     hooks:
       - id: flake8
-  - repo: https://github.com/asottile/seed-isort-config
-    rev: v2.2.0
-    hooks:
-      - id: seed-isort-config
-  - repo: https://github.com/timothycrosley/isort
-    rev: 4.3.21
+  - repo: https://github.com/PyCQA/isort
+    rev: 5.11.5
     hooks:
       - id: isort
   - repo: https://github.com/pre-commit/mirrors-yapf

demo/huge_image_demo.py

@@ -1,7 +1,6 @@
 # Copyright (c) OpenMMLab. All rights reserved.
-from argparse import ArgumentParser
-
 import mmcv
+from argparse import ArgumentParser
 from mmdet.apis import init_detector
 
 from mmrotate.apis import inference_detector_by_patches

demo/image_demo.py

@@ -1,7 +1,6 @@
 # Copyright (c) OpenMMLab. All rights reserved.
-from argparse import ArgumentParser
-
 import mmcv
+from argparse import ArgumentParser
 from mmdet.apis import inference_detector, init_detector
 
 from mmrotate.registry import VISUALIZERS

docs/en/conf.py

@@ -11,9 +11,8 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
 import os
-import sys
-
 import pytorch_sphinx_theme
+import sys
 
 sys.path.insert(0, os.path.abspath('../..'))
 

docs/zh_cn/conf.py

@@ -11,9 +11,8 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
 import os
-import sys
-
 import pytorch_sphinx_theme
+import sys
 
 sys.path.insert(0, os.path.abspath('../..'))
 

mmrotate/apis/inference.py

@@ -1,13 +1,12 @@
 # Copyright (c) OpenMMLab. All rights reserved.
-from typing import List, Optional, Sequence, Union
-
 import mmcv
 import numpy as np
 import torch
 from mmcv.ops import RoIPool
 from mmcv.transforms import Compose
 from mmdet.structures import DetDataSample, SampleList
 from torch import nn
+from typing import List, Optional, Sequence, Union
 
 from mmrotate.utils import (get_multiscale_patch, get_test_pipeline_cfg,
                             merge_results_by_nms, slide_window)

mmrotate/datasets/dior.py

@@ -1,12 +1,11 @@
 # Copyright (c) OpenMMLab. All rights reserved.
-import os.path as osp
-import xml.etree.ElementTree as ET
-from typing import List, Optional, Union
-
 import mmcv
 import numpy as np
+import os.path as osp
+import xml.etree.ElementTree as ET
 from mmengine.dataset import BaseDataset
 from mmengine.fileio import get, get_local_path, list_from_file
+from typing import List, Optional, Union
 
 from mmrotate.registry import DATASETS
 

mmrotate/datasets/dota.py

@@ -1,9 +1,8 @@
 # Copyright (c) OpenMMLab. All rights reserved.
 import glob
 import os.path as osp
-from typing import List
-
 from mmengine.dataset import BaseDataset
+from typing import List
 
 from mmrotate.registry import DATASETS
 

mmrotate/datasets/hrsc.py

@@ -1,13 +1,12 @@
 # Copyright (c) OpenMMLab. All rights reserved.
-import os.path as osp
-import xml.etree.ElementTree as ET
-from typing import List, Optional, Union
-
 import mmcv
 import numpy as np
+import os.path as osp
 import torch
+import xml.etree.ElementTree as ET
 from mmengine.dataset import BaseDataset
 from mmengine.fileio import get, get_local_path, list_from_file
+from typing import List, Optional, Union
 
 from mmrotate.registry import DATASETS
 from mmrotate.structures.bbox import rbox2qbox

mmrotate/datasets/transforms/loading.py

@@ -1,8 +1,7 @@
 # Copyright (c) OpenMMLab. All rights reserved.
-from typing import Sequence, Union
-
 import mmcv
 from mmcv.transforms import BaseTransform
+from typing import Sequence, Union
 
 from mmrotate.registry import TRANSFORMS
 

mmrotate/datasets/transforms/transforms.py

@@ -1,7 +1,4 @@
 # Copyright (c) OpenMMLab. All rights reserved.
-from numbers import Number
-from typing import List, Optional, Union
-
 import cv2
 import mmcv
 import numpy as np
@@ -10,6 +7,8 @@
 from mmdet.structures.bbox import BaseBoxes, get_box_type
 from mmdet.structures.mask import PolygonMasks
 from mmengine.utils import is_list_of
+from numbers import Number
+from typing import List, Optional, Union
 
 from mmrotate.registry import TRANSFORMS
 

mmrotate/evaluation/functional/mean_ap.py

@@ -1,11 +1,10 @@
 # Copyright (c) OpenMMLab. All rights reserved.
-from multiprocessing import get_context
-
 import numpy as np
 import torch
 from mmcv.ops import box_iou_quadri, box_iou_rotated
 from mmdet.evaluation.functional import average_precision
 from mmengine.logging import print_log
+from multiprocessing import get_context
 from terminaltables import AsciiTable
 
 

mmrotate/evaluation/metrics/dota_metric.py

@@ -1,19 +1,18 @@
 # Copyright (c) OpenMMLab. All rights reserved.
 import copy
+import numpy as np
 import os
 import os.path as osp
 import re
 import tempfile
+import torch
 import zipfile
 from collections import OrderedDict, defaultdict
-from typing import List, Optional, Sequence, Union
-
-import numpy as np
-import torch
 from mmcv.ops import nms_quadri, nms_rotated
 from mmengine.evaluator import BaseMetric
 from mmengine.fileio import dump
 from mmengine.logging import MMLogger
+from typing import List, Optional, Sequence, Union
 
 from mmrotate.evaluation import eval_rbbox_map
 from mmrotate.registry import METRICS

mmrotate/evaluation/metrics/rotated_coco_metric.py

@@ -1,21 +1,20 @@
 # Copyright (c) OpenMMLab. All rights reserved.
+import cv2
 import datetime
 import itertools
+import numpy as np
 import os.path as osp
+import pycocotools.mask as maskUtils
 import tempfile
 from collections import OrderedDict
-from typing import Dict, Optional, Sequence
-
-import cv2
-import numpy as np
-import pycocotools.mask as maskUtils
 from mmcv.ops import box_iou_rotated
 from mmdet.datasets.api_wrappers import COCO
 from mmdet.evaluation import CocoMetric
 from mmengine import MMLogger
 from mmengine.fileio import dump, load
 from pycocotools.cocoeval import COCOeval
 from terminaltables import AsciiTable
+from typing import Dict, Optional, Sequence
 
 from mmrotate.registry import METRICS
 from mmrotate.structures.bbox import RotatedBoxes

mmrotate/models/backbones/re_resnet.py

@@ -1,19 +1,19 @@
 # Copyright (c) OpenMMLab. All rights reserved.
 # Modified from csuhan: https://github.com/csuhan/ReDet
-from typing import Optional, Sequence, Tuple
-
 import torch.nn as nn
 import torch.utils.checkpoint as cp
 from mmdet.utils import ConfigType, OptConfigType, OptMultiConfig
 from mmengine.model import BaseModule
 from torch import Tensor
 from torch.nn.modules.batchnorm import _BatchNorm
+from typing import Optional, Sequence, Tuple
 
 from mmrotate.registry import MODELS
 
 try:
     import e2cnn.nn as enn
     from e2cnn.nn import EquivariantModule
+
     from ..utils.enn import (build_enn_divide_feature, build_enn_norm_layer,
                              build_enn_trivial_feature, ennAvgPool, ennConv,
                              ennMaxPool, ennReLU, ennTrivialConv)

mmrotate/models/dense_heads/angle_branch_retina_head.py

@@ -1,7 +1,5 @@
 # Copyright (c) OpenMMLab. All rights reserved.
 import copy
-from typing import List, Optional, Tuple, Union
-
 import torch
 import torch.nn as nn
 from mmdet.models.dense_heads.retina_head import RetinaHead
@@ -13,6 +11,7 @@
 from mmengine.config import ConfigDict
 from mmengine.structures import InstanceData
 from torch import Tensor
+from typing import List, Optional, Tuple, Union
 
 from mmrotate.registry import MODELS, TASK_UTILS
 

mmrotate/models/dense_heads/cfa_head.py

@@ -1,12 +1,11 @@
 # Copyright (c) OpenMMLab. All rights reserved.
-from typing import Dict, List, Optional, Tuple
-
 import numpy as np
 import torch
 from mmdet.models.utils import multi_apply
 from mmdet.utils import InstanceList, OptInstanceList
 from mmengine.structures import InstanceData
 from torch import Tensor
+from typing import Dict, List, Optional, Tuple
 
 from mmrotate.models.dense_heads.rotated_reppoints_head import \
     RotatedRepPointsHead

mmrotate/models/dense_heads/h2rbox_head.py

@@ -1,8 +1,6 @@
 # Copyright (c) OpenMMLab. All rights reserved.
 import copy
 import math
-from typing import Dict, List, Optional, Tuple
-
 import torch
 from mmcv.cnn import Scale
 from mmdet.models.utils import (filter_scores_and_topk, multi_apply,
@@ -13,6 +11,7 @@
 from mmengine import ConfigDict
 from mmengine.structures import InstanceData
 from torch import Tensor
+from typing import Dict, List, Optional, Tuple
 
 from mmrotate.models.dense_heads.rotated_fcos_head import RotatedFCOSHead
 from mmrotate.registry import MODELS

mmrotate/models/dense_heads/oriented_reppoints_head.py

@@ -1,7 +1,5 @@
 # Copyright (c) OpenMMLab. All rights reserved.
 import math
-from typing import Dict, List, Optional, Tuple
-
 import numpy as np
 import torch
 import torch.nn as nn
@@ -11,6 +9,7 @@
 from mmdet.utils import ConfigType, InstanceList, OptInstanceList
 from mmengine.structures import InstanceData
 from torch import Tensor
+from typing import Dict, List, Optional, Tuple
 
 from mmrotate.models.dense_heads.rotated_reppoints_head import \
     RotatedRepPointsHead

mmrotate/models/dense_heads/oriented_rpn_head.py

@@ -1,13 +1,12 @@
 # Copyright (c) OpenMMLab. All rights reserved.
-from typing import Optional
-
 import torch
 from mmcv.ops import batched_nms
 from mmdet.models.dense_heads import RPNHead
 from mmdet.structures.bbox import (BaseBoxes, get_box_tensor, get_box_wh,
                                    scale_boxes)
 from mmengine.config import ConfigDict
 from mmengine.structures import InstanceData
+from typing import Optional
 
 from mmrotate.registry import MODELS
 from mmrotate.structures.bbox import rbox2hbox

mmrotate/models/dense_heads/r3_head.py

@@ -1,11 +1,10 @@
 # Copyright (c) OpenMMLab. All rights reserved.
-from typing import List, Optional, Tuple, Union
-
 import torch
 from mmdet.models.utils import select_single_mlvl
 from mmdet.utils import InstanceList, OptInstanceList
 from mmengine.config import ConfigDict
 from torch import Tensor
+from typing import List, Optional, Tuple, Union
 
 from mmrotate.registry import MODELS
 from mmrotate.structures.bbox import RotatedBoxes

mmrotate/models/dense_heads/rotated_atss_head.py

@@ -1,6 +1,4 @@
 # Copyright (c) OpenMMLab. All rights reserved.
-from typing import List, Optional
-
 import torch
 import torch.nn as nn
 from mmcv.cnn import ConvModule, Scale
@@ -11,6 +9,7 @@
 from mmdet.utils import InstanceList, OptInstanceList
 from mmengine.structures import InstanceData
 from torch import Tensor
+from typing import List, Optional
 
 from mmrotate.registry import MODELS
 from mmrotate.structures.bbox import RotatedBoxes

mmrotate/models/dense_heads/rotated_fcos_head.py

@@ -1,7 +1,5 @@
 # Copyright (c) OpenMMLab. All rights reserved.
 import copy
-from typing import Dict, List, Optional, Tuple
-
 import torch
 import torch.nn as nn
 from mmcv.cnn import Scale
@@ -14,6 +12,7 @@
 from mmengine import ConfigDict
 from mmengine.structures import InstanceData
 from torch import Tensor
+from typing import Dict, List, Optional, Tuple
 
 from mmrotate.registry import MODELS, TASK_UTILS
 from mmrotate.structures import RotatedBoxes

mmrotate/models/dense_heads/rotated_reppoints_head.py

@@ -1,6 +1,4 @@
 # Copyright (c) OpenMMLab. All rights reserved.
-from typing import Dict, List, Tuple
-
 import torch
 from mmcv.ops import min_area_polygons
 from mmdet.models.dense_heads.reppoints_head import RepPointsHead
@@ -9,6 +7,7 @@
 from mmengine.config import ConfigDict
 from mmengine.structures import InstanceData
 from torch import Tensor
+from typing import Dict, List, Tuple
 
 from mmrotate.registry import MODELS
 from mmrotate.structures.bbox import RotatedBoxes, qbox2rbox