[Bf-blender-cvs] [75396edb315] master: Buildbot: Disable Cycles CUDA support on 32bit, and stop building sm_2x.
Thomas Dinges
noreply at git.blender.org
Sat Feb 17 15:50:21 CET 2018
Commit: 75396edb315c4f4dd5928cf3ad9e103eb2a1c61e
Author: Thomas Dinges
Date: Sat Feb 17 15:49:37 2018 +0100
Branches: master
https://developer.blender.org/rB75396edb315c4f4dd5928cf3ad9e103eb2a1c61e
Buildbot: Disable Cycles CUDA support on 32bit, and stop building sm_2x.
===================================================================
M build_files/buildbot/slave_compile.py
===================================================================
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))
More information about the Bf-blender-cvs
mailing list