- lib: actually let's make it "intel_gpu".

This commit is contained in:
David Anderson 2012-12-10 20:00:17 -08:00 committed by Oliver Bock
parent 2a1ef0bb6f
commit 0c4a9bc452
3 changed files with 12 additions and 4 deletions

View File

@ -7552,3 +7552,11 @@ David 10 Dec 2012
lib/
coproc.cpp
David 10 Dec 2012
- lib: actually let's make it "intel_gpu".
lib/
coproc.cpp
sched/
sched_customize.cpp

View File

@ -1027,7 +1027,7 @@ const char* proc_type_name_xml(int pt) {
case PROC_TYPE_CPU: return "CPU";
case PROC_TYPE_NVIDIA_GPU: return "NVIDIA";
case PROC_TYPE_AMD_GPU: return "ATI";
case PROC_TYPE_INTEL_GPU: return "INTEL_GPU";
case PROC_TYPE_INTEL_GPU: return "intel_gpu";
}
return "unknown";
}

View File

@ -502,13 +502,13 @@ static inline bool opencl_check(
}
hu.gpu_ram = min_global_mem_size;
if (!strcmp(cp.type, "NVIDIA")) {
if (!strcmp(cp.type, proc_type_name_xml(PROC_TYPE_NVIDIA_GPU))) {
hu.proc_type = PROC_TYPE_NVIDIA_GPU;
hu.gpu_usage = ndevs;
} else if (!strcmp(cp.type, "ATI")) {
} else if (!strcmp(cp.type, proc_type_name_xml(PROC_TYPE_AMD_GPU))) {
hu.proc_type = PROC_TYPE_AMD_GPU;
hu.gpu_usage = ndevs;
} else if (!strcmp(cp.type, "intel_gpu")) {
} else if (!strcmp(cp.type, proc_type_name_xml(PROC_TYPE_INTEL_GPU))) {
hu.proc_type = PROC_TYPE_INTEL_GPU;
hu.gpu_usage = ndevs;
}