Merge branch 'develop' into dev

cmake/external/boost.cmake

@@ -25,7 +25,7 @@ set(BOOST_PROJECT       "extern_boost")
 
 set(BOOST_VER           "1.74.0")
 set(BOOST_TAR "boost_1_74_0" CACHE STRING "" FORCE)
-set(BOOST_URL "http://paddlepaddledeps.cdn.bcebos.com/${BOOST_TAR}.tar.gz" CACHE STRING "" FORCE)
+set(BOOST_URL "http://paddlepaddledeps.bj.bcebos.com/${BOOST_TAR}.tar.gz" CACHE STRING "" FORCE)
 
 MESSAGE(STATUS "BOOST_TAR: ${BOOST_TAR}, BOOST_URL: ${BOOST_URL}")
 

cmake/paddlepaddle.cmake

@@ -52,14 +52,19 @@ if (WITH_GPU)
 else()
     set(WITH_TRT OFF)
 endif()  
-
 if (WITH_GPU)
     SET(PADDLE_LIB_VERSION "${PADDLE_VERSION}/cxx_c/Linux/GPU/${CUDA_SUFFIX}")
 elseif (WITH_LITE)
+    message("cpu arch: ${CMAKE_SYSTEM_PROCESSOR}")
     if (WITH_XPU)
-        SET(PADDLE_LIB_VERSION "arm64_gcc7.3_openblas")
+        if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86-64")
+            SET(PADDLE_LIB_VERSION "x86-64_gcc8.2_avx_mkl")
+        elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
+            SET(PADDLE_LIB_VERSION "arm64_gcc7.3_openblas")
+        endif()
     else()
-        SET(PADDLE_LIB_VERSION "${PADDLE_VERSION}-${CMAKE_SYSTEM_PROCESSOR}")
+        MESSAGE("paddle lite lib is unknown.")
+        SET(PADDLE_LIB_VERSION "paddle-lite-unknown")
     endif()
 else()
     if (WITH_AVX)

python/CMakeLists.txt

@@ -72,9 +72,13 @@ if (SERVER)
     if(CUDA_VERSION EQUAL 10.1)
       set(VERSION_SUFFIX 101)
     elseif(CUDA_VERSION EQUAL 10.2)
-      set(VERSION_SUFFIX 102)
-    elseif(CUDA_VERSION EQUAL 11.0)
-      set(VERSION_SUFFIX 11)
+      if(CUDNN_MAJOR_VERSION EQUAL 7)
+        set(VERSION_SUFFIX 1027)
+      elseif(CUDNN_MAJOR_VERSION EQUAL 8)
+        set(VERSION_SUFFIX 1028)
+      endif()
+    elseif(CUDA_VERSION EQUAL 11.2)
+      set(VERSION_SUFFIX 112)
     endif()
   endif()
 

python/paddle_serving_server/server.py

@@ -428,7 +428,7 @@ class Server(object):
         if device_type == "0":
             device_version = self.get_device_version()
         elif device_type == "1":
-            if version_suffix == "101" or version_suffix == "102":
+            if version_suffix == "101" or version_suffix == "1027" or version_suffix == "1028" or version_suffix == "112":
                 device_version = "gpu-" + version_suffix
             else:
                 device_version = "gpu-cuda" + version_suffix