From 4e1975c60514bd8af285c5a10af2bc2023ea27a6 Mon Sep 17 00:00:00 2001 From: zhangjun Date: Tue, 16 Mar 2021 12:43:54 +0000 Subject: [PATCH] use paddle 2.0.1, remove paddle_fluid --- cmake/paddlepaddle.cmake | 8 ++++---- core/general-server/CMakeLists.txt | 4 ++-- core/predictor/CMakeLists.txt | 4 ++-- paddle_inference/paddle/CMakeLists.txt | 2 +- tools/cpp_examples/demo-serving/CMakeLists.txt | 10 +++++----- tools/cpp_examples/elastic-ctr/serving/CMakeLists.txt | 6 +++--- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/cmake/paddlepaddle.cmake b/cmake/paddlepaddle.cmake index a93da4ed..1421f52c 100644 --- a/cmake/paddlepaddle.cmake +++ b/cmake/paddlepaddle.cmake @@ -18,7 +18,7 @@ SET(PADDLE_SOURCES_DIR ${THIRD_PARTY_PATH}/Paddle) SET(PADDLE_DOWNLOAD_DIR ${PADDLE_SOURCES_DIR}/src/extern_paddle) SET(PADDLE_INSTALL_DIR ${THIRD_PARTY_PATH}/install/Paddle/) SET(PADDLE_INCLUDE_DIR "${PADDLE_INSTALL_DIR}/include" CACHE PATH "PaddlePaddle include directory." FORCE) -SET(PADDLE_LIBRARIES "${PADDLE_INSTALL_DIR}/lib/libpaddle_fluid.a" CACHE FILEPATH "Paddle library." FORCE) +SET(PADDLE_LIBRARIES "${PADDLE_INSTALL_DIR}/lib/libpaddle_inference.a" CACHE FILEPATH "Paddle library." FORCE) message("paddle install dir: " ${PADDLE_INSTALL_DIR}) @@ -31,7 +31,7 @@ message( "WITH_GPU = ${WITH_GPU}") # Paddle Version should be one of: # latest: latest develop build # version number like 1.5.2 -SET(PADDLE_VERSION "2.0.0") +SET(PADDLE_VERSION "2.0.1") if (WITH_GPU) if(CUDA_VERSION EQUAL 11.0) set(CUDA_SUFFIX "cuda11-cudnn8-avx-mkl") @@ -139,8 +139,8 @@ LINK_DIRECTORIES(${PADDLE_INSTALL_DIR}/third_party/install/mkldnn/lib) ADD_LIBRARY(openblas STATIC IMPORTED GLOBAL) SET_PROPERTY(TARGET openblas PROPERTY IMPORTED_LOCATION ${PADDLE_INSTALL_DIR}/third_party/install/openblas/lib/libopenblas.a) -ADD_LIBRARY(paddle_fluid STATIC IMPORTED GLOBAL) -SET_PROPERTY(TARGET paddle_fluid PROPERTY IMPORTED_LOCATION ${PADDLE_INSTALL_DIR}/lib/libpaddle_fluid.a) +ADD_LIBRARY(paddle_inference STATIC IMPORTED GLOBAL) +SET_PROPERTY(TARGET paddle_inference PROPERTY IMPORTED_LOCATION ${PADDLE_INSTALL_DIR}/lib/libpaddle_inference.a) if (WITH_TRT) ADD_LIBRARY(nvinfer SHARED IMPORTED GLOBAL) diff --git a/core/general-server/CMakeLists.txt b/core/general-server/CMakeLists.txt index e9e12a33..6ea0b5e4 100644 --- a/core/general-server/CMakeLists.txt +++ b/core/general-server/CMakeLists.txt @@ -2,7 +2,7 @@ include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../../) include(op/CMakeLists.txt) include(proto/CMakeLists.txt) add_executable(serving ${serving_srcs}) -add_dependencies(serving pdcodegen paddle_inference_engine pdserving paddle_fluid cube-api utils) +add_dependencies(serving pdcodegen paddle_inference_engine pdserving paddle_inference cube-api utils) if (WITH_GPU) add_dependencies(serving paddle_inference_engine) @@ -20,7 +20,7 @@ include_directories(${CUDNN_ROOT}/include/) target_link_libraries(serving -Wl,--whole-archive paddle_inference_engine -Wl,--no-whole-archive) -target_link_libraries(serving paddle_fluid ${paddle_depend_libs}) +target_link_libraries(serving paddle_inference ${paddle_depend_libs}) target_link_libraries(serving brpc) target_link_libraries(serving protobuf) target_link_libraries(serving pdserving) diff --git a/core/predictor/CMakeLists.txt b/core/predictor/CMakeLists.txt index 10fcd0b2..baa7cf18 100644 --- a/core/predictor/CMakeLists.txt +++ b/core/predictor/CMakeLists.txt @@ -12,12 +12,12 @@ set_source_files_properties( ${pdserving_srcs} PROPERTIES COMPILE_FLAGS "-Wno-strict-aliasing -Wno-unused-variable -Wno-non-virtual-dtor -Wno-error=non-virtual-dtor -Wno-error=delete-non-virtual-dtor") -add_dependencies(pdserving protobuf boost brpc leveldb pdcodegen configure extern_paddle paddle_fluid) +add_dependencies(pdserving protobuf boost brpc leveldb pdcodegen configure extern_paddle paddle_inference) if (WITH_TRT) add_definitions(-DWITH_TRT) endif() target_link_libraries(pdserving - brpc protobuf boost leveldb configure -lpthread -lcrypto -lm -lrt -lssl -ldl -lz paddle_fluid ${paddle_depend_libs}) + brpc protobuf boost leveldb configure -lpthread -lcrypto -lm -lrt -lssl -ldl -lz paddle_inference ${paddle_depend_libs}) # install install(TARGETS pdserving RUNTIME DESTINATION ${PADDLE_SERVING_INSTALL_DIR}/bin diff --git a/paddle_inference/paddle/CMakeLists.txt b/paddle_inference/paddle/CMakeLists.txt index 7873bb80..a13653e8 100644 --- a/paddle_inference/paddle/CMakeLists.txt +++ b/paddle_inference/paddle/CMakeLists.txt @@ -3,7 +3,7 @@ add_library(paddle_inference_engine ${paddle_inference_engine_srcs}) target_include_directories(paddle_inference_engine PUBLIC ${CMAKE_BINARY_DIR}/Paddle/fluid_install_dir/) add_dependencies(paddle_inference_engine pdserving extern_paddle configure) -target_link_libraries(paddle_inference_engine pdserving paddle_fluid -lpthread -lcrypto -lm -lrt -lssl -ldl -lz) +target_link_libraries(paddle_inference_engine pdserving paddle_inference -lpthread -lcrypto -lm -lrt -lssl -ldl -lz) install(TARGETS paddle_inference_engine ARCHIVE DESTINATION ${PADDLE_SERVING_INSTALL_DIR}/lib diff --git a/tools/cpp_examples/demo-serving/CMakeLists.txt b/tools/cpp_examples/demo-serving/CMakeLists.txt index ab340ad1..6e871e84 100644 --- a/tools/cpp_examples/demo-serving/CMakeLists.txt +++ b/tools/cpp_examples/demo-serving/CMakeLists.txt @@ -41,24 +41,24 @@ include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../kvdb/include) include(op/CMakeLists.txt) include(proto/CMakeLists.txt) add_executable(serving ${serving_srcs}) -add_dependencies(serving pdcodegen fluid_cpu_engine pdserving paddle_fluid +add_dependencies(serving pdcodegen paddle_inference_engine pdserving paddle_inference opencv_imgcodecs cube-api) if (WITH_GPU) - add_dependencies(serving fluid_gpu_engine) + add_dependencies(serving paddle_inference_engine) endif() target_include_directories(serving PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/../../core/predictor ) if(WITH_GPU) - target_link_libraries(serving -Wl,--whole-archive fluid_gpu_engine + target_link_libraries(serving -Wl,--whole-archive paddle_inference_engine -Wl,--no-whole-archive) endif() -target_link_libraries(serving -Wl,--whole-archive fluid_cpu_engine +target_link_libraries(serving -Wl,--whole-archive paddle_inference_engine -Wl,--no-whole-archive) -target_link_libraries(serving paddle_fluid ${paddle_depend_libs}) +target_link_libraries(serving paddle_inference ${paddle_depend_libs}) target_link_libraries(serving opencv_imgcodecs ${opencv_depend_libs}) diff --git a/tools/cpp_examples/elastic-ctr/serving/CMakeLists.txt b/tools/cpp_examples/elastic-ctr/serving/CMakeLists.txt index 8df36c35..e6a6b5ff 100644 --- a/tools/cpp_examples/elastic-ctr/serving/CMakeLists.txt +++ b/tools/cpp_examples/elastic-ctr/serving/CMakeLists.txt @@ -18,16 +18,16 @@ include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../kvdb/include) include(op/CMakeLists.txt) include(proto/CMakeLists.txt) add_executable(elastic_serving ${serving_srcs}) -add_dependencies(elastic_serving pdcodegen fluid_cpu_engine pdserving paddle_fluid cube-api) +add_dependencies(elastic_serving pdcodegen paddle_inference_engine pdserving paddle_inference cube-api) target_include_directories(elastic_serving PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/../../predictor ) -target_link_libraries(elastic_serving -Wl,--whole-archive fluid_cpu_engine +target_link_libraries(elastic_serving -Wl,--whole-archive paddle_inference_engine -Wl,--no-whole-archive) -target_link_libraries(elastic_serving paddle_fluid ${paddle_depend_libs}) +target_link_libraries(elastic_serving paddle_inference ${paddle_depend_libs}) target_link_libraries(elastic_serving pdserving) target_link_libraries(elastic_serving cube-api) -- GitLab