From 0c4a9bc452375642529cb7e04df85e75be81e02c Mon Sep 17 00:00:00 2001 From: David Anderson Date: Mon, 10 Dec 2012 20:00:17 -0800 Subject: [PATCH] - lib: actually let's make it "intel_gpu". --- checkin_notes | 8 ++++++++ lib/coproc.cpp | 2 +- sched/sched_customize.cpp | 6 +++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/checkin_notes b/checkin_notes index b9abd9716b..5696e78aa0 100644 --- a/checkin_notes +++ b/checkin_notes @@ -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 diff --git a/lib/coproc.cpp b/lib/coproc.cpp index 6a55c25521..3142cacf79 100644 --- a/lib/coproc.cpp +++ b/lib/coproc.cpp @@ -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"; } diff --git a/sched/sched_customize.cpp b/sched/sched_customize.cpp index 188e0b2843..f0c691c6c5 100644 --- a/sched/sched_customize.cpp +++ b/sched/sched_customize.cpp @@ -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; }