Skip to content

Commit d8c0df4

Browse files
authored
[Config] rename base dataset terms to {dataset-name}_task_train/test (#1541)
1 parent b8e395e commit d8c0df4

File tree

53 files changed

+291
-275
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+291
-275
lines changed

configs/textdet/_base_/datasets/ctw1500.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
ctw_det_data_root = 'data/det/ctw1500'
1+
ctw1500_textdet_data_root = 'data/det/ctw1500'
22

3-
ctw_det_train = dict(
3+
ctw1500_textdet_train = dict(
44
type='OCRDataset',
5-
data_root=ctw_det_data_root,
5+
data_root=ctw1500_textdet_data_root,
66
ann_file='instances_training.json',
77
data_prefix=dict(img_path='imgs/'),
88
filter_cfg=dict(filter_empty_gt=True, min_size=32),
99
pipeline=None)
1010

11-
ctw_det_test = dict(
11+
ctw1500_textdet_test = dict(
1212
type='OCRDataset',
13-
data_root=ctw_det_data_root,
13+
data_root=ctw1500_textdet_data_root,
1414
ann_file='instances_test.json',
1515
data_prefix=dict(img_path='imgs/'),
1616
test_mode=True,

configs/textdet/_base_/datasets/icdar2015.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
ic15_det_data_root = 'data/det/icdar2015'
1+
icdar2015_textdet_data_root = 'data/det/icdar2015'
22

3-
ic15_det_train = dict(
3+
icdar2015_textdet_train = dict(
44
type='OCRDataset',
5-
data_root=ic15_det_data_root,
5+
data_root=icdar2015_textdet_data_root,
66
ann_file='instances_training.json',
77
data_prefix=dict(img_path='imgs/'),
88
filter_cfg=dict(filter_empty_gt=True, min_size=32),
99
pipeline=None)
1010

11-
ic15_det_test = dict(
11+
icdar2015_textdet_test = dict(
1212
type='OCRDataset',
13-
data_root=ic15_det_data_root,
13+
data_root=icdar2015_textdet_data_root,
1414
ann_file='instances_test.json',
1515
data_prefix=dict(img_path='imgs/'),
1616
test_mode=True,

configs/textdet/_base_/datasets/icdar2017.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
ic17_det_data_root = 'data/det/icdar_2017'
1+
icdar2017_textdet_data_root = 'data/det/icdar_2017'
22

3-
ic17_det_train = dict(
3+
icdar2017_textdet_train = dict(
44
type='OCRDataset',
5-
data_root=ic17_det_data_root,
5+
data_root=icdar2017_textdet_data_root,
66
ann_file='instances_training.json',
77
data_prefix=dict(img_path='imgs/'),
88
filter_cfg=dict(filter_empty_gt=True, min_size=32),
99
pipeline=None)
1010

11-
ic17_det_test = dict(
11+
icdar2017_textdet_test = dict(
1212
type='OCRDataset',
13-
data_root=ic17_det_data_root,
13+
data_root=icdar2017_textdet_data_root,
1414
ann_file='instances_test.json',
1515
data_prefix=dict(img_path='imgs/'),
1616
test_mode=True,

configs/textdet/_base_/datasets/synthtext.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
st_det_data_root = 'data/det/synthtext'
1+
synthtext_textdet_data_root = 'data/det/synthtext'
22

3-
st_det_train = dict(
3+
synthtext_textdet_train = dict(
44
type='OCRDataset',
5-
data_root=st_det_data_root,
5+
data_root=synthtext_textdet_data_root,
66
ann_file='instances_training.json',
77
data_prefix=dict(img_path='imgs/'),
88
filter_cfg=dict(filter_empty_gt=True, min_size=32),
99
pipeline=None)
1010

11-
st_det_test = dict(
11+
synthtext_textdet_test = dict(
1212
type='OCRDataset',
13-
data_root=st_det_data_root,
13+
data_root=synthtext_textdet_data_root,
1414
ann_file='instances_test.json',
1515
data_prefix=dict(img_path='imgs/'),
1616
test_mode=True,
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
tt_det_data_root = 'data/totaltext'
1+
totaltext_textdet_data_root = 'data/totaltext'
22

3-
tt_det_train = dict(
3+
totaltext_textdet_train = dict(
44
type='OCRDataset',
5-
data_root=tt_det_data_root,
5+
data_root=totaltext_textdet_data_root,
66
ann_file='textdet_train.json',
77
filter_cfg=dict(filter_empty_gt=True, min_size=32),
88
pipeline=None)
99

10-
tt_det_test = dict(
10+
totaltext_textdet_test = dict(
1111
type='OCRDataset',
12-
data_root=tt_det_data_root,
12+
data_root=totaltext_textdet_data_root,
1313
ann_file='textdet_test.json',
1414
test_mode=True,
1515
pipeline=None)

configs/textdet/dbnet/dbnet_resnet18_fpnc_100k_synthtext.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,24 @@
66
]
77

88
# dataset settings
9-
st_det_train = _base_.st_det_train
10-
st_det_train.pipeline = _base_.train_pipeline
11-
st_det_test = _base_.st_det_test
12-
st_det_test.pipeline = _base_.test_pipeline
9+
synthtext_textdet_train = _base_.synthtext_textdet_train
10+
synthtext_textdet_train.pipeline = _base_.train_pipeline
11+
synthtext_textdet_test = _base_.synthtext_textdet_test
12+
synthtext_textdet_test.pipeline = _base_.test_pipeline
1313

1414
train_dataloader = dict(
1515
batch_size=16,
1616
num_workers=8,
1717
persistent_workers=True,
1818
sampler=dict(type='DefaultSampler', shuffle=True),
19-
dataset=st_det_train)
19+
dataset=synthtext_textdet_train)
2020

2121
val_dataloader = dict(
2222
batch_size=1,
2323
num_workers=4,
2424
persistent_workers=True,
2525
sampler=dict(type='DefaultSampler', shuffle=False),
26-
dataset=st_det_test)
26+
dataset=synthtext_textdet_test)
2727

2828
test_dataloader = val_dataloader
2929

configs/textdet/dbnet/dbnet_resnet18_fpnc_1200e_icdar2015.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,24 @@
66
]
77

88
# dataset settings
9-
ic15_det_train = _base_.ic15_det_train
10-
ic15_det_train.pipeline = _base_.train_pipeline
11-
ic15_det_test = _base_.ic15_det_test
12-
ic15_det_test.pipeline = _base_.test_pipeline
9+
icdar2015_textdet_train = _base_.icdar2015_textdet_train
10+
icdar2015_textdet_train.pipeline = _base_.train_pipeline
11+
icdar2015_textdet_test = _base_.icdar2015_textdet_test
12+
icdar2015_textdet_test.pipeline = _base_.test_pipeline
1313

1414
train_dataloader = dict(
1515
batch_size=16,
1616
num_workers=8,
1717
persistent_workers=True,
1818
sampler=dict(type='DefaultSampler', shuffle=True),
19-
dataset=ic15_det_train)
19+
dataset=icdar2015_textdet_train)
2020

2121
val_dataloader = dict(
2222
batch_size=1,
2323
num_workers=4,
2424
persistent_workers=True,
2525
sampler=dict(type='DefaultSampler', shuffle=False),
26-
dataset=ic15_det_test)
26+
dataset=icdar2015_textdet_test)
2727

2828
test_dataloader = val_dataloader
2929

configs/textdet/dbnet/dbnet_resnet50-dcnv2_fpnc_100k_synthtext.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,24 @@
66
]
77

88
# dataset settings
9-
st_det_train = _base_.st_det_train
10-
st_det_train.pipeline = _base_.train_pipeline
11-
st_det_test = _base_.st_det_test
12-
st_det_test.pipeline = _base_.test_pipeline
9+
synthtext_textdet_train = _base_.synthtext_textdet_train
10+
synthtext_textdet_train.pipeline = _base_.train_pipeline
11+
synthtext_textdet_test = _base_.synthtext_textdet_test
12+
synthtext_textdet_test.pipeline = _base_.test_pipeline
1313

1414
train_dataloader = dict(
1515
batch_size=16,
1616
num_workers=8,
1717
persistent_workers=True,
1818
sampler=dict(type='DefaultSampler', shuffle=True),
19-
dataset=st_det_train)
19+
dataset=synthtext_textdet_train)
2020

2121
val_dataloader = dict(
2222
batch_size=1,
2323
num_workers=4,
2424
persistent_workers=True,
2525
sampler=dict(type='DefaultSampler', shuffle=False),
26-
dataset=st_det_test)
26+
dataset=synthtext_textdet_test)
2727

2828
test_dataloader = val_dataloader
2929

configs/textdet/dbnet/dbnet_resnet50-dcnv2_fpnc_1200e_icdar2015.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,24 @@
99
load_from = 'https://download.openmmlab.com/mmocr/textdet/dbnet/tmp_1.0_pretrain/dbnet_r50dcnv2_fpnc_sbn_2e_synthtext_20210325-ed322016.pth' # noqa
1010

1111
# dataset settings
12-
ic15_det_train = _base_.ic15_det_train
13-
ic15_det_train.pipeline = _base_.train_pipeline
14-
ic15_det_test = _base_.ic15_det_test
15-
ic15_det_test.pipeline = _base_.test_pipeline
12+
icdar2015_textdet_train = _base_.icdar2015_textdet_train
13+
icdar2015_textdet_train.pipeline = _base_.train_pipeline
14+
icdar2015_textdet_test = _base_.icdar2015_textdet_test
15+
icdar2015_textdet_test.pipeline = _base_.test_pipeline
1616

1717
train_dataloader = dict(
1818
batch_size=16,
1919
num_workers=8,
2020
persistent_workers=True,
2121
sampler=dict(type='DefaultSampler', shuffle=True),
22-
dataset=ic15_det_train)
22+
dataset=icdar2015_textdet_train)
2323

2424
val_dataloader = dict(
2525
batch_size=1,
2626
num_workers=4,
2727
persistent_workers=True,
2828
sampler=dict(type='DefaultSampler', shuffle=False),
29-
dataset=ic15_det_test)
29+
dataset=icdar2015_textdet_test)
3030

3131
test_dataloader = val_dataloader
3232

configs/textdet/dbnetpp/dbnetpp_resnet50-dcnv2_fpnc_100k_synthtext.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
]
77

88
# dataset settings
9-
train_list = [_base_.st_det_train]
10-
test_list = [_base_.st_det_test]
9+
train_list = [_base_.synthtext_textdet_train]
10+
test_list = [_base_.synthtext_textdet_test]
1111

1212
train_dataloader = dict(
1313
batch_size=16,

configs/textdet/dbnetpp/dbnetpp_resnet50-dcnv2_fpnc_1200e_icdar2015.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
load_from = 'https://download.openmmlab.com/mmocr/textdet/dbnetpp/tmp_1.0_pretrain/dbnetpp_r50dcnv2_fpnc_100k_iter_synthtext-20220502-352fec8a.pth' # noqa
99

1010
# dataset settings
11-
train_list = [_base_.ic15_det_train]
12-
test_list = [_base_.ic15_det_test]
11+
train_list = [_base_.icdar2015_textdet_train]
12+
test_list = [_base_.icdar2015_textdet_test]
1313

1414
train_dataloader = dict(
1515
batch_size=16,

configs/textdet/drrg/drrg_resnet50_fpn-unet_1200e_ctw1500.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,24 @@
66
]
77

88
# dataset settings
9-
ctw_det_train = _base_.ctw_det_train
10-
ctw_det_train.pipeline = _base_.train_pipeline
11-
ctw_det_test = _base_.ctw_det_test
12-
ctw_det_test.pipeline = _base_.test_pipeline
9+
ctw1500_textdet_train = _base_.ctw1500_textdet_train
10+
ctw1500_textdet_train.pipeline = _base_.train_pipeline
11+
ctw1500_textdet_test = _base_.ctw1500_textdet_test
12+
ctw1500_textdet_test.pipeline = _base_.test_pipeline
1313

1414
train_dataloader = dict(
1515
batch_size=4,
1616
num_workers=4,
1717
persistent_workers=True,
1818
sampler=dict(type='DefaultSampler', shuffle=True),
19-
dataset=ctw_det_train)
19+
dataset=ctw1500_textdet_train)
2020

2121
val_dataloader = dict(
2222
batch_size=1,
2323
num_workers=1,
2424
persistent_workers=True,
2525
sampler=dict(type='DefaultSampler', shuffle=False),
26-
dataset=ctw_det_test)
26+
dataset=ctw1500_textdet_test)
2727

2828
test_dataloader = val_dataloader
2929

configs/textdet/fcenet/fcenet_resnet50-dcnv2_fpn_1500e_ctw1500.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
file_client_args = dict(backend='disk')
1616
# dataset settings
17-
ctw_det_train = _base_.ctw_det_train
18-
ctw_det_test = _base_.ctw_det_test
17+
ctw1500_textdet_train = _base_.ctw1500_textdet_train
18+
ctw1500_textdet_test = _base_.ctw1500_textdet_test
1919

2020
# test pipeline for CTW1500
2121
ctw_test_pipeline = [
@@ -36,22 +36,22 @@
3636
meta_keys=('img_path', 'ori_shape', 'img_shape', 'scale_factor'))
3737
]
3838

39-
ctw_det_train.pipeline = _base_.train_pipeline
40-
ctw_det_test.pipeline = ctw_test_pipeline
39+
ctw1500_textdet_train.pipeline = _base_.train_pipeline
40+
ctw1500_textdet_test.pipeline = ctw_test_pipeline
4141

4242
train_dataloader = dict(
4343
batch_size=8,
4444
num_workers=4,
4545
persistent_workers=True,
4646
sampler=dict(type='DefaultSampler', shuffle=True),
47-
dataset=ctw_det_train)
47+
dataset=ctw1500_textdet_train)
4848

4949
val_dataloader = dict(
5050
batch_size=1,
5151
num_workers=1,
5252
persistent_workers=True,
5353
sampler=dict(type='DefaultSampler', shuffle=False),
54-
dataset=ctw_det_test)
54+
dataset=ctw1500_textdet_test)
5555

5656
test_dataloader = val_dataloader
5757

configs/textdet/fcenet/fcenet_resnet50_fpn_1500e_icdar2015.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,24 @@
1313
]
1414

1515
# dataset settings
16-
ic15_det_train = _base_.ic15_det_train
17-
ic15_det_test = _base_.ic15_det_test
18-
ic15_det_train.pipeline = _base_.train_pipeline
19-
ic15_det_test.pipeline = _base_.test_pipeline
16+
icdar2015_textdet_train = _base_.icdar2015_textdet_train
17+
icdar2015_textdet_test = _base_.icdar2015_textdet_test
18+
icdar2015_textdet_train.pipeline = _base_.train_pipeline
19+
icdar2015_textdet_test.pipeline = _base_.test_pipeline
2020

2121
train_dataloader = dict(
2222
batch_size=8,
2323
num_workers=4,
2424
persistent_workers=True,
2525
sampler=dict(type='DefaultSampler', shuffle=True),
26-
dataset=ic15_det_train)
26+
dataset=icdar2015_textdet_train)
2727

2828
val_dataloader = dict(
2929
batch_size=1,
3030
num_workers=1,
3131
persistent_workers=True,
3232
sampler=dict(type='DefaultSampler', shuffle=False),
33-
dataset=ic15_det_test)
33+
dataset=icdar2015_textdet_test)
3434

3535
test_dataloader = val_dataloader
3636

configs/textdet/maskrcnn/mask-rcnn_resnet50_fpn_160e_ctw1500.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
]
1616

1717
# dataset settings
18-
ctw_det_train = _base_.ctw_det_train
19-
ctw_det_test = _base_.ctw_det_test
18+
ctw1500_textdet_train = _base_.ctw1500_textdet_train
19+
ctw1500_textdet_test = _base_.ctw1500_textdet_test
2020

2121
# test pipeline for CTW1500
2222
ctw_test_pipeline = [
@@ -37,22 +37,22 @@
3737
meta_keys=('img_path', 'ori_shape', 'img_shape', 'scale_factor'))
3838
]
3939

40-
ctw_det_train.pipeline = _base_.train_pipeline
41-
ctw_det_test.pipeline = ctw_test_pipeline
40+
ctw1500_textdet_train.pipeline = _base_.train_pipeline
41+
ctw1500_textdet_test.pipeline = ctw_test_pipeline
4242

4343
train_dataloader = dict(
4444
batch_size=8,
4545
num_workers=4,
4646
persistent_workers=True,
4747
sampler=dict(type='DefaultSampler', shuffle=True),
48-
dataset=ctw_det_train)
48+
dataset=ctw1500_textdet_train)
4949

5050
val_dataloader = dict(
5151
batch_size=1,
5252
num_workers=1,
5353
persistent_workers=True,
5454
sampler=dict(type='DefaultSampler', shuffle=False),
55-
dataset=ctw_det_test)
55+
dataset=ctw1500_textdet_test)
5656

5757
test_dataloader = val_dataloader
5858

0 commit comments

Comments
 (0)