Merge pull request #1437 from bjjwwang/develop

version 0.7 suffix

Merge pull request #1437 from bjjwwang/develop
version 0.7 suffix
394d2e0e · Jiawei Wang · bjjwwang · 62966745 · 394d2e0e · 394d2e0e
隐藏空白更改
内联并排

Showing with 8 addition and 4 deletion

python/CMakeLists.txt python/CMakeLists.txt +7 -3

python/paddle_serving_server/server.py python/paddle_serving_server/server.py +1 -1

未找到文件。
--- a/python/CMakeLists.txt
+++ b/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)
+      if(CUDNN_MAJOR_VERSION EQUAL 7)
-    elseif(CUDA_VERSION EQUAL 11.0)
+        set(VERSION_SUFFIX 1027)
-      set(VERSION_SUFFIX 11)
+      elseif(CUDNN_MAJOR_VERSION EQUAL 8)
+        set(VERSION_SUFFIX 1028)
+      endif()
+    elseif(CUDA_VERSION EQUAL 11.2)
+      set(VERSION_SUFFIX 112)
    endif()
  endif()

--- a/python/paddle_serving_server/server.py
+++ b/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