Merge branch 'develop' into autoshape

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

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

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)

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 + "-"