Skip to content

Commit

Permalink
plan class: add filters <min_wu_id>, <amx_wu_id>, <min_batch>, <max_b…
Browse files Browse the repository at this point in the history 
…atch> and <disabled>

- WU information is passed from check_homogeneous_app_version()
  down to PLAN_CLASS::check()

- wu_is_infeasible_custom() is extended such that additional
  tasks also follow the plan class restrictions.
  • Loading branch information
@bema-aei
bema-aei committed Aug 2, 2017
1 parent 3875b45 commit ae1edb1
Show file tree
Hide file tree
Showing 5 changed files with 91 additions and 15 deletions.
70 changes: 66 additions & 4 deletions sched/plan_class_spec.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,41 @@ bool PLAN_CLASS_SPEC::opencl_check(OPENCL_DEVICE_PROP& opencl_prop) {
return true;
}

bool PLAN_CLASS_SPEC::check(SCHEDULER_REQUEST& sreq, HOST_USAGE& hu) {
bool PLAN_CLASS_SPEC::check(SCHEDULER_REQUEST& sreq, HOST_USAGE& hu, const WORKUNIT* wu) {
COPROC* cpp = NULL;
bool can_use_multicore = true;

hu.sequential_app(sreq.host.p_fpops);

// disabled by configuration
if (disabled) {
if (config.debug_version_select)
log_messages.printf(MSG_NORMAL, "[version] Plan class disabled\n");
return false;
}

// WU restriction
if (min_wu_id && wu->id < min_wu_id) {
if (config.debug_version_select)
log_messages.printf(MSG_NORMAL, "[version] WU#%ld too old\n", wu->id);
return false;
}
if (max_wu_id && wu->id > max_wu_id) {
if (config.debug_version_select)
log_messages.printf(MSG_NORMAL, "[version] WU#%ld too new\n", wu->id);
return false;
}
if (min_batch && wu->batch < min_batch) {
if (config.debug_version_select)
log_messages.printf(MSG_NORMAL, "[version] batch#%ld too old\n", wu->id);
return false;
}
if (max_batch && wu->batch > max_batch) {
if (config.debug_version_select)
log_messages.printf(MSG_NORMAL, "[version] batch#%ld too new\n", wu->id);
return false;
}

// CPU features
//
// older clients report CPU features in p_model,
Expand Down Expand Up @@ -882,19 +911,47 @@ bool PLAN_CLASS_SPEC::check(SCHEDULER_REQUEST& sreq, HOST_USAGE& hu) {

}


bool PLAN_CLASS_SPECS::check(
SCHEDULER_REQUEST& sreq, char* plan_class, HOST_USAGE& hu
SCHEDULER_REQUEST& sreq, char* plan_class, HOST_USAGE& hu, const WORKUNIT* wu
) {
for (unsigned int i=0; i<classes.size(); i++) {
if (!strcmp(classes[i].name, plan_class)) {
return classes[i].check(sreq, hu);
return classes[i].check(sreq, hu, wu);
}
}
log_messages.printf(MSG_CRITICAL, "Unknown plan class: %s\n", plan_class);
return false;
}

bool PLAN_CLASS_SPECS::wu_is_infeasible(char* plan_class, const WORKUNIT* wu) {
for (unsigned int i=0; i<classes.size(); i++) {
if(!strcmp(classes[i].name, plan_class)) {
if (classes[i].min_wu_id && wu->id < classes[i].min_wu_id) {
if (config.debug_version_select)
log_messages.printf(MSG_NORMAL, "[version] WU#%ld too old for plan class '%s'\n", wu->id, plan_class);
return true;
}
if (classes[i].max_wu_id && wu->id > classes[i].max_wu_id) {
if (config.debug_version_select)
log_messages.printf(MSG_NORMAL, "[version] WU#%ld too new for plan class '%s'\n", wu->id, plan_class);
return true;
}
if (classes[i].min_batch && wu->batch < classes[i].min_batch) {
if (config.debug_version_select)
log_messages.printff(MSG_NORMAL, "[version] batch#%ld too old for plan class '%s'\n", wu->id, plan_class);
return true;
}
if (classes[i].max_batch && wu->batch > classes[i].max_batch) {
if (config.debug_version_select)
log_messages.printf(MSG_NORMAL, "[version] batch#%ld too new for plan class '%s'\n", wu->id, plan_class);
return true;
}
break;
}
}
return false;
}

int PLAN_CLASS_SPEC::parse(XML_PARSER& xp) {
char buf[256];
int i;
Expand All @@ -903,6 +960,7 @@ int PLAN_CLASS_SPEC::parse(XML_PARSER& xp) {
return 0;
}
if (xp.parse_str("name", name, sizeof(name))) continue;
if (xp.parse_bool("disabled", disabled)) continue;
if (xp.parse_int("min_core_client_version", min_core_client_version)) continue;
if (xp.parse_int("max_core_client_version", max_core_client_version)) continue;
if (xp.parse_str("gpu_type", gpu_type, sizeof(gpu_type))) continue;
Expand Down Expand Up @@ -975,6 +1033,10 @@ int PLAN_CLASS_SPEC::parse(XML_PARSER& xp) {
if (xp.parse_int("min_driver_version", min_driver_version)) continue;
if (xp.parse_int("max_driver_version", max_driver_version)) continue;
if (xp.parse_str("gpu_utilization_tag", gpu_utilization_tag, sizeof(gpu_utilization_tag))) continue;
if (xp.parse_int("min_wu_id", min_wu_id)) continue;
if (xp.parse_int("max_wu_id", max_wu_id)) continue;
if (xp.parse_int("min_batch", min_batch)) continue;
if (xp.parse_int("max_batch", max_batch)) continue;

if (xp.parse_bool("need_ati_libs", need_ati_libs)) continue;
if (xp.parse_bool("need_amd_libs", need_amd_libs)) continue;
Expand Down
10 changes: 8 additions & 2 deletions sched/plan_class_spec.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
// if you add anything here, initialize if in the constructor
//
struct PLAN_CLASS_SPEC {
bool disabled;
char name[256];
char gpu_type[256];
bool cuda;
Expand Down Expand Up @@ -59,6 +60,10 @@ struct PLAN_CLASS_SPEC {
// for non-compute-intensive, or override for GPU apps
bool have_host_summary_regex;
regex_t host_summary_regex;
int min_wu_id;
int max_wu_id;
int min_batch;
int max_batch;

// GPU apps
//
Expand Down Expand Up @@ -109,14 +114,15 @@ struct PLAN_CLASS_SPEC {

int parse(XML_PARSER&);
bool opencl_check(OPENCL_DEVICE_PROP&);
bool check(SCHEDULER_REQUEST& sreq, HOST_USAGE& hu);
bool check(SCHEDULER_REQUEST& sreq, HOST_USAGE& hu, const WORKUNIT* wu);
PLAN_CLASS_SPEC();
};

struct PLAN_CLASS_SPECS {
std::vector<PLAN_CLASS_SPEC> classes;
int parse_file(const char*);
int parse_specs(FILE*);
bool check(SCHEDULER_REQUEST& sreq, char* plan_class, HOST_USAGE& hu);
bool check(SCHEDULER_REQUEST& sreq, char* plan_class, HOST_USAGE& hu, const WORKUNIT* wu);
bool wu_is_infeasible(char* plan_class, const WORKUNIT* wu);
PLAN_CLASS_SPECS(){};
};
20 changes: 14 additions & 6 deletions sched/sched_customize.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,14 @@ using std::string;
#define OPENCL_NVIDIA_MIN_RAM CUDA_MIN_RAM
#endif

PLAN_CLASS_SPECS plan_class_specs;

GPU_REQUIREMENTS gpu_requirements[NPROC_TYPES];

bool wu_is_infeasible_custom(
WORKUNIT& /*wu*/,
WORKUNIT& wu,
APP& /*app*/,
BEST_APP_VERSION& /*bav*/
BEST_APP_VERSION& bav
) {
#if 0
// example 1: if WU name contains "_v1", don't use GPU apps.
Expand Down Expand Up @@ -129,6 +131,14 @@ bool wu_is_infeasible_custom(
return true;
}
#endif

// WU restriction
if (plan_class_specs.classes.size() > 0) {
if (plan_class_specs.wu_is_infeasible(bav.avp->plan_class, &wu)) {
return true;
}
}

return false;
}

Expand Down Expand Up @@ -912,12 +922,10 @@ static inline bool app_plan_vbox(
return true;
}

PLAN_CLASS_SPECS plan_class_specs;

// app planning function.
// See http://boinc.berkeley.edu/trac/wiki/AppPlan
//
bool app_plan(SCHEDULER_REQUEST& sreq, char* plan_class, HOST_USAGE& hu) {
bool app_plan(SCHEDULER_REQUEST& sreq, char* plan_class, HOST_USAGE& hu, const WORKUNIT* wu) {
char buf[256];
static bool check_plan_class_spec = true;
static bool have_plan_class_spec = false;
Expand Down Expand Up @@ -955,7 +963,7 @@ bool app_plan(SCHEDULER_REQUEST& sreq, char* plan_class, HOST_USAGE& hu) {
return false;
}
if (have_plan_class_spec) {
return plan_class_specs.check(sreq, plan_class, hu);
return plan_class_specs.check(sreq, plan_class, hu, wu);
}

if (!strcmp(plan_class, "mt")) {
Expand Down
2 changes: 1 addition & 1 deletion sched/sched_customize.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ struct GPU_REQUIREMENTS {
extern GPU_REQUIREMENTS gpu_requirements[NPROC_TYPES];

extern bool wu_is_infeasible_custom(WORKUNIT&, APP&, BEST_APP_VERSION&);
extern bool app_plan(SCHEDULER_REQUEST&, char* plan_class, HOST_USAGE&);
extern bool app_plan(SCHEDULER_REQUEST&, char* plan_class, HOST_USAGE&, const WORKUNIT* wu);
extern void handle_file_xfer_results();

// Suppose we have a computation that uses two devices alternately.
Expand Down
4 changes: 2 additions & 2 deletions sched/sched_version.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ static BEST_APP_VERSION* check_homogeneous_app_version(
// and see if it supports the plan class
//
if (strlen(avp->plan_class)) {
if (!app_plan(*g_request, avp->plan_class, bav.host_usage)) {
if (!app_plan(*g_request, avp->plan_class, bav.host_usage, &wu)) {
return NULL;
}
} else {
Expand Down Expand Up @@ -705,7 +705,7 @@ BEST_APP_VERSION* get_app_version(
}

if (strlen(av.plan_class)) {
if (!app_plan(*g_request, av.plan_class, host_usage)) {
if (!app_plan(*g_request, av.plan_class, host_usage, &wu)) {
if (config.debug_version_select) {
log_messages.printf(MSG_NORMAL,
"[version] [AV#%lu] app_plan() returned false\n",
Expand Down

0 comments on commit ae1edb1

Please sign in to comment.