diff --git a/.isort.cfg b/.isort.cfg index e790e3ee0ce0b21dda62f56fc5072b99ff05ab7c..9f43efc7dd4c0ab674da474e73b660508cdacbb1 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 c2956e73f1f66e5f6843d428fb39e4bf57731919..a2f379838e0f5b0a3f9e8c0d7912c898852131ba 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 40a2d97d06fcf27e5ea929490f0a67f381b0f42d..0a0231db22abbc09cc644edb107daf41a320281b 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 9d4402a852d440809c0aadc551e7c74edbe59bdf..352cf2da4c44f644e4669cafc6ff556d6b334f5c 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 83967ff92efc512ea7281796117fd884cdc1a7ca..87c2b4c929f3c1f31f0249d61b12c128a8afbae9 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 06aa6eeaf77703482125a7790c56650ad73fb49e..4cd3a35985b393ad14151d4a9f1af3279a9ecc01 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 e469223ca9035d62c9646cf03063f20d9d581efc..ddaae7c423534b8a0c017845b400a185f20bf2fe 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 2e79fa85dc6a304fd962b753adfa585e208afcee..fbb8fc8addd90ba8d7df70964ba4f3467dc020bf 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 8ed0af0de89760f0bff6d5bf2df15419035cdd6f..e9415eea5dfaf60386d375bd91c416e990631007 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 7d0843e560062a609483141218d3373ca99c7dbf..e91aedadd790ad243ceb69fd224b5c7d80dbb81c 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 f603e21d67b93a8ce6ed64ffa5690e2701dd129d..789127628edc7efddcbfce4353576b9fd53988c0 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(