[Python] Add backward compatible for paddle2.4.2 (#1929)

* [Python] Add backward compatible for paddle2.4.2 * [Python] Add backward compatible for paddle2.4.2 * [scripts] update linux build scripts
2025-10-05 08:37:06 +08:00 · 2023-05-11 19:34:06 +08:00
parent 643f41e711
commit 15c29f7e49
6 changed files with 214 additions and 25 deletions
--- a/scripts/linux/build_linux_x86_64_cpp_cpu.sh
+++ b/scripts/linux/build_linux_x86_64_cpp_cpu.sh
@@ -8,6 +8,13 @@ set +x
 readonly ROOT_PATH=$(pwd)
 readonly BUILD_ROOT=build/Linux
 readonly BUILD_DIR=${BUILD_ROOT}/x86_64
+readonly PADDLEINFERENCE_DIRECTORY=$1
+readonly PADDLEINFERENCE_VERSION=$2
+
+BUILD_WITH_CUSTOM_PADDLE='OFF'
+if [[ "$PADDLEINFERENCE_DIRECTORY" != "" ]]; then
+  BUILD_WITH_CUSTOM_PADDLE='ON'
+fi

 # -------------------------------------------------------------------------------
 #                                 tasks
@@ -69,10 +76,39 @@ __build_fastdeploy_linux_x86_64_shared() {
  echo "-- [INFO][built][x86_64]][${BUILD_DIR}/install]"
 }

+__build_fastdeploy_linux_x86_64_shared_custom_paddle() {
+
+  local FASDEPLOY_INSTALL_DIR="${ROOT_PATH}/${BUILD_DIR}/install"
+  cd "${BUILD_DIR}" && echo "-- [INFO] Working Dir: ${PWD}"
+
+  cmake -DCMAKE_BUILD_TYPE=Release \
+        -DWITH_GPU=OFF \
+        -DENABLE_ORT_BACKEND=ON \
+        -DENABLE_PADDLE_BACKEND=ON \
+        -DENABLE_OPENVINO_BACKEND=ON \
+        -DENABLE_PADDLE2ONNX=ON \
+        -DENABLE_VISION=ON \
+        -DENABLE_BENCHMARK=ON \
+        -DPADDLEINFERENCE_DIRECTORY=${PADDLEINFERENCE_DIRECTORY} \
+        -DPADDLEINFERENCE_VERSION=${PADDLEINFERENCE_VERSION} \
+        -DENABLE_FLYCV=OFF \
+        -DWITH_FLYCV_STATIC=OFF \
+        -DBUILD_EXAMPLES=ON \
+        -DCMAKE_INSTALL_PREFIX=${FASDEPLOY_INSTALL_DIR} \
+        -Wno-dev ../../.. && make -j8 && make install
+
+  echo "-- [INFO][built][x86_64]][${BUILD_DIR}/install]"
+  echo "-- [INFO][${PADDLEINFERENCE_VERSION}][${PADDLEINFERENCE_DIRECTORY}]"
+}
+
 main() {
  __make_build_dir
  __check_cxx_envs
-  __build_fastdeploy_linux_x86_64_shared
+  if [ "${BUILD_WITH_CUSTOM_PADDLE}" == "ON" ]; then
+    __build_fastdeploy_linux_x86_64_shared_custom_paddle
+  else
+    __build_fastdeploy_linux_x86_64_shared
+  fi
  exit 0
 }

@@ -80,3 +116,4 @@ main

 # Usage:
 # ./scripts/linux/build_linux_x86_64_cpp_cpu.sh
+# ./scripts/linux/build_linux_x86_64_cpp_cpu.sh paddle_inference-linux-x64-mkl-avx-2.4.2 paddle2.4.2
--- a/scripts/linux/build_linux_x86_64_cpp_gpu.sh
+++ b/scripts/linux/build_linux_x86_64_cpp_gpu.sh
@@ -8,6 +8,13 @@ set +x
 readonly ROOT_PATH=$(pwd)
 readonly BUILD_ROOT=build/Linux
 readonly BUILD_DIR="${BUILD_ROOT}/x86_64_gpu"
+readonly PADDLEINFERENCE_DIRECTORY=$1
+readonly PADDLEINFERENCE_VERSION=$2
+
+BUILD_WITH_CUSTOM_PADDLE='OFF'
+if [[ "$PADDLEINFERENCE_DIRECTORY" != "" ]]; then
+  BUILD_WITH_CUSTOM_PADDLE='ON'
+fi

 # -------------------------------------------------------------------------------
 #                                 tasks
@@ -70,10 +77,40 @@ __build_fastdeploy_linux_x86_64_gpu_shared() {
  echo "-- [INFO][built][x86_64_gpu}][${BUILD_DIR}/install]"
 }

+__build_fastdeploy_linux_x86_64_gpu_shared_custom_paddle() {
+
+  local FASDEPLOY_INSTALL_DIR="${ROOT_PATH}/${BUILD_DIR}/install"
+  cd "${BUILD_DIR}" && echo "-- [INFO] Working Dir: ${PWD}"
+
+  cmake -DCMAKE_BUILD_TYPE=Release \
+        -DWITH_GPU=ON \
+        -DTRT_DIRECTORY=${TRT_DIRECTORY} \
+        -DCUDA_DIRECTORY=${CUDA_DIRECTORY} \
+        -DENABLE_ORT_BACKEND=ON \
+        -DENABLE_TRT_BACKEND=ON \
+        -DENABLE_PADDLE_BACKEND=ON \
+        -DPADDLEINFERENCE_DIRECTORY=${PADDLEINFERENCE_DIRECTORY} \
+        -DPADDLEINFERENCE_VERSION=${PADDLEINFERENCE_VERSION} \
+        -DENABLE_OPENVINO_BACKEND=ON \
+        -DENABLE_PADDLE2ONNX=ON \
+        -DENABLE_VISION=ON \
+        -DENABLE_BENCHMARK=OFF \
+        -DBUILD_EXAMPLES=ON \
+        -DCMAKE_INSTALL_PREFIX=${FASDEPLOY_INSTALL_DIR} \
+        -Wno-dev ../../.. && make -j8 && make install
+
+  echo "-- [INFO][built][x86_64_gpu}][${BUILD_DIR}/install]"
+  echo "-- [INFO][${PADDLEINFERENCE_VERSION}][${PADDLEINFERENCE_DIRECTORY}]"
+}
+
 main() {
  __make_build_dir
  __check_cxx_envs
-  __build_fastdeploy_linux_x86_64_gpu_shared
+  if [ "${BUILD_WITH_CUSTOM_PADDLE}" == "ON" ]; then
+    __build_fastdeploy_linux_x86_64_gpu_shared_custom_paddle
+  else
+    __build_fastdeploy_linux_x86_64_gpu_shared
+  fi
  exit 0
 }

@@ -81,3 +118,4 @@ main

 # Usage:
 # ./scripts/linux/build_linux_x86_64_cpp_gpu.sh
+# ./scripts/linux/build_linux_x86_64_cpp_gpu.sh paddle_inference-linux-x64-gpu-trt8.5.2.2-mkl-avx-2.4.2 paddle2.4.2
--- a/scripts/linux/build_linux_x86_64_cpp_gpu_with_benchmark.sh
+++ b/scripts/linux/build_linux_x86_64_cpp_gpu_with_benchmark.sh
@@ -8,6 +8,13 @@ set +x
 readonly ROOT_PATH=$(pwd)
 readonly BUILD_ROOT=build/Linux
 readonly BUILD_DIR="${BUILD_ROOT}/x86_64_gpu"
+readonly PADDLEINFERENCE_DIRECTORY=$1
+readonly PADDLEINFERENCE_VERSION=$2
+
+BUILD_WITH_CUSTOM_PADDLE='OFF'
+if [[ "$PADDLEINFERENCE_DIRECTORY" != "" ]]; then
+  BUILD_WITH_CUSTOM_PADDLE='ON'
+fi

 # -------------------------------------------------------------------------------
 #                                 tasks
@@ -70,10 +77,41 @@ __build_fastdeploy_linux_x86_64_gpu_shared() {
  echo "-- [INFO][built][x86_64_gpu}][${BUILD_DIR}/install]"
 }

+__build_fastdeploy_linux_x86_64_gpu_shared_custom_paddle() {
+
+  local FASDEPLOY_INSTALL_DIR="${ROOT_PATH}/${BUILD_DIR}/install"
+  cd "${BUILD_DIR}" && echo "-- [INFO] Working Dir: ${PWD}"
+
+  cmake -DCMAKE_BUILD_TYPE=Release \
+        -DWITH_GPU=ON \
+        -DTRT_DIRECTORY=${TRT_DIRECTORY} \
+        -DCUDA_DIRECTORY=${CUDA_DIRECTORY} \
+        -DENABLE_ORT_BACKEND=ON \
+        -DENABLE_TRT_BACKEND=ON \
+        -DENABLE_PADDLE_BACKEND=ON \
+        -DPADDLEINFERENCE_DIRECTORY=${PADDLEINFERENCE_DIRECTORY} \
+        -DPADDLEINFERENCE_VERSION=${PADDLEINFERENCE_VERSION} \
+        -DENABLE_OPENVINO_BACKEND=ON \
+        -DENABLE_PADDLE2ONNX=ON \
+        -DENABLE_VISION=ON \
+        -DENABLE_BENCHMARK=ON \
+        -DBUILD_EXAMPLES=ON \
+        -DCMAKE_INSTALL_PREFIX=${FASDEPLOY_INSTALL_DIR} \
+        -Wno-dev ../../.. && make -j8 && make install
+
+  echo "-- [INFO][built][x86_64_gpu}][${BUILD_DIR}/install]"
+  echo "-- [INFO][${PADDLEINFERENCE_VERSION}][${PADDLEINFERENCE_DIRECTORY}]"
+}
+
+
 main() {
  __make_build_dir
  __check_cxx_envs
-  __build_fastdeploy_linux_x86_64_gpu_shared
+  if [ "${BUILD_WITH_CUSTOM_PADDLE}" == "ON" ]; then
+    __build_fastdeploy_linux_x86_64_gpu_shared_custom_paddle
+  else
+    __build_fastdeploy_linux_x86_64_gpu_shared
+  fi
  exit 0
 }

@@ -81,3 +119,4 @@ main

 # Usage:
 # ./scripts/linux/build_linux_x86_64_cpp_gpu.sh
+# ./scripts/linux/build_linux_x86_64_cpp_gpu.sh paddle_inference-linux-x64-gpu-trt8.5.2.2-mkl-avx-2.4.2 paddle2.4.2