[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54465] trunk/blender/build_files/buildbot : Buildbot: switch to using native toolkit again

Sergey Sharybin sergey.vfx at gmail.com
Mon Feb 11 14:39:22 CET 2013


Revision: 54465
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54465
Author:   nazgul
Date:     2013-02-11 13:39:22 +0000 (Mon, 11 Feb 2013)
Log Message:
-----------
Buildbot: switch to using native toolkit again

Crosscompiling of cubins doesn't work on linux with toolkit 4.2,
so use native toolkit for now. Disabled sm_13 for 32bit platform
for now.

Would keep cudakernels build target for a while. It doesn't hurt
being in the code and it could be helpful again once we'll switch
to toolkit 5.x where crosscompilation works fine.

Some further tweaks could probably be needed still, let's see how
building goes on buildbot now :)

Modified Paths:
--------------
    trunk/blender/build_files/buildbot/config/user-config-glibc211-i686.py
    trunk/blender/build_files/buildbot/config/user-config-glibc211-x86_64.py
    trunk/blender/build_files/buildbot/slave_compile.py

Modified: trunk/blender/build_files/buildbot/config/user-config-glibc211-i686.py
===================================================================
--- trunk/blender/build_files/buildbot/config/user-config-glibc211-i686.py	2013-02-11 13:28:18 UTC (rev 54464)
+++ trunk/blender/build_files/buildbot/config/user-config-glibc211-i686.py	2013-02-11 13:39:22 UTC (rev 54465)
@@ -110,7 +110,9 @@
 
 # Cycles
 WITH_BF_CYCLES = True
-WITH_BF_CYCLES_CUDA_BINARIES = False
+WITH_BF_CYCLES_CUDA_BINARIES = True
+#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
 WITH_BF_STATICOIIO = True

Modified: trunk/blender/build_files/buildbot/config/user-config-glibc211-x86_64.py
===================================================================
--- trunk/blender/build_files/buildbot/config/user-config-glibc211-x86_64.py	2013-02-11 13:28:18 UTC (rev 54464)
+++ trunk/blender/build_files/buildbot/config/user-config-glibc211-x86_64.py	2013-02-11 13:39:22 UTC (rev 54465)
@@ -110,7 +110,8 @@
 
 # Cycles
 WITH_BF_CYCLES = True
-WITH_BF_CYCLES_CUDA_BINARIES = False
+WITH_BF_CYCLES_CUDA_BINARIES = True
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
 
 WITH_BF_OIIO = True
 WITH_BF_STATICOIIO = True

Modified: trunk/blender/build_files/buildbot/slave_compile.py
===================================================================
--- trunk/blender/build_files/buildbot/slave_compile.py	2013-02-11 13:28:18 UTC (rev 54464)
+++ trunk/blender/build_files/buildbot/slave_compile.py	2013-02-11 13:39:22 UTC (rev 54465)
@@ -63,14 +63,14 @@
         configs = []
         if builder.endswith('linux_glibc211_x86_64_scons'):
             configs = ['user-config-player-glibc211-x86_64.py',
-                       'user-config-cuda-glibc211-x86_64.py',
+                       #'user-config-cuda-glibc211-x86_64.py',
                        'user-config-glibc211-x86_64.py'
                        ]
             chroot_name = 'buildbot_squeeze_x86_64'
             cuda_chroot = 'buildbot_squeeze_x86_64'
         elif builder.endswith('linux_glibc211_i386_scons'):
             configs = ['user-config-player-glibc211-i686.py',
-                       'user-config-cuda-glibc211-i686.py',
+                       #'user-config-cuda-glibc211-i686.py',
                        'user-config-glibc211-i686.py']
             chroot_name = 'buildbot_squeeze_i686'
 




More information about the Bf-blender-cvs mailing list