[Config] Refactor base config (part 1) (#1314)

* [Config] Refactor base config

* [Config] Refactor base config

* fix panet

* fix

configs/_base_/schedules/schedule_sgd_1500e.py

@@ -1,10 +0,0 @@
-optim_wrapper = dict(
-    type='OptimWrapper',
-    optimizer=dict(type='SGD', lr=1e-3, momentum=0.9, weight_decay=5e-4))
-train_cfg = dict(type='EpochBasedTrainLoop', max_epochs=1500, val_interval=20)
-val_cfg = dict(type='ValLoop')
-test_cfg = dict(type='TestLoop')
-# learning policy
-param_scheduler = [
-    dict(type='PolyLR', power=0.9, eta_min=1e-7, end=1500),
-]

configs/_base_/schedules/schedule_sgd_160e.py

@@ -1,12 +0,0 @@
-# optimizer
-optim_wrapper = dict(
-    type='OptimWrapper',
-    optimizer=dict(type='SGD', lr=0.08, momentum=0.9, weight_decay=0.0001))
-train_cfg = dict(type='EpochBasedTrainLoop', max_epochs=160, val_interval=20)
-val_cfg = dict(type='ValLoop')
-test_cfg = dict(type='TestLoop')
-# learning policy
-param_scheduler = [
-    dict(type='LinearLR', end=500, start_factor=0.001, by_epoch=False),
-    dict(type='MultiStepLR', milestones=[80, 128], end=160),
-]

configs/_base_/schedules/schedule_sgd_600e.py

@@ -1,10 +0,0 @@
-optim_wrapper = dict(
-    type='OptimWrapper',
-    optimizer=dict(type='SGD', lr=1e-3, momentum=0.99, weight_decay=5e-4))
-train_cfg = dict(type='EpochBasedTrainLoop', max_epochs=600, val_interval=50)
-val_cfg = dict(type='ValLoop')
-test_cfg = dict(type='TestLoop')
-# learning policy
-param_scheduler = [
-    dict(type='MultiStepLR', milestones=[200, 400], end=600),
-]

configs/textdet/dbnet/_base_dbnet_resnet18_fpnc.py

@@ -70,7 +70,3 @@ test_pipeline = [
         type='PackTextDetInputs',
         meta_keys=('img_path', 'ori_shape', 'img_shape', 'scale_factor'))
 ]
-
-val_evaluator = dict(
-    type='HmeanIOUMetric', pred_score_thrs=dict(start=0.3, stop=1, step=0.05))
-test_evaluator = val_evaluator

configs/textdet/dbnet/dbnet_resnet18_fpnc_100k_synthtext.py

@@ -1,8 +1,8 @@
 _base_ = [
     '_base_dbnet_resnet18_fpnc.py',
-    '../../_base_/det_datasets/synthtext.py',
-    '../../_base_/textdet_default_runtime.py',
-    '../../_base_/schedules/schedule_sgd_100k_iters.py',
+    '../_base_/datasets/synthtext.py',
+    '../_base_/default_runtime.py',
+    '../_base_/schedules/schedule_sgd_100k.py',
 ]
 
 # dataset settings

configs/textdet/dbnet/dbnet_resnet18_fpnc_1200e_icdar2015.py

@@ -1,8 +1,8 @@
 _base_ = [
     '_base_dbnet_resnet18_fpnc.py',
-    '../../_base_/det_datasets/icdar2015.py',
-    '../../_base_/textdet_default_runtime.py',
-    '../../_base_/schedules/schedule_sgd_1200e.py',
+    '../_base_/datasets/icdar2015.py',
+    '../_base_/default_runtime.py',
+    '../_base_/schedules/schedule_sgd_1200e.py',
 ]
 
 # dataset settings

configs/textdet/dbnet/dbnet_resnet50-dcnv2_fpnc_100k_synthtext.py

@@ -1,8 +1,8 @@
 _base_ = [
     '_base_dbnet_resnet50-dcnv2_fpnc.py',
-    '../../_base_/textdet_default_runtime.py',
-    '../../_base_/det_datasets/synthtext.py',
-    '../../_base_/schedules/schedule_sgd_100k_iters.py',
+    '../_base_/default_runtime.py',
+    '../_base_/datasets/synthtext.py',
+    '../_base_/schedules/schedule_sgd_100k.py',
 ]
 
 # dataset settings

configs/textdet/dbnet/dbnet_resnet50-dcnv2_fpnc_1200e_icdar2015.py

@@ -1,8 +1,8 @@
 _base_ = [
     '_base_dbnet_resnet50-dcnv2_fpnc.py',
-    '../../_base_/det_datasets/icdar2015.py',
-    '../../_base_/textdet_default_runtime.py',
-    '../../_base_/schedules/schedule_sgd_1200e.py',
+    '../_base_/datasets/icdar2015.py',
+    '../_base_/default_runtime.py',
+    '../_base_/schedules/schedule_sgd_1200e.py',
 ]
 
 # TODO: Replace the link

configs/textdet/dbnetpp/dbnetpp_resnet50-dcnv2_fpnc_100k_synthtext.py

@@ -1,8 +1,8 @@
 _base_ = [
     '_base_dbnetpp_resnet50-dcnv2_fpnc.py',
-    '../../_base_/textdet_default_runtime.py',
-    '../../_base_/det_datasets/synthtext.py',
-    '../../_base_/schedules/schedule_sgd_100k_iters.py',
+    '../_base_/default_runtime.py',
+    '../_base_/datasets/synthtext.py',
+    '../_base_/schedules/schedule_sgd_100k.py',
 ]
 
 # dataset settings

configs/textdet/dbnetpp/dbnetpp_resnet50-dcnv2_fpnc_1200e_icdar2015.py

@@ -1,8 +1,8 @@
 _base_ = [
     '_base_dbnetpp_resnet50-dcnv2_fpnc.py',
-    '../../_base_/textdet_default_runtime.py',
-    '../../_base_/det_datasets/icdar2015.py',
-    '../../_base_/schedules/schedule_sgd_1200e.py',
+    '../_base_/default_runtime.py',
+    '../_base_/datasets/icdar2015.py',
+    '../_base_/schedules/schedule_sgd_1200e.py',
 ]
 
 # dataset settings

configs/textdet/drrg/drrg_resnet50_fpn-unet_1200e_ctw1500.py

@@ -1,8 +1,8 @@
 _base_ = [
     '_base_drrg_resnet50_fpn-unet.py',
-    '../../_base_/det_datasets/ctw1500.py',
-    '../../_base_/textdet_default_runtime.py',
-    '../../_base_/schedules/schedule_sgd_1200e.py',
+    '../_base_/datasets/ctw1500.py',
+    '../_base_/default_runtime.py',
+    '../_base_/schedules/schedule_sgd_1200e.py',
 ]
 
 # dataset settings

configs/textdet/fcenet/fcenet_resnet50-dcnv2_fpn_1500e_ctw1500.py

@@ -1,8 +1,15 @@
 _base_ = [
     '_base_fcenet_resnet50-dcnv2_fpn.py',
-    '../../_base_/det_datasets/ctw1500.py',
-    '../../_base_/textdet_default_runtime.py',
-    '../../_base_/schedules/schedule_sgd_1500e.py',
+    '../_base_/datasets/ctw1500.py',
+    '../_base_/default_runtime.py',
+    '../_base_/schedules/schedule_sgd_1200e.py',
+]
+
+optim_wrapper = dict(optimizer=dict(lr=1e-3, weight_decay=5e-4))
+train_cfg = dict(max_epochs=1500)
+# learning policy
+param_scheduler = [
+    dict(type='PolyLR', power=0.9, eta_min=1e-7, end=1500),
 ]
 
 file_client_args = dict(backend='disk')

configs/textdet/fcenet/fcenet_resnet50_fpn_1500e_icdar2015.py

@@ -1,8 +1,15 @@
 _base_ = [
     '_base_fcenet_resnet50_fpn.py',
-    '../../_base_/det_datasets/icdar2015.py',
-    '../../_base_/textdet_default_runtime.py',
-    '../../_base_/schedules/schedule_sgd_1500e.py',
+    '../_base_/datasets/icdar2015.py',
+    '../_base_/default_runtime.py',
+    '../_base_/schedules/schedule_sgd_1200e.py',
+]
+
+optim_wrapper = dict(optimizer=dict(lr=1e-3, weight_decay=5e-4))
+train_cfg = dict(max_epochs=1500)
+# learning policy
+param_scheduler = [
+    dict(type='PolyLR', power=0.9, eta_min=1e-7, end=1500),
 ]
 
 # dataset settings

configs/textdet/maskrcnn/mask-rcnn_resnet50_fpn_160e_ctw1500.py

@@ -1,8 +1,17 @@
 _base_ = [
     '_base_mask-rcnn_resnet50_fpn.py',
-    '../../_base_/det_datasets/ctw1500.py',
-    '../../_base_/textdet_default_runtime.py',
-    '../../_base_/schedules/schedule_sgd_160e.py',
+    '../_base_/datasets/ctw1500.py',
+    '../_base_/default_runtime.py',
+    '../_base_/schedules/schedule_sgd_1200e.py',
+]
+
+# optimizer
+optim_wrapper = dict(optimizer=dict(lr=0.08))
+train_cfg = dict(max_epochs=160)
+# learning policy
+param_scheduler = [
+    dict(type='LinearLR', end=500, start_factor=0.001, by_epoch=False),
+    dict(type='MultiStepLR', milestones=[80, 128], end=160),
 ]
 
 # dataset settings

configs/textdet/maskrcnn/mask-rcnn_resnet50_fpn_160e_icdar2015.py

@@ -1,8 +1,17 @@
 _base_ = [
     '_base_mask-rcnn_resnet50_fpn.py',
-    '../../_base_/det_datasets/icdar2015.py',
-    '../../_base_/textdet_default_runtime.py',
-    '../../_base_/schedules/schedule_sgd_160e.py',
+    '../_base_/datasets/icdar2015.py',
+    '../_base_/default_runtime.py',
+    '../_base_/schedules/schedule_sgd_1200e.py',
+]
+
+# optimizer
+optim_wrapper = dict(optimizer=dict(lr=0.08))
+train_cfg = dict(max_epochs=160)
+# learning policy
+param_scheduler = [
+    dict(type='LinearLR', end=500, start_factor=0.001, by_epoch=False),
+    dict(type='MultiStepLR', milestones=[80, 128], end=160),
 ]
 
 # dataset settings

configs/textdet/maskrcnn/mask-rcnn_resnet50_fpn_160e_icdar2017.py

@@ -1,6 +1,6 @@
 _base_ = [
     'mask-rcnn_resnet50_fpn_160e_icdar2015.py',
-    '../../_base_/det_datasets/icdar2017.py',
+    '../_base_/datasets/icdar2017.py',
 ]
 
 ic17_det_train = _base_.ic17_det_train

configs/textdet/panet/panet_resnet18_fpem-ffm_600e_ctw1500.py

@@ -1,7 +1,7 @@
 _base_ = [
-    '../../_base_/det_datasets/ctw1500.py',
-    '../../_base_/textdet_default_runtime.py',
-    '../../_base_/schedules/schedule_adam_600e.py',
+    '../_base_/datasets/ctw1500.py',
+    '../_base_/default_runtime.py',
+    '../_base_/schedules/schedule_adam_600e.py',
     '_base_panet_resnet18_fpem-ffm.py',
 ]
 
@@ -78,3 +78,7 @@ val_dataloader = dict(
     sampler=dict(type='DefaultSampler', shuffle=False),
     dataset=ctw_det_test)
 test_dataloader = val_dataloader
+
+val_evaluator = dict(
+    type='HmeanIOUMetric', pred_score_thrs=dict(start=0.3, stop=1, step=0.05))
+test_evaluator = val_evaluator

configs/textdet/panet/panet_resnet18_fpem-ffm_600e_icdar2015.py

@@ -1,7 +1,7 @@
 _base_ = [
-    '../../_base_/det_datasets/icdar2015.py',
-    '../../_base_/textdet_default_runtime.py',
-    '../../_base_/schedules/schedule_adam_600e.py',
+    '../_base_/datasets/icdar2015.py',
+    '../_base_/default_runtime.py',
+    '../_base_/schedules/schedule_adam_600e.py',
     '_base_panet_resnet18_fpem-ffm.py',
 ]
 
@@ -27,3 +27,7 @@ val_dataloader = dict(
     sampler=dict(type='DefaultSampler', shuffle=False),
     dataset=ic15_det_test)
 test_dataloader = val_dataloader
+
+val_evaluator = dict(
+    type='HmeanIOUMetric', pred_score_thrs=dict(start=0.3, stop=1, step=0.05))
+test_evaluator = val_evaluator

configs/textdet/panet/panet_resnet50_fpem-ffm_600e_icdar2017.py

@@ -1,7 +1,7 @@
 _base_ = [
-    '../../_base_/det_datasets/icdar2017.py',
-    '../../_base_/textdet_default_runtime.py',
-    '../../_base_/schedules/schedule_adam_600e.py',
+    '../_base_/datasets/icdar2017.py',
+    '../_base_/default_runtime.py',
+    '../_base_/schedules/schedule_adam_600e.py',
     '_base_panet_resnet50_fpem-ffm.py',
 ]
 
@@ -73,3 +73,7 @@ val_dataloader = dict(
     sampler=dict(type='DefaultSampler', shuffle=False),
     dataset=ic17_det_test)
 test_dataloader = val_dataloader
+
+val_evaluator = dict(
+    type='HmeanIOUMetric', pred_score_thrs=dict(start=0.3, stop=1, step=0.05))
+test_evaluator = val_evaluator

configs/textdet/psenet/psenet_resnet50_fpnf_600e_ctw1500.py

@@ -1,8 +1,15 @@
 _base_ = [
     '_base_psenet_resnet50_fpnf.py',
-    '../../_base_/det_datasets/ctw1500.py',
-    '../../_base_/textdet_default_runtime.py',
-    '../../_base_/schedules/schedule_adam_step_600e.py',
+    '../_base_/datasets/ctw1500.py',
+    '../_base_/default_runtime.py',
+    '../_base_/schedules/schedule_adam_600e.py',
+]
+
+# optimizer
+optim_wrapper = dict(optimizer=dict(lr=1e-4))
+train_cfg = dict(val_interval=40)
+param_scheduler = [
+    dict(type='MultiStepLR', milestones=[200, 400], end=600),
 ]
 
 # dataset settings

configs/textdet/psenet/psenet_resnet50_fpnf_600e_icdar2015.py

@@ -1,8 +1,15 @@
 _base_ = [
     '_base_psenet_resnet50_fpnf.py',
-    '../../_base_/det_datasets/icdar2015.py',
-    '../../_base_/textdet_default_runtime.py',
-    '../../_base_/schedules/schedule_adam_step_600e.py',
+    '../_base_/datasets/icdar2015.py',
+    '../_base_/default_runtime.py',
+    '../_base_/schedules/schedule_adam_600e.py',
+]
+
+# optimizer
+optim_wrapper = dict(optimizer=dict(lr=1e-4))
+train_cfg = dict(val_interval=40)
+param_scheduler = [
+    dict(type='MultiStepLR', milestones=[200, 400], end=600),
 ]
 
 # dataset settings

configs/textdet/psenet/psenet_resnet50_fpnf_600e_icdar2017.py

@@ -1,13 +1,13 @@
 _base_ = [
     'psenet_resnet50_fpnf_600e_icdar2015.py',
-    '../../_base_/det_datasets/icdar2017.py',
+    '../_base_/datasets/icdar2017.py',
 ]
 
 ic17_det_train = _base_.ic17_det_train
 ic17_det_test = _base_.ic17_det_test
 # use the same pipeline as icdar2015
-ic17_det_train.pipeline = _base_.train_pipeline_icdar2015
-ic17_det_test.pipeline = _base_.test_pipeline_icdar2015
+ic17_det_train.pipeline = _base_.train_pipeline
+ic17_det_test.pipeline = _base_.test_pipeline
 
 train_dataloader = dict(dataset=ic17_det_train)
 val_dataloader = dict(dataset=ic17_det_test)

configs/textdet/textsnake/textsnake_resnet50_fpn-unet_1200e_ctw1500.py

@@ -1,8 +1,8 @@
 _base_ = [
     '_base_textsnake_resnet50_fpn-unet.py',
-    '../../_base_/det_datasets/ctw1500.py',
-    '../../_base_/textdet_default_runtime.py',
-    '../../_base_/schedules/schedule_sgd_1200e.py',
+    '../_base_/datasets/ctw1500.py',
+    '../_base_/default_runtime.py',
+    '../_base_/schedules/schedule_sgd_1200e.py',
 ]
 
 # dataset settings