Skip to content

Commit e855ee4

Browse files
authored
[Enhancement] upgrade isort in pre-commit config (#141)
* [Enhancement] upgrade isort in pre-commit config by refering to mmflow pr #87 * fix lint * remove .isort.cfg and put its known_third_party to setup.cfg
1 parent cce81d3 commit e855ee4

27 files changed

+50
-49
lines changed

.isort.cfg

Lines changed: 0 additions & 2 deletions
This file was deleted.

.pre-commit-config.yaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@ repos:
33
rev: 4.0.1
44
hooks:
55
- id: flake8
6-
- repo: https://github.com/asottile/seed-isort-config
7-
rev: v2.2.0
8-
hooks:
9-
- id: seed-isort-config
10-
- repo: https://github.com/timothycrosley/isort
11-
rev: 4.3.21
6+
- repo: https://github.com/PyCQA/isort
7+
rev: 5.10.1
128
hooks:
139
- id: isort
1410
- repo: https://github.com/pre-commit/mirrors-yapf

mmdeploy/apis/ncnn/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
__all__ = ['is_available', 'is_plugin_available']
55

66
if is_available():
7-
from mmdeploy.backend.ncnn.onnx2ncnn import (onnx2ncnn,
8-
get_output_model_file)
7+
from mmdeploy.backend.ncnn.onnx2ncnn import (get_output_model_file,
8+
onnx2ncnn)
99
__all__ += ['onnx2ncnn', 'get_output_model_file']

mmdeploy/apis/openvino/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
__all__ = ['is_available']
55

66
if is_available():
7-
from mmdeploy.backend.openvino.onnx2openvino \
8-
import onnx2openvino, get_output_model_file
7+
from mmdeploy.backend.openvino.onnx2openvino import (get_output_model_file,
8+
onnx2openvino)
99
from .utils import get_input_info_from_cfg
1010
__all__ += [
1111
'onnx2openvino', 'get_output_model_file', 'get_input_info_from_cfg'

mmdeploy/backend/openvino/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ def is_available() -> bool:
1212

1313

1414
if is_available():
15-
from .wrapper import OpenVINOWrapper
1615
from .onnx2openvino import get_output_model_file
16+
from .wrapper import OpenVINOWrapper
1717
__all__ = ['OpenVINOWrapper', 'get_output_model_file']

mmdeploy/codebase/mmcls/deploy/classification.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ def evaluate_outputs(model_cfg: mmcv.Config,
230230
Defaults to `None` and the results will only print on stdout.
231231
"""
232232
import warnings
233+
233234
from mmcv.utils import get_logger
234235
logger = get_logger('test', log_file=log_file, log_level=logging.INFO)
235236

mmdeploy/codebase/mmdet/deploy/object_detection.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ def create_input(self,
109109
Returns:
110110
tuple: (data, img), meta information for the input image and input.
111111
"""
112-
from mmdet.datasets.pipelines import Compose
113112
from mmcv.parallel import collate, scatter
113+
from mmdet.datasets.pipelines import Compose
114114
if not isinstance(imgs, (list, tuple)):
115115
imgs = [imgs]
116116
dynamic_flag = is_dynamic_shape(self.deploy_cfg)

mmdeploy/codebase/mmdet/deploy/object_detection_model.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,7 @@ def __init__(self, backend: Backend, backend_files: Sequence[str],
399399
super().__init__(backend, backend_files, device, class_names,
400400
deploy_cfg, **kwargs)
401401
from mmdet.models.builder import build_head, build_roi_extractor
402+
402403
from ..models.roi_heads.bbox_head import bbox_head__get_bboxes
403404

404405
self.bbox_roi_extractor = build_roi_extractor(

mmdeploy/codebase/mmdet/models/dense_heads/yolox_head.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ def yolox_head__get_bboxes__ncnn(ctx,
139139
output__ncnn (Tensor): outputs, shape is [N, num_det, 6].
140140
"""
141141
from mmdeploy.codebase.mmdet.core.ops import ncnn_detection_output_forward
142-
from mmdeploy.utils.config_utils import is_dynamic_shape
143142
from mmdeploy.utils import get_root_logger
143+
from mmdeploy.utils.config_utils import is_dynamic_shape
144144
dynamic_flag = is_dynamic_shape(ctx.cfg)
145145
if dynamic_flag:
146146
logger = get_root_logger()

mmdeploy/codebase/mmedit/deploy/mmediting.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ def build_dataset(dataset_cfg: Union[str, mmcv.Config], *args,
5555
Dataset: A PyTorch dataset.
5656
"""
5757
from mmedit.datasets import build_dataset as build_dataset_mmedit
58+
5859
from mmdeploy.utils import load_config
5960
dataset_cfg = load_config(dataset_cfg)[0]
6061
data = dataset_cfg.data

0 commit comments

Comments
 (0)