diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-02-11 17:39:22 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-02-11 17:39:22 +0400 |
commit | 6888d6eac828689b8a9fb96f5b4f80f45be8301a (patch) | |
tree | 1b3f7b1ffde7893127727b23bfff331ad51dd52a /build_files | |
parent | 16477259137f0e349cb9f51217543000c0ccf4c7 (diff) |
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 :)
Diffstat (limited to 'build_files')
-rw-r--r-- | build_files/buildbot/config/user-config-glibc211-i686.py | 4 | ||||
-rw-r--r-- | build_files/buildbot/config/user-config-glibc211-x86_64.py | 3 | ||||
-rw-r--r-- | build_files/buildbot/slave_compile.py | 4 |
3 files changed, 7 insertions, 4 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..b2dcd40bff0 100644 --- a/build_files/buildbot/config/user-config-glibc211-i686.py +++ b/build_files/buildbot/config/user-config-glibc211-i686.py @@ -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 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..edd9500d88d 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 = ['sm_13', 'sm_20', 'sm_21', 'sm_30'] WITH_BF_OIIO = True WITH_BF_STATICOIIO = True diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index dab8a8e6483..ae9a84ab22c 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -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' |