diff --git a/cmake/external/lite.cmake b/cmake/external/lite.cmake index 0c920adf6387d40874507a0a1304694cbbe008a0..73fc1aeff87479cfaa98af10126fbbb72abae109 100644 --- a/cmake/external/lite.cmake +++ b/cmake/external/lite.cmake @@ -25,7 +25,7 @@ if (NOT LITE_SOURCE_DIR OR NOT LITE_BINARY_DIR) set(LITE_INSTALL_DIR ${THIRD_PARTY_PATH}/install/lite) # No quotes, so cmake can resolve it as a command with arguments. - set(LITE_BUILD_COMMAND $(MAKE) -j) + set(LITE_BUILD_COMMAND $(MAKE) publish_inference -j) set(LITE_OPTIONAL_ARGS -DWITH_MKL=ON -DLITE_WITH_CUDA=${WITH_GPU} -DWITH_MKLDNN=OFF @@ -34,16 +34,17 @@ if (NOT LITE_SOURCE_DIR OR NOT LITE_BINARY_DIR) -DWITH_LITE=OFF -DLITE_WITH_LIGHT_WEIGHT_FRAMEWORK=OFF -DWITH_PYTHON=OFF - -DWITH_TESTING=ON + -DWITH_TESTING=OFF -DLITE_BUILD_EXTRA=ON -DCUDNN_ROOT=${CUDNN_ROOT} + -DLITE_WITH_STATIC_CUDA=OFF -DLITE_WITH_ARM=OFF) ExternalProject_Add( ${LITE_PROJECT} ${EXTERNAL_PROJECT_LOG_ARGS} GIT_REPOSITORY "https://github.com/PaddlePaddle/Paddle-Lite.git" - GIT_TAG d8143103f9fb63dd362d7b0d72ca3c0ac6e10f72 + GIT_TAG 9343782bb6e3c7876fdb6ecacd0d3bd3db4ce2bc PREFIX ${LITE_SOURCES_DIR} UPDATE_COMMAND "" BUILD_COMMAND ${LITE_BUILD_COMMAND} @@ -74,7 +75,7 @@ include_directories(${LITE_SOURCE_DIR}) include_directories(${LITE_BINARY_DIR}) function(external_lite_static_libs alias path) - add_library(${alias} STATIC IMPORTED GLOBAL) + add_library(${alias} SHARED IMPORTED GLOBAL) SET_PROPERTY(TARGET ${alias} PROPERTY IMPORTED_LOCATION ${path}) if (LITE_PROJECT) @@ -82,6 +83,6 @@ function(external_lite_static_libs alias path) endif() endfunction() -external_lite_static_libs(lite_full_static ${LITE_BINARY_DIR}/lite/api/libapi_full_static.a) +external_lite_static_libs(lite_full_static ${LITE_BINARY_DIR}/inference_lite_lib/cxx/lib/libpaddle_full_api_shared.so) add_definitions(-DPADDLE_WITH_LITE) diff --git a/cmake/inference_lib.cmake b/cmake/inference_lib.cmake index 4d0e777af8cf9980282b7b88f34d35b3a1f2fff4..6386eb68f74f707a6f72eb5b91f4c24b7d68a682 100644 --- a/cmake/inference_lib.cmake +++ b/cmake/inference_lib.cmake @@ -131,6 +131,13 @@ function(copy_part_of_thrid_party TARGET DST) DSTS ${dst_dir}/include ${dst_dir}/lib) endif () + if (LITE_BINARY_DIR) + set(dst_dir "${DST}/third_party/install/lite") + copy(${TARGET} + SRCS ${LITE_BINARY_DIR}/inference_lite_lib/* + DSTS ${dst_dir}) + endif() + if (ANAKIN_FOUND) set(dst_dir "${DST}/third_party/install/anakin") copy(${TARGET}