Merge branch 'dev-1.x' into layoutlm

open-mmlab · Mar 29, 2023 · 9774dd6 · 9774dd6
2 parents 1d0c5e3 + 1c91a98
commit 9774dd6
Show file tree

Hide file tree

Showing 19 changed files with 1,149 additions and 139 deletions.
diff --git a/README.md b/README.md
@@ -42,7 +42,7 @@ English | [简体中文](README_zh-CN.md)
 </div>
 <div align="center">
   <a href="https://openmmlab.medium.com/" style="text-decoration:none;">
-    <img src="https://user-images.githubusercontent.com/25839884/218352562-cdded397-b0f3-4ca1-b8dd-a60df8dca75b.png" width="3%" alt="" /></a>
+    <img src="https://user-images.githubusercontent.com/25839884/219255827-67c1a27f-f8c5-46a9-811d-5e57448c61d1.png" width="3%" alt="" /></a>
   <img src="https://user-images.githubusercontent.com/25839884/218346358-56cc8e2f-a2b8-487f-9088-32480cceabcf.png" width="3%" alt="" />
   <a href="https://discord.gg/raweFPmdzG" style="text-decoration:none;">
     <img src="https://user-images.githubusercontent.com/25839884/218347213-c080267f-cbb6-443e-8532-8e1ed9a58ea9.png" width="3%" alt="" /></a>
@@ -52,6 +52,12 @@ English | [简体中文](README_zh-CN.md)
   <img src="https://user-images.githubusercontent.com/25839884/218346358-56cc8e2f-a2b8-487f-9088-32480cceabcf.png" width="3%" alt="" />
   <a href="https://www.youtube.com/openmmlab" style="text-decoration:none;">
     <img src="https://user-images.githubusercontent.com/25839884/218346691-ceb2116a-465a-40af-8424-9f30d2348ca9.png" width="3%" alt="" /></a>
+  <img src="https://user-images.githubusercontent.com/25839884/218346358-56cc8e2f-a2b8-487f-9088-32480cceabcf.png" width="3%" alt="" />
+  <a href="https://space.bilibili.com/1293512903" style="text-decoration:none;">
+    <img src="https://user-images.githubusercontent.com/25839884/219026751-d7d14cce-a7c9-4e82-9942-8375fca65b99.png" width="3%" alt="" /></a>
+  <img src="https://user-images.githubusercontent.com/25839884/218346358-56cc8e2f-a2b8-487f-9088-32480cceabcf.png" width="3%" alt="" />
+  <a href="https://www.zhihu.com/people/openmmlab" style="text-decoration:none;">
+    <img src="https://user-images.githubusercontent.com/25839884/219026120-ba71e48b-6e94-4bd4-b4e9-b7d175b5e362.png" width="3%" alt="" /></a>
 </div>
 
 ## Latest Updates

diff --git a/README_zh-CN.md b/README_zh-CN.md
@@ -41,6 +41,26 @@
 
 </div>
 
+<div align="center">
+  <a href="https://openmmlab.medium.com/" style="text-decoration:none;">
+    <img src="https://user-images.githubusercontent.com/25839884/219255827-67c1a27f-f8c5-46a9-811d-5e57448c61d1.png" width="3%" alt="" /></a>
+  <img src="https://user-images.githubusercontent.com/25839884/218346358-56cc8e2f-a2b8-487f-9088-32480cceabcf.png" width="3%" alt="" />
+  <a href="https://discord.gg/raweFPmdzG" style="text-decoration:none;">
+    <img src="https://user-images.githubusercontent.com/25839884/218347213-c080267f-cbb6-443e-8532-8e1ed9a58ea9.png" width="3%" alt="" /></a>
+  <img src="https://user-images.githubusercontent.com/25839884/218346358-56cc8e2f-a2b8-487f-9088-32480cceabcf.png" width="3%" alt="" />
+  <a href="https://twitter.com/OpenMMLab" style="text-decoration:none;">
+    <img src="https://user-images.githubusercontent.com/25839884/218346637-d30c8a0f-3eba-4699-8131-512fb06d46db.png" width="3%" alt="" /></a>
+  <img src="https://user-images.githubusercontent.com/25839884/218346358-56cc8e2f-a2b8-487f-9088-32480cceabcf.png" width="3%" alt="" />
+  <a href="https://www.youtube.com/openmmlab" style="text-decoration:none;">
+    <img src="https://user-images.githubusercontent.com/25839884/218346691-ceb2116a-465a-40af-8424-9f30d2348ca9.png" width="3%" alt="" /></a>
+  <img src="https://user-images.githubusercontent.com/25839884/218346358-56cc8e2f-a2b8-487f-9088-32480cceabcf.png" width="3%" alt="" />
+  <a href="https://space.bilibili.com/1293512903" style="text-decoration:none;">
+    <img src="https://user-images.githubusercontent.com/25839884/219026751-d7d14cce-a7c9-4e82-9942-8375fca65b99.png" width="3%" alt="" /></a>
+  <img src="https://user-images.githubusercontent.com/25839884/218346358-56cc8e2f-a2b8-487f-9088-32480cceabcf.png" width="3%" alt="" />
+  <a href="https://www.zhihu.com/people/openmmlab" style="text-decoration:none;">
+    <img src="https://user-images.githubusercontent.com/25839884/219026120-ba71e48b-6e94-4bd4-b4e9-b7d175b5e362.png" width="3%" alt="" /></a>
+</div>
+
 ## 近期更新
 
 **默认分支已经从 `main` 切换到 `1.x`。我们鼓励用户迁移到最新版本，请参考 [迁移指南](https://mmocr.readthedocs.io/zh_CN/dev-1.x/migration/overview.html) 以了解更多细节。**

diff --git a/configs/textdet/_base_/datasets/ctw1500.py b/configs/textdet/_base_/datasets/ctw1500.py
@@ -1,17 +1,15 @@
-ctw1500_textdet_data_root = 'data/det/ctw1500'
+ctw1500_textdet_data_root = 'data/ctw1500'
 
 ctw1500_textdet_train = dict(
     type='OCRDataset',
     data_root=ctw1500_textdet_data_root,
-    ann_file='instances_training.json',
-    data_prefix=dict(img_path='imgs/'),
+    ann_file='textdet_train.json',
     filter_cfg=dict(filter_empty_gt=True, min_size=32),
     pipeline=None)
 
 ctw1500_textdet_test = dict(
     type='OCRDataset',
     data_root=ctw1500_textdet_data_root,
-    ann_file='instances_test.json',
-    data_prefix=dict(img_path='imgs/'),
+    ann_file='textdet_test.json',
     test_mode=True,
     pipeline=None)
diff --git a/configs/textrecog/_base_/datasets/mjsynth.py b/configs/textrecog/_base_/datasets/mjsynth.py
@@ -5,3 +5,9 @@
     data_root=mjsynth_textrecog_data_root,
     ann_file='textrecog_train.json',
     pipeline=None)
+
+mjsynth_sub_textrecog_train = dict(
+    type='OCRDataset',
+    data_root=mjsynth_textrecog_data_root,
+    ann_file='subset_textrecog_train.json',
+    pipeline=None)
diff --git a/configs/textrecog/abinet/_base_abinet-vision.py b/configs/textrecog/abinet/_base_abinet-vision.py
@@ -80,7 +80,7 @@
                 type='mmdet.Albu',
                 transforms=[
                     dict(type='GaussNoise', var_limit=(20, 20), p=0.5),
-                    dict(type='MotionBlur', blur_limit=6, p=0.5),
+                    dict(type='MotionBlur', blur_limit=7, p=0.5),
                 ]),
         ]),
     dict(

diff --git a/dataset_zoo/mjsynth/textrecog.py b/dataset_zoo/mjsynth/textrecog.py
@@ -23,12 +23,19 @@
                         'annotations/annotation.txt'
                     ]
                 ]),
+            dict(
+                url='https://download.openmmlab.com/mmocr/data/1.x/recog/'
+                'Syn90k/subset_textrecog_train.json',
+                save_name='subset_textrecog_train.json',
+                md5='ba958d87bb170980f39e194180c15b9e',
+                split=['train'],
+                content=['annotation'])
         ]),
     gatherer=dict(type='MonoGatherer', ann_name='annotation.txt'),
     parser=dict(
-        type='ICDARTxtTextRecogAnnParser',
+        type='MJSynthAnnParser',
         separator=' ',
-        format='img text',
+        format='img num',
         remove_strs=None),
     packer=dict(type='TextRecogPacker'),
     dumper=dict(type='JsonDumper'),
@@ -37,4 +44,10 @@
 delete = ['mjsynth', 'annotations']
 
 config_generator = dict(
-    type='TextRecogConfigGenerator', data_root=data_root, test_anns=None)
+    type='TextRecogConfigGenerator',
+    data_root=data_root,
+    train_anns=[
+        dict(ann_file='textrecog_train.json', dataset_postfix=''),
+        dict(ann_file='subset_textrecog_train.json', dataset_postfix='sub'),
+    ],
+    test_anns=None)
diff --git a/dataset_zoo/synthtext/textrecog.py b/dataset_zoo/synthtext/textrecog.py
@@ -27,4 +27,5 @@
         dict(
             ann_file='alphanumeric_textrecog_train.json',
             dataset_postfix='an'),
-    ])
+    ],
+    test_anns=None)