[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54706] trunk/blender: Cycles GPU rendering:
Thomas Dinges
blender at dingto.org
Thu Feb 21 18:14:07 CET 2013
Revision: 54706
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54706
Author: dingto
Date: 2013-02-21 17:14:07 +0000 (Thu, 21 Feb 2013)
Log Message:
-----------
Cycles GPU rendering:
* Deprecate computing capability 1.3 (sm_13)
This commit disables auto build of sm_13 CUDA platform, which means that starting with Blender 2.67, we don't support sm_13 devices anymore. It has become difficult to support that and it was already feature incomplete (no render-passes, AO, Multi Closure etc).
It's still possible to manually enable sm_13 for own tests, but building might break in the future.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/build_files/buildbot/config/user-config-cuda-glibc211-i686.py
trunk/blender/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py
trunk/blender/build_files/scons/config/darwin-config.py
trunk/blender/build_files/scons/config/linux-config.py
trunk/blender/build_files/scons/config/win32-mingw-config.py
trunk/blender/build_files/scons/config/win32-vc-config.py
trunk/blender/build_files/scons/config/win64-mingw-config.py
trunk/blender/build_files/scons/config/win64-vc-config.py
trunk/blender/intern/cycles/device/device_cuda.cpp
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2013-02-21 17:13:25 UTC (rev 54705)
+++ trunk/blender/CMakeLists.txt 2013-02-21 17:14:07 UTC (rev 54706)
@@ -250,7 +250,7 @@
option(WITH_CYCLES_TEST "Build cycles test application" OFF)
option(WITH_CYCLES_OSL "Build Cycles with OSL support" OFF)
option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF)
-set(CYCLES_CUDA_BINARIES_ARCH sm_13 sm_20 sm_21 sm_30 CACHE STRING "CUDA architectures to build binaries for")
+set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 CACHE STRING "CUDA architectures to build binaries for")
mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
unset(PLATFORM_DEFAULT)
Modified: trunk/blender/build_files/buildbot/config/user-config-cuda-glibc211-i686.py
===================================================================
--- trunk/blender/build_files/buildbot/config/user-config-cuda-glibc211-i686.py 2013-02-21 17:13:25 UTC (rev 54705)
+++ trunk/blender/build_files/buildbot/config/user-config-cuda-glibc211-i686.py 2013-02-21 17:14:07 UTC (rev 54706)
@@ -2,4 +2,4 @@
BF_INSTALLDIR = '../blender-install/linux-glibc211-i686'
BF_NUMJOBS = 1
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
Modified: trunk/blender/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py
===================================================================
--- trunk/blender/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py 2013-02-21 17:13:25 UTC (rev 54705)
+++ trunk/blender/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py 2013-02-21 17:14:07 UTC (rev 54706)
@@ -2,4 +2,4 @@
BF_INSTALLDIR = '../blender-install/linux-glibc211-x86_64'
BF_NUMJOBS = 1
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
Modified: trunk/blender/build_files/scons/config/darwin-config.py
===================================================================
--- trunk/blender/build_files/scons/config/darwin-config.py 2013-02-21 17:13:25 UTC (rev 54705)
+++ trunk/blender/build_files/scons/config/darwin-config.py 2013-02-21 17:14:07 UTC (rev 54706)
@@ -315,7 +315,7 @@
WITH_BF_CYCLES_CUDA_BINARIES = False
BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc'
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
#Ray trace optimization
if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'i386':
Modified: trunk/blender/build_files/scons/config/linux-config.py
===================================================================
--- trunk/blender/build_files/scons/config/linux-config.py 2013-02-21 17:13:25 UTC (rev 54705)
+++ trunk/blender/build_files/scons/config/linux-config.py 2013-02-21 17:14:07 UTC (rev 54706)
@@ -209,7 +209,7 @@
WITH_BF_CYCLES_CUDA_BINARIES = False
BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc'
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
WITH_BF_OPENMP = True
Modified: trunk/blender/build_files/scons/config/win32-mingw-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-mingw-config.py 2013-02-21 17:13:25 UTC (rev 54705)
+++ trunk/blender/build_files/scons/config/win32-mingw-config.py 2013-02-21 17:14:07 UTC (rev 54706)
@@ -174,7 +174,7 @@
#CUDA
WITH_BF_CYCLES_CUDA_BINARIES = False
#BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
##
CC = 'gcc'
Modified: trunk/blender/build_files/scons/config/win32-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-vc-config.py 2013-02-21 17:13:25 UTC (rev 54705)
+++ trunk/blender/build_files/scons/config/win32-vc-config.py 2013-02-21 17:14:07 UTC (rev 54706)
@@ -189,7 +189,7 @@
#CUDA
WITH_BF_CYCLES_CUDA_BINARIES = False
#BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
#Ray trace optimization
WITH_BF_RAYOPTIMIZATION = True
Modified: trunk/blender/build_files/scons/config/win64-mingw-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win64-mingw-config.py 2013-02-21 17:13:25 UTC (rev 54705)
+++ trunk/blender/build_files/scons/config/win64-mingw-config.py 2013-02-21 17:14:07 UTC (rev 54706)
@@ -146,7 +146,7 @@
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_13', 'sm_20', 'sm_21', 'sm_30']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
WITH_BF_OIIO = True
BF_OIIO = LIBDIR + '/openimageio'
Modified: trunk/blender/build_files/scons/config/win64-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win64-vc-config.py 2013-02-21 17:13:25 UTC (rev 54705)
+++ trunk/blender/build_files/scons/config/win64-vc-config.py 2013-02-21 17:14:07 UTC (rev 54706)
@@ -185,7 +185,7 @@
#CUDA
WITH_BF_CYCLES_CUDA_BINARIES = False
#BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
#Ray trace optimization
WITH_BF_RAYOPTIMIZATION = True
Modified: trunk/blender/intern/cycles/device/device_cuda.cpp
===================================================================
--- trunk/blender/intern/cycles/device/device_cuda.cpp 2013-02-21 17:13:25 UTC (rev 54705)
+++ trunk/blender/intern/cycles/device/device_cuda.cpp 2013-02-21 17:14:07 UTC (rev 54706)
@@ -209,8 +209,8 @@
int major, minor;
cuDeviceComputeCapability(&major, &minor, cuDevId);
- if(major <= 1 && minor <= 2) {
- cuda_error_message(string_printf("CUDA device supported only with compute capability 1.3 or up, found %d.%d.", major, minor));
+ if(major <= 1 && minor <= 3) {
+ cuda_error_message(string_printf("CUDA device supported only with compute capability 2.0 or up, found %d.%d.", major, minor));
return false;
}
}
@@ -242,8 +242,8 @@
#ifdef _WIN32
if(cuHavePrecompiledKernels()) {
- if(major <= 1 && minor <= 2)
- cuda_error_message(string_printf("CUDA device requires compute capability 1.3 or up, found %d.%d. Your GPU is not supported.", major, minor));
+ if(major <= 1 && minor <= 3)
+ cuda_error_message(string_printf("CUDA device requires compute capability 2.0 or up, found %d.%d. Your GPU is not supported.", major, minor));
else
cuda_error_message(string_printf("CUDA binary kernel for this graphics card compute capability (%d.%d) not found.", major, minor));
return "";
More information about the Bf-blender-cvs
mailing list