Cycles GPU rendering:
authorThomas Dinges <blender@dingto.org>
Thu, 21 Feb 2013 17:14:07 +0000 (17:14 +0000)
committerThomas Dinges <blender@dingto.org>
Thu, 21 Feb 2013 17:14:07 +0000 (17:14 +0000)
* 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.

CMakeLists.txt
build_files/buildbot/config/user-config-cuda-glibc211-i686.py
build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py
build_files/scons/config/darwin-config.py
build_files/scons/config/linux-config.py
build_files/scons/config/win32-mingw-config.py
build_files/scons/config/win32-vc-config.py
build_files/scons/config/win64-mingw-config.py
build_files/scons/config/win64-vc-config.py
intern/cycles/device/device_cuda.cpp

index d208d730e1d2ca1323c39702ead505691f752b82..d6a0fa4e016aa9d0a79a5e335865b3e0762ab21c 100644 (file)
@@ -250,7 +250,7 @@ option(WITH_CYCLES                                  "Enable cycles Render Engine" ON)
 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)
 
index e72218e66156abdc7ebb8364d5c6cb874d5bf515..0e56c4326f901e6d51c890f1fd31c6203e8e4be9 100644 (file)
@@ -2,4 +2,4 @@ BF_BUILDDIR = '../blender-build/linux-glibc211-i686'
 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']
index 10738a11eaa753b12e3c30aa3af09ea0f57c2736..59725522e1868a1c56814d83b2c3a5f901f0bc2c 100644 (file)
@@ -2,4 +2,4 @@ BF_BUILDDIR = '../blender-build/linux-glibc211-x86_64'
 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']
index 5c0e13a94431158b112a1b72c1eccd7db68487b5..267505bc449e55a064655ebcd563dbe45f3ca8f0 100644 (file)
@@ -315,7 +315,7 @@ BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
 
 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':
index 068273e35ef3e633cbde293d64bdd256bd4653ed..bef34727014320b292823392f3966fca9ae0a5e3 100644 (file)
@@ -209,7 +209,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_13', 'sm_20', 'sm_21', 'sm_30']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
 
 WITH_BF_OPENMP = True
 
index 391421609d2bf64088b562528619fe92bc01e63a..b5bcbc9266558aa98a7d23628b6ff1f792a637c3 100644 (file)
@@ -174,7 +174,7 @@ BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse']
 #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'
index 95352bda8a7f0ac3350cd93b03cd73f9bc5df16e..8d17c777b0fcbb4c05290c0532729d228e62e273 100644 (file)
@@ -189,7 +189,7 @@ BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
 #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
index d00e7a3ffa7043215cda2a604e2193e91ab481ee..0a604b0f861763868f5842521ed75f2c67fddaf3 100644 (file)
@@ -146,7 +146,7 @@ BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
 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'
index 7597dd85beb732c357d2bb0f6e54fc6096a1b994..4e763343fe64e313d4390b180e5aab64f852b84f 100644 (file)
@@ -185,7 +185,7 @@ BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
 #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
index 77082006169af1be2df79d9d3fe30a39926cf144..173ac3d57dfe1b11fd0ab06a753ca72145014c6f 100644 (file)
@@ -209,8 +209,8 @@ public:
                        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 @@ public:
 
 #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 "";