[Bf-blender-cvs] [5949b796f00] blender-v2.83-release: BuildBot: Select CUDA 10.1 for Blender v2.83 releases

Jeroen Bakker noreply at git.blender.org
Wed Oct 21 10:15:33 CEST 2020


Commit: 5949b796f00245f2cd8e0bf0609b8b4f025ff20a
Author: Jeroen Bakker
Date:   Wed Oct 21 10:12:17 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rB5949b796f00245f2cd8e0bf0609b8b4f025ff20a

BuildBot: Select CUDA 10.1 for Blender v2.83 releases

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.

===================================================================

M	build_files/buildbot/worker_compile.py

===================================================================

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))



More information about the Bf-blender-cvs mailing list