diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-01-12 23:17:50 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-01-12 23:17:50 +0400 |
| commit | dc4636827bca3538bf0f640229d7103b59409d4e (patch) | |
| tree | dc2f673063d0b7ec6fdc9d42700877626f111f5c /build_files/buildbot | |
| parent | 9c003a36d6e1fb6a42d7abba45d5c6740a912250 (diff) | |
Buildbot: fix for missing CUDA compute after recent changes
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.
Diffstat (limited to 'build_files/buildbot')
| -rw-r--r-- | build_files/buildbot/config/user-config-glibc211-i686.py | 3 | ||||
| -rw-r--r-- | build_files/buildbot/config/user-config-glibc211-x86_64.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/build_files/buildbot/config/user-config-glibc211-i686.py b/build_files/buildbot/config/user-config-glibc211-i686.py index 540416ee1fb..8274236a37d 100644 --- a/build_files/buildbot/config/user-config-glibc211-i686.py +++ b/build_files/buildbot/config/user-config-glibc211-i686.py @@ -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 diff --git a/build_files/buildbot/config/user-config-glibc211-x86_64.py b/build_files/buildbot/config/user-config-glibc211-x86_64.py index c0ba8060712..8469128b651 100644 --- a/build_files/buildbot/config/user-config-glibc211-x86_64.py +++ b/build_files/buildbot/config/user-config-glibc211-x86_64.py @@ -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 |