diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-10-03 23:14:43 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-10-03 23:15:26 +0300 |
| commit | b4f9766ed13b00fbcdbd7c6e051f993caa95828c (patch) | |
| tree | 18ae25a11f57671666276069bbf9a61e450697a0 /intern/cycles/kernel/CMakeLists.txt | |
| parent | a3abb020e37a072eb71fd30de9ab125d1c16623a (diff) | |
Cycles CUDA: make CUDA 8.0 the officially supported version for all platforms.
Diffstat (limited to 'intern/cycles/kernel/CMakeLists.txt')
| -rw-r--r-- | intern/cycles/kernel/CMakeLists.txt | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index 06089b4014a..e4341c8aca1 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -215,11 +215,11 @@ if(WITH_CYCLES_CUDA_BINARIES) set(CUDA_VERSION "${CUDA_VERSION_MAJOR}${CUDA_VERSION_MINOR}") # warn for other versions - if(CUDA_VERSION MATCHES "75") + if(CUDA_VERSION MATCHES "80") else() message(WARNING "CUDA version ${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR} detected, " - "build may succeed but only CUDA 7.5 is officially supported") + "build may succeed but only CUDA 8.0 is officially supported") endif() # build for each arch @@ -251,11 +251,6 @@ if(WITH_CYCLES_CUDA_BINARIES) set(cuda_nvcc_command ${CUDA_NVCC_EXECUTABLE}) set(cuda_nvcc_version ${CUDA_VERSION}) - if(DEFINED CUDA_NVCC8_EXECUTABLE AND ((${arch} STREQUAL "sm_60") OR (${arch} STREQUAL "sm_61"))) - set(cuda_nvcc_command ${CUDA_NVCC8_EXECUTABLE}) - set(cuda_nvcc_version "80") - endif() - set(cuda_version_flags "-D__KERNEL_CUDA_VERSION__=${cuda_nvcc_version}") set(cuda_math_flags "--use_fast_math") |