未验证 提交 e03ba047 编写于 作者: T TeslaZhao 提交者: GitHub

Merge pull request #1781 from ShiningZhang/dev

update paddlepaddle.cmake
...@@ -53,6 +53,7 @@ else() ...@@ -53,6 +53,7 @@ else()
set(WITH_TRT OFF) set(WITH_TRT OFF)
endif() endif()
if (WITH_GPU) if (WITH_GPU)
SET(PADDLE_VERSION "2.3.0-no-ort")
SET(PADDLE_LIB_VERSION "${PADDLE_VERSION}/cxx_c/Linux/GPU/${CUDA_SUFFIX}") SET(PADDLE_LIB_VERSION "${PADDLE_VERSION}/cxx_c/Linux/GPU/${CUDA_SUFFIX}")
elseif (WITH_LITE) elseif (WITH_LITE)
message("cpu arch: ${CMAKE_SYSTEM_PROCESSOR}") message("cpu arch: ${CMAKE_SYSTEM_PROCESSOR}")
...@@ -85,6 +86,7 @@ elseif (WITH_ASCEND_CL) ...@@ -85,6 +86,7 @@ elseif (WITH_ASCEND_CL)
endif() endif()
else() else()
if (WITH_AVX) if (WITH_AVX)
SET(PADDLE_VERSION "2.3.0-no-ort")
if (WITH_MKLML) if (WITH_MKLML)
SET(PADDLE_LIB_VERSION "${PADDLE_VERSION}/cxx_c/Linux/CPU/gcc8.2_avx_mkl") SET(PADDLE_LIB_VERSION "${PADDLE_VERSION}/cxx_c/Linux/CPU/gcc8.2_avx_mkl")
else() else()
...@@ -177,7 +179,7 @@ if (NOT WITH_MKLML) ...@@ -177,7 +179,7 @@ if (NOT WITH_MKLML)
endif() endif()
ADD_LIBRARY(paddle_inference STATIC IMPORTED GLOBAL) ADD_LIBRARY(paddle_inference STATIC IMPORTED GLOBAL)
SET_PROPERTY(TARGET paddle_inference PROPERTY IMPORTED_LOCATION ${PADDLE_INSTALL_DIR}/lib/libpaddle_inference.so) SET_PROPERTY(TARGET paddle_inference PROPERTY IMPORTED_LOCATION ${PADDLE_INSTALL_DIR}/lib/libpaddle_inference.a)
if (WITH_ASCEND_CL) if (WITH_ASCEND_CL)
SET_PROPERTY(TARGET paddle_inference PROPERTY IMPORTED_LOCATION ${PADDLE_INSTALL_DIR}/lib/libpaddle_inference.so) SET_PROPERTY(TARGET paddle_inference PROPERTY IMPORTED_LOCATION ${PADDLE_INSTALL_DIR}/lib/libpaddle_inference.so)
endif() endif()
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册