Cycles: Make CUDA 7.5 officially recommended
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 17 Feb 2016 14:10:02 +0000 (15:10 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 17 Feb 2016 14:18:56 +0000 (15:18 +0100)
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.

intern/cycles/device/device_cuda.cpp
intern/cycles/kernel/CMakeLists.txt

index 98997ae0968710d17ac0980e955a1ffa629e36f8..80c8cb1e59229b7f75fa765b00f45257d231b375 100644 (file)
@@ -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")));
index 582db860491900d8efba35a1af8a4de7ae0cffe7..3c17429fd092b59fb72ded4cbead600ab284df73 100644 (file)
@@ -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