feat: 超级大更新

.github/workflows/build.yml

@@ -1,31 +1,89 @@
-name: Build
-on: [pull_request]
+name: Build and Package
+
+on:
+  push:
+  pull_request:
+    branches: [ dev ]
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
-  macOS-latest-py:
+  # =========================================================================
+  # 1. macOS ARM64 (Apple Silicon: CoreML & CPU)
+  # =========================================================================
+  build-macos-arm64:
+    name: macOS (arm64)
     runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v7
+      - uses: lukka/get-cmake@latest
+      - name: Install System Dependencies
+        run: brew install opencv@4 eigen onnxruntime
+      - name: Build & Package
+        run: python3 scripts/build.py --target macos-arm64
+      - uses: actions/upload-artifact@v7
+        with:
+          name: fastdeploy_ppocr-macos-arm64
+          path: fastdeploy_ppocr-macos-arm64.tar.gz
 
+  # =========================================================================
+  # 2. Linux x86_64 (CPU)
+  # =========================================================================
+  build-linux-x64:
+    name: Linux (x64)
+    runs-on: ubuntu-latest
     steps:
-      - name: Clone
-        uses: actions/checkout@v1
+      - uses: actions/checkout@v7
+      - uses: lukka/get-cmake@latest
+      - name: Install System Dependencies
+        run: sudo apt-get update && sudo apt-get install -y libopencv-dev libeigen3-dev wget tar
+      - name: Build & Package
+        run: python3 scripts/build.py --target linux-x64
+      - uses: actions/upload-artifact@v7
+        with:
+          name: fastdeploy_ppocr-linux-x64
+          path: fastdeploy_ppocr-linux-x64.tar.gz
+
+  # =========================================================================
+  # 3. Windows x64 (DirectML & CPU)
+  # =========================================================================
+  build-windows-x64:
+    name: Windows (x64)
+    runs-on: windows-latest
+    steps:
+      - name: Enable Git LongPaths
+        run: git config --system core.longpaths true
+      - uses: actions/checkout@v7
+      - uses: TheMrMilchmann/setup-msvc-dev@v4
+        with:
+          arch: x64
+      - uses: lukka/get-cmake@latest
+      - name: Build & Package
+        run: python scripts/build.py --target windows-x64
+      - uses: actions/upload-artifact@v7
+        with:
+          name: fastdeploy_ppocr-windows-x64
+          path: fastdeploy_ppocr-windows-x64.zip
 
-      - name: Get CMake
-        uses: lukka/get-cmake@latest
 
-      - name: Get Python
-        uses: actions/setup-python@v4
+  # =========================================================================
+  # 5. Android ARM64-v8a (Google NDK Cross Compilation)
+  # =========================================================================
+  build-android-arm64:
+    name: Android (arm64)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v7
+      - uses: lukka/get-cmake@latest
+      - name: Install System Dependencies
+        run: sudo apt-get update && sudo apt-get install -y libeigen3-dev wget unzip
+      - name: Build & Package
+        run: python3 scripts/build.py --target android-arm64
+      - uses: actions/upload-artifact@v7
         with:
-          python-version: '3.10'
-
-      - name: Build FastDeploy
-        working-directory: ./python
-        run: |
-          export ENABLE_ORT_BACKEND=ON
-          export ENABLE_PADDLE_BACKEND=OFF
-          export ENABLE_OPENVINO_BACKEND=OFF
-          export ENABLE_VISION=ON
-          export ENABLE_TEXT=ON
-          python -m pip install wheel
-          python setup.py build
-          python setup.py bdist_wheel
-          ls -l
+          name: fastdeploy_ppocr-android-arm64
+          path: fastdeploy_ppocr-android-arm64.tar.gz
+

.pre-commit-config.yaml

@@ -10,21 +10,12 @@ repos:
     -   id: check-symlinks
     -   id: check-added-large-files
 
--   repo: local
-    hooks:
-    -   id: copyright_checker
-        name: copyright_checker
-        entry: python ./.copyright.hook
-        language: system
-        files: \.(c|cc|cxx|cpp|cu|h|hpp|hxx|proto|py)$
-        exclude: (?!.*third_party)^.*$
-
 -   repo: local
     hooks:
     -   id: clang-format-with-version-check
         name: clang-format
         description: Format files with ClangFormat.
-        entry: bash .clang_format.hook -i
+        entry: bash scripts/hooks/.clang_format.hook -i
         language: system
         files: \.(c|cc|cxx|cpp|cu|hxx|proto)$
 
@@ -33,6 +24,6 @@ repos:
     -   id: cpplint-cpp-source
         name: cpplint
         description: Check C++ code style using cpplint.py.
-        entry: bash .cpplint_pre_commit.hook
+        entry: bash scripts/hooks/.cpplint_pre_commit.hook
         language: system
         files: \.(c|cc|cxx|cpp|cu|h|hpp|hxx)$

CMakeLists.txt

@@ -8,7 +8,7 @@ find_package(onnxruntime REQUIRED)
 find_package(Eigen3 REQUIRED)
 message("OpenCV_LIBS: ${OpenCV_LIBS} ${OPENCV_core_FOUND} ${OPENCV_WORLD_FOUND}")
 
-option(WITH_CUDA "Whether WITH_CUDA=ON, will enable onnxruntime-gpu/paddle-infernce-gpu/poros-gpu" OFF)
+option(WITH_CUDA "Whether WITH_CUDA=ON, will enable onnxruntime-gpu/paddle-inference-gpu" OFF)
 option(PRINT_INFO "Print more debug info while running" OFF)
 
 if(WITH_CUDA)
@@ -132,7 +132,7 @@ install(TARGETS fastdeploy_ppocr EXPORT fastdeploy_ppocrConfig)
 install(EXPORT fastdeploy_ppocrConfig DESTINATION share/fastdeploy_ppocr)
 install(
   DIRECTORY ${PROJECT_SOURCE_DIR}/fastdeploy
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include
+  DESTINATION include
   FILES_MATCHING
   PATTERN "*.h"
 )

README.md

@@ -0,0 +1,12 @@
+# FastDeploy
+
+This is a stripped-down version of [PaddlePaddle/FastDeploy@v1](https://github.com/PaddlePaddle/FastDeploy/tree/release/1.1.0) and [MaaAssistantArknights/FastDeploy](https://github.com/MaaAssistantArknights/FastDeploy).
+
+## Key modifications
+
+* ~~Removed unused components and dead code, focusing on `fastdeploy_ppocr`~~
+* Use system libraries (CMake `find_package`) only
+* Support in-memory model and dictionary loading
+* Reorganized project layout (`bindings/`, `services/`)
+* Add support for PP-OCR v5 and v6
+* Add multi-platform build script (`scripts/build.py`)

benchmark/python/benchmark_ppocr.py

@@ -341,6 +341,54 @@ def cpu_stat_func(self, q, pid, interval=0.0):
                 runtime_option=rec_option)
             model = fd.vision.ocr.PPOCRv4(
                 det_model=det_model, cls_model=cls_model, rec_model=rec_model)
+        elif "OCRv5" in args.model_dir:
+            det_option = option
+            if args.backend in ["trt", "paddle_trt"]:
+                det_option.trt_option.set_shape(
+                    "x", [1, 3, 64, 64], [1, 3, 640, 640], [1, 3, 960, 960])
+            det_model = fd.vision.ocr.DBDetector(
+                det_model_file, det_params_file, runtime_option=det_option)
+            cls_option = option
+            if args.backend in ["trt", "paddle_trt"]:
+                cls_option.trt_option.set_shape(
+                    "x", [1, 3, 48, 10], [10, 3, 48, 320], [64, 3, 48, 1024])
+            cls_model = fd.vision.ocr.Classifier(
+                cls_model_file, cls_params_file, runtime_option=cls_option)
+            rec_option = option
+            if args.backend in ["trt", "paddle_trt"]:
+                rec_option.trt_option.set_shape(
+                    "x", [1, 3, 48, 10], [10, 3, 48, 320], [64, 3, 48, 2304])
+            rec_model = fd.vision.ocr.Recognizer(
+                rec_model_file,
+                rec_params_file,
+                rec_label_file,
+                runtime_option=rec_option)
+            model = fd.vision.ocr.PPOCRv5(
+                det_model=det_model, cls_model=cls_model, rec_model=rec_model)
+        elif "OCRv6" in args.model_dir:
+            det_option = option
+            if args.backend in ["trt", "paddle_trt"]:
+                det_option.trt_option.set_shape(
+                    "x", [1, 3, 64, 64], [1, 3, 640, 640], [1, 3, 960, 960])
+            det_model = fd.vision.ocr.DBDetector(
+                det_model_file, det_params_file, runtime_option=det_option)
+            cls_option = option
+            if args.backend in ["trt", "paddle_trt"]:
+                cls_option.trt_option.set_shape(
+                    "x", [1, 3, 48, 10], [10, 3, 48, 320], [64, 3, 48, 1024])
+            cls_model = fd.vision.ocr.Classifier(
+                cls_model_file, cls_params_file, runtime_option=cls_option)
+            rec_option = option
+            if args.backend in ["trt", "paddle_trt"]:
+                rec_option.trt_option.set_shape(
+                    "x", [1, 3, 48, 10], [10, 3, 48, 320], [64, 3, 48, 2304])
+            rec_model = fd.vision.ocr.Recognizer(
+                rec_model_file,
+                rec_params_file,
+                rec_label_file,
+                runtime_option=rec_option)
+            model = fd.vision.ocr.PPOCRv6(
+                det_model=det_model, cls_model=cls_model, rec_model=rec_model)
         else:
             raise Exception("model {} not support now in ppocr series".format(
                 args.model_dir))

c_api/CMakeLists.txt → bindings/c_api/CMakeLists.txt

@@ -19,11 +19,11 @@ if(NOT WITH_CAPI)
   return()
 endif()
 
-configure_file(${PROJECT_SOURCE_DIR}/${CSRCS_DIR_NAME}/c_api/fastdeploy_capi/core/config.h.in ${PROJECT_SOURCE_DIR}/${CSRCS_DIR_NAME}/c_api/fastdeploy_capi/core/config.h)
-file(GLOB_RECURSE DEPLOY_CAPI_SRCS ${PROJECT_SOURCE_DIR}/${CSRCS_DIR_NAME}/c_api/fastdeploy_capi/*.cc)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fastdeploy_capi/core/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/fastdeploy_capi/core/config.h)
+file(GLOB_RECURSE DEPLOY_CAPI_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/fastdeploy_capi/*.cc)
 if(NOT ENABLE_VISION)
-    file(GLOB_RECURSE DEPLOY_VISION_CAPI_SRCS ${PROJECT_SOURCE_DIR}/${CSRCS_DIR_NAME}/c_api/fastdeploy_capi/vision/*.cc)
+    file(GLOB_RECURSE DEPLOY_VISION_CAPI_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/fastdeploy_capi/vision/*.cc)
     list(REMOVE_ITEM DEPLOY_CAPI_SRCS ${DEPLOY_VISION_CAPI_SRCS})
 endif()
 list(APPEND ALL_DEPLOY_SRCS ${DEPLOY_CAPI_SRCS})
-include_directories(${PROJECT_SOURCE_DIR}/${CSRCS_DIR_NAME}/c_api)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})

c_api/fastdeploy_capi/vision/types_internal.h → bindings/c_api/fastdeploy_capi/vision/types_internal.h

@@ -191,6 +191,12 @@ DEFINE_PIPELINE_MODEL_WRAPPER_STRUCT(PPOCRv3, ppocrv3_model);
 // PPOCRv4
 DEFINE_PIPELINE_MODEL_WRAPPER_STRUCT(PPOCRv4, ppocrv4_model);
 
+// PPOCRv5
+DEFINE_PIPELINE_MODEL_WRAPPER_STRUCT(PPOCRv5, ppocrv5_model);
+
+// PPOCRv6
+DEFINE_PIPELINE_MODEL_WRAPPER_STRUCT(PPOCRv6, ppocrv6_model);
+
 // PPStructureV2Table
 DEFINE_PIPELINE_MODEL_WRAPPER_STRUCT(PPStructureV2Table, ppstructurev2table_model);
 
@@ -407,6 +413,12 @@ DECLARE_PIPELINE_MODEL_FUNC_FOR_GET_PTR_FROM_WRAPPER(PPOCRv3, fd_ppocrv3_wrapper
 // PPOCRv4
 DECLARE_PIPELINE_MODEL_FUNC_FOR_GET_PTR_FROM_WRAPPER(PPOCRv4, fd_ppocrv4_wrapper);
 
+// PPOCRv5
+DECLARE_PIPELINE_MODEL_FUNC_FOR_GET_PTR_FROM_WRAPPER(PPOCRv5, fd_ppocrv5_wrapper);
+
+// PPOCRv6
+DECLARE_PIPELINE_MODEL_FUNC_FOR_GET_PTR_FROM_WRAPPER(PPOCRv6, fd_ppocrv6_wrapper);
+
 // PPStructureV2Table
 DECLARE_PIPELINE_MODEL_FUNC_FOR_GET_PTR_FROM_WRAPPER(PPStructureV2Table, fd_ppstructurev2_table_wrapper);