From 76cec3e2eab4c8dfadac5b4f5838049ebabb113f Mon Sep 17 00:00:00 2001
From: wangjiawei04 <wangjiawei04@baidu.com>
Date: Sat, 30 Jan 2021 11:09:02 +0800
Subject: [PATCH] fix cmake problem and gpu serve

---
 cmake/paddlepaddle.cmake                  | 3 ++-
 core/general-server/CMakeLists.txt        | 3 ++-
 python/paddle_serving_server/serve.py     | 1 +
 python/paddle_serving_server_gpu/serve.py | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/cmake/paddlepaddle.cmake b/cmake/paddlepaddle.cmake
index 1d6faa4a..ccccddde 100644
--- a/cmake/paddlepaddle.cmake
+++ b/cmake/paddlepaddle.cmake
@@ -88,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(
diff --git a/core/general-server/CMakeLists.txt b/core/general-server/CMakeLists.txt
index 27ceddc0..48f154b0 100644
--- a/core/general-server/CMakeLists.txt
+++ b/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()
diff --git a/python/paddle_serving_server/serve.py b/python/paddle_serving_server/serve.py
index 33c652c3..63354f08 100644
--- a/python/paddle_serving_server/serve.py
+++ b/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:
diff --git a/python/paddle_serving_server_gpu/serve.py b/python/paddle_serving_server_gpu/serve.py
index 739a7484..88a29099 100644
--- a/python/paddle_serving_server_gpu/serve.py
+++ b/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:
-- 
GitLab