[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47174] trunk/blender/build_files/scons/ config: Cycles / CUDA:

Thomas Dinges blender at dingto.org
Tue May 29 14:28:34 CEST 2012


Revision: 47174
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47174
Author:   dingto
Date:     2012-05-29 12:28:34 +0000 (Tue, 29 May 2012)
Log Message:
-----------
Cycles / CUDA:
* Windows department switches to CUDA Toolkit 4.2 :)
* Windows Buildbot uses that too now (thanks jesterKing) 
* Re-enable sm_13 for x86, compiled again with current SVN and the new toolkit. 

* All official builds for windows now come with sm_13, sm_20, sm_21 and sm_30 for the Kepler cards. 

Modified Paths:
--------------
    trunk/blender/build_files/scons/config/win32-vc-config.py
    trunk/blender/build_files/scons/config/win64-vc-config.py

Modified: trunk/blender/build_files/scons/config/win32-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-vc-config.py	2012-05-29 12:26:39 UTC (rev 47173)
+++ trunk/blender/build_files/scons/config/win32-vc-config.py	2012-05-29 12:28:34 UTC (rev 47174)
@@ -165,7 +165,7 @@
 #CUDA
 WITH_BF_CYCLES_CUDA_BINARIES = False
 #BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21'] # don't build sm_13 until the compile can fit in 32bit process again :)
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
 
 #Ray trace optimization
 WITH_BF_RAYOPTIMIZATION = True

Modified: trunk/blender/build_files/scons/config/win64-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win64-vc-config.py	2012-05-29 12:26:39 UTC (rev 47173)
+++ trunk/blender/build_files/scons/config/win64-vc-config.py	2012-05-29 12:28:34 UTC (rev 47174)
@@ -162,7 +162,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']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
 
 #Ray trace optimization
 WITH_BF_RAYOPTIMIZATION = True




More information about the Bf-blender-cvs mailing list