From ef576ce8757da1be328ed53da3b5093bc702aa9a Mon Sep 17 00:00:00 2001 From: DefTruth <31974251+DefTruth@users.noreply.github.com> Date: Wed, 26 Apr 2023 10:32:18 +0800 Subject: [PATCH] [Paddle2ONNX] switch paddle2onnx default policy (#1873) --- CMakeLists.txt | 3 +-- cmake/onnxruntime.cmake | 7 ++++++- cmake/toolchain.cmake | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 332f382da..347bfacb6 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,8 +77,8 @@ option(WITH_TESTING "Whether to compile with unittest." OFF) option(WITH_CAPI "Whether to compile with c api." OFF) option(WITH_CSHARPAPI "Whether to compile with c# api" OFF) -# Whether to build fastdeploy with vision/text/... examples, only for testings. option(BUILD_EXAMPLES "Whether to build fastdeploy with vision examples" OFF) +option(BUILD_PADDLE2ONNX "Whether to build paddle2onnx from sources" OFF) ######################### Paths to user's custom libraries directory ##################### set(CUDA_DIRECTORY "" CACHE PATH "If build tensorrt backend, need to define path of cuda library.") @@ -425,7 +425,6 @@ if(ENABLE_ENCRYPTION) endif() if(ENABLE_PADDLE2ONNX) - set(BUILD_PADDLE2ONNX ON) add_definitions(-DENABLE_PADDLE2ONNX) if(BUILD_PADDLE2ONNX) download_protobuf() diff --git a/cmake/onnxruntime.cmake b/cmake/onnxruntime.cmake index b823f734b..0ba70324a 100644 --- a/cmake/onnxruntime.cmake +++ b/cmake/onnxruntime.cmake @@ -77,7 +77,12 @@ else() if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "aarch64") set(ONNXRUNTIME_FILENAME "onnxruntime-linux-aarch64-${ONNXRUNTIME_VERSION}.tgz") else() - set(ONNXRUNTIME_FILENAME "onnxruntime-linux-x64-${ONNXRUNTIME_VERSION}.tgz") + # cross-compling while the host is x64 but the target is aarch64. + if ((CMAKE_SYSTEM_PROCESSOR MATCHES "arm64") OR (CMAKE_SYSTEM_PROCESSOR MATCHES "arm")) + set(ONNXRUNTIME_FILENAME "onnxruntime-linux-aarch64-${ONNXRUNTIME_VERSION}.tgz") + else() + set(ONNXRUNTIME_FILENAME "onnxruntime-linux-x64-${ONNXRUNTIME_VERSION}.tgz") + endif() endif() endif() endif() diff --git a/cmake/toolchain.cmake b/cmake/toolchain.cmake index f05157fdf..0c39fd678 100755 --- a/cmake/toolchain.cmake +++ b/cmake/toolchain.cmake @@ -41,6 +41,6 @@ if (DEFINED TARGET_ABI) set(OpenCV_DIR ${THIRD_PARTY_PATH}/install/opencv/lib/cmake/opencv4) else() message(FATAL_ERROR "When cross-compiling, please set the -DTARGET_ABI to arm64 or armhf.") - endif() + endif() endif()