优化xfund数据集的config_generator命名，使config_generator目录结构更清晰

open-mmlab · Mar 30, 2023 · 443e979 · 443e979
1 parent deb96cc
commit 443e979
Show file tree

Hide file tree

Showing 20 changed files with 208 additions and 213 deletions.
diff --git a/configs/re/_base_/datasets/xfund_zh.py b/configs/re/_base_/datasets/xfund_zh.py
@@ -1,13 +1,13 @@
 xfund_zh_re_data_root = 'data/xfund/zh'
 
 xfund_zh_re_train = dict(
-    type='REDataset',
+    type='XFUNDREDataset',
     data_root=xfund_zh_re_data_root,
     ann_file='re_train.json',
     pipeline=None)
 
 xfund_zh_re_test = dict(
-    type='REDataset',
+    type='XFUNDREDataset',
     data_root=xfund_zh_re_data_root,
     ann_file='re_test.json',
     test_mode=True,

diff --git a/configs/ser/_base_/datasets/xfund_zh.py b/configs/ser/_base_/datasets/xfund_zh.py
@@ -1,13 +1,13 @@
 xfund_zh_ser_data_root = 'data/xfund/zh'
 
 xfund_zh_ser_train = dict(
-    type='SERDataset',
+    type='XFUNDSERDataset',
     data_root=xfund_zh_ser_data_root,
     ann_file='ser_train.json',
     pipeline=None)
 
 xfund_zh_ser_test = dict(
-    type='SERDataset',
+    type='XFUNDSERDataset',
     data_root=xfund_zh_ser_data_root,
     ann_file='ser_test.json',
     test_mode=True,

diff --git a/dataset_zoo/xfund/de/re.py b/dataset_zoo/xfund/de/re.py
@@ -3,4 +3,4 @@
 _base_.train_preparer.packer.type = 'REPacker'
 _base_.test_preparer.packer.type = 'REPacker'
 
-config_generator = dict(type='REConfigGenerator')
+config_generator = dict(type='XFUNDREConfigGenerator')
diff --git a/dataset_zoo/xfund/de/ser.py b/dataset_zoo/xfund/de/ser.py
@@ -57,4 +57,4 @@
 )
 
 delete = ['annotations'] + [f'{lang}_{split}' for split in ['train', 'val']]
-config_generator = dict(type='SERConfigGenerator')
+config_generator = dict(type='XFUNDSERConfigGenerator')
diff --git a/dataset_zoo/xfund/es/re.py b/dataset_zoo/xfund/es/re.py
@@ -3,4 +3,4 @@
 _base_.train_preparer.packer.type = 'REPacker'
 _base_.test_preparer.packer.type = 'REPacker'
 
-config_generator = dict(type='REConfigGenerator')
+config_generator = dict(type='XFUNDREConfigGenerator')
diff --git a/dataset_zoo/xfund/es/ser.py b/dataset_zoo/xfund/es/ser.py
@@ -57,4 +57,4 @@
 )
 
 delete = ['annotations'] + [f'{lang}_{split}' for split in ['train', 'val']]
-config_generator = dict(type='SERConfigGenerator')
+config_generator = dict(type='XFUNDSERConfigGenerator')
diff --git a/dataset_zoo/xfund/fr/re.py b/dataset_zoo/xfund/fr/re.py
@@ -3,4 +3,4 @@
 _base_.train_preparer.packer.type = 'REPacker'
 _base_.test_preparer.packer.type = 'REPacker'
 
-config_generator = dict(type='REConfigGenerator')
+config_generator = dict(type='XFUNDREConfigGenerator')
diff --git a/dataset_zoo/xfund/fr/ser.py b/dataset_zoo/xfund/fr/ser.py
@@ -57,4 +57,4 @@
 )
 
 delete = ['annotations'] + [f'{lang}_{split}' for split in ['train', 'val']]
-config_generator = dict(type='SERConfigGenerator')
+config_generator = dict(type='XFUNDSERConfigGenerator')
diff --git a/dataset_zoo/xfund/it/re.py b/dataset_zoo/xfund/it/re.py
@@ -3,4 +3,4 @@
 _base_.train_preparer.packer.type = 'REPacker'
 _base_.test_preparer.packer.type = 'REPacker'
 
-config_generator = dict(type='REConfigGenerator')
+config_generator = dict(type='XFUNDREConfigGenerator')
diff --git a/dataset_zoo/xfund/it/ser.py b/dataset_zoo/xfund/it/ser.py
@@ -57,4 +57,4 @@
 )
 
 delete = ['annotations'] + [f'{lang}_{split}' for split in ['train', 'val']]
-config_generator = dict(type='SERConfigGenerator')
+config_generator = dict(type='XFUNDSERConfigGenerator')
diff --git a/dataset_zoo/xfund/ja/re.py b/dataset_zoo/xfund/ja/re.py
@@ -3,4 +3,4 @@
 _base_.train_preparer.packer.type = 'REPacker'
 _base_.test_preparer.packer.type = 'REPacker'
 
-config_generator = dict(type='REConfigGenerator')
+config_generator = dict(type='XFUNDREConfigGenerator')
diff --git a/dataset_zoo/xfund/ja/ser.py b/dataset_zoo/xfund/ja/ser.py
@@ -57,4 +57,4 @@
 )
 
 delete = ['annotations'] + [f'{lang}_{split}' for split in ['train', 'val']]
-config_generator = dict(type='SERConfigGenerator')
+config_generator = dict(type='XFUNDSERConfigGenerator')
diff --git a/dataset_zoo/xfund/pt/re.py b/dataset_zoo/xfund/pt/re.py
@@ -3,4 +3,4 @@
 _base_.train_preparer.packer.type = 'REPacker'
 _base_.test_preparer.packer.type = 'REPacker'
 
-config_generator = dict(type='REConfigGenerator')
+config_generator = dict(type='XFUNDREConfigGenerator')
diff --git a/dataset_zoo/xfund/pt/ser.py b/dataset_zoo/xfund/pt/ser.py
@@ -57,4 +57,4 @@
 )
 
 delete = ['annotations'] + [f'{lang}_{split}' for split in ['train', 'val']]
-config_generator = dict(type='SERConfigGenerator')
+config_generator = dict(type='XFUNDSERConfigGenerator')
diff --git a/dataset_zoo/xfund/zh/re.py b/dataset_zoo/xfund/zh/re.py
@@ -3,4 +3,4 @@
 _base_.train_preparer.packer.type = 'REPacker'
 _base_.test_preparer.packer.type = 'REPacker'
 
-config_generator = dict(type='REConfigGenerator')
+config_generator = dict(type='XFUNDREConfigGenerator')
diff --git a/dataset_zoo/xfund/zh/ser.py b/dataset_zoo/xfund/zh/ser.py
@@ -57,4 +57,4 @@
 )
 
 delete = ['annotations'] + [f'{lang}_{split}' for split in ['train', 'val']]
-config_generator = dict(type='SERConfigGenerator')
+config_generator = dict(type='XFUNDSERConfigGenerator')
diff --git a/mmocr/datasets/preparers/config_generators/__init__.py b/mmocr/datasets/preparers/config_generators/__init__.py
@@ -1,13 +1,13 @@
 # Copyright (c) OpenMMLab. All rights reserved.
 from .base import BaseDatasetConfigGenerator
-from .re_config_generator import REConfigGenerator
-from .ser_config_generator import SERConfigGenerator
 from .textdet_config_generator import TextDetConfigGenerator
 from .textrecog_config_generator import TextRecogConfigGenerator
 from .textspotting_config_generator import TextSpottingConfigGenerator
+from .xfund_config_generator import (XFUNDREConfigGenerator,
+                                     XFUNDSERConfigGenerator)
 
 __all__ = [
     'BaseDatasetConfigGenerator', 'TextDetConfigGenerator',
     'TextRecogConfigGenerator', 'TextSpottingConfigGenerator',
-    'SERConfigGenerator', 'REConfigGenerator'
+    'XFUNDSERConfigGenerator', 'XFUNDREConfigGenerator'
 ]
diff --git a/mmocr/datasets/preparers/config_generators/re_config_generator.py b/mmocr/datasets/preparers/config_generators/re_config_generator.py
diff --git a/mmocr/datasets/preparers/config_generators/ser_config_generator.py b/mmocr/datasets/preparers/config_generators/ser_config_generator.py