Merge branch 'dygraph' of https://github.com/PaddlePaddle/PaddleOCR into dygraph

3e1db518 · andyjpaddle · 8502f132 · 8f7518cd · 3e1db518 · 3e1db518
8 changed file
--- a/PPOCRLabel/data/gif/kie.gif
+++ b/PPOCRLabel/data/gif/kie.gif
--- a/PPOCRLabel/data/gif/multi-point.gif
+++ b/PPOCRLabel/data/gif/multi-point.gif
--- a/PPOCRLabel/data/gif/steps.gif
+++ b/PPOCRLabel/data/gif/steps.gif
--- a/PPOCRLabel/data/gif/table.gif
+++ b/PPOCRLabel/data/gif/table.gif
--- a/README.md
+++ b/README.md
@@ -26,13 +26,17 @@ PaddleOCR aims to create multilingual, awesome, leading, and practical OCR tools
 </div>

 ## Recent updates
- 2022.5.9 release PaddleOCR v2.5, including:
-    - [PP-OCRv3](./doc/doc_en/ppocr_introduction_en.md#pp-ocrv3): With comparable speed, the effect of Chinese scene is further improved by 5% compared with PP-OCRv2, the effect of English scene is improved by 11%, and the average recognition accuracy of 80 language multilingual models is improved by more than 5%.
-    - [PPOCRLabelv2](./PPOCRLabel): Add the annotation function for table recognition task, key information extraction task and irregular text image.
-    - Interactive e-book [*"Dive into OCR"*](./doc/doc_en/ocr_book_en.md), covers the cutting-edge theory and code practice of OCR full stack technology.
- 2021.12.21 release PaddleOCR v2.4, release 1 text detection algorithm (PSENet), 3 text recognition algorithms (NRTR、SEED、SAR), 1 key information extraction algorithm (SDMGR, [tutorial](./ppstructure/docs/kie_en.md)) and 3 DocVQA algorithms (LayoutLM, LayoutLMv2, LayoutXLM, [tutorial](./ppstructure/vqa)).
- 2021.9.7 release PaddleOCR v2.3, [PP-OCRv2](./doc/doc_en/ppocr_introduction_en.md#pp-ocrv2) is proposed. The inference speed of PP-OCRv2 is 220% higher than that of PP-OCR server in CPU device. The F-score of PP-OCRv2 is 7% higher than that of PP-OCR mobile.
- 2021.8.3 released PaddleOCR v2.2, add a new structured documents analysis toolkit, i.e., [PP-Structure](./ppstructure/README.md), support layout analysis and table recognition (One-key to export chart images to Excel files).
+- **🔥2022.5.9 Release PaddleOCR [release/2.5](https://github.com/PaddlePaddle/PaddleOCR/tree/release/2.5)**
+    - Release [PP-OCRv3](./doc/doc_en/ppocr_introduction_en.md#pp-ocrv3): With comparable speed, the effect of Chinese scene is further improved by 5% compared with PP-OCRv2, the effect of English scene is improved by 11%, and the average recognition accuracy of 80 language multilingual models is improved by more than 5%.
+    - Release [PPOCRLabelv2](./PPOCRLabel): Add the annotation function for table recognition task, key information extraction task and irregular text image.
+    - Release interactive e-book [*"Dive into OCR"*](./doc/doc_en/ocr_book_en.md), covers the cutting-edge theory and code practice of OCR full stack technology.
+- 2021.12.21 Release PaddleOCR [release/2.4](https://github.com/PaddlePaddle/PaddleOCR/tree/release/2.4)
+    - Release 1 text detection algorithm (PSENet), 3 text recognition algorithms (NRTR、SEED、SAR).
+    - Release 1 key information extraction algorithm (SDMGR, [tutorial](./ppstructure/docs/kie_en.md)) and 3 [DocVQA](./ppstructure/vqa) algorithms (LayoutLM, LayoutLMv2, LayoutXLM).
+- 2021.9.7 Release PaddleOCR [release/2.3](https://github.com/PaddlePaddle/PaddleOCR/tree/release/2.3)
+    - Release [PP-OCRv2](./doc/doc_en/ppocr_introduction_en.md#pp-ocrv2). The inference speed of PP-OCRv2 is 220% higher than that of PP-OCR server in CPU device. The F-score of PP-OCRv2 is 7% higher than that of PP-OCR mobile.
+- 2021.8.3 Release PaddleOCR [release/2.2](https://github.com/PaddlePaddle/PaddleOCR/tree/release/2.2)
+    - Release a new structured documents analysis toolkit, i.e., [PP-Structure](./ppstructure/README.md), support layout analysis and table recognition (One-key to export chart images to Excel files).

 - [more](./doc/doc_en/update_en.md)


--- a/README_ch.md
+++ b/README_ch.md
@@ -61,7 +61,7 @@ PaddleOCR旨在打造一套丰富、领先、且实用的OCR工具库，助力
 <a name="开源社区"></a>
 ## 开源社区

- **加入社区👬：**微信扫描二维码并填写问卷之后，加入交流群领取福利
+- **加入社区👬：** 微信扫描二维码并填写问卷之后，加入交流群领取福利
  - **获取5月11-13日每晚20:30《OCR超强技术详解与产业应用实战》的直播课链接**
  - **10G重磅OCR学习大礼包：**《动手学OCR》电子书，配套讲解视频和notebook项目；66篇OCR相关顶会前沿论文打包放送，包括CVPR、AAAI、IJCAI、ICCV等；PaddleOCR历次发版直播课视频；OCR社区优秀开发者项目分享视频。

@@ -87,6 +87,7 @@ PaddleOCR旨在打造一套丰富、领先、且实用的OCR工具库，助力
 更多模型下载（包括多语言），可以参考[PP-OCR 系列模型下载](./doc/doc_ch/models_list.md)，文档分析相关模型参考[PP-Structure 系列模型下载](./ppstructure/docs/models_list.md)


+<a name="文档教程"></a>
 ## 文档教程

 - [运行环境准备](./doc/doc_ch/environment.md)

--- a/doc/doc_ch/ppocr_introduction.md
+++ b/doc/doc_ch/ppocr_introduction.md
@@ -71,38 +71,28 @@ PP-OCRv3系统pipeline如下：
 ## 4. 效果展示 [more](./visualization.md)

 <details open>
-<summary>PP-OCRv2 中文模型</summary>
-
-<div align="center">
-      <img src="../imgs_results/ch_ppocr_mobile_v2.0/test_add_91.jpg" width="800">
-      <img src="../imgs_results/ch_ppocr_mobile_v2.0/00018069.jpg" width="800">
-</div>
+<summary>PP-OCRv3 中文模型</summary>
 <div align="center">
-    <img src="../imgs_results/ch_ppocr_mobile_v2.0/00056221.jpg" width="800">
-    <img src="../imgs_results/ch_ppocr_mobile_v2.0/rotate_00052204.jpg" width="800">
+    <img src="../imgs_results/PP-OCRv3/ch/PP-OCRv3-pic001.jpg" width="800">
+    <img src="../imgs_results/PP-OCRv3/ch/PP-OCRv3-pic002.jpg" width="800">
+    <img src="../imgs_results/PP-OCRv3/ch/PP-OCRv3-pic003.jpg" width="800">
 </div>
-
 </details>

-
 <details open>
-<summary>PP-OCRv2 英文模型</summary>
-
+<summary>PP-OCRv3 英文模型</summary>
 <div align="center">
-    <img src="../imgs_results/ch_ppocr_mobile_v2.0/img_12.jpg" width="800">
+    <img src="../imgs_results/PP-OCRv3/en/en_1.png" width="800">
+    <img src="../imgs_results/PP-OCRv3/en/en_2.png" width="800">
 </div>
-
 </details>

-
 <details open>
-<summary>PP-OCRv2 其他语言模型</summary>
-
+<summary>PP-OCRv3 多语言模型</summary>
 <div align="center">
-    <img src="../imgs_results/french_0.jpg" width="800">
-    <img src="../imgs_results/korean.jpg" width="800">
+    <img src="../imgs_results/PP-OCRv3/multi_lang/japan_2.jpg" width="800">
+    <img src="../imgs_results/PP-OCRv3/multi_lang/korean_1.jpg" width="800">
 </div>
-
 </details>



--- a/doc/doc_en/ppocr_introduction_en.md
+++ b/doc/doc_en/ppocr_introduction_en.md
@@ -67,36 +67,28 @@ For the performance comparison between PP-OCR series models, please check the [b
 ## 4. Visualization [more](./visualization.md)

 <details open>
-<summary>PP-OCRv2 English model</summary>
-
+<summary>PP-OCRv3 Chinese model</summary>
 <div align="center">
-    <img src="../imgs_results/ch_ppocr_mobile_v2.0/img_12.jpg" width="800">
+    <img src="../imgs_results/PP-OCRv3/ch/PP-OCRv3-pic001.jpg" width="800">
+    <img src="../imgs_results/PP-OCRv3/ch/PP-OCRv3-pic002.jpg" width="800">
+    <img src="../imgs_results/PP-OCRv3/ch/PP-OCRv3-pic003.jpg" width="800">
 </div>
-
 </details>

 <details open>
-<summary>PP-OCRv2 Chinese model</summary>
-
-<div align="center">
-      <img src="../imgs_results/ch_ppocr_mobile_v2.0/test_add_91.jpg" width="800">
-      <img src="../imgs_results/ch_ppocr_mobile_v2.0/00018069.jpg" width="800">
-</div>
+<summary>PP-OCRv3 English model</summary>
 <div align="center">
-    <img src="../imgs_results/ch_ppocr_mobile_v2.0/00056221.jpg" width="800">
-    <img src="../imgs_results/ch_ppocr_mobile_v2.0/rotate_00052204.jpg" width="800">
+    <img src="../imgs_results/PP-OCRv3/en/en_1.png" width="800">
+    <img src="../imgs_results/PP-OCRv3/en/en_2.png" width="800">
 </div>
-
 </details>

 <details open>
-<summary>PP-OCRv2 Multilingual model</summary>
-
+<summary>PP-OCRv3 Multilingual model</summary>
 <div align="center">
-    <img src="../imgs_results/french_0.jpg" width="800">
-    <img src="../imgs_results/korean.jpg" width="800">
+    <img src="../imgs_results/PP-OCRv3/multi_lang/japan_2.jpg" width="800">
+    <img src="../imgs_results/PP-OCRv3/multi_lang/korean_1.jpg" width="800">
 </div>
-
 </details>