From 2d7573b8f7264d9ea12fd3f5536fe2958c916ee2 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Fri, 2 Dec 2011 14:37:47 +0000 Subject: [PATCH] - scheduler: in app_plan(), check for "opencl" before "ati". Otherwise "opencl_ati" won't get handled right. Fixes #1158 svn path=/trunk/boinc/; revision=24716 --- checkin_notes | 8 ++++++++ sched/sched_customize.cpp | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/checkin_notes b/checkin_notes index a09f6d17d2..b5032dd10d 100644 --- a/checkin_notes +++ b/checkin_notes @@ -8785,3 +8785,11 @@ Charlie 2 Dec 2011 clientgui/ mac/ SetupSecurity.cpp + +David 2 Dec 2011 + - scheduler: in app_plan(), check for "opencl" before "ati". + Otherwise "opencl_ati" won't get handled right. + Fixes #1158 + + sched/ + sched_customize.cpp diff --git a/sched/sched_customize.cpp b/sched/sched_customize.cpp index 3c458233d4..9757177fbf 100644 --- a/sched/sched_customize.cpp +++ b/sched/sched_customize.cpp @@ -547,6 +547,8 @@ static inline bool app_plan_vbox( bool app_plan(SCHEDULER_REQUEST& sreq, char* plan_class, HOST_USAGE& hu) { if (!strcmp(plan_class, "mt")) { return app_plan_mt(sreq, hu); + } else if (strstr(plan_class, "opencl")) { + return app_plan_opencl(sreq, plan_class, hu); } else if (strstr(plan_class, "ati")) { return app_plan_ati(sreq, plan_class, hu); } else if (strstr(plan_class, "cuda")) { @@ -559,8 +561,6 @@ bool app_plan(SCHEDULER_REQUEST& sreq, char* plan_class, HOST_USAGE& hu) { return app_plan_vbox(sreq, hu, false); } else if (!strcmp(plan_class, "vbox64")) { return app_plan_vbox(sreq, hu, true); - } else if (strstr(plan_class, "opencl")) { - return app_plan_opencl(sreq, plan_class, hu); } log_messages.printf(MSG_CRITICAL, "Unknown plan class: %s\n", plan_class