[Bf-blender-cvs] [8cab327] master: Cycles: Make CUDA 7.5 officially recommended
Sergey Sharybin
noreply at git.blender.org
Wed Feb 17 15:29:00 CET 2016
Commit: 8cab3273163d49986943adba702a8ccc2094e230
Author: Sergey Sharybin
Date: Wed Feb 17 15:10:02 2016 +0100
Branches: master
https://developer.blender.org/rB8cab3273163d49986943adba702a8ccc2094e230
Cycles: Make CUDA 7.5 officially recommended
This was a hard decision, because going newer CUDA toolkit makes
rendering up to 5% slower. But on another hand, it solves major
speed regressions (up to 30%) with branched path tracing on a
top level cards.
Neither of those regressions have a meaningful and sane workaround
from the code itself.
Toolkit 6.5 could still be used, but it's no longer recommended one.
===================================================================
M intern/cycles/device/device_cuda.cpp
M intern/cycles/kernel/CMakeLists.txt
===================================================================
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index 98997ae..80c8cb1 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -310,11 +310,11 @@ public:
return "";
}
if(cuda_version < 60) {
- printf("Unsupported CUDA version %d.%d detected, you need CUDA 6.5.\n", cuda_version/10, cuda_version%10);
+ printf("Unsupported CUDA version %d.%d detected, you need CUDA 7.5.\n", cuda_version/10, cuda_version%10);
return "";
}
- else if(cuda_version != 65)
- printf("CUDA version %d.%d detected, build may succeed but only CUDA 6.5 is officially supported.\n", cuda_version/10, cuda_version%10);
+ else if(cuda_version != 75)
+ printf("CUDA version %d.%d detected, build may succeed but only CUDA 7.5 is officially supported.\n", cuda_version/10, cuda_version%10);
/* compile */
string kernel = path_join(kernel_path, path_join("kernels", path_join("cuda", "kernel.cu")));
diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt
index 582db86..3c17429 100644
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@ -199,11 +199,11 @@ if(WITH_CYCLES_CUDA_BINARIES)
set(CUDA_VERSION "${CUDA_VERSION_MAJOR}${CUDA_VERSION_MINOR}")
# warn for other versions
- if(CUDA_VERSION MATCHES "65")
+ if(CUDA_VERSION MATCHES "75")
else()
message(WARNING
"CUDA version ${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR} detected, "
- "build may succeed but only CUDA 6.5 is officially supported")
+ "build may succeed but only CUDA 7.5 is officially supported")
endif()
# build for each arch
More information about the Bf-blender-cvs
mailing list