diff --git a/checkin_notes b/checkin_notes index 2deb9c953d..db28d76a27 100644 --- a/checkin_notes +++ b/checkin_notes @@ -9013,3 +9013,10 @@ David 10 Nov 2009 average.h sched/ credit_test.cpp + +David 10 Nov 2009 + - scheduler: fix bug that caused no ATI jobs to be sent + if max_jobs_in_progress defined. + + sched/ + sched_send.cpp diff --git a/doc/links.php b/doc/links.php index 43cf9d470b..2547943b9a 100644 --- a/doc/links.php +++ b/doc/links.php @@ -285,7 +285,7 @@ language("Japanese", array( "translation by Komori Hitoshi") )); language("Korean", array( - site("http://setikah.mi.am/", "SETIKAH@home"), + site("http://cafe.naver.com/setikah", "SETIKAH@home"), site("http://boincatkorea.xo.st/", "BOINC@KOREA"), )); diff --git a/sched/sched_send.cpp b/sched/sched_send.cpp index 27ed99392c..dbdb90c4a3 100644 --- a/sched/sched_send.cpp +++ b/sched/sched_send.cpp @@ -81,8 +81,8 @@ const char* infeasible_string(int code) { const double MIN_REQ_SECS = 0; const double MAX_REQ_SECS = (28*SECONDS_IN_DAY); -const int MAX_CUDA_DEVS = 8; - // don't believe clients who claim they have more CUDA devices than this +const int MAX_GPUS = 8; + // don't believe clients who claim they have more GPUs than this // get limits on #jobs per day and per RPC, on in progress // @@ -100,7 +100,13 @@ void WORK_REQ::get_job_limits() { COPROC* cp = g_request->coprocs.lookup("CUDA"); if (cp) { n = cp->count; - if (n > MAX_CUDA_DEVS) n = MAX_CUDA_DEVS; + if (n > MAX_GPUS) n = MAX_GPUS; + } + cp = g_request->coprocs.lookup("ATI"); + if (cp) { + if (cp->count <= MAX_GPUS && cp->count > n) { + n = cp->count; + } } effective_ngpus = n;