build with cuda 9 by default

git-svn-id: https://xpra.org/svn/Xpra/trunk@16979 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · Sep 29, 2017 · ec65a81 · ec65a81
1 parent 329873f
commit ec65a81
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/setup.py b/src/setup.py
@@ -1900,10 +1900,11 @@ def osx_pkgconfig(*pkgs_options, **ekw):
         path_options = [
                          "C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v7.5\\bin",
                          "C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v8.0\\bin",
+                         "C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v9.0\\bin"
                          ] + path_options
     else:
         nvcc_exe = "nvcc"
-        for v in ("-7.5", "-8.0", ""):
+        for v in ("-7.5", "-8.0", "-9.0"):
             path_options += ["/usr/local/cuda%s/bin" % v, "/opt/cuda%s/bin" % v]
     options = [os.path.join(x, nvcc_exe) for x in path_options]
     def which(cmd):

diff --git a/src/win32/BUILD_CUDA_KERNEL.BAT b/src/win32/BUILD_CUDA_KERNEL.BAT
@@ -5,7 +5,7 @@ SET KERNEL=%1
 SET CUDA_SRC=xpra\codecs\cuda_common\%KERNEL%.cu
 SET CUDA_BIN=xpra\codecs\cuda_common\%KERNEL%.fatbin
 
-SET NVCC_DIR=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v8.0\bin\
+SET NVCC_DIR=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v9.0\bin\
 SET NVCC=%NVCC_DIR%\nvcc.exe
 SET CL_VERSION=2015
 CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64
@@ -17,7 +17,8 @@ CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_
 	-gencode=arch=compute_53,code=sm_53 ^
 	-gencode=arch=compute_60,code=sm_60 ^
 	-gencode=arch=compute_61,code=sm_61 ^
-	-gencode=arch=compute_62,code=sm_62
+	-gencode=arch=compute_62,code=sm_62 ^
+	-gencode=arch=compute_70,code=sm_70
 
 ENDLOCAL
 SET ERRORLEVEL=0