Commit: 5a4b51992e25a4351ca2715cdef25690db0002bb
Author: Sergey Sharybin
Date: Sat Jun 20 17:00:29 2015 +0200
Branches: master
https://developer.blender.org/rB5a4b51992e25a4351ca2715cdef25690db0002bb
SCons: Enable sm_52 CUDA kernel on all platforms
===================================================================
M build_files/scons/config/linux-config.py
M build_files/scons/config/win32-mingw-config.py
M build_files/scons/config/win64-mingw-config.py
===================================================================
diff --git a/build_files/scons/config/linux-config.py
b/build_files/scons/config/linux-config.py
index 6353120..9607045 100644
--- a/build_files/scons/config/linux-config.py
+++ b/build_files/scons/config/linux-config.py
@@ -206,7 +206,7 @@ WITH_BF_CYCLES = WITH_BF_OIIO and WITH_BF_BOOST
WITH_BF_CYCLES_CUDA_BINARIES = False
BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc'
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35', 'sm_50']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35', 'sm_50',
'sm_52']
WITH_BF_OPENMP = True
diff --git a/build_files/scons/config/win32-mingw-config.py
b/build_files/scons/config/win32-mingw-config.py
index 87c35e1..cbb7755 100644
--- a/build_files/scons/config/win32-mingw-config.py
+++ b/build_files/scons/config/win32-mingw-config.py
@@ -145,7 +145,7 @@ BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib/opencollada'
WITH_BF_CYCLES = True
WITH_BF_CYCLES_CUDA_BINARIES = False
BF_CYCLES_CUDA_NVCC = "" # Path to the NVIDIA CUDA compiler
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35', 'sm_50']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35', 'sm_50',
'sm_52']
WITH_BF_OIIO = True
BF_OIIO = LIBDIR + '/openimageio'
diff --git a/build_files/scons/config/win64-mingw-config.py
b/build_files/scons/config/win64-mingw-config.py
index 57eaae8..e4def7e 100644
--- a/build_files/scons/config/win64-mingw-config.py
+++ b/build_files/scons/config/win64-mingw-config.py
@@ -144,7 +144,7 @@ BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib/opencollada'
WITH_BF_CYCLES = True
WITH_BF_CYCLES_CUDA_BINARIES = False
BF_CYCLES_CUDA_NVCC = "" # Path to the NVIDIA CUDA compiler
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35', 'sm_50']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35', 'sm_50',
'sm_52']
WITH_BF_OIIO = True
BF_OIIO = LIBDIR + '/openimageio'
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
