diff --git a/CMakeLists.txt b/CMakeLists.txt index 93fddfb1d15..e392a5007e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -503,7 +503,7 @@ if(NOT APPLE) mark_as_advanced(WITH_CYCLES_DEVICE_CUDA) option(WITH_CYCLES_CUDA_BINARIES "Build Cycles NVIDIA CUDA binaries" OFF) - set(CYCLES_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70 sm_75 sm_86 compute_75 CACHE STRING "CUDA architectures to build binaries for") + set(CYCLES_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70 sm_75 sm_86 sm_89 compute_75 CACHE STRING "CUDA architectures to build binaries for") option(WITH_CYCLES_CUDA_BUILD_SERIAL "Build cubins one after another (useful on machines with limited RAM)" OFF) option(WITH_CUDA_DYNLOAD "Dynamically load CUDA libraries at runtime (for developers, makes cuda-gdb work)" ON) diff --git a/build_files/config/pipeline_config.yaml b/build_files/config/pipeline_config.yaml index 6edc4801bf6..c7e10a887ec 100644 --- a/build_files/config/pipeline_config.yaml +++ b/build_files/config/pipeline_config.yaml @@ -8,6 +8,8 @@ buildbot: version: '10.1.243' cuda11: version: '11.4.1' + cuda12: + version: '12.1.1' hip: version: '5.5.30571' hiprt: diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index b22146eaf83..325048c0927 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -540,12 +540,12 @@ if(WITH_CYCLES_CUDA_BINARIES) elseif(${arch} MATCHES ".*_7." AND "${CUDA_VERSION}" LESS 100) message(STATUS "CUDA binaries for ${arch} require CUDA 10.0+, skipped.") elseif(${arch} MATCHES ".*_8.") - if(DEFINED CUDA11_NVCC_EXECUTABLE) - set(cuda_nvcc_executable ${CUDA11_NVCC_EXECUTABLE}) - set(cuda_toolkit_root_dir ${CUDA11_TOOLKIT_ROOT_DIR}) - elseif("${CUDA_VERSION}" GREATER_EQUAL 111) # Support for sm_86 was introduced in CUDA 11 + if("${CUDA_VERSION}" GREATER_EQUAL 111) # Support for sm_86 was introduced in CUDA 11 set(cuda_nvcc_executable ${CUDA_NVCC_EXECUTABLE}) set(cuda_toolkit_root_dir ${CUDA_TOOLKIT_ROOT_DIR}) + elseif(DEFINED CUDA11_NVCC_EXECUTABLE) + set(cuda_nvcc_executable ${CUDA11_NVCC_EXECUTABLE}) + set(cuda_toolkit_root_dir ${CUDA11_TOOLKIT_ROOT_DIR}) else() message(STATUS "CUDA binaries for ${arch} require CUDA 11.1+, skipped.") endif()