diff --git a/core/general-client/CMakeLists.txt b/core/general-client/CMakeLists.txt index d6079317a75d3f45b61920836e6695bd6b31d951..ddacb8d53d141e242fe6222a837ec8997608382b 100644 --- a/core/general-client/CMakeLists.txt +++ b/core/general-client/CMakeLists.txt @@ -1,5 +1,6 @@ if(CLIENT) add_subdirectory(pybind11) pybind11_add_module(serving_client src/general_model.cpp src/pybind_general_model.cpp) +add_dependencies(serving_client sdk_cpp) target_link_libraries(serving_client PRIVATE -Wl,--whole-archive utils sdk-cpp pybind python -Wl,--no-whole-archive -lpthread -lcrypto -lm -lrt -lssl -ldl -lz -Wl,-rpath,'$ORIGIN'/lib) endif() diff --git a/core/pdcodegen/CMakeLists.txt b/core/pdcodegen/CMakeLists.txt index c47e668f595fbfe26b08c163bb7f78dacebbbf4e..c74273f024359ec50854cddf32ce6d8b7922437b 100644 --- a/core/pdcodegen/CMakeLists.txt +++ b/core/pdcodegen/CMakeLists.txt @@ -7,7 +7,7 @@ PROTOBUF_GENERATE_CPP(pdcodegen_proto_srcs pdcodegen_proto_hdrs LIST(APPEND pdcodegen_srcs ${pdcodegen_proto_srcs}) add_executable(pdcodegen ${pdcodegen_srcs}) -add_dependencies(pdcodegen boost) +add_dependencies(pdcodegen boost protobuf) target_link_libraries(pdcodegen protobuf ${PROTOBUF_PROTOC_LIBRARY}) # install diff --git a/core/sdk-cpp/CMakeLists.txt b/core/sdk-cpp/CMakeLists.txt index 35312b572bace8138b50b4f7349e20cb141980d0..f2e44ec3e3aed32f5d4fb52cb44511f6343968c4 100644 --- a/core/sdk-cpp/CMakeLists.txt +++ b/core/sdk-cpp/CMakeLists.txt @@ -2,7 +2,7 @@ include(src/CMakeLists.txt) include(proto/CMakeLists.txt) add_library(sdk-cpp ${sdk_cpp_srcs}) -add_dependencies(sdk-cpp pdcodegen configure) +add_dependencies(sdk-cpp pdcodegen configure protobuf brpc leveldb) target_link_libraries(sdk-cpp brpc configure protobuf leveldb) # install diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index d17844991ea342e142476acececb14ac2e6ae106..a44027d90228f69b6d3f2f80995bd4609b8b64b8 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -86,7 +86,7 @@ if (SERVER) elseif(CUDA_VERSION EQUAL 10.2) set(SUFFIX 102) elseif(CUDA_VERSION EQUAL 11.0) - set(SUFFIX 110) + set(SUFFIX 11) endif() add_custom_command( diff --git a/python/paddle_serving_server_gpu/__init__.py b/python/paddle_serving_server_gpu/__init__.py index d53c67797f66e89e1f6c78d3aeef79d9d8603fc7..69dcf96de2d5b71537c4c7072fb53f9d8d8c3aa5 100644 --- a/python/paddle_serving_server_gpu/__init__.py +++ b/python/paddle_serving_server_gpu/__init__.py @@ -442,7 +442,7 @@ class Server(object): for line in version_file.readlines(): if re.match("cuda_version", line): cuda_version = line.split("\"")[1] - if cuda_version == "101" or cuda_version == "102" or cuda_version == "110": + if cuda_version == "101" or cuda_version == "102": device_version = "serving-gpu-" + cuda_version + "-" elif cuda_version == "arm" or cuda_version == "arm-xpu": device_version = "serving-" + cuda_version + "-"