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

Fix windows compile bug

Browse Source
This commit is contained in:
zhoushunjie
2022-09-25 11:43:16 +08:00
parent 749319e2a8
commit c53d8fd82c
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
FastDeploy.cmake.in
View File

@@ -58,9 +58,18 @@ endif()
if(ENABLE_OPENVINO_BACKEND) if(ENABLE_OPENVINO_BACKEND)
set(OPENVINO_FILENAME @OPENVINO_FILENAME@) set(OPENVINO_FILENAME @OPENVINO_FILENAME@)
find_library(OPENVINO_LIB openvino ${CMAKE_CURRENT_LIST_DIR}/third_libs/install/${OPENVINO_FILENAME}/runtime/lib/ NO_DEFAULT_PATH) find_library(OPENVINO_LIB openvino ${CMAKE_CURRENT_LIST_DIR}/third_libs/install/${OPENVINO_FILENAME}/runtime/lib/ NO_DEFAULT_PATH)
set(OPENVINO_LIBS ${OPENVINO_LIB})
# Find tbb libs # Find tbb libs
find_package(TBB REQUIRED PATHS "${CMAKE_CURRENT_LIST_DIR}/third_libs/install/${OPENVINO_FILENAME}/runtime/3rdparty/tbb/") find_package(TBB PATHS "${CMAKE_CURRENT_LIST_DIR}/third_libs/install/${OPENVINO_FILENAME}/runtime/3rdparty/tbb/")
set(OPENVINO_LIBS ${OPENVINO_LIB} ${TBB_IMPORTED_TARGETS}) if (TBB_FOUND)
list(APPEND OPENVINO_LIBS ${TBB_IMPORTED_TARGETS})
else()
# TODO(zhoushunjie): Use openvino with tbb on linux in future.
set(OMP_LIB "${CMAKE_CURRENT_LIST_DIR}/third_libs/install/${OPENVINO_FILENAME}/runtime/3rdparty/omp/lib/libiomp5.so")
add_library(omp STATIC IMPORTED GLOBAL)
set_property(TARGET omp PROPERTY IMPORTED_LOCATION ${OMP_LIB})
list(APPEND OPENVINO_LIBS omp)
endif()
message(STATUS "OPENVINO_LIBS = ${OPENVINO_LIBS}") message(STATUS "OPENVINO_LIBS = ${OPENVINO_LIBS}")
list(APPEND FASTDEPLOY_LIBS ${OPENVINO_LIBS}) list(APPEND FASTDEPLOY_LIBS ${OPENVINO_LIBS})
endif() endif()

4
cmake/openvino.cmake
View File

@@ -67,10 +67,11 @@ if(WIN32)
CACHE FILEPATH "OPENVINO shared library." FORCE) CACHE FILEPATH "OPENVINO shared library." FORCE)
file(GLOB_RECURSE OPENVINO_LIB_FILES ${OPENVINO_INSTALL_DIR}/lib/intel64/Release/*) file(GLOB_RECURSE OPENVINO_LIB_FILES ${OPENVINO_INSTALL_DIR}/lib/intel64/Release/*)
file(COPY ${OPENVINO_LIB_FILES} DESTINATION ${OPENVINO_INSTALL_DIR}/lib/) file(COPY ${OPENVINO_LIB_FILES} DESTINATION ${OPENVINO_INSTALL_DIR}/lib/)
file(REMOVE_RECURSE ${OPENVINO_INSTALL_DIR}/lib/intel64)
file(GLOB_RECURSE OPENVINO_BIN_FILES ${OPENVINO_INSTALL_DIR}/bin/intel64/Release/*) file(GLOB_RECURSE OPENVINO_BIN_FILES ${OPENVINO_INSTALL_DIR}/bin/intel64/Release/*)
file(COPY ${OPENVINO_LIB_FILES} DESTINATION ${OPENVINO_INSTALL_DIR}/bin/) file(COPY ${OPENVINO_LIB_FILES} DESTINATION ${OPENVINO_INSTALL_DIR}/bin/)
file(REMOVE_RECURSE ${OPENVINO_INSTALL_DIR}/lib/intel64)
file(REMOVE_RECURSE ${OPENVINO_INSTALL_DIR}/bin/intel64) file(REMOVE_RECURSE ${OPENVINO_INSTALL_DIR}/bin/intel64)
elseif(APPLE) elseif(APPLE)
set(OPENVINO_LIB set(OPENVINO_LIB
@@ -102,6 +103,7 @@ find_package(TBB PATHS "${OPENVINO_INSTALL_DIR}/3rdparty/tbb")
if (TBB_FOUND) if (TBB_FOUND)
list(APPEND OPENVINO_LIBS ${TBB_IMPORTED_TARGETS}) list(APPEND OPENVINO_LIBS ${TBB_IMPORTED_TARGETS})
else() else()
# TODO(zhoushunjie): Use openvino with tbb on linux in future.
set(OMP_LIB "${OPENVINO_INSTALL_DIR}/3rdparty/omp/lib/libiomp5.so") set(OMP_LIB "${OPENVINO_INSTALL_DIR}/3rdparty/omp/lib/libiomp5.so")
add_library(omp STATIC IMPORTED GLOBAL) add_library(omp STATIC IMPORTED GLOBAL)
set_property(TARGET omp PROPERTY IMPORTED_LOCATION set_property(TARGET omp PROPERTY IMPORTED_LOCATION