diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-04-30 12:54:17 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-04-30 18:07:27 +0400 |
| commit | 741f17f05b8272abfaf000a403e44b73692ba4c7 (patch) | |
| tree | dafcf851ca51b51b56e947bfb3879d224381cd6d /intern/cycles/kernel/CMakeLists.txt | |
| parent | 4d1a109ddec02ad7e527d8b65a5cdc8d4a7528a9 (diff) | |
Cycles CUDA: make CUDA toolkit 6.0 the official supported version.
This also updates the configurations to build kernels for compute capability
5.0 cards, when using and older CUDA toolkit version this will be skipped.
Also includes tweaks to improve performance with this version:
* Increase max registers on sm_30, sm_35 and sm_50
* No longer use texture storage on sm_30
Diffstat (limited to 'intern/cycles/kernel/CMakeLists.txt')
| -rw-r--r-- | intern/cycles/kernel/CMakeLists.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index 1527d154c86..d18f4fa2998 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -146,11 +146,11 @@ if(WITH_CYCLES_CUDA_BINARIES) set(CUDA_VERSION "${CUDA_VERSION_MAJOR}${CUDA_VERSION_MINOR}") # warn for other versions - if(CUDA_VERSION MATCHES "50") + if(CUDA_VERSION MATCHES "60") else() message(WARNING "CUDA version ${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR} detected, " - "build may succeed but only CUDA 5.0 is officially supported") + "build may succeed but only CUDA 6.0 is officially supported") endif() # build for each arch @@ -162,8 +162,10 @@ if(WITH_CYCLES_CUDA_BINARIES) set(cuda_version_flags "-D__KERNEL_CUDA_VERSION__=${CUDA_VERSION}") set(cuda_math_flags "--use_fast_math") - - if(CUDA_VERSION LESS 50 AND ${arch} MATCHES "sm_35") + + if(CUDA_VERSION LESS 60 AND ${arch} MATCHES "sm_50") + message(WARNING "Can't build kernel for CUDA sm_50 architecture, skipping") + elseif(CUDA_VERSION LESS 50 AND ${arch} MATCHES "sm_35") message(WARNING "Can't build kernel for CUDA sm_35 architecture, skipping") else() add_custom_command( |