[Other]Add FlyCV for RV1126 (#985)

* add FlyCV for RV1126 * update CMake
2025-10-26 18:10:32 +08:00 · 2022-12-28 10:46:55 +08:00
parent aea454a856
commit 1da821a871
11 changed files with 24 additions and 51 deletions
--- a/cmake/flycv.cmake
+++ b/cmake/flycv.cmake
@@ -84,6 +84,8 @@ else()
  else()
    if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")
      set(FLYCV_FILE "flycv-linux-aarch64-${FLYCV_VERSION}.tgz")
+    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm")
+      set(FLYCV_FILE "flycv-linux-armhf-${FLYCV_VERSION}.tgz")
    else()
      set(FLYCV_FILE "flycv-linux-x64-${FLYCV_VERSION}.tgz")
    endif()
--- a/docs/cn/build_and_install/rv1126.md
+++ b/docs/cn/build_and_install/rv1126.md
@@ -61,6 +61,7 @@ mkdir build && cd build
 cmake -DCMAKE_TOOLCHAIN_FILE=./../cmake/toolchain.cmake \
      -DWITH_TIMVX=ON  \
      -DTARGET_ABI=armhf \
+      -DENABLE_FLYCV=ON \ # 是否开启 FlyCV 优化前后处理，可以选择开启
      -DCMAKE_INSTALL_PREFIX=fastdeploy-timvx \
      -DENABLE_VISION=ON \ # 是否编译集成视觉模型的部署模块，可选择开启
      -Wno-dev ..
--- a/docs/en/build_and_install/rv1126.md
+++ b/docs/en/build_and_install/rv1126.md
@@ -60,6 +60,7 @@ mkdir build && cd build
 cmake -DCMAKE_TOOLCHAIN_FILE=./../cmake/toolchain.cmake \
      -DWITH_TIMVX=ON  \
      -DTARGET_ABI=armhf \
+      -DENABLE_FLYCV=ON \ # Whether to enable FlyCV optimization
      -DCMAKE_INSTALL_PREFIX=fastdeploy-timvx \
      -DENABLE_VISION=ON \ # Whether to compile the vision module
      -Wno-dev ..
--- a/examples/vision/classification/paddleclas/rv1126/cpp/CMakeLists.txt
+++ b/examples/vision/classification/paddleclas/rv1126/cpp/CMakeLists.txt
@@ -20,19 +20,11 @@ install(TARGETS infer_demo DESTINATION ./)

 install(DIRECTORY models DESTINATION ./)
 install(DIRECTORY images DESTINATION ./)
-# install(DIRECTORY run_with_adb.sh DESTINATION ./)

-file(GLOB FASTDEPLOY_LIBS ${FASTDEPLOY_INSTALL_DIR}/lib/*)
-install(PROGRAMS ${FASTDEPLOY_LIBS} DESTINATION lib)
-
-file(GLOB OPENCV_LIBS ${FASTDEPLOY_INSTALL_DIR}/third_libs/install/opencv/lib/lib*)
-install(PROGRAMS ${OPENCV_LIBS} DESTINATION lib)
-
-file(GLOB PADDLELITE_LIBS ${FASTDEPLOY_INSTALL_DIR}/third_libs/install/paddlelite/lib/lib*)
-install(PROGRAMS ${PADDLELITE_LIBS} DESTINATION lib)
-
-file(GLOB TIMVX_LIBS ${FASTDEPLOY_INSTALL_DIR}/third_libs/install/paddlelite/lib/verisilicon_timvx/*)
-install(PROGRAMS ${TIMVX_LIBS} DESTINATION lib)
+file(GLOB_RECURSE FASTDEPLOY_LIBS ${FASTDEPLOY_INSTALL_DIR}/lib/lib*.so*)
+file(GLOB_RECURSE ALL_LIBS ${FASTDEPLOY_INSTALL_DIR}/third_libs/install/lib*.so*)
+list(APPEND ALL_LIBS ${FASTDEPLOY_LIBS})
+install(PROGRAMS ${ALL_LIBS} DESTINATION lib)

 file(GLOB ADB_TOOLS run_with_adb.sh)
 install(PROGRAMS ${ADB_TOOLS} DESTINATION ./)
--- a/examples/vision/classification/paddleclas/rv1126/cpp/infer.cc
+++ b/examples/vision/classification/paddleclas/rv1126/cpp/infer.cc
@@ -23,7 +23,7 @@ void InitAndInfer(const std::string& model_dir, const std::string& image_file) {
  auto model_file = model_dir + sep + "inference.pdmodel";
  auto params_file = model_dir + sep + "inference.pdiparams";
  auto config_file = model_dir + sep + "inference_cls.yaml";
-  
+  fastdeploy::vision::EnableFlyCV(); 
  fastdeploy::RuntimeOption option;
  option.UseTimVX();

--- a/examples/vision/detection/paddledetection/rv1126/cpp/CMakeLists.txt
+++ b/examples/vision/detection/paddledetection/rv1126/cpp/CMakeLists.txt
@@ -20,19 +20,11 @@ install(TARGETS infer_demo DESTINATION ./)

 install(DIRECTORY models DESTINATION ./)
 install(DIRECTORY images DESTINATION ./)
-# install(DIRECTORY run_with_adb.sh DESTINATION ./)

-file(GLOB FASTDEPLOY_LIBS ${FASTDEPLOY_INSTALL_DIR}/lib/*)
-install(PROGRAMS ${FASTDEPLOY_LIBS} DESTINATION lib)
-
-file(GLOB OPENCV_LIBS ${FASTDEPLOY_INSTALL_DIR}/third_libs/install/opencv/lib/lib*)
-install(PROGRAMS ${OPENCV_LIBS} DESTINATION lib)
-
-file(GLOB PADDLELITE_LIBS ${FASTDEPLOY_INSTALL_DIR}/third_libs/install/paddlelite/lib/lib*)
-install(PROGRAMS ${PADDLELITE_LIBS} DESTINATION lib)
-
-file(GLOB TIMVX_LIBS ${FASTDEPLOY_INSTALL_DIR}/third_libs/install/paddlelite/lib/verisilicon_timvx/*)
-install(PROGRAMS ${TIMVX_LIBS} DESTINATION lib)
+file(GLOB_RECURSE FASTDEPLOY_LIBS ${FASTDEPLOY_INSTALL_DIR}/lib/lib*.so*)
+file(GLOB_RECURSE ALL_LIBS ${FASTDEPLOY_INSTALL_DIR}/third_libs/install/lib*.so*)
+list(APPEND ALL_LIBS ${FASTDEPLOY_LIBS})
+install(PROGRAMS ${ALL_LIBS} DESTINATION lib)

 file(GLOB ADB_TOOLS run_with_adb.sh)
 install(PROGRAMS ${ADB_TOOLS} DESTINATION ./)
--- a/examples/vision/detection/paddledetection/rv1126/cpp/infer_ppyoloe.cc
+++ b/examples/vision/detection/paddledetection/rv1126/cpp/infer_ppyoloe.cc
@@ -24,7 +24,7 @@ void InitAndInfer(const std::string& model_dir, const std::string& image_file) {
  auto params_file = model_dir + sep + "model.pdiparams";
  auto config_file = model_dir + sep + "infer_cfg.yml";
  auto subgraph_file = model_dir + sep + "subgraph.txt";
-
+  fastdeploy::vision::EnableFlyCV(); 
  fastdeploy::RuntimeOption option;
  option.UseTimVX();
  option.SetLiteSubgraphPartitionPath(subgraph_file);
--- a/examples/vision/detection/yolov5/rv1126/cpp/CMakeLists.txt
+++ b/examples/vision/detection/yolov5/rv1126/cpp/CMakeLists.txt
@@ -21,17 +21,10 @@ install(TARGETS infer_demo DESTINATION ./)
 install(DIRECTORY models DESTINATION ./)
 install(DIRECTORY images DESTINATION ./)

-file(GLOB FASTDEPLOY_LIBS ${FASTDEPLOY_INSTALL_DIR}/lib/*)
-install(PROGRAMS ${FASTDEPLOY_LIBS} DESTINATION lib)
-
-file(GLOB OPENCV_LIBS ${FASTDEPLOY_INSTALL_DIR}/third_libs/install/opencv/lib/lib*)
-install(PROGRAMS ${OPENCV_LIBS} DESTINATION lib)
-
-file(GLOB PADDLELITE_LIBS ${FASTDEPLOY_INSTALL_DIR}/third_libs/install/paddlelite/lib/lib*)
-install(PROGRAMS ${PADDLELITE_LIBS} DESTINATION lib)
-
-file(GLOB TIMVX_LIBS ${FASTDEPLOY_INSTALL_DIR}/third_libs/install/paddlelite/lib/verisilicon_timvx/*)
-install(PROGRAMS ${TIMVX_LIBS} DESTINATION lib)
+file(GLOB_RECURSE FASTDEPLOY_LIBS ${FASTDEPLOY_INSTALL_DIR}/lib/lib*.so*)
+file(GLOB_RECURSE ALL_LIBS ${FASTDEPLOY_INSTALL_DIR}/third_libs/install/lib*.so*)
+list(APPEND ALL_LIBS ${FASTDEPLOY_LIBS})
+install(PROGRAMS ${ALL_LIBS} DESTINATION lib)

 file(GLOB ADB_TOOLS run_with_adb.sh)
 install(PROGRAMS ${ADB_TOOLS} DESTINATION ./)
--- a/examples/vision/detection/yolov5/rv1126/cpp/infer.cc
+++ b/examples/vision/detection/yolov5/rv1126/cpp/infer.cc
@@ -23,7 +23,7 @@ void InitAndInfer(const std::string& model_dir, const std::string& image_file) {
  auto model_file = model_dir + sep + "model.pdmodel";
  auto params_file = model_dir + sep + "model.pdiparams";
  auto subgraph_file = model_dir + sep + "subgraph.txt";
-
+  fastdeploy::vision::EnableFlyCV(); 
  fastdeploy::RuntimeOption option;
  option.UseTimVX();
  option.SetLiteSubgraphPartitionPath(subgraph_file);
--- a/examples/vision/segmentation/paddleseg/rv1126/cpp/CMakeLists.txt
+++ b/examples/vision/segmentation/paddleseg/rv1126/cpp/CMakeLists.txt
@@ -20,19 +20,11 @@ install(TARGETS infer_demo DESTINATION ./)

 install(DIRECTORY models DESTINATION ./)
 install(DIRECTORY images DESTINATION ./)
-# install(DIRECTORY run_with_adb.sh DESTINATION ./)

-file(GLOB FASTDEPLOY_LIBS ${FASTDEPLOY_INSTALL_DIR}/lib/*)
-install(PROGRAMS ${FASTDEPLOY_LIBS} DESTINATION lib)
-
-file(GLOB OPENCV_LIBS ${FASTDEPLOY_INSTALL_DIR}/third_libs/install/opencv/lib/lib*)
-install(PROGRAMS ${OPENCV_LIBS} DESTINATION lib)
-
-file(GLOB PADDLELITE_LIBS ${FASTDEPLOY_INSTALL_DIR}/third_libs/install/paddlelite/lib/lib*)
-install(PROGRAMS ${PADDLELITE_LIBS} DESTINATION lib)
-
-file(GLOB TIMVX_LIBS ${FASTDEPLOY_INSTALL_DIR}/third_libs/install/paddlelite/lib/verisilicon_timvx/*)
-install(PROGRAMS ${TIMVX_LIBS} DESTINATION lib)
+file(GLOB_RECURSE FASTDEPLOY_LIBS ${FASTDEPLOY_INSTALL_DIR}/lib/lib*.so*)
+file(GLOB_RECURSE ALL_LIBS ${FASTDEPLOY_INSTALL_DIR}/third_libs/install/lib*.so*)
+list(APPEND ALL_LIBS ${FASTDEPLOY_LIBS})
+install(PROGRAMS ${ALL_LIBS} DESTINATION lib)

 file(GLOB ADB_TOOLS run_with_adb.sh)
 install(PROGRAMS ${ADB_TOOLS} DESTINATION ./)
--- a/examples/vision/segmentation/paddleseg/rv1126/cpp/infer.cc
+++ b/examples/vision/segmentation/paddleseg/rv1126/cpp/infer.cc
@@ -24,7 +24,7 @@ void InitAndInfer(const std::string& model_dir, const std::string& image_file) {
  auto params_file = model_dir + sep + "model.pdiparams";
  auto config_file = model_dir + sep + "deploy.yaml";
  auto subgraph_file = model_dir + sep + "subgraph.txt";
-
+  fastdeploy::vision::EnableFlyCV(); 
  fastdeploy::RuntimeOption option;
  option.UseTimVX();
  option.SetLiteSubgraphPartitionPath(subgraph_file);