From 10c82efb0392fc1a5e1c696a53fe9ca7dfc3cdda Mon Sep 17 00:00:00 2001 From: Kai Chen <chenkaidev@gmail.com> Date: Tue, 28 Jan 2020 17:33:26 +0800 Subject: [PATCH] format configs with yapf (#2023) --- .isort.cfg | 2 +- .travis.yml | 2 +- configs/dcn/cascade_mask_rcnn_dconv_c3-c5_r50_fpn_1x.py | 3 +-- configs/dcn/cascade_rcnn_dconv_c3-c5_r50_fpn_1x.py | 3 +-- configs/dcn/faster_rcnn_dconv_c3-c5_r50_fpn_1x.py | 3 +-- configs/dcn/faster_rcnn_dconv_c3-c5_x101_32x4d_fpn_1x.py | 5 +---- configs/dcn/faster_rcnn_mdconv_c3-c5_group4_r50_fpn_1x.py | 3 +-- configs/dcn/faster_rcnn_mdconv_c3-c5_r50_fpn_1x.py | 3 +-- configs/dcn/mask_rcnn_dconv_c3-c5_r50_fpn_1x.py | 3 +-- .../faster_rcnn_r50_fpn_attention_0010_dcn_1x.py | 3 +-- .../faster_rcnn_r50_fpn_attention_1111_dcn_1x.py | 3 +-- 11 files changed, 11 insertions(+), 22 deletions(-) diff --git a/.isort.cfg b/.isort.cfg index e790e3ee..9f43efc7 100644 --- a/.isort.cfg +++ b/.isort.cfg @@ -3,6 +3,6 @@ line_length = 79 multi_line_output = 0 known_standard_library = setuptools known_first_party = mmdet -known_third_party = Cython,albumentations,asynctest,cv2,imagecorruptions,matplotlib,mmcv,numpy,pycocotools,robustness_eval,roi_align,roi_pool,seaborn,six,terminaltables,torch,torchvision +known_third_party = Cython,asynctest,cv2,matplotlib,mmcv,numpy,pycocotools,robustness_eval,roi_align,roi_pool,seaborn,six,terminaltables,torch,torchvision no_lines_before = STDLIB,LOCALFOLDER default_section = THIRDPARTY diff --git a/.travis.yml b/.travis.yml index c2956e73..a2f37983 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ install: before_script: - flake8 . - isort -rc --check-only --diff mmdet/ tools/ tests/ - - yapf -r -d --style .style.yapf mmdet/ tools/ tests/ + - yapf -r -d --style .style.yapf mmdet/ tools/ tests/ configs/ script: - python setup.py check -m -s diff --git a/configs/dcn/cascade_mask_rcnn_dconv_c3-c5_r50_fpn_1x.py b/configs/dcn/cascade_mask_rcnn_dconv_c3-c5_r50_fpn_1x.py index 40a2d97d..0a0231db 100644 --- a/configs/dcn/cascade_mask_rcnn_dconv_c3-c5_r50_fpn_1x.py +++ b/configs/dcn/cascade_mask_rcnn_dconv_c3-c5_r50_fpn_1x.py @@ -10,8 +10,7 @@ model = dict( out_indices=(0, 1, 2, 3), frozen_stages=1, style='pytorch', - dcn=dict( - type='DCN', deformable_groups=1, fallback_on_stride=False), + dcn=dict(type='DCN', deformable_groups=1, fallback_on_stride=False), stage_with_dcn=(False, True, True, True)), neck=dict( type='FPN', diff --git a/configs/dcn/cascade_rcnn_dconv_c3-c5_r50_fpn_1x.py b/configs/dcn/cascade_rcnn_dconv_c3-c5_r50_fpn_1x.py index 9d4402a8..352cf2da 100644 --- a/configs/dcn/cascade_rcnn_dconv_c3-c5_r50_fpn_1x.py +++ b/configs/dcn/cascade_rcnn_dconv_c3-c5_r50_fpn_1x.py @@ -10,8 +10,7 @@ model = dict( out_indices=(0, 1, 2, 3), frozen_stages=1, style='pytorch', - dcn=dict( - type='DCN', deformable_groups=1, fallback_on_stride=False), + dcn=dict(type='DCN', deformable_groups=1, fallback_on_stride=False), stage_with_dcn=(False, True, True, True)), neck=dict( type='FPN', diff --git a/configs/dcn/faster_rcnn_dconv_c3-c5_r50_fpn_1x.py b/configs/dcn/faster_rcnn_dconv_c3-c5_r50_fpn_1x.py index 83967ff9..87c2b4c9 100644 --- a/configs/dcn/faster_rcnn_dconv_c3-c5_r50_fpn_1x.py +++ b/configs/dcn/faster_rcnn_dconv_c3-c5_r50_fpn_1x.py @@ -9,8 +9,7 @@ model = dict( out_indices=(0, 1, 2, 3), frozen_stages=1, style='pytorch', - dcn=dict( - type='DCN', deformable_groups=1, fallback_on_stride=False), + dcn=dict(type='DCN', deformable_groups=1, fallback_on_stride=False), stage_with_dcn=(False, True, True, True)), neck=dict( type='FPN', diff --git a/configs/dcn/faster_rcnn_dconv_c3-c5_x101_32x4d_fpn_1x.py b/configs/dcn/faster_rcnn_dconv_c3-c5_x101_32x4d_fpn_1x.py index 06aa6eea..4cd3a359 100644 --- a/configs/dcn/faster_rcnn_dconv_c3-c5_x101_32x4d_fpn_1x.py +++ b/configs/dcn/faster_rcnn_dconv_c3-c5_x101_32x4d_fpn_1x.py @@ -11,10 +11,7 @@ model = dict( out_indices=(0, 1, 2, 3), frozen_stages=1, style='pytorch', - dcn=dict( - type='DCN', - deformable_groups=1, - fallback_on_stride=False), + dcn=dict(type='DCN', deformable_groups=1, fallback_on_stride=False), stage_with_dcn=(False, True, True, True)), neck=dict( type='FPN', diff --git a/configs/dcn/faster_rcnn_mdconv_c3-c5_group4_r50_fpn_1x.py b/configs/dcn/faster_rcnn_mdconv_c3-c5_group4_r50_fpn_1x.py index e469223c..ddaae7c4 100644 --- a/configs/dcn/faster_rcnn_mdconv_c3-c5_group4_r50_fpn_1x.py +++ b/configs/dcn/faster_rcnn_mdconv_c3-c5_group4_r50_fpn_1x.py @@ -9,8 +9,7 @@ model = dict( out_indices=(0, 1, 2, 3), frozen_stages=1, style='pytorch', - dcn=dict( - type='DCNv2', deformable_groups=4, fallback_on_stride=False), + dcn=dict(type='DCNv2', deformable_groups=4, fallback_on_stride=False), stage_with_dcn=(False, True, True, True)), neck=dict( type='FPN', diff --git a/configs/dcn/faster_rcnn_mdconv_c3-c5_r50_fpn_1x.py b/configs/dcn/faster_rcnn_mdconv_c3-c5_r50_fpn_1x.py index 2e79fa85..fbb8fc8a 100644 --- a/configs/dcn/faster_rcnn_mdconv_c3-c5_r50_fpn_1x.py +++ b/configs/dcn/faster_rcnn_mdconv_c3-c5_r50_fpn_1x.py @@ -9,8 +9,7 @@ model = dict( out_indices=(0, 1, 2, 3), frozen_stages=1, style='pytorch', - dcn=dict( - type='DCNv2', deformable_groups=1, fallback_on_stride=False), + dcn=dict(type='DCNv2', deformable_groups=1, fallback_on_stride=False), stage_with_dcn=(False, True, True, True)), neck=dict( type='FPN', diff --git a/configs/dcn/mask_rcnn_dconv_c3-c5_r50_fpn_1x.py b/configs/dcn/mask_rcnn_dconv_c3-c5_r50_fpn_1x.py index 8ed0af0d..e9415eea 100644 --- a/configs/dcn/mask_rcnn_dconv_c3-c5_r50_fpn_1x.py +++ b/configs/dcn/mask_rcnn_dconv_c3-c5_r50_fpn_1x.py @@ -9,8 +9,7 @@ model = dict( out_indices=(0, 1, 2, 3), frozen_stages=1, style='pytorch', - dcn=dict( - type='DCN', deformable_groups=1, fallback_on_stride=False), + dcn=dict(type='DCN', deformable_groups=1, fallback_on_stride=False), stage_with_dcn=(False, True, True, True)), neck=dict( type='FPN', diff --git a/configs/empirical_attention/faster_rcnn_r50_fpn_attention_0010_dcn_1x.py b/configs/empirical_attention/faster_rcnn_r50_fpn_attention_0010_dcn_1x.py index 7d0843e5..e91aedad 100644 --- a/configs/empirical_attention/faster_rcnn_r50_fpn_attention_0010_dcn_1x.py +++ b/configs/empirical_attention/faster_rcnn_r50_fpn_attention_0010_dcn_1x.py @@ -12,8 +12,7 @@ model = dict( gen_attention=dict( spatial_range=-1, num_heads=8, attention_type='0010', kv_stride=2), stage_with_gen_attention=[[], [], [0, 1, 2, 3, 4, 5], [0, 1, 2]], - dcn=dict( - type='DCN', deformable_groups=1, fallback_on_stride=False), + dcn=dict(type='DCN', deformable_groups=1, fallback_on_stride=False), stage_with_dcn=(False, True, True, True), ), neck=dict( diff --git a/configs/empirical_attention/faster_rcnn_r50_fpn_attention_1111_dcn_1x.py b/configs/empirical_attention/faster_rcnn_r50_fpn_attention_1111_dcn_1x.py index f603e21d..78912762 100644 --- a/configs/empirical_attention/faster_rcnn_r50_fpn_attention_1111_dcn_1x.py +++ b/configs/empirical_attention/faster_rcnn_r50_fpn_attention_1111_dcn_1x.py @@ -12,8 +12,7 @@ model = dict( gen_attention=dict( spatial_range=-1, num_heads=8, attention_type='1111', kv_stride=2), stage_with_gen_attention=[[], [], [0, 1, 2, 3, 4, 5], [0, 1, 2]], - dcn=dict( - type='DCN', deformable_groups=1, fallback_on_stride=False), + dcn=dict(type='DCN', deformable_groups=1, fallback_on_stride=False), stage_with_dcn=(False, True, True, True), ), neck=dict( -- GitLab