merge main branch to release/3.3 branch (#16878)

* polish (#16665)

* polish (#16667)

* polish (#16670)

* polish (#16676)

* use FlashAttention 2.8.2 (#16689)

* polish (#16690)

* update docs (#16688)

* update docs

* add methods

* adding frigate to awesome_projects.md (#16659)

Frigate is a real-time NVR system that uses PaddleOCR for License Plate Recognition (LPR).

Co-authored-by: AmirHossein_Omidi <[email protected]>

* update PaddleOCR-VL paper url (#16696)

* update PaddleOCR-VL paper url

* polish README

* update doc (#16700)

* [doc] add hareware support (#16725)

* Add hardware support

* Add hardware support

* fix

* update

* update

* 109 langs dos (#16718)

* fix invalid link in doc (#16719)

* fix conflict

* fix doc2

* update fqa (#16716)

* update fqa

* Update PaddleOCR-VL.en.md

* Update PaddleOCR-VL.en.md

* Update PaddleOCR-VL.en.md

* Update PaddleOCR-VL.md

* support cinn flag (#16745)

* docs: fix_doc1 (#16752)

* Parse all local OCR result batches instead of only the first (#16756)

Signed-off-by: Adler Fleurant <[email protected]>

* [ILUVATAR_GPU] Support for iluvatar_gpu (#16518)

* docs: fix valid link in doc1022 (#16812)

* fix_doc

* fix_doc

* update readme (#16861)

* update readme

* fix code-style for readme

* [Docs] Optimize docs for deployment of PaddleOCR-VL (#16808)

* Optimize docs for deployment of PaddleOCR-VL

* Update docs

* Fix not-using-doc-prepeocessor bug

* Update dockerfiles and docs

* Add SFT

* Fix code style

* Add PaddleOCR-VL-0.9B model into offline pipeline image

* Support Windows

* Add lower bound for paddleocr version

* Revert windows and paddle 3.2.1

* Support setting paddleocr version

* Fix typo

* Update docker image sizes

* Fix bug

* Fix doc

---------

Signed-off-by: Adler Fleurant <[email protected]>
Co-authored-by: Tingquan Gao <[email protected]>
Co-authored-by: zhang-prog <[email protected]>
Co-authored-by: Sunflower7788 <[email protected]>
Co-authored-by: AmirHossein_Omidi <[email protected]>
Co-authored-by: AmirHossein_Omidi <[email protected]>
Co-authored-by: changdazhou <[email protected]>
Co-authored-by: liuhongen1234567 <[email protected]>
Co-authored-by: Zx <[email protected]>
Co-authored-by: Adler Fleurant <[email protected]>
Co-authored-by: tianyuzhou668 <[email protected]>
Co-authored-by: Lin Manhui <[email protected]>

Author: 11 people

README.md

@@ -26,4 +26,5 @@
 | [PaddleSharp](https://github.com/sdcb/PaddleSharp) <a href="https://github.com/sdcb/PaddleSharp"><img src="https://img.shields.io/github/stars/sdcb/PaddleSharp"></a>|.NET/C# binding for Baidu paddle inference library and PaddleOCR |
 | [python-office](https://github.com/CoderWanFeng/python-office) <a href="https://github.com/CoderWanFeng/python-office"><img src="https://img.shields.io/github/stars/CoderWanFeng/python-office"></a> | Python tool for office works. |
 | [OnnxOCR](https://github.com/jingsongliujing/OnnxOCR) <a href="https://github.com/jingsongliujing/OnnxOCR"><img src="https://img.shields.io/github/stars/jingsongliujing/OnnxOCR"></a>|A lightweight OCR system based on PaddleOCR, decoupled from the PaddlePaddle deep learning training framework, with ultra-fast inference speed |
+| [Frigate](https://github.com/blakeblackshear/frigate) <a href="https://github.com/blakeblackshear/frigate"><img src="https://img.shields.io/github/stars/blakeblackshear/frigate"></a> | Real-time NVR system with AI-powered object detection and License Plate Recognition (LPR) using PaddleOCR. |
 | ... |... |

awesome_projects.md

@@ -113,7 +113,7 @@ python3 ./convert_image.py path/to/image
 Model description
 -----------------
 
-The example is built on [PP-OCRv3](https://github.com/PaddlePaddle/PaddleOCR/blob/dygraph/doc/doc_ch/PP-OCRv3_introduction.md) English recognition model released by [PaddleOCR](https://github.com/PaddlePaddle/PaddleOCR). Since Arm(R) Cortex(R)-M55 CPU does not support rnn operator, we delete the unsupported operator based on the PP-OCRv3 text recognition model to obtain the current 2.7M English recognition model.
+The example is built on [PP-OCRv3](https://github.com/PaddlePaddle/PaddleOCR/blob/main/docs/version2.x/ppocr/blog/PP-OCRv3_introduction.md) English recognition model released by [PaddleOCR](https://github.com/PaddlePaddle/PaddleOCR). Since Arm(R) Cortex(R)-M55 CPU does not support rnn operator, we delete the unsupported operator based on the PP-OCRv3 text recognition model to obtain the current 2.7M English recognition model.
 
 PP-OCRv3 is the third version of the PP-OCR series model. This series of models has the following features:
 

deploy/avh/README.md

@@ -28,7 +28,7 @@
 
 在非docker环境中，需要手动安装如下依赖项:
 
-- 软件可通过[安装脚本](https://github.com/apache/tvm/blob/main/docker/install/ubuntu_install_ethosu_driver_stack.sh)一键安装
+- 软件可通过[安装脚本](https://github.com/apache/tvm/blob/v0.9.0/docker/install/ubuntu_install_ethosu_driver_stack.sh)一键安装
   - [Fixed Virtual Platform (FVP) based on Arm(R) Corstone(TM)-300 software](https://developer.arm.com/tools-and-software/open-source-software/arm-platforms-software/arm-ecosystem-fvps)
   - [cmake 3.19.5](https://github.com/Kitware/CMake/releases/)
   - [GCC toolchain from Arm(R)](https://developer.arm.com/-/media/Files/downloads/gnu-rm/10-2020q4/gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2)
@@ -86,7 +86,7 @@ export PATH=/opt/arm/FVP_Corstone_SSE-300/models/Linux64_GCC-6.4:/opt/arm/cmake/
 模型描述
 -----------------
 
-在这个demo中，我们使用的模型是基于[PP-OCRv3](https://github.com/PaddlePaddle/PaddleOCR/blob/dygraph/doc/doc_ch/PP-OCRv3_introduction.md)的英文识别模型。由于Arm(R) Cortex(R)-M55 CPU不支持rnn算子，我们在PP-OCRv3原始文本识别模型的基础上进行适配，最终模型大小为2.7M。
+在这个demo中，我们使用的模型是基于[PP-OCRv3](https://github.com/PaddlePaddle/PaddleOCR/blob/main/docs/version2.x/ppocr/blog/PP-OCRv3_introduction.md)的英文识别模型。由于Arm(R) Cortex(R)-M55 CPU不支持rnn算子，我们在PP-OCRv3原始文本识别模型的基础上进行适配，最终模型大小为2.7M。
 
 PP-OCRv3是[PaddleOCR](https://github.com/PaddlePaddle/PaddleOCR)发布的PP-OCR系列模型的第三个版本，该系列模型具有以下特点：
    - 超轻量级OCR系统：检测（3.6M）+方向分类器（1.4M）+识别（12M）=17.0M。

deploy/avh/README_ch.md

@@ -71,7 +71,7 @@ pip3 install paddlehub==2.1.0 --upgrade -i https://mirror.baidu.com/pypi/simple
 
 **模型路径可在`params.py`中查看和修改。**
 
-更多模型可以从PaddleOCR提供的模型库[PP-OCR](../../doc/doc_ch/models_list.md)和[PP-Structure](../../ppstructure/docs/models_list.md)下载，也可以替换成自己训练转换好的模型。
+更多模型可以从PaddleOCR提供的模型库[PP-OCR](../../docs/version2.x/ppstructure/models_list.md)和[PP-Structure](../../docs/version2.x/ppstructure/models_list.en.md)下载，也可以替换成自己训练转换好的模型。
 
 ### 2.3 安装服务模块
 PaddleOCR提供5种服务模块，根据需要安装所需模块。

deploy/hubserving/readme.md

@@ -69,7 +69,7 @@ Before installing the service module, you need to prepare the inference model an
 | KIE(SER+RE) | ./inference/re_vi_layoutxlm_xfund_infer/ |
 
 **The model path can be found and modified in `params.py`.**
-More models provided by PaddleOCR can be obtained from the [model library](../../doc/doc_en/models_list_en.md). You can also use models trained by yourself.
+More models provided by PaddleOCR can be obtained from the [model library](../../docs/version2.x/ppocr/model_list.en.md). You can also use models trained by yourself.
 
 ### 2.3 Install Service Module
 PaddleOCR provides 5 kinds of service modules, install the required modules according to your needs.

deploy/hubserving/readme_en.md

@@ -27,9 +27,9 @@ Supports multiple development environments.
 
 For the compilation process of different development environments, please refer to the corresponding documents.
 
-1. [Docker](https://paddle-lite.readthedocs.io/zh/latest/source_compile/compile_env.html#docker)
-2. [Linux](https://paddle-lite.readthedocs.io/zh/latest/source_compile/compile_env.html#linux)
-3. [MAC OS](https://paddle-lite.readthedocs.io/zh/latest/source_compile/compile_env.html#mac-os)
+1. [Docker](https://paddle-lite-pjc.readthedocs.io/zh/latest/user_guides/source_compile.html#docker)
+2. [Linux](https://paddle-lite-pjc.readthedocs.io/zh/latest/user_guides/source_compile.html#linux)
+3. [MAC OS](https://paddle-lite-pjc.readthedocs.io/zh/latest/user_guides/source_compile.html#mac-os)
 
 ### 1.2 Prepare Paddle-Lite library
 
@@ -56,7 +56,7 @@ git checkout release/v2.10
 
 Note: When compiling Paddle-Lite to obtain the Paddle-Lite library, you need to turn on the two options `--with_cv=ON --with_extra=ON`, `--arch` means the `arm` version, here is designated as armv8,
 
-More compilation commands refer to the introduction [link](https://paddle-lite.readthedocs.io/zh/release-v2.10_a/source_compile/linux_x86_compile_android.html) 。
+More compilation commands refer to the introduction [link](https://paddle-lite-pjc.readthedocs.io/zh/latest/user_guides/source_compile.html#paddlelite) 。
 
 After directly downloading the Paddle-Lite library and decompressing it, you can get the `inference_lite_lib.android.armv8/` folder, and the Paddle-Lite library obtained by compiling Paddle-Lite is located
 `Paddle-Lite/build.lite.android.armv8.gcc/inference_lite_lib.android.armv8/` folder.

deploy/lite/readme.md

@@ -25,9 +25,9 @@ Paddle Lite是飞桨轻量化推理引擎，为手机、IOT端提供高效推理
 交叉编译环境用于编译 Paddle Lite 和 PaddleOCR 的C++ demo。
 支持多种开发环境，不同开发环境的编译流程请参考对应文档。
 
-1. [Docker](https://paddle-lite.readthedocs.io/zh/latest/source_compile/compile_env.html#docker)
-2. [Linux](https://paddle-lite.readthedocs.io/zh/latest/source_compile/compile_env.html#linux)
-3. [MAC OS](https://paddle-lite.readthedocs.io/zh/latest/source_compile/compile_env.html#mac-os)
+1. [Docker](https://paddle-lite-pjc.readthedocs.io/zh/latest/user_guides/source_compile.html#docker)
+2. [Linux](https://paddle-lite-pjc.readthedocs.io/zh/latest/user_guides/source_compile.html#linux)
+3. [MAC OS](https://paddle-lite-pjc.readthedocs.io/zh/latest/user_guides/source_compile.html#mac-os)
 
 ### 1.2 准备预测库
 
@@ -54,7 +54,7 @@ git checkout release/v2.10
 
 注意：编译Paddle-Lite获得预测库时，需要打开`--with_cv=ON --with_extra=ON`两个选项，`--arch`表示`arm`版本，这里指定为armv8，
 更多编译命令
-介绍请参考 [链接](https://paddle-lite.readthedocs.io/zh/release-v2.10_a/source_compile/linux_x86_compile_android.html) 。
+介绍请参考 [链接](https://paddle-lite-pjc.readthedocs.io/zh/latest/user_guides/source_compile.html#paddlelite) 。
 
 直接下载预测库并解压后，可以得到`inference_lite_lib.android.armv8/`文件夹，通过编译Paddle-Lite得到的预测库位于
 `Paddle-Lite/build.lite.android.armv8.gcc/inference_lite_lib.android.armv8/`文件夹下。

deploy/lite/readme_ch.md

@@ -122,13 +122,13 @@ After executing the command, the predicted identification information will be pr
 ONNXRuntime result：
 
 <div align="center">
-    <img src="../../doc/imgs_results/multi_lang/img_12.jpg" width=800">
+    <img src="../../docs/version2.x/ppocr/images/multi_lang/img_12.jpg" width=800">
 </div>
 
 Paddle Inference result：
 
 <div align="center">
-    <img src="../../doc/imgs_results/multi_lang/img_12.jpg" width=800">
+    <img src="../../docs/version2.x/ppocr/images/multi_lang/img_12.jpg" width=800">
 </div>
 
 

deploy/paddle2onnx/readme.md

@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+
+build_for_offline='false'
+tag_suffix='latest'
+paddleocr_version='>=3.3.1,<3.4'
+
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        --offline)
+            build_for_offline='true'
+            tag_suffix='latest-offline'
+            shift
+            ;;
+        --ppocr-version)
+            paddleocr_version="==$2"
+            shift
+            shift
+            ;;
+        *)
+            echo "Unknown option: $1"
+            exit 1
+            ;;
+    esac
+done
+
+docker build \
+    -f pipeline.Dockerfile \
+    -t "ccr-2vdh3abv-pub.cnc.bj.baidubce.com/paddlepaddle/paddleocr-vl:${tag_suffix}" \
+    --build-arg BUILD_FOR_OFFLINE="${build_for_offline}" \
+    --build-arg PADDLEOCR_VERSION="${paddleocr_version}" \
+    --build-arg http_proxy="${http_proxy}" \
+    --build-arg https_proxy="${https_proxy}" \
+    --build-arg no_proxy="${no_proxy}" \
+    .
+
+docker build \
+    -f vlm.Dockerfile \
+    -t "ccr-2vdh3abv-pub.cnc.bj.baidubce.com/paddlepaddle/paddleocr-genai-vllm-server:${tag_suffix}" \
+    --build-arg BUILD_FOR_OFFLINE="${build_for_offline}" \
+    --build-arg PADDLEOCR_VERSION="${paddleocr_version}" \
+    --build-arg http_proxy="${http_proxy}" \
+    --build-arg https_proxy="${https_proxy}" \
+    --build-arg no_proxy="${no_proxy}" \
+    .