Buildbot: switch to using native toolkit again
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 11 Feb 2013 13:39:22 +0000 (13:39 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 11 Feb 2013 13:39:22 +0000 (13:39 +0000)
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 :)

build_files/buildbot/config/user-config-glibc211-i686.py
build_files/buildbot/config/user-config-glibc211-x86_64.py
build_files/buildbot/slave_compile.py

index 540416ee1fbca3bf4ba6a417d7e6d1f567c7096f..b2dcd40bff0f14487c42d5099fa2f6ab08f24cfc 100644 (file)
@@ -110,7 +110,9 @@ BF_JACK_LIB_STATIC = '${BF_ZLIB}/lib/libjack.a'
 
 # 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
index c0ba8060712f09b17cd650dc8b3a13a944faaaad..edd9500d88d00dd11e52889a3f995983fe7f3f4f 100644 (file)
@@ -110,7 +110,8 @@ BF_JACK_LIB_STATIC = '${BF_ZLIB}/lib/libjack.a'
 
 # 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
index dab8a8e6483b28e0f1c1c4282474d2fb473e3c55..ae9a84ab22c4667c8c3c1176c2f25870bc8bab6c 100644 (file)
@@ -63,14 +63,14 @@ else:
         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'