diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-12-04 18:35:16 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-12-04 18:35:16 +0300 |
commit | b9b88d59ddde50bd1de1f7f96b1c91cbdaf7497b (patch) | |
tree | 763faa6c9a34be6d3e7539e2a02ee38240ec7be5 /build_files/buildbot | |
parent | cf2e35fcfe31aa2c1836f51d1206901b4be6aeba (diff) | |
parent | f63da3dcf59f87b34aa916b2c65ce5a40a48fd92 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files/buildbot')
-rw-r--r-- | build_files/buildbot/slave_compile.py | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 61ce11bbe0c..102fbd903e2 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -72,9 +72,6 @@ if 'cmake' in builder: if builder.endswith('x86_64_10_9_cmake'): cmake_extra_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=x86_64') cmake_extra_options.append('-DCMAKE_OSX_DEPLOYMENT_TARGET=10.9') - # Used to trick CUDFA to see CLang as an older version. - # cmake_extra_options.append('-DCUDA_HOST_COMPILER=/usr/local/cuda-hack/clang') - # cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-hack/nvcc') elif builder.startswith('win'): if builder.endswith('_vs2017'): @@ -119,12 +116,28 @@ if 'cmake' in builder: cmake_extra_options.extend(["-DCMAKE_C_COMPILER=/usr/bin/gcc-7", "-DCMAKE_CXX_COMPILER=/usr/bin/g++-7"]) + # Workaround to build only sm_7x kernels with CUDA 10, until + # older kernels work well with this version. + if builder.startswith('win'): + cmake_extra_options.append('-DCUDA_VERSION=9.1') + cmake_extra_options.append('-DCUDA_TOOLKIT_INCLUDE:PATH=C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v9.1/include') + cmake_extra_options.append('-DCUDA_TOOLKIT_ROOT_DIR:PATH=C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v9.1') + cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE:FILEPATH=C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v9.1/bin/nvcc.exe') + cmake_extra_options.append('-DCUDA10_NVCC_EXECUTABLE:FILEPATH=C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v10.0/bin/nvcc.exe') + cmake_extra_options.append('-DCUDA10_TOOLKIT_ROOT_DIR:PATH=C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v10.0') + elif builder.startswith('linux'): + cmake_extra_options.append('-DCUDA_VERSION=9.1') + cmake_extra_options.append('-DCUDA_TOOLKIT_INCLDUE:PATH=/usr/local/cuda-9.1/include') + cmake_extra_options.append('-DCUDA_TOOLKIT_ROOT_DIR:PATH=/usr/local/cuda-9.1') + cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE:FILEPATH=/usr/local/cuda-9.1/bin/nvcc') + cmake_extra_options.append('-DCUDA10_NVCC_EXECUTABLE:FILEPATH=/usr/local/cuda-10.0/bin/nvcc') + cmake_extra_options.append('-DCUDA10_TOOLKIT_ROOT_DIR:PATH=/usr/local/cuda-10.0') + cmake_options.append("-C" + os.path.join(blender_dir, cmake_config_file)) # 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;sm_70") if build_cubins or 'cuda' in targets: cuda_cmake_options.append("-DCUDA_64_BIT_DEVICE_CODE=ON") |