From d97c83712cf8d133beb77573fac35c459a64d827 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 5 May 2020 12:59:25 +0200 Subject: [PATCH] Cycles: mark CUDA 10.2 as officially supported It appears to work fine after a recent bugfix and testing for the past few weeks. --- intern/cycles/device/cuda/device_cuda_impl.cpp | 4 ++-- intern/cycles/kernel/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/intern/cycles/device/cuda/device_cuda_impl.cpp b/intern/cycles/device/cuda/device_cuda_impl.cpp index 0f261ef2f70..ba5d479e0e7 100644 --- a/intern/cycles/device/cuda/device_cuda_impl.cpp +++ b/intern/cycles/device/cuda/device_cuda_impl.cpp @@ -421,10 +421,10 @@ string CUDADevice::compile_kernel(const DeviceRequestedFeatures &requested_featu nvcc_cuda_version % 10); return string(); } - else if (nvcc_cuda_version != 101) { + else if (!(nvcc_cuda_version == 101 || nvcc_cuda_version == 102)) { printf( "CUDA version %d.%d detected, build may succeed but only " - "CUDA 10.1 is officially supported.\n", + "CUDA 10.1 and 10.2 are officially supported.\n", nvcc_cuda_version / 10, nvcc_cuda_version % 10); } diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index ac3a85089c2..2e839a616e9 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -375,11 +375,11 @@ if(WITH_CYCLES_CUDA_BINARIES) set(CUDA_VERSION "${CUDA_VERSION_MAJOR}${CUDA_VERSION_MINOR}") # warn for other versions - if(CUDA_VERSION MATCHES "101") + if((CUDA_VERSION MATCHES "101") OR (CUDA_VERSION MATCHES "102")) else() message(WARNING "CUDA version ${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR} detected, " - "build may succeed but only CUDA 10.1 is officially supported") + "build may succeed but only CUDA 10.1 and 10.2 are officially supported") endif() # build for each arch