未验证 提交 ad730ae4 编写于 作者: T Tingquan Gao 提交者: GitHub

Adapt to paddle inference 2.0 (#607)

上级 0c35c4c7
...@@ -124,7 +124,11 @@ if(WITH_MKL) ...@@ -124,7 +124,11 @@ if(WITH_MKL)
endif () endif ()
endif() endif()
else() else()
set(MATH_LIB ${PADDLE_LIB}/third_party/install/openblas/lib/libopenblas${CMAKE_STATIC_LIBRARY_SUFFIX}) if (WIN32)
set(MATH_LIB ${PADDLE_LIB}/third_party/install/openblas/lib/openblas${CMAKE_STATIC_LIBRARY_SUFFIX})
else ()
set(MATH_LIB ${PADDLE_LIB}/third_party/install/openblas/lib/libopenblas${CMAKE_STATIC_LIBRARY_SUFFIX})
endif ()
endif() endif()
# Note: libpaddle_inference_api.so/a must put before libpaddle_fluid.so/a # Note: libpaddle_inference_api.so/a must put before libpaddle_fluid.so/a
...@@ -148,7 +152,7 @@ endif(WITH_STATIC_LIB) ...@@ -148,7 +152,7 @@ endif(WITH_STATIC_LIB)
if (NOT WIN32) if (NOT WIN32)
set(DEPS ${DEPS} set(DEPS ${DEPS}
${MATH_LIB} ${MKLDNN_LIB} ${MATH_LIB} ${MKLDNN_LIB}
glog gflags protobuf z xxhash glog gflags protobuf z xxhash
) )
if(EXISTS "${PADDLE_LIB}/third_party/install/snappystream/lib") if(EXISTS "${PADDLE_LIB}/third_party/install/snappystream/lib")
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册