apps/FastDeploy
1
0
Fork 0
mirror of https://github.com/PaddlePaddle/FastDeploy.git synced 2025-10-05 16:48:03 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Simplify cmake and add openvino directory (#285)

Browse Source 
* simplify the opencv.cmake

* Add OPENVINO_DIRECTORY option

* Add openvino directory
This commit is contained in:
Jack Zhou
2022-09-27 10:02:34 +08:00
committed by GitHub
parent 9e09a55abb
commit b83cb993ac
5 changed files with 42 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@@ -55,10 +55,6 @@ option(ENABLE_VISION "Whether to enable vision models usage." OFF)
option(ENABLE_VISION_VISUALIZE "Whether to enable visualize vision model result toolbox." ON)
option(ENABLE_TEXT "Whether to enable text models usage." OFF)
option(WITH_TESTING "Whether to compile with unittest." OFF)
# option(CUDA_DIRECTORY "If build tensorrt backend, need to define path of cuda library.")
# option(TRT_DIRECTORY "If build tensorrt backend, need to define path of tensorrt library.")
# option(OPENCV_DIRECTORY "User can specify the installed opencv directory.")
# option(ORT_DIRECTORY "User can specify the installed onnxruntime directory.")
######################### Options for Android cross compiling ####################
option(WITH_OPENCV_STATIC "Use OpenCV static lib for Android." OFF)
option(WITH_LITE_STATIC "Use Paddle-Lite static lib for Android." OFF)
@@ -74,6 +70,7 @@ set(CUDA_DIRECTORY "" CACHE PATH "If build tensorrt backend, need to define path
set(TRT_DIRECTORY "" CACHE PATH "If build tensorrt backend, need to define path of tensorrt library.")
set(ORT_DIRECTORY "" CACHE PATH "User can specify the installed onnxruntime directory.")
set(OPENCV_DIRECTORY "" CACHE PATH "User can specify the installed opencv directory.")
set(OPENVINO_DIRECTORY "" CACHE PATH "User can specify the installed openvino directory.")
# Whether to build fastdeploy on device Nvidia Jetson

32
FastDeploy.cmake.in
View File

@@ -15,9 +15,11 @@ set(OPENVINO_VERSION @OPENVINO_VERSION@)
set(WITH_LITE_STATIC @WITH_LITE_STATIC@)
set(WITH_OPENCV_STATIC @WITH_OPENCV_STATIC@)
# set(ENABLE_OPENCV_CUDA @ENABLE_OPENCV_CUDA@)
set(OPENCV_FILENAME "@OPENCV_FILENAME@")
set(LIBRARY_NAME @LIBRARY_NAME@)
set(OPENCV_DIRECTORY "@OPENCV_DIRECTORY@")
set(ORT_DIRECTORY "@ORT_DIRECTORY@")
set(OPENVINO_DIRECTORY "@OPENVINO_DIRECTORY@")
set(FASTDEPLOY_LIBS "")
set(FASTDEPLOY_INCS "")
@@ -63,8 +65,12 @@ if(ENABLE_PADDLE_BACKEND)
endif()
if(ENABLE_OPENVINO_BACKEND)
set(OPENVINO_FILENAME @OPENVINO_FILENAME@)
get_openvino_libs(${CMAKE_CURRENT_LIST_DIR}/third_libs/install/${OPENVINO_FILENAME}/runtime)
if (OPENVINO_DIRECTORY)
get_openvino_libs(${OPENVINO_DIRECTORY}/runtime)
else()
set(OPENVINO_FILENAME @OPENVINO_FILENAME@)
get_openvino_libs(${CMAKE_CURRENT_LIST_DIR}/third_libs/install/${OPENVINO_FILENAME}/runtime)
endif()
message(STATUS "OPENVINO_LIBS = ${OPENVINO_LIBS}")
list(APPEND FASTDEPLOY_LIBS ${OPENVINO_LIBS})
endif()
@@ -96,22 +102,12 @@ if(ENABLE_VISION)
if (OPENCV_DIRECTORY)
set(OpenCV_DIR ${OPENCV_DIRECTORY})
else()
if(WIN32)
set(OpenCV_DIR ${CMAKE_CURRENT_LIST_DIR}/third_libs/install/opencv-win-x64-3.4.16/build)
elseif(ANDROID)
# TODO(qiuyanjun): use single 'opencv' path instead of 'opencv-xxx-xxx'.
if (ANDROID)
set(OpenCV_DIR ${CMAKE_CURRENT_LIST_DIR}/third_libs/install/opencv-android-4.6.0/sdk/native/jni)
elseif(APPLE)
if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "arm64")
set(OpenCV_DIR ${CMAKE_CURRENT_LIST_DIR}/third_libs/install/opencv-osx-x86_64-3.4.16)
else()
set(OpenCV_DIR ${CMAKE_CURRENT_LIST_DIR}/third_libs/install/opencv-arm64-3.4.16)
endif()
else()
if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "aarch64")
set(OPENCV_LIB ${CMAKE_CURRENT_LIST_DIR}/third_libs/install/opencv-linux-aarch64-3.4.14)
else()
set(OpenCV_DIR ${CMAKE_CURRENT_LIST_DIR}/third_libs/install/opencv-linux-x64-3.4.16)
set(OpenCV_DIR ${CMAKE_CURRENT_LIST_DIR}/third_libs/install/${OPENCV_FILENAME})
if (WIN32)
set(OpenCV_DIR ${OpenCV_DIR}/build/)
endif()
endif()
endif()
@@ -134,7 +130,6 @@ if(ENABLE_PADDLE_FRONTEND)
list(APPEND FASTDEPLOY_LIBS ${PADDLE2ONNX_LIB})
endif()
message("FASTDEPLOY_LIBS = ${FASTDEPLOY_LIBS}")
remove_duplicate_libraries(FASTDEPLOY_LIBS)
# Print compiler information
@@ -170,6 +165,9 @@ endif()
if(ORT_DIRECTORY)
message(STATUS " ORT_DIRECTORY : ${ORT_DIRECTORY}")
endif()
if (OPENVINO_DIRECTORY)
message(STATUS " OPENVINO_DIRECTORY : ${OPENVINO_DIRECTORY}")
endif()
if(ANDROID)
message(STATUS " ANDROID_ABI : ${ANDROID_ABI}")
message(STATUS " ANDROID_PLATFORM : ${ANDROID_PLATFORM}")

33
cmake/opencv.cmake
View File

@@ -13,23 +13,24 @@
# limitations under the License.
set(COMPRESSED_SUFFIX ".tgz")
if(WIN32)
set(OPENCV_LIB "opencv-win-x64-3.4.16")
set(OPENCV_FILENAME "opencv-win-x64-3.4.16")
set(COMPRESSED_SUFFIX ".zip")
elseif(APPLE)
if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "arm64")
set(OPENCV_LIB "opencv-osx-arm64-3.4.16")
set(OPENCV_FILENAME "opencv-osx-arm64-3.4.16")
else()
set(OPENCV_LIB "opencv-osx-x86_64-3.4.16")
set(OPENCV_FILENAME "opencv-osx-x86_64-3.4.16")
endif()
elseif(ANDROID)
# Use different OpenCV libs according to toolchain
# gcc: OpenCV 3.x, clang: OpenCV 4.x
if(ANDROID_TOOLCHAIN MATCHES "clang")
set(OPENCV_LIB "opencv-android-4.6.0")
set(OPENCV_FILENAME "opencv-android-4.6.0")
set(OPENCV_ANDROID_SHARED_LIB_NAME "libopencv_java4.so")
elseif(ANDROID_TOOLCHAIN MATCHES "gcc")
set(OPENCV_LIB "opencv-android-3.4.16")
set(OPENCV_FILENAME "opencv-android-3.4.16")
set(OPENCV_ANDROID_SHARED_LIB_NAME "libopencv_java3.so")
else()
message(FATAL_ERROR "Only support clang/gcc toolchain, but found ${ANDROID_TOOLCHAIN}.")
@@ -39,15 +40,15 @@ elseif(IOS)
# Linux
else()
if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "aarch64")
set(OPENCV_LIB "opencv-linux-aarch64-3.4.14")
set(OPENCV_FILENAME "opencv-linux-aarch64-3.4.14")
else()
set(OPENCV_LIB "opencv-linux-x64-3.4.16")
set(OPENCV_FILENAME "opencv-linux-x64-3.4.16")
endif()
if(ENABLE_OPENCV_CUDA)
if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "aarch64")
message(FATAL_ERROR "Cannot set ENABLE_OPENCV_CUDA=ON while in linux-aarch64 platform.")
endif()
set(OPENCV_LIB "opencv-linux-x64-gpu-3.4.16")
set(OPENCV_FILENAME "opencv-linux-x64-gpu-3.4.16")
endif()
endif()
@@ -57,7 +58,7 @@ if(ANDROID)
else() # TODO: use fastdeploy/third_libs instead.
set(OPENCV_URL_PREFIX "https://bj.bcebos.com/paddle2onnx/libs")
endif()
set(OPENCV_URL ${OPENCV_URL_PREFIX}/${OPENCV_LIB}${COMPRESSED_SUFFIX})
set(OPENCV_URL ${OPENCV_URL_PREFIX}/${OPENCV_FILENAME}${COMPRESSED_SUFFIX})
if(BUILD_ON_JETSON)
if(EXISTS /usr/lib/aarch64-linux-gnu/cmake/opencv4/)
@@ -97,19 +98,19 @@ else()
if(ANDROID)
if(WITH_OPENCV_STATIC)
# When FastDeploy uses the OpenCV static library, there is no need to install OpenCV to FastDeploy thirds_libs
download_and_decompress(${OPENCV_URL} ${CMAKE_CURRENT_BINARY_DIR}/${OPENCV_LIB}${COMPRESSED_SUFFIX} ${THIRD_PARTY_PATH})
set(OpenCV_DIR ${THIRD_PARTY_PATH}/${OPENCV_LIB}/sdk/native/jni)
download_and_decompress(${OPENCV_URL} ${CMAKE_CURRENT_BINARY_DIR}/${OPENCV_FILENAME}${COMPRESSED_SUFFIX} ${THIRD_PARTY_PATH})
set(OpenCV_DIR ${THIRD_PARTY_PATH}/${OPENCV_FILENAME}/sdk/native/jni)
find_package(OpenCV REQUIRED PATHS ${OpenCV_DIR})
include_directories(${OpenCV_INCLUDE_DIRS})
list(APPEND DEPEND_LIBS ${OpenCV_LIBS})
# Still need OpenCV headers now. TODO(qiuyanjun): May remove OpenCV headers.
execute_process(
COMMAND ${CMAKE_COMMAND} -E copy_directory ${OpenCV_DIR}
${THIRD_PARTY_PATH}/install/${OPENCV_LIB}/sdk/native/jni)
${THIRD_PARTY_PATH}/install/${OPENCV_FILENAME}/sdk/native/jni)
else()
# Installing OpenCV shared lib to FastDeploy third_libs/install dir.
download_and_decompress(${OPENCV_URL} ${CMAKE_CURRENT_BINARY_DIR}/${OPENCV_LIB}${COMPRESSED_SUFFIX} ${THIRD_PARTY_PATH}/install)
set(OpenCV_DIR ${THIRD_PARTY_PATH}/install/${OPENCV_LIB}/sdk/native/jni)
download_and_decompress(${OPENCV_URL} ${CMAKE_CURRENT_BINARY_DIR}/${OPENCV_FILENAME}${COMPRESSED_SUFFIX} ${THIRD_PARTY_PATH}/install)
set(OpenCV_DIR ${THIRD_PARTY_PATH}/install/${OPENCV_FILENAME}/sdk/native/jni)
get_filename_component(OpenCV_NATIVE_DIR ${OpenCV_DIR} DIRECTORY)
set(OpenCV_INCLUDE_DIRS ${OpenCV_DIR}/include)
set(OpenCV_LIBS_DIR ${OpenCV_NATIVE_DIR}/libs)
@@ -121,8 +122,8 @@ else()
endif()
# Win/Linux/Mac
else()
download_and_decompress(${OPENCV_URL} ${CMAKE_CURRENT_BINARY_DIR}/${OPENCV_LIB}${COMPRESSED_SUFFIX} ${THIRD_PARTY_PATH}/install/)
set(OpenCV_DIR ${THIRD_PARTY_PATH}/install/${OPENCV_LIB}/)
download_and_decompress(${OPENCV_URL} ${CMAKE_CURRENT_BINARY_DIR}/${OPENCV_FILENAME}${COMPRESSED_SUFFIX} ${THIRD_PARTY_PATH}/install/)
set(OpenCV_DIR ${THIRD_PARTY_PATH}/install/${OPENCV_FILENAME}/)
if (WIN32)
set(OpenCV_DIR ${OpenCV_DIR}/build/)
endif()

8
cmake/openvino.cmake
View File

@@ -84,6 +84,12 @@ file(REMOVE_RECURSE ${THIRD_PARTY_PATH}/install/${OPENVINO_FILENAME}/samples)
file(REMOVE_RECURSE ${THIRD_PARTY_PATH}/install/${OPENVINO_FILENAME}/setupvars.sh)
file(REMOVE_RECURSE ${THIRD_PARTY_PATH}/install/${OPENVINO_FILENAME}/tools)
get_openvino_libs(${OPENVINO_INSTALL_DIR})
if (OPENVINO_DIRECTORY)
message(STATUS "Use the openvino lib specified by user. The OpenVINO path: ${OPENVINO_DIRECTORY}")
STRING(REGEX REPLACE "\\\\" "/" OPENVINO_DIRECTORY ${OPENVINO_DIRECTORY})
get_openvino_libs(${OPENVINO_DIRECTORY}/runtime)
else()
get_openvino_libs(${OPENVINO_INSTALL_DIR})
endif()
message("OPENVINO_LIBS = ${OPENVINO_LIBS}")
list(APPEND DEPEND_LIBS ${OPENVINO_LIBS})

4
cmake/utils.cmake
View File

@@ -29,10 +29,10 @@ endfunction()
function(get_openvino_libs OPENVINO_RUNTIME_DIR)
set(LIB_LIST "")
find_library(OPENVINO_LIB openvino ${OPENVINO_RUNTIME_DIR}/lib/ NO_DEFAULT_PATH)
find_library(OPENVINO_LIB openvino PATHS ${OPENVINO_RUNTIME_DIR}/lib/ ${OPENVINO_RUNTIME_DIR}/lib/intel64 NO_DEFAULT_PATH)
list(APPEND LIB_LIST ${OPENVINO_LIB})
find_package(TBB PATHS "${OPENVINO_RUNTIME_DIR}/3rdparty/tbb")
find_package(TBB PATHS ${OPENVINO_RUNTIME_DIR}/3rdparty/tbb)
if (TBB_FOUND)
list(APPEND LIB_LIST ${TBB_IMPORTED_TARGETS})
else()