Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

- scheduler: minor fixes to plan_clas_spec: 

- consistently accept both 'ati' and 'amd' for AMD/ATI plan classes
      - in OpenCL plan classes always use device memory reported via OpenCL
        (might be different e.g. from what's available/reported via CUDA)
      - comment formatting

svn path=/trunk/boinc/; revision=25744
This commit is contained in:
Bernd Machenschalk 2012-06-06 10:05:00 +00:00
parent da2f59137e
commit 470c505d78
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
checkin_notes
View File

@ -4217,3 +4217,13 @@ Bernd 6 Jun 2012
sched/
sched_version.cpp
Bernd 6 Jun 2012
- scheduler: minor fixes to plan_clas_spec:
- consistently accept both 'ati' and 'amd' for AMD/ATI plan classes
- in OpenCL plan classes always use device memory reported via OpenCL
(might be different e.g. from what's available/reported via CUDA)
- comment formatting
sched/
plan_class_spec.cpp

18
sched/plan_class_spec.cpp
View File

@ -228,7 +228,7 @@ bool PLAN_CLASS_SPEC::check(SCHEDULER_REQUEST& sreq, HOST_USAGE& hu) {
// AMD
//
if (!strcmp(gpu_type, "amd")) {
if (!strcmp(gpu_type, "amd") || !strcmp(gpu_type, "ati")) {
COPROC_ATI& cp = sreq.coprocs.ati;
cpp = &cp;
@ -271,9 +271,10 @@ bool PLAN_CLASS_SPEC::check(SCHEDULER_REQUEST& sreq, HOST_USAGE& hu) {
);
}
}
// NVIDIA
//
} else if (!strcmp(gpu_type, "nvidia")) {
// NVIDIA
//
COPROC_NVIDIA& cp = sreq.coprocs.nvidia;
cpp = &cp;
@ -359,6 +360,8 @@ bool PLAN_CLASS_SPEC::check(SCHEDULER_REQUEST& sreq, HOST_USAGE& hu) {
}
return false;
}
gpu_ram = cpp->opencl_prop.global_mem_size;
}
// general GPU
@ -376,8 +379,6 @@ bool PLAN_CLASS_SPEC::check(SCHEDULER_REQUEST& sreq, HOST_USAGE& hu) {
return false;
}
// (display) driver version
if (min_driver_version && driver_version) {
if (min_driver_version > driver_version) {
@ -429,12 +430,15 @@ bool PLAN_CLASS_SPEC::check(SCHEDULER_REQUEST& sreq, HOST_USAGE& hu) {
hu.avg_ncpus = avg_ncpus;
}
if (!strcmp(gpu_type, "ati")) {
if (!strcmp(gpu_type, "amd") || !strcmp(gpu_type, "ati")) {
hu.natis = gpu_usage;
} else if (!strcmp(gpu_type, "nvidia")) {
hu.ncudas = gpu_usage;
}
} else { // CPU only
// CPU only
//
} else {
if (avg_ncpus) {
hu.avg_ncpus = avg_ncpus;
} else {