Merge pull request #18 from PaddlePaddle/develop

Develop

cmake/paddlepaddle.cmake

@@ -32,13 +32,23 @@ message( "WITH_GPU = ${WITH_GPU}")
 # latest: latest develop build
 # version number like 1.5.2
 SET(PADDLE_VERSION "2.0.0")
+if(CUDA_VERSION EQUAL 11.0)
+    set(CUDA_SUFFIX "cuda11-cudnn8-avx-mkl")
+    set(WITH_TRT ON)
+elseif(CUDA_VERSION EQUAL 10.2)
+    set(CUDA_SUFFIX "cuda10.2-cudnn8-avx-mkl")
+    set(WITH_TRT ON)
+elseif(CUDA_VERSION EQUAL 10.1)
+    set(CUDA_SUFFIX "cuda10.1-cudnn7-avx-mkl")
+    set(WITH_TRT ON)
+elseif(CUDA_VERSION EQUAL 10.0)
+    set(CUDA_SUFFIX "cuda10-cudnn7-avx-mkl")
+elseif(CUDA_VERSION EQUAL 9.0)
+    set(CUDA_SUFFIX "cuda9-cudnn7-avx-mkl")
+endif()  
 
 if (WITH_GPU)
-    if (WITH_TRT)
-        SET(PADDLE_LIB_VERSION "${PADDLE_VERSION}-gpu-cuda10.1-cudnn7-avx-mkl-trt6")
-    else()
-        SET(PADDLE_LIB_VERSION "${PADDLE_VERSION}-gpu-cuda10-cudnn7-avx-mkl")
-    endif()
+    SET(PADDLE_LIB_VERSION "${PADDLE_VERSION}-gpu-${CUDA_SUFFIX}")
 elseif (WITH_LITE)
     if (WITH_XPU)
         SET(PADDLE_LIB_VERSION "${PADDLE_VERSION}-arm-xpu")
@@ -78,7 +88,8 @@ if (WITH_GPU OR WITH_MKLML)
             INSTALL_COMMAND
                 ${CMAKE_COMMAND} -E copy_directory ${PADDLE_DOWNLOAD_DIR}/paddle/include ${PADDLE_INSTALL_DIR}/include &&
                 ${CMAKE_COMMAND} -E copy_directory ${PADDLE_DOWNLOAD_DIR}/paddle/lib ${PADDLE_INSTALL_DIR}/lib &&
-                ${CMAKE_COMMAND} -E copy_directory ${PADDLE_DOWNLOAD_DIR}/third_party ${PADDLE_INSTALL_DIR}/third_party
+                ${CMAKE_COMMAND} -E copy_directory ${PADDLE_DOWNLOAD_DIR}/third_party ${PADDLE_INSTALL_DIR}/third_party &&
+                ${CMAKE_COMMAND} -E copy ${PADDLE_INSTALL_DIR}/third_party/install/mkldnn/lib/libdnnl.so.1 ${PADDLE_INSTALL_DIR}/third_party/install/mkldnn/lib/libdnnl.so
         )
     else()
         ExternalProject_Add(

core/general-server/CMakeLists.txt

@@ -41,7 +41,7 @@ endif()
 
 if(WITH_MKL OR WITH_GPU)
     if (WITH_TRT)
-    target_link_libraries(serving -liomp5 -lmklml_intel -lpthread -lcrypto -lm -lrt -lssl -ldl -lz -lbz2)
+    target_link_libraries(serving -liomp5 -lmklml_intel -lpthread -lcrypto -lm -lrt -lssl -ldl -lz -lbz2 -ldnnl)
     else()
     target_link_libraries(serving -liomp5 -lmklml_intel -lmkldnn -lpthread -lcrypto -lm -lrt -lssl -ldl -lz -lbz2)
 endif()
@@ -62,6 +62,7 @@ install(FILES
         ${CMAKE_BINARY_DIR}/third_party/install/Paddle/third_party/install/mklml/lib/libmklml_intel.so
         ${CMAKE_BINARY_DIR}/third_party/install/Paddle/third_party/install/mklml/lib/libiomp5.so
         ${CMAKE_BINARY_DIR}/third_party/install/Paddle/third_party/install/mkldnn/lib/libmkldnn.so.0
+        ${CMAKE_BINARY_DIR}/third_party/install/Paddle/third_party/install/mkldnn/lib/libdnnl.so.1
         DESTINATION
         ${PADDLE_SERVING_INSTALL_DIR}/demo/serving/bin)
 endif()

python/examples/encryption/README.md

@@ -12,6 +12,7 @@ sh get_data.sh
 
 ## Encrypt Model
 
+The `paddlepaddle` package is used in this example, you may need to download the corresponding package(`pip install paddlepaddle`).
 ```
 python encrypt.py
 ```

python/examples/encryption/README_CN.md

@@ -11,7 +11,7 @@ sh get_data.sh
 ```
 
 ## 模型加密
-
+本示例中使用了`paddlepaddle`包中的模块，需要进行下载（`pip install paddlepaddle`）。
 ```
 python encrypt.py
 ```

python/examples/pipeline/imagenet/README_CN.md

@@ -4,7 +4,7 @@
 
 ## 获取模型
 ```
-sh get_data.sh
+sh get_model.sh
 ```
 
 ## 启动服务

python/paddle_serving_server/serve.py

@@ -25,6 +25,7 @@ import time
 from multiprocessing import Process
 from .web_service import WebService, port_is_available
 from flask import Flask, request
+import sys
 if sys.version_info.major == 2:
     from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
 elif sys.version_info.major == 3:

python/paddle_serving_server_gpu/__init__.py

@@ -771,6 +771,9 @@ class MultiLangServer(object):
         self.concurrency_ = concurrency
         self.bserver_.set_max_concurrency(concurrency)
 
+    def set_device(self, device="cpu"):
+        self.device = device
+
     def set_num_threads(self, threads):
         self.worker_num_ = threads
         self.bserver_.set_num_threads(threads)

python/paddle_serving_server_gpu/serve.py

@@ -25,6 +25,7 @@ import time
 from multiprocessing import Pool, Process
 from paddle_serving_server_gpu import serve_args
 from flask import Flask, request
+import sys
 if sys.version_info.major == 2:
     from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
 elif sys.version_info.major == 3: