From 284d1375f3c888076811411096b9defceff7aeac Mon Sep 17 00:00:00 2001 From: Luo Tao Date: Wed, 24 Jan 2018 16:36:42 +0800 Subject: [PATCH 1/8] compile and install the static library of fluid inference --- cmake/external/openblas.cmake | 2 +- paddle/inference/CMakeLists.txt | 12 ++++++++++-- paddle/operators/math/CMakeLists.txt | 4 ++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/cmake/external/openblas.cmake b/cmake/external/openblas.cmake index 4012a164be1d2..86ea4b388edae 100644 --- a/cmake/external/openblas.cmake +++ b/cmake/external/openblas.cmake @@ -82,7 +82,7 @@ IF(NOT ${CBLAS_FOUND}) CONFIGURE_COMMAND "" ) SET(CBLAS_PROVIDER openblas) - IF(WITH_C_API) + IF(WITH_C_API OR WITH_FLUID) INSTALL(DIRECTORY ${CBLAS_INC_DIR} DESTINATION third_party/openblas) # Because libopenblas.a is a symbolic link of another library, thus need to # install the whole directory. diff --git a/paddle/inference/CMakeLists.txt b/paddle/inference/CMakeLists.txt index ae4d3fd2f58da..46138eec1a5e6 100644 --- a/paddle/inference/CMakeLists.txt +++ b/paddle/inference/CMakeLists.txt @@ -5,7 +5,15 @@ cc_library(paddle_fluid_api DEPS ${FLUID_CORE_MODULES} ${GLOB_OP_LIB}) # Merge all modules into a single static library -cc_library(paddle_fluid DEPS paddle_fluid_api ${FLUID_CORE_MODULES} ${GLOB_OP_LIB}) +cc_library(paddle_fluid DEPS paddle_fluid_api + framework_proto ddim tensor place scope threadpool attribute + shape_inference cpu_info op_registry operator op_proto_maker op_info + data_transform data_device_transform data_type_transform data_layout_transform + selected_rows lod_tensor lod_rank_table dynload_warpctc + device_context dynload_cuda dynamic_loader + ${OP_MATH_MODULES} + ${FLUID_CORE_MODULES} + ${GLOB_OP_LIB}) # Create shared library add_library(paddle_fluid_shared SHARED inference.cc) @@ -21,7 +29,7 @@ SET_TARGET_PROPERTIES(paddle_fluid_shared PROPERTIES OUTPUT_NAME paddle_fluid) # install library & headers if(NOT WITH_C_API AND WITH_FLUID) install(FILES inference.h DESTINATION include/paddle/inference) - install(TARGETS paddle_fluid_shared DESTINATION lib) + install(TARGETS paddle_fluid_shared paddle_fluid DESTINATION lib) endif() add_executable(example example.cc) diff --git a/paddle/operators/math/CMakeLists.txt b/paddle/operators/math/CMakeLists.txt index c607704efac86..d9250457101ea 100644 --- a/paddle/operators/math/CMakeLists.txt +++ b/paddle/operators/math/CMakeLists.txt @@ -43,3 +43,7 @@ cc_test(selected_rows_functor_test SRCS selected_rows_functor_test.cc DEPS selec cc_test(im2col_test SRCS im2col_test.cc DEPS math_function tensor) cc_test(vol2col_test SRCS vol2col_test.cc DEPS vol2col tensor) cc_test(sequence_padding_test SRCS sequence_padding_test.cc DEPS sequence_padding) + +set(OP_MATH_MODULES math_function selected_rows_functor softmax cross_entropy pooling sequence_pooling + vol2col context_project sequence2batch sequence_padding sequence_scale lstm_compute maxouting + unpooling gru_compute cos_sim_functor activation_functions CACHE INTERNAL "Global OP Math Modules") From ff06face1643b783bf41efcdda9efea82b297a97 Mon Sep 17 00:00:00 2001 From: Luo Tao Date: Wed, 24 Jan 2018 21:45:16 +0800 Subject: [PATCH 2/8] fix dynload_cuda not in CPU mode --- paddle/inference/CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/paddle/inference/CMakeLists.txt b/paddle/inference/CMakeLists.txt index 46138eec1a5e6..d81adfaff6f52 100644 --- a/paddle/inference/CMakeLists.txt +++ b/paddle/inference/CMakeLists.txt @@ -4,13 +4,17 @@ cc_library(paddle_fluid_api SRCS inference.cc DEPS ${FLUID_CORE_MODULES} ${GLOB_OP_LIB}) +if(WITH_GPU) + set(GPU_DEPS gpu_info dynload_cuda) +endif() # Merge all modules into a single static library cc_library(paddle_fluid DEPS paddle_fluid_api framework_proto ddim tensor place scope threadpool attribute shape_inference cpu_info op_registry operator op_proto_maker op_info data_transform data_device_transform data_type_transform data_layout_transform - selected_rows lod_tensor lod_rank_table dynload_warpctc - device_context dynload_cuda dynamic_loader + selected_rows lod_tensor lod_rank_table dynload_warpctc dynamic_loader + device_context profiler + ${GPU_DEPS} ${OP_MATH_MODULES} ${FLUID_CORE_MODULES} ${GLOB_OP_LIB}) From 750d2e6f571f78b3c9f07554456d729b0ee85c62 Mon Sep 17 00:00:00 2001 From: Luo Tao Date: Thu, 8 Feb 2018 18:13:45 +0800 Subject: [PATCH 3/8] update shared library and adjust the deploy of openblas --- cmake/external/openblas.cmake | 8 ++------ cmake/inference_lib.cmake | 10 ++++++++-- paddle/inference/CMakeLists.txt | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/cmake/external/openblas.cmake b/cmake/external/openblas.cmake index 86ea4b388edae..58d957876b03f 100644 --- a/cmake/external/openblas.cmake +++ b/cmake/external/openblas.cmake @@ -82,7 +82,8 @@ IF(NOT ${CBLAS_FOUND}) CONFIGURE_COMMAND "" ) SET(CBLAS_PROVIDER openblas) - IF(WITH_C_API OR WITH_FLUID) + FILE(REMOVE_RECURSE ${CBLAS_INSTALL_DIR}/lib/cmake ${CBLAS_INSTALL_DIR}/lib/pkgconfig) + IF(WITH_C_API) INSTALL(DIRECTORY ${CBLAS_INC_DIR} DESTINATION third_party/openblas) # Because libopenblas.a is a symbolic link of another library, thus need to # install the whole directory. @@ -100,11 +101,6 @@ IF(NOT ${CBLAS_FOUND}) \"${CBLAS_INSTALL_DIR}/lib -> ${CMAKE_INSTALL_PREFIX}/${TMP_INSTALL_DIR}\" )" ) - INSTALL(CODE "execute_process( - COMMAND rm -r ${CMAKE_INSTALL_PREFIX}/${TMP_INSTALL_DIR}/cmake - ${CMAKE_INSTALL_PREFIX}/${TMP_INSTALL_DIR}/pkgconfig - )" - ) ENDIF() ENDIF(NOT ${CBLAS_FOUND}) diff --git a/cmake/inference_lib.cmake b/cmake/inference_lib.cmake index 7d53554358497..5a988f01e2d88 100644 --- a/cmake/inference_lib.cmake +++ b/cmake/inference_lib.cmake @@ -52,6 +52,12 @@ IF(NOT PROTOBUF_FOUND) ) ENDIF(NOT PROTOBUF_FOUND) +set(dst_dir "${CMAKE_INSTALL_PREFIX}/third_party/install/openblas") +copy(openblas_lib + SRCS ${CBLAS_INSTALL_DIR}/lib ${CBLAS_INSTALL_DIR}/include + DSTS ${dst_dir} ${dst_dir} +) + # paddle fluid module set(src_dir "${PADDLE_SOURCE_DIR}/paddle") set(dst_dir "${CMAKE_INSTALL_PREFIX}/paddle") @@ -69,7 +75,7 @@ copy(memory_lib set(module "inference") copy(inference_lib DEPENDS paddle_fluid_shared - SRCS ${src_dir}/${module}/*.h ${PADDLE_BINARY_DIR}/paddle/inference/libpaddle_fluid.so + SRCS ${src_dir}/${module}/*.h ${PADDLE_BINARY_DIR}/paddle/inference/libpaddle_fluid.* DSTS ${dst_dir}/${module} ${dst_dir}/${module} ) @@ -87,4 +93,4 @@ copy(string_lib add_custom_target(inference_lib_dist DEPENDS inference_lib framework_lib memory_lib platform_lib string_lib - gflags_lib glog_lib protobuf_lib eigen3_lib) + gflags_lib glog_lib protobuf_lib eigen3_lib openblas_lib) diff --git a/paddle/inference/CMakeLists.txt b/paddle/inference/CMakeLists.txt index 0308486e1cf0c..253a6d36d376a 100644 --- a/paddle/inference/CMakeLists.txt +++ b/paddle/inference/CMakeLists.txt @@ -13,7 +13,7 @@ cc_library(paddle_fluid DEPS paddle_fluid_api shape_inference cpu_info op_registry operator op_proto_maker op_info data_transform data_device_transform data_type_transform data_layout_transform selected_rows lod_tensor lod_rank_table dynload_warpctc dynamic_loader - device_context profiler + device_context profiler reader feed_fetch_method ${GPU_DEPS} ${OP_MATH_MODULES} ${FLUID_CORE_MODULES} From 52d3bff43b0c712cf68eff057e46ef645857736f Mon Sep 17 00:00:00 2001 From: Luo Tao Date: Sun, 11 Feb 2018 17:48:11 +0800 Subject: [PATCH 4/8] adjust the deploy of openblas --- cmake/external/openblas.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/external/openblas.cmake b/cmake/external/openblas.cmake index 58d957876b03f..5822c6eaa71dc 100644 --- a/cmake/external/openblas.cmake +++ b/cmake/external/openblas.cmake @@ -77,12 +77,12 @@ IF(NOT ${CBLAS_FOUND}) INSTALL_DIR ${CBLAS_INSTALL_DIR} BUILD_IN_SOURCE 1 BUILD_COMMAND ${CMAKE_MAKE_PROGRAM} ${COMMON_ARGS} ${OPTIONAL_ARGS} - INSTALL_COMMAND ${CMAKE_MAKE_PROGRAM} install NO_SHARED=1 NO_LAPACK=1 PREFIX= + INSTALL_COMMAND ${CMAKE_MAKE_PROGRAM} install NO_SHARED=1 NO_LAPACK=1 PREFIX= + && rm -r ${CBLAS_INSTALL_DIR}/lib/cmake ${CBLAS_INSTALL_DIR}/lib/pkgconfig UPDATE_COMMAND "" CONFIGURE_COMMAND "" ) SET(CBLAS_PROVIDER openblas) - FILE(REMOVE_RECURSE ${CBLAS_INSTALL_DIR}/lib/cmake ${CBLAS_INSTALL_DIR}/lib/pkgconfig) IF(WITH_C_API) INSTALL(DIRECTORY ${CBLAS_INC_DIR} DESTINATION third_party/openblas) # Because libopenblas.a is a symbolic link of another library, thus need to From 47f1d475e95d1d52dc544379dc51d69abf4352d9 Mon Sep 17 00:00:00 2001 From: Luo Tao Date: Fri, 2 Mar 2018 18:54:37 +0800 Subject: [PATCH 5/8] * auto add all fluid modules for static library * use libprotobuf.a instead of libprotobuf-lite.a for profiler --- cmake/generic.cmake | 7 +++++++ cmake/inference_lib.cmake | 4 ++-- paddle/fluid/inference/CMakeLists.txt | 14 +------------- paddle/fluid/operators/math/CMakeLists.txt | 4 ---- 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/cmake/generic.cmake b/cmake/generic.cmake index 356da582d1f8b..1668825a8969f 100644 --- a/cmake/generic.cmake +++ b/cmake/generic.cmake @@ -176,6 +176,7 @@ function(merge_static_libs TARGET_NAME) endif() endfunction(merge_static_libs) +set(ENV{FLUID_MODULES}) # used for building fluid static library function(cc_library TARGET_NAME) set(options STATIC static SHARED shared) set(oneValueArgs "") @@ -186,7 +187,13 @@ function(cc_library TARGET_NAME) add_library(${TARGET_NAME} SHARED ${cc_library_SRCS}) else() add_library(${TARGET_NAME} STATIC ${cc_library_SRCS}) + get_filename_component(__target_path ${TARGET_NAME} ABSOLUTE) + string(FIND "${__target_path}" "fluid" pos) + if(pos GREATER 1) + set(ENV{FLUID_MODULES} "$ENV{FLUID_MODULES};${TARGET_NAME}") + endif() endif() + if(cc_library_DEPS) # Don't need link libwarpctc.so if("${cc_library_DEPS};" MATCHES "warpctc;") diff --git a/cmake/inference_lib.cmake b/cmake/inference_lib.cmake index 09c6adc043b51..b3a23e187b365 100644 --- a/cmake/inference_lib.cmake +++ b/cmake/inference_lib.cmake @@ -45,7 +45,7 @@ copy(glog_lib IF(NOT PROTOBUF_FOUND) set(dst_dir "${CMAKE_INSTALL_PREFIX}/third_party/install/protobuf") copy(protobuf_lib - SRCS ${PROTOBUF_INCLUDE_DIR} ${PROTOBUF_LITE_LIBRARY} + SRCS ${PROTOBUF_INCLUDE_DIR} ${PROTOBUF_LIBRARY} DSTS ${dst_dir} ${dst_dir}/lib ) ENDIF(NOT PROTOBUF_FOUND) @@ -73,7 +73,7 @@ copy(memory_lib set(module "inference") copy(inference_lib DEPENDS paddle_fluid_shared - SRCS ${src_dir}/${module}/*.h ${PADDLE_BINARY_DIR}/paddle/inference/libpaddle_fluid.* + SRCS ${src_dir}/${module}/*.h ${PADDLE_BINARY_DIR}/paddle/fluid/inference/libpaddle_fluid.* DSTS ${dst_dir}/${module} ${dst_dir}/${module} ) diff --git a/paddle/fluid/inference/CMakeLists.txt b/paddle/fluid/inference/CMakeLists.txt index e35f275af1a84..4e9474fb6dbd1 100644 --- a/paddle/fluid/inference/CMakeLists.txt +++ b/paddle/fluid/inference/CMakeLists.txt @@ -4,20 +4,8 @@ cc_library(paddle_fluid_api SRCS io.cc DEPS ${FLUID_CORE_MODULES} ${GLOB_OP_LIB}) -if(WITH_GPU) - set(GPU_DEPS gpu_info dynload_cuda) -endif() # Create static library -cc_library(paddle_fluid DEPS paddle_fluid_api - framework_proto ddim tensor place scope threadpool attribute - shape_inference cpu_info op_registry operator op_proto_maker op_info - data_transform data_device_transform data_type_transform data_layout_transform - selected_rows lod_tensor lod_rank_table dynload_warpctc dynamic_loader - device_context profiler reader feed_fetch_method - ${GPU_DEPS} - ${OP_MATH_MODULES} - ${FLUID_CORE_MODULES} - ${GLOB_OP_LIB}) +cc_library(paddle_fluid DEPS $ENV{FLUID_MODULES}) # Create shared library cc_library(paddle_fluid_shared SHARED diff --git a/paddle/fluid/operators/math/CMakeLists.txt b/paddle/fluid/operators/math/CMakeLists.txt index f6e6b46a4b42c..768106fadf355 100644 --- a/paddle/fluid/operators/math/CMakeLists.txt +++ b/paddle/fluid/operators/math/CMakeLists.txt @@ -44,7 +44,3 @@ cc_test(selected_rows_functor_test SRCS selected_rows_functor_test.cc DEPS selec cc_test(im2col_test SRCS im2col_test.cc DEPS math_function tensor) cc_test(vol2col_test SRCS vol2col_test.cc DEPS vol2col tensor) cc_test(sequence_padding_test SRCS sequence_padding_test.cc DEPS sequence_padding) - -set(OP_MATH_MODULES math_function selected_rows_functor softmax cross_entropy pooling sequence_pooling - vol2col context_project sequence2batch sequence_padding sequence_scale lstm_compute maxouting - unpooling gru_compute cos_sim_functor activation_functions CACHE INTERNAL "Global OP Math Modules") From 9bb9962317b9c385cca745e95b4479d26f16eb4e Mon Sep 17 00:00:00 2001 From: Luo Tao Date: Wed, 7 Mar 2018 11:25:00 +0800 Subject: [PATCH 6/8] use set_property to set the global varible instead of ENV --- cmake/generic.cmake | 6 ++++-- paddle/fluid/inference/CMakeLists.txt | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake/generic.cmake b/cmake/generic.cmake index 1668825a8969f..41af1651bc1bf 100644 --- a/cmake/generic.cmake +++ b/cmake/generic.cmake @@ -176,7 +176,7 @@ function(merge_static_libs TARGET_NAME) endif() endfunction(merge_static_libs) -set(ENV{FLUID_MODULES}) # used for building fluid static library +set_property(GLOBAL PROPERTY FLUID_MODULES "") # used for building fluid static library function(cc_library TARGET_NAME) set(options STATIC static SHARED shared) set(oneValueArgs "") @@ -190,7 +190,9 @@ function(cc_library TARGET_NAME) get_filename_component(__target_path ${TARGET_NAME} ABSOLUTE) string(FIND "${__target_path}" "fluid" pos) if(pos GREATER 1) - set(ENV{FLUID_MODULES} "$ENV{FLUID_MODULES};${TARGET_NAME}") + get_property(fluid_modules GLOBAL PROPERTY FLUID_MODULES) + set(fluid_modules ${fluid_modules} ${TARGET_NAME}) + set_property(GLOBAL PROPERTY FLUID_MODULES "${fluid_modules}") endif() endif() diff --git a/paddle/fluid/inference/CMakeLists.txt b/paddle/fluid/inference/CMakeLists.txt index 4e9474fb6dbd1..17ccca8cdcbca 100644 --- a/paddle/fluid/inference/CMakeLists.txt +++ b/paddle/fluid/inference/CMakeLists.txt @@ -5,7 +5,8 @@ cc_library(paddle_fluid_api DEPS ${FLUID_CORE_MODULES} ${GLOB_OP_LIB}) # Create static library -cc_library(paddle_fluid DEPS $ENV{FLUID_MODULES}) +get_property(fluid_modules GLOBAL PROPERTY FLUID_MODULES) +cc_library(paddle_fluid DEPS ${fluid_modules}) # Create shared library cc_library(paddle_fluid_shared SHARED From 9b6b8450019953f59efb0811d962cd9655269029 Mon Sep 17 00:00:00 2001 From: Luo Tao Date: Wed, 7 Mar 2018 13:29:23 +0800 Subject: [PATCH 7/8] add gpu depends of fluid modules, auto add inference_lib_dist depends --- cmake/generic.cmake | 12 +++--------- cmake/inference_lib.cmake | 31 ++++++++++++++++++++++--------- 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/cmake/generic.cmake b/cmake/generic.cmake index 41af1651bc1bf..d0b5eaec2e2a5 100644 --- a/cmake/generic.cmake +++ b/cmake/generic.cmake @@ -176,7 +176,6 @@ function(merge_static_libs TARGET_NAME) endif() endfunction(merge_static_libs) -set_property(GLOBAL PROPERTY FLUID_MODULES "") # used for building fluid static library function(cc_library TARGET_NAME) set(options STATIC static SHARED shared) set(oneValueArgs "") @@ -187,13 +186,7 @@ function(cc_library TARGET_NAME) add_library(${TARGET_NAME} SHARED ${cc_library_SRCS}) else() add_library(${TARGET_NAME} STATIC ${cc_library_SRCS}) - get_filename_component(__target_path ${TARGET_NAME} ABSOLUTE) - string(FIND "${__target_path}" "fluid" pos) - if(pos GREATER 1) - get_property(fluid_modules GLOBAL PROPERTY FLUID_MODULES) - set(fluid_modules ${fluid_modules} ${TARGET_NAME}) - set_property(GLOBAL PROPERTY FLUID_MODULES "${fluid_modules}") - endif() + find_fluid_modules(${TARGET_NAME}) endif() if(cc_library_DEPS) @@ -272,7 +265,8 @@ function(nv_library TARGET_NAME) if (nv_library_SHARED OR nv_library_shared) # build *.so cuda_add_library(${TARGET_NAME} SHARED ${nv_library_SRCS}) else() - cuda_add_library(${TARGET_NAME} STATIC ${nv_library_SRCS}) + cuda_add_library(${TARGET_NAME} STATIC ${nv_library_SRCS}) + find_fluid_modules(${TARGET_NAME}) endif() if (nv_library_DEPS) add_dependencies(${TARGET_NAME} ${nv_library_DEPS}) diff --git a/cmake/inference_lib.cmake b/cmake/inference_lib.cmake index b3a23e187b365..fd4d1fd269309 100644 --- a/cmake/inference_lib.cmake +++ b/cmake/inference_lib.cmake @@ -1,9 +1,22 @@ +set_property(GLOBAL PROPERTY FLUID_MODULES "") +# find all fluid modules is used for paddle fluid static library +function(find_fluid_modules TARGET_NAME) + get_filename_component(__target_path ${TARGET_NAME} ABSOLUTE) + string(FIND "${__target_path}" "fluid" pos) + if(pos GREATER 1) + get_property(fluid_modules GLOBAL PROPERTY FLUID_MODULES) + set(fluid_modules ${fluid_modules} ${TARGET_NAME}) + set_property(GLOBAL PROPERTY FLUID_MODULES "${fluid_modules}") + endif() +endfunction(find_fluid_modules) + # make package for paddle fluid shared and static library function(copy TARGET) set(options "") set(oneValueArgs "") set(multiValueArgs SRCS DSTS DEPS) cmake_parse_arguments(copy_lib "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + set(inference_lib_dist_dep ${TARGET} ${inference_lib_dist_dep} PARENT_SCOPE) list(LENGTH copy_lib_SRCS copy_lib_SRCS_len) list(LENGTH copy_lib_DSTS copy_lib_DSTS_len) @@ -50,11 +63,13 @@ IF(NOT PROTOBUF_FOUND) ) ENDIF(NOT PROTOBUF_FOUND) -set(dst_dir "${CMAKE_INSTALL_PREFIX}/third_party/install/openblas") -copy(openblas_lib - SRCS ${CBLAS_INSTALL_DIR}/lib ${CBLAS_INSTALL_DIR}/include - DSTS ${dst_dir} ${dst_dir} -) +IF(NOT WITH_MKL) + set(dst_dir "${CMAKE_INSTALL_PREFIX}/third_party/install/openblas") + copy(openblas_lib + SRCS ${CBLAS_INSTALL_DIR}/lib ${CBLAS_INSTALL_DIR}/include + DSTS ${dst_dir} ${dst_dir} + ) +ENDIF(NOT WITH_MKL) # paddle fluid module set(src_dir "${PADDLE_SOURCE_DIR}/paddle/fluid") @@ -72,7 +87,7 @@ copy(memory_lib ) set(module "inference") -copy(inference_lib DEPENDS paddle_fluid_shared +copy(inference_lib DEPS paddle_fluid_shared paddle_fluid SRCS ${src_dir}/${module}/*.h ${PADDLE_BINARY_DIR}/paddle/fluid/inference/libpaddle_fluid.* DSTS ${dst_dir}/${module} ${dst_dir}/${module} ) @@ -89,6 +104,4 @@ copy(string_lib DSTS ${dst_dir}/${module} ${dst_dir}/${module}/tinyformat ) -add_custom_target(inference_lib_dist DEPENDS - inference_lib framework_lib memory_lib platform_lib string_lib - gflags_lib glog_lib protobuf_lib eigen3_lib openblas_lib) +add_custom_target(inference_lib_dist DEPENDS ${inference_lib_dist_dep}) From 565278b205aa4894ad589bc6e206bd0b26cc51de Mon Sep 17 00:00:00 2001 From: Luo Tao Date: Wed, 7 Mar 2018 18:18:23 +0800 Subject: [PATCH 8/8] change the condition of openblas_lib, and fix a typo --- cmake/inference_lib.cmake | 8 ++++---- paddle/scripts/docker/build.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/inference_lib.cmake b/cmake/inference_lib.cmake index fd4d1fd269309..6b2237b858380 100644 --- a/cmake/inference_lib.cmake +++ b/cmake/inference_lib.cmake @@ -55,21 +55,21 @@ copy(glog_lib DSTS ${dst_dir} ${dst_dir}/lib ) -IF(NOT PROTOBUF_FOUND) +if(NOT PROTOBUF_FOUND) set(dst_dir "${CMAKE_INSTALL_PREFIX}/third_party/install/protobuf") copy(protobuf_lib SRCS ${PROTOBUF_INCLUDE_DIR} ${PROTOBUF_LIBRARY} DSTS ${dst_dir} ${dst_dir}/lib ) -ENDIF(NOT PROTOBUF_FOUND) +endif() -IF(NOT WITH_MKL) +if(NOT CBLAS_FOUND) set(dst_dir "${CMAKE_INSTALL_PREFIX}/third_party/install/openblas") copy(openblas_lib SRCS ${CBLAS_INSTALL_DIR}/lib ${CBLAS_INSTALL_DIR}/include DSTS ${dst_dir} ${dst_dir} ) -ENDIF(NOT WITH_MKL) +endif() # paddle fluid module set(src_dir "${PADDLE_SOURCE_DIR}/paddle/fluid") diff --git a/paddle/scripts/docker/build.sh b/paddle/scripts/docker/build.sh index 06319fc638984..6be2bd8fad9e3 100644 --- a/paddle/scripts/docker/build.sh +++ b/paddle/scripts/docker/build.sh @@ -213,7 +213,7 @@ function gen_fluid_inference_lib() { if [ ${WITH_C_API:-OFF} == "OFF" ] ; then cat <