sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

CMake: support CUDA 9 toolkit, and automatically disable sm_2x binaries.

Browse Source 
Fermi cards (GTX 4xx and 5xx) are no longer supported with this version, so
we can keep supporting both CUDA 8 and 9 for a while.
This commit is contained in:
Brecht Van Lommel 2017-10-01 14:04:34 +02:00
parent 22ecea9e38
commit f55735e533
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
intern/cycles/kernel/CMakeLists.txt
View File

@ -321,7 +321,7 @@ if(WITH_CYCLES_CUDA_BINARIES)
set(CUDA_VERSION "${CUDA_VERSION_MAJOR}${CUDA_VERSION_MINOR}") set(CUDA_VERSION "${CUDA_VERSION_MAJOR}${CUDA_VERSION_MINOR}")
# warn for other versions # warn for other versions
if(CUDA_VERSION MATCHES "80") if(CUDA_VERSION MATCHES "80" OR CUDA_VERSION MATCHES "90")
else() else()
message(WARNING message(WARNING
"CUDA version ${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR} detected, " "CUDA version ${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR} detected, "
@ -399,13 +399,17 @@ if(WITH_CYCLES_CUDA_BINARIES)
endmacro() endmacro()
foreach(arch ${CYCLES_CUDA_BINARIES_ARCH}) foreach(arch ${CYCLES_CUDA_BINARIES_ARCH})
# Compile regular kernel if(CUDA_VERSION MATCHES "90" AND ${arch} MATCHES "sm_2.")
CYCLES_CUDA_KERNEL_ADD(${arch} kernel "" "${cuda_sources}" FALSE) message(STATUS "CUDA binaries for ${arch} disabled, not supported by CUDA 9.")
CYCLES_CUDA_KERNEL_ADD(${arch} filter "" "${cuda_filter_sources}" FALSE) else()
# Compile regular kernel
CYCLES_CUDA_KERNEL_ADD(${arch} kernel "" "${cuda_sources}" FALSE)
CYCLES_CUDA_KERNEL_ADD(${arch} filter "" "${cuda_filter_sources}" FALSE)
if(WITH_CYCLES_CUDA_SPLIT_KERNEL_BINARIES) if(WITH_CYCLES_CUDA_SPLIT_KERNEL_BINARIES)
# Compile split kernel # Compile split kernel
CYCLES_CUDA_KERNEL_ADD(${arch} kernel_split "-D__SPLIT__" ${cuda_sources} FALSE) CYCLES_CUDA_KERNEL_ADD(${arch} kernel_split "-D__SPLIT__" ${cuda_sources} FALSE)
endif()
endif() endif()
endforeach() endforeach()