Buildbot: fix for missing CUDA compute after recent changes
authorSergey Sharybin <sergey.vfx@gmail.com>
Sat, 12 Jan 2013 19:17:50 +0000 (19:17 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sat, 12 Jan 2013 19:17:50 +0000 (19:17 +0000)
Issue was caused by how CUDA devices availability done in Cycles.
Basically, if there's no WITH_CUDA_BINARIES buildtime, nvcc becomes
mandatory dependency.

Since kernels are building in separate target now, this logic broke
a bit.

Perhaps condition in util_cuda shall be changed to be a bit smarter,
but for now just work-around by enabling CUDA binaries when building
Cycles. Made it empty arch list to be sure no kernels will try to
re-compile after cudakernels target is done.

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

index 540416ee1fbca3bf4ba6a417d7e6d1f567c7096f..8274236a37dc97d4192550b59ff5db9f0d49954a 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 = []
 
 WITH_BF_OIIO = True
 WITH_BF_STATICOIIO = True
index c0ba8060712f09b17cd650dc8b3a13a944faaaad..8469128b65187a0e6d859d8b0de7d0ce93b5f462 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 = []
 
 WITH_BF_OIIO = True
 WITH_BF_STATICOIIO = True