diff options
| author | Jeroen Bakker <jeroen@blender.org> | 2020-10-21 11:12:17 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2020-10-21 11:12:17 +0300 |
| commit | 5949b796f00245f2cd8e0bf0609b8b4f025ff20a (patch) | |
| tree | 4c0057a8fdc3b49d37025bf07f8939f2bc27a61b | |
| parent | 3e104c5c423c3fc0bb2fb45fc199c610d8b4639f (diff) | |
BuildBot: Select CUDA 10.1 for Blender v2.83 releasesv2.83.8
Buildbot has multiple cuda versions installed. Master selects the right
cuda version based on the architecture that is compiled. {D9179}.
When building BlenderLTS it defaults to CUDA 11.1 what isn't able to
compile `sm_30` architecture. This patch selects CUDA 10.1 as default.
| -rw-r--r-- | build_files/buildbot/worker_compile.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/build_files/buildbot/worker_compile.py b/build_files/buildbot/worker_compile.py index 6df112713a4..340f507df4c 100644 --- a/build_files/buildbot/worker_compile.py +++ b/build_files/buildbot/worker_compile.py @@ -44,6 +44,14 @@ def get_cmake_options(builder): optix_sdk_dir = os.path.join(builder.blender_dir, '..', '..', 'NVIDIA-Optix-SDK') options.append('-DOPTIX_ROOT_DIR:PATH=' + optix_sdk_dir) + # Workers have multiple CUDA versions installed. Select 10.1 for Blender 2.83 releases. + if builder.platform == 'win': + options.append('-DCUDA_TOOLKIT_ROOT_DIR:PATH=C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v10.1') + options.append('-DCUDA_NVCC_EXECUTABLE:FILEPATH=C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v10.1/bin/nvcc.exe') + elif builder.platform == 'linux': + options.append('-DCUDA_TOOLKIT_ROOT_DIR:PATH=/usr/local/cuda-10.1') + options.append('-DCUDA_NVCC_EXECUTABLE:FILEPATH=/usr/local/cuda-10.1/bin/nvcc') + options.append("-C" + os.path.join(builder.blender_dir, config_file)) options.append("-DCMAKE_INSTALL_PREFIX=%s" % (builder.install_dir)) |