diff --git a/.maabundlerignore b/.maabundlerignore index f64e1527ca..7e55e5f210 100644 --- a/.maabundlerignore +++ b/.maabundlerignore @@ -1,8 +1,2 @@ -libiomp5md.dll -mkldnn.dll -mklml.dll opencv_world453.dll -paddle_inference.dll -ppocr.dll aria2c.exe -resource/PaddleOCR/** diff --git a/3rdparty/bin/mkldnn.dll b/3rdparty/bin/mkldnn.dll index 7fd13a2d44..728e1b371f 100644 Binary files a/3rdparty/bin/mkldnn.dll and b/3rdparty/bin/mkldnn.dll differ diff --git a/3rdparty/bin/onnxruntime.dll b/3rdparty/bin/onnxruntime.dll new file mode 100644 index 0000000000..1284d425fa Binary files /dev/null and b/3rdparty/bin/onnxruntime.dll differ diff --git a/3rdparty/bin/paddle2onnx.dll b/3rdparty/bin/paddle2onnx.dll new file mode 100644 index 0000000000..bcfdddb7d2 Binary files /dev/null and b/3rdparty/bin/paddle2onnx.dll differ diff --git a/3rdparty/bin/ppocr.dll b/3rdparty/bin/ppocr.dll index e4a2961f3f..9bf5cbaadf 100644 Binary files a/3rdparty/bin/ppocr.dll and b/3rdparty/bin/ppocr.dll differ diff --git a/3rdparty/lib/ppocr.lib b/3rdparty/lib/ppocr.lib index 9ff1b91974..e850d785c4 100644 Binary files a/3rdparty/lib/ppocr.lib and b/3rdparty/lib/ppocr.lib differ diff --git a/3rdparty/resource/PaddleOCR/det/inference.pdiparams b/3rdparty/resource/PaddleOCR/det/inference.pdiparams index 0794fa26d8..b33c3b0c9f 100644 Binary files a/3rdparty/resource/PaddleOCR/det/inference.pdiparams and b/3rdparty/resource/PaddleOCR/det/inference.pdiparams differ diff --git a/3rdparty/resource/PaddleOCR/det/inference.pdmodel b/3rdparty/resource/PaddleOCR/det/inference.pdmodel index 213147e488..d09eb79085 100644 Binary files a/3rdparty/resource/PaddleOCR/det/inference.pdmodel and b/3rdparty/resource/PaddleOCR/det/inference.pdmodel differ diff --git a/3rdparty/resource/PaddleOCR/det/version.txt b/3rdparty/resource/PaddleOCR/det/version.txt index c5193c02b3..4aa94ab62b 100644 --- a/3rdparty/resource/PaddleOCR/det/version.txt +++ b/3rdparty/resource/PaddleOCR/det/version.txt @@ -1 +1 @@ -ch_PP-OCRv2_det_infer \ No newline at end of file +ch_PP-OCRv3_det_infer diff --git a/3rdparty/resource/PaddleOCR/rec/inference.pdiparams b/3rdparty/resource/PaddleOCR/rec/inference.pdiparams index ff73fe2808..5eff539417 100644 Binary files a/3rdparty/resource/PaddleOCR/rec/inference.pdiparams and b/3rdparty/resource/PaddleOCR/rec/inference.pdiparams differ diff --git a/3rdparty/resource/PaddleOCR/rec/inference.pdmodel b/3rdparty/resource/PaddleOCR/rec/inference.pdmodel index be5425e58c..585fcdc69e 100644 Binary files a/3rdparty/resource/PaddleOCR/rec/inference.pdmodel and b/3rdparty/resource/PaddleOCR/rec/inference.pdmodel differ diff --git a/3rdparty/resource/PaddleOCR/rec/version.txt b/3rdparty/resource/PaddleOCR/rec/version.txt index 8bf34ca81c..d0adf1a0e8 100644 --- a/3rdparty/resource/PaddleOCR/rec/version.txt +++ b/3rdparty/resource/PaddleOCR/rec/version.txt @@ -1 +1 @@ -ch_ppocr_mobile_v2.0_rec_slim_infer \ No newline at end of file +ch_PP-OCRv3_rec_infer diff --git a/docs/Linux编译教程.md b/docs/Linux编译教程.md index a10863e56f..084e3d0cd5 100644 --- a/docs/Linux编译教程.md +++ b/docs/Linux编译教程.md @@ -14,8 +14,8 @@ ### PaddleOCR -1. 使用我魔改了接口的版本：https://github.com/MistEO/PaddleOCR -2. 参考 [这个教程](https://github.com/PaddlePaddle/PaddleOCR/tree/release/2.3/deploy/cpp_infer#readme) +1. 使用我魔改了接口的版本： +2. 参考 [这个教程](https://github.com/PaddlePaddle/PaddleOCR/blob/release/2.5/deploy/cpp_infer/readme_ch.md) 3. 额外依赖的 `PaddlePaddle` 直接 [下载](https://paddleinference.paddlepaddle.org.cn/master/user_guides/download_lib.html) 即可。其中 `avx` 和 `mkl` 两者都可以提高计算效率，建议选择。但如果 CPU 不支持，则只能选择 `noavx` 和 `openblas` 的兼容性版本（一般稍微新一点的 CPU 都支持两者了，AMD 的也没关系）。 `cuda` 和 `cudnn` 是 GPU 加速库，在 `PaddleOCR` 上可能比较麻烦，我没折腾过，有兴趣可以尝试下 4. 若 `cmake` 找不到 `Opencv` ，可尝试修改 [Opencv 的查找路径](https://github.com/MistEO/PaddleOCR/blob/release/2.3/deploy/cpp_infer/CMakeLists.txt#L49) 5. 若您使用 `MKL` 版本，可修改 [MKL 宏定义](https://github.com/MistEO/PaddleOCR/blob/release/2.3/deploy/cpp_infer/include/ocr_defines.h#L9) 为 `true` 以提高性能 @@ -45,12 +45,12 @@ sudo ldconfig 3. 安装 `adb`, 并修改 `resource/config.json` 中 `Custom`.`adb`.`path` 的值为 `"adb"` 4. 复制资源文件到 `libMeoAssitant.so` 同一目录下 -```sh -cd tools -sh ./update_resource.sh -``` + ```sh + cd tools + sh ./update_resource.sh + ``` -5. 通过 [Python 接口](../src/Python/interface.py) 或 [C 接口](../include/AsstCaller.h) 进行调用，需要自行编写少量的代码 +5. 通过 [Python 接口](../src/Python/asst.py) 或 [C 接口](../include/AsstCaller.h) 进行调用，需要自行编写少量的代码 6. `cmake` 可通过添加 `-DBUILD_TEST=ON` 选项来编译一个测试小 demo ## 集成文档