Skip to content

Commit b4d4303

Browse files
authored
windows inference fix (#13141)
* windows inference fix * windows inference fix
1 parent 597b730 commit b4d4303

File tree

1 file changed

+25
-8
lines changed

1 file changed

+25
-8
lines changed

paddle/fluid/inference/api/demo_ci/CMakeLists.txt

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ cmake_minimum_required(VERSION 3.0)
33
project(cpp_inference_demo CXX C)
44

55
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
6+
if (WIN32)
7+
set(CMAKE_STATIC_LIBRARY_PREFIX "lib")
8+
else()
9+
set(CMAKE_STATIC_LIBRARY_PREFIX "")
10+
endif()
611

712
if(NOT DEFINED PADDLE_LIB)
813
message(FATAL_ERROR "please set PADDLE_LIB with -DPADDLE_LIB=/path/paddle/lib")
@@ -32,44 +37,56 @@ endif(NOT WIN32)
3237
include_directories("${PADDLE_LIB}/third_party/boost")
3338
include_directories("${PADDLE_LIB}/third_party/eigen3")
3439

40+
if (NOT WIN32)
3541
link_directories("${PADDLE_LIB}/third_party/install/snappy/lib")
3642
link_directories("${PADDLE_LIB}/third_party/install/snappystream/lib")
43+
link_directories("${PADDLE_LIB}/third_party/install/zlib/lib")
44+
endif(NOT WIN32)
45+
3746
link_directories("${PADDLE_LIB}/third_party/install/protobuf/lib")
3847
link_directories("${PADDLE_LIB}/third_party/install/glog/lib")
3948
link_directories("${PADDLE_LIB}/third_party/install/gflags/lib")
40-
link_directories("${PADDLE_LIB}/third_party/install/zlib/lib")
49+
link_directories("${PADDLE_LIB}/paddle/fluid/inference")
4150

4251
add_executable(${DEMO_NAME} ${DEMO_NAME}.cc)
4352

4453
if(WITH_MKL)
4554
include_directories("${PADDLE_LIB}/third_party/install/mklml/include")
46-
set(MATH_LIB ${PADDLE_LIB}/third_party/install/mklml/lib/libmklml_intel.so
47-
${PADDLE_LIB}/third_party/install/mklml/lib/libiomp5.so)
55+
set(MATH_LIB ${PADDLE_LIB}/third_party/install/mklml/lib/libmklml_intel${CMAKE_SHARED_LIBRARY_SUFFIX}
56+
${PADDLE_LIB}/third_party/install/mklml/lib/libiomp5${CMAKE_SHARED_LIBRARY_SUFFIX})
4857
set(MKLDNN_PATH "${PADDLE_LIB}/third_party/install/mkldnn")
4958
if(EXISTS ${MKLDNN_PATH})
5059
include_directories("${MKLDNN_PATH}/include")
5160
set(MKLDNN_LIB ${MKLDNN_PATH}/lib/libmkldnn.so.0)
5261
endif()
5362
else()
54-
set(MATH_LIB ${PADDLE_LIB}/third_party/install/openblas/lib/libopenblas.a)
63+
set(MATH_LIB ${PADDLE_LIB}/third_party/install/openblas/lib/libopenblas${CMAKE_STATIC_LIBRARY_SUFFIX})
5564
endif()
5665

5766
# Note: libpaddle_inference_api.so/a must put before libpaddle_fluid.so/a
5867
if(WITH_STATIC_LIB)
5968
set(DEPS
60-
${PADDLE_LIB}/paddle/fluid/inference/libpaddle_fluid.a)
69+
${PADDLE_LIB}/paddle/fluid/inference/libpaddle_fluid${CMAKE_STATIC_LIBRARY_SUFFIX})
6170
else()
6271
set(DEPS
63-
${PADDLE_LIB}/paddle/fluid/inference/libpaddle_fluid.so)
72+
${PADDLE_LIB}/paddle/fluid/inference/libpaddle_fluid${CMAKE_SHARED_LIBRARY_SUFFIX})
6473
endif()
65-
set(EXTERNAL_LIB "-lrt -ldl -lpthread")
6674

75+
if (NOT WIN32)
76+
set(EXTERNAL_LIB "-lrt -ldl -lpthread")
6777
set(DEPS ${DEPS}
6878
${MATH_LIB} ${MKLDNN_LIB}
6979
glog gflags protobuf snappystream snappy z
7080
${EXTERNAL_LIB})
81+
else()
82+
set(DEPS ${DEPS}
83+
${MATH_LIB} ${MKLDNN_LIB}
84+
${CMAKE_STATIC_LIBRARY_PREFIX}glog ${CMAKE_STATIC_LIBRARY_PREFIX}gflags ${CMAKE_STATIC_LIBRARY_PREFIX}protobuf
85+
${EXTERNAL_LIB})
86+
endif(NOT WIN32)
87+
7188
if(WITH_GPU)
72-
set(DEPS ${DEPS} ${CUDA_LIB}/libcudart.so)
89+
set(DEPS ${DEPS} ${CUDA_LIB}/libcudart${CMAKE_SHARED_LIBRARY_SUFFIX})
7390
endif()
7491

7592
target_link_libraries(${DEMO_NAME} ${DEPS})

0 commit comments

Comments
 (0)