forked from bartvdbraak/blender
Cycles: Drop support for CUDA 5.0 Toolkit, only 6.0 and 6.5 (recommended) are supported now.
This commit is contained in:
parent
2e5e1e2028
commit
603348c56e
@ -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");
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user