diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-08-22 01:35:20 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-08-22 01:35:20 +0400 |
| commit | 603348c56e5f86dbc10076daa01ebfab2b49f739 (patch) | |
| tree | 41bcdbc5a965731d588df1e146afcbb6eeb81695 /intern | |
| parent | 2e5e1e20282f127a9044e08bc7c2b08e8596a6ee (diff) | |
Cycles: Drop support for CUDA 5.0 Toolkit, only 6.0 and 6.5 (recommended) are supported now.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/device/device_cuda.cpp | 8 | ||||
| -rw-r--r-- | intern/cycles/kernel/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | intern/cycles/kernel/SConscript | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index 9e3d703f5d9..f2e470c21d5 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -243,12 +243,12 @@ public: cuda_error_message("CUDA nvcc compiler version could not be parsed."); return ""; } - if(cuda_version < 50) { - printf("Unsupported CUDA version %d.%d detected, you need CUDA 6.0.\n", cuda_version/10, cuda_version%10); + if(cuda_version < 60) { + printf("Unsupported CUDA version %d.%d detected, you need CUDA 6.5.\n", cuda_version/10, cuda_version%10); return ""; } - else if(cuda_version != 60) - printf("CUDA version %d.%d detected, build may succeed but only CUDA 6.0 is officially supported.\n", cuda_version/10, cuda_version%10); + 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); /* compile */ string kernel = path_join(kernel_path, "kernel.cu"); diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index 2ff6b53b0a5..34ef9e5a387 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -149,11 +149,11 @@ if(WITH_CYCLES_CUDA_BINARIES) set(CUDA_VERSION "${CUDA_VERSION_MAJOR}${CUDA_VERSION_MINOR}") # warn for other versions - if(CUDA_VERSION MATCHES "60") + if(CUDA_VERSION MATCHES "65") else() message(WARNING "CUDA version ${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR} detected, " - "build may succeed but only CUDA 6.0 is officially supported") + "build may succeed but only CUDA 6.5 is officially supported") endif() # build for each arch diff --git a/intern/cycles/kernel/SConscript b/intern/cycles/kernel/SConscript index cfe12e8533d..39f0dd44774 100644 --- a/intern/cycles/kernel/SConscript +++ b/intern/cycles/kernel/SConscript @@ -69,8 +69,8 @@ if env['WITH_BF_CYCLES_CUDA_BINARIES']: cuda_major_minor = re.findall(r'release (\d+).(\d+)', output)[0] cuda_version = int(cuda_major_minor[0])*10 + int(cuda_major_minor[1]) - if cuda_version != 60: - print("CUDA version %d.%d detected, build may succeed but only CUDA 6.0 is officially supported." % (cuda_version/10, cuda_version%10)) + if cuda_version != 65: + print("CUDA version %d.%d detected, build may succeed but only CUDA 6.5 is officially supported." % (cuda_version/10, cuda_version%10)) # nvcc flags nvcc_flags = "-m%s" % (bits) |