From b1d1c7f4015780c17a2a32a311950bb8f5efe367 Mon Sep 17 00:00:00 2001 From: Tong Gao Date: Tue, 2 Aug 2022 19:00:44 +0800 Subject: [PATCH] [Fix] Add back some missing fields in configs (#1171) * [Fix] Add back some missing fields in configs * update --- configs/_base_/det_datasets/toy_data.py | 6 ++++-- .../_base_/recog_datasets/ST_SA_MJ_real_train.py | 14 +++++++------- configs/textrecog/satrn/satrn_academic.py | 4 ++-- configs/textrecog/satrn/satrn_small.py | 4 ++-- .../textrecog/seg/seg_r31_1by16_fpnocr_academic.py | 3 ++- .../seg/seg_r31_1by16_fpnocr_toy_dataset.py | 2 +- 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/configs/_base_/det_datasets/toy_data.py b/configs/_base_/det_datasets/toy_data.py index 512d1d20..2e0425d4 100644 --- a/configs/_base_/det_datasets/toy_data.py +++ b/configs/_base_/det_datasets/toy_data.py @@ -15,7 +15,9 @@ train1 = dict( pipeline=None, test_mode=False) -# dataset with type='IcdarDataset' +# dataset with type='IcdarDataset'. +# Cannot be concatenated by 'UniformConcatDataset' and therefore not appended +# to train_list, but left for demonstration. train2 = dict( type='IcdarDataset', ann_file=f'{root}/instances_test.json', @@ -36,6 +38,6 @@ test = dict( pipeline=None, test_mode=True) -train_list = [train1, train2] +train_list = [train1] test_list = [test] diff --git a/configs/_base_/recog_datasets/ST_SA_MJ_real_train.py b/configs/_base_/recog_datasets/ST_SA_MJ_real_train.py index 87dab335..2cd1cea7 100644 --- a/configs/_base_/recog_datasets/ST_SA_MJ_real_train.py +++ b/configs/_base_/recog_datasets/ST_SA_MJ_real_train.py @@ -13,13 +13,13 @@ train_img_prefix6 = f'{train_prefix}/SynthText_Add' train_img_prefix7 = f'{train_prefix}/SynthText' train_img_prefix8 = f'{train_prefix}/Syn90k' -train_ann_file1 = f'{train_prefix}/icdar_2011/train_label.txt', -train_ann_file2 = f'{train_prefix}/icdar_2013/train_label.txt', -train_ann_file3 = f'{train_prefix}/icdar_2015/train_label.txt', -train_ann_file4 = f'{train_prefix}/coco_text/train_label.txt', -train_ann_file5 = f'{train_prefix}/IIIT5K/train_label.txt', -train_ann_file6 = f'{train_prefix}/SynthText_Add/label.txt', -train_ann_file7 = f'{train_prefix}/SynthText/shuffle_labels.txt', +train_ann_file1 = f'{train_prefix}/icdar_2011/train_label.txt' +train_ann_file2 = f'{train_prefix}/icdar_2013/train_label.txt' +train_ann_file3 = f'{train_prefix}/icdar_2015/train_label.txt' +train_ann_file4 = f'{train_prefix}/coco_text/train_label.txt' +train_ann_file5 = f'{train_prefix}/IIIT5K/train_label.txt' +train_ann_file6 = f'{train_prefix}/SynthText_Add/label.txt' +train_ann_file7 = f'{train_prefix}/SynthText/shuffle_labels.txt' train_ann_file8 = f'{train_prefix}/Syn90k/shuffle_labels.txt' train1 = dict( diff --git a/configs/textrecog/satrn/satrn_academic.py b/configs/textrecog/satrn/satrn_academic.py index 00a664e2..49d015a5 100644 --- a/configs/textrecog/satrn/satrn_academic.py +++ b/configs/textrecog/satrn/satrn_academic.py @@ -2,7 +2,8 @@ _base_ = [ '../../_base_/default_runtime.py', '../../_base_/recog_pipelines/satrn_pipeline.py', '../../_base_/recog_datasets/ST_MJ_train.py', - '../../_base_/recog_datasets/academic_test.py' + '../../_base_/recog_datasets/academic_test.py', + '../../_base_/schedules/schedule_adam_step_6e.py', ] train_list = {{_base_.train_list}} @@ -45,7 +46,6 @@ optimizer = dict(type='Adam', lr=3e-4) optimizer_config = dict(grad_clip=None) # learning policy lr_config = dict(policy='step', step=[3, 4]) -total_epochs = 6 data = dict( samples_per_gpu=64, diff --git a/configs/textrecog/satrn/satrn_small.py b/configs/textrecog/satrn/satrn_small.py index 96f86797..805d2eac 100644 --- a/configs/textrecog/satrn/satrn_small.py +++ b/configs/textrecog/satrn/satrn_small.py @@ -2,7 +2,8 @@ _base_ = [ '../../_base_/default_runtime.py', '../../_base_/recog_pipelines/satrn_pipeline.py', '../../_base_/recog_datasets/ST_MJ_train.py', - '../../_base_/recog_datasets/academic_test.py' + '../../_base_/recog_datasets/academic_test.py', + '../../_base_/schedules/schedule_adam_step_6e.py', ] train_list = {{_base_.train_list}} @@ -45,7 +46,6 @@ optimizer = dict(type='Adam', lr=3e-4) optimizer_config = dict(grad_clip=None) # learning policy lr_config = dict(policy='step', step=[3, 4]) -total_epochs = 6 data = dict( samples_per_gpu=64, diff --git a/configs/textrecog/seg/seg_r31_1by16_fpnocr_academic.py b/configs/textrecog/seg/seg_r31_1by16_fpnocr_academic.py index 4e37856c..88edab83 100644 --- a/configs/textrecog/seg/seg_r31_1by16_fpnocr_academic.py +++ b/configs/textrecog/seg/seg_r31_1by16_fpnocr_academic.py @@ -3,7 +3,8 @@ _base_ = [ '../../_base_/recog_pipelines/seg_pipeline.py', '../../_base_/recog_models/seg.py', '../../_base_/recog_datasets/ST_charbox_train.py', - '../../_base_/recog_datasets/academic_test.py' + '../../_base_/recog_datasets/academic_test.py', + '../../_base_/schedules/schedule_adam_step_5e.py' ] train_list = {{_base_.train_list}} diff --git a/configs/textrecog/seg/seg_r31_1by16_fpnocr_toy_dataset.py b/configs/textrecog/seg/seg_r31_1by16_fpnocr_toy_dataset.py index 893bebba..149f5e85 100644 --- a/configs/textrecog/seg/seg_r31_1by16_fpnocr_toy_dataset.py +++ b/configs/textrecog/seg/seg_r31_1by16_fpnocr_toy_dataset.py @@ -3,6 +3,7 @@ _base_ = [ '../../_base_/recog_datasets/seg_toy_data.py', '../../_base_/recog_models/seg.py', '../../_base_/recog_pipelines/seg_pipeline.py', + '../../_base_/schedules/schedule_adam_step_5e.py' ] train_list = {{_base_.train_list}} @@ -16,7 +17,6 @@ optimizer = dict(type='Adam', lr=1e-4) optimizer_config = dict(grad_clip=None) # learning policy lr_config = dict(policy='step', step=[3, 4]) -total_epochs = 5 data = dict( samples_per_gpu=8,