diff --git a/core/pdcodegen/CMakeLists.txt b/core/pdcodegen/CMakeLists.txt index 6f113a97e86d27a5b41925cc47ff1e8b2e87e237..c47e668f595fbfe26b08c163bb7f78dacebbbf4e 100644 --- a/core/pdcodegen/CMakeLists.txt +++ b/core/pdcodegen/CMakeLists.txt @@ -7,6 +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) target_link_libraries(pdcodegen protobuf ${PROTOBUF_PROTOC_LIBRARY}) # install diff --git a/doc/LATEST_PACKAGES.md b/doc/LATEST_PACKAGES.md index dc72421ef5b1766955a67814b83071f591700f9c..1c15371fda01e0f1aee00312a2f7bc9628b741af 100644 --- a/doc/LATEST_PACKAGES.md +++ b/doc/LATEST_PACKAGES.md @@ -19,7 +19,9 @@ https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.post9-p #cuda 10.0 https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.post10-py3-none-any.whl #cuda10.1 with TensorRT 6 -https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.trt-py3-none-any.whl +https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.post101-py3-none-any.whl +#cuda10.2 with TensorRT 7 +https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.post102-py3-none-any.whl ``` ### Python 2 ``` @@ -28,7 +30,9 @@ https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.post9-p #cuda 10.0 https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.post10-py2-none-any.whl ##cuda10.1 with TensorRT 6 -https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.trt-py2-none-any.whl +https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.post101-py2-none-any.whl +#cuda10.2 with TensorRT 7 +https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.post102-py2-none-any.whl ``` ## Client diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index f3762df4616e7e971772b2955954af946132329f..2f3865d67d22403c38d9db21fbfb39e98de2659f 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -81,12 +81,20 @@ if (SERVER) DEPENDS ${SERVING_SERVER_CORE} server_config_py_proto ${PY_FILES}) add_custom_target(paddle_python ALL DEPENDS ${PADDLE_SERVING_BINARY_DIR}/.timestamp) elseif(WITH_TRT) + if(CUDA_VERSION EQUAL 10.1) + set(SUFFIX 101) + elseif(CUDA_VERSION EQUAL 10.2) + set(SUFFIX 102) + elseif(CUDA_VERSION EQUAL 11.0) + set(SUFFIX 110) + + endif() add_custom_command( OUTPUT ${PADDLE_SERVING_BINARY_DIR}/.timestamp COMMAND cp -r ${CMAKE_CURRENT_SOURCE_DIR}/paddle_serving_server_gpu/ ${PADDLE_SERVING_BINARY_DIR}/python/ COMMAND env ${py_env} ${PYTHON_EXECUTABLE} gen_version.py - "server_gpu" trt + "server_gpu" ${SUFFIX} COMMAND env ${py_env} ${PYTHON_EXECUTABLE} setup.py bdist_wheel DEPENDS ${SERVING_SERVER_CORE} server_config_py_proto ${PY_FILES}) add_custom_target(paddle_python ALL DEPENDS ${PADDLE_SERVING_BINARY_DIR}/.timestamp) diff --git a/python/paddle_serving_server_gpu/__init__.py b/python/paddle_serving_server_gpu/__init__.py index 13f6a61c600995be95b051d3b2691ae68e5e788e..b8fe91bb594b1f91141658afcb876f2291d4d35e 100644 --- a/python/paddle_serving_server_gpu/__init__.py +++ b/python/paddle_serving_server_gpu/__init__.py @@ -423,7 +423,7 @@ class Server(object): for line in version_file.readlines(): if re.match("cuda_version", line): cuda_version = line.split("\"")[1] - if cuda_version == "trt": + if cuda_version == "101" or cuda_version == "102" or cuda_version == "110": device_version = "serving-gpu-" + cuda_version + "-" elif cuda_version == "arm": device_version = "serving-" + cuda_version + "-"