diff options
| author | Thomas Dinges <blender@dingto.org> | 2018-02-17 17:49:37 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2018-02-17 17:49:37 +0300 |
| commit | 75396edb315c4f4dd5928cf3ad9e103eb2a1c61e (patch) | |
| tree | 79e3ac053ded5a2dcfd72ce0abe2038277ee7a59 /build_files | |
| parent | 5bc2c17161cfc23ca2d8c58e7e24458c277100ae (diff) | |
Buildbot: Disable Cycles CUDA support on 32bit, and stop building sm_2x.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/buildbot/slave_compile.py | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 1318cd26294..f2f8edc614d 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -107,25 +107,24 @@ if 'cmake' in builder: elif builder.endswith('i686_cmake'): bits = 32 chroot_name = 'buildbot_' + deb_name + '_i686' - cuda_chroot_name = 'buildbot_' + deb_name + '_x86_64' - targets = ['player', 'blender', 'cuda'] + targets = ['player', 'blender'] cmake_extra_options.extend(["-DCMAKE_C_COMPILER=/usr/bin/gcc-7", "-DCMAKE_CXX_COMPILER=/usr/bin/g++-7"]) cmake_options.append("-C" + os.path.join(blender_dir, cmake_config_file)) - # Prepare CMake options needed to configure cuda binaries compilation. - cuda_cmake_options.append("-DWITH_CYCLES_CUDA_BINARIES=%s" % ('ON' if build_cubins else 'OFF')) - cuda_cmake_options.append("-DCYCLES_CUDA_BINARIES_ARCH=sm_20;sm_21;sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61") - if build_cubins or 'cuda' in targets: - if bits == 32: - cuda_cmake_options.append("-DCUDA_64_BIT_DEVICE_CODE=OFF") - else: + # Prepare CMake options needed to configure cuda binaries compilation, 64bit only. + if bits == 64: + cuda_cmake_options.append("-DWITH_CYCLES_CUDA_BINARIES=%s" % ('ON' if build_cubins else 'OFF')) + cuda_cmake_options.append("-DCYCLES_CUDA_BINARIES_ARCH=sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61") + if build_cubins or 'cuda' in targets: cuda_cmake_options.append("-DCUDA_64_BIT_DEVICE_CODE=ON") - # Only modify common cmake options if cuda doesn't require separate target. - if 'cuda' not in targets: - cmake_options += cuda_cmake_options + # Only modify common cmake options if cuda doesn't require separate target. + if 'cuda' not in targets: + cmake_options += cuda_cmake_options + else: + cuda_cmake_options.append("-DWITH_CYCLES_CUDA_BINARIES=OFF") cmake_options.append("-DCMAKE_INSTALL_PREFIX=%s" % (install_dir)) |