From e777d62672740f55d2d2ac7c577d6e64bdd6c477 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Tue, 12 May 2009 23:23:47 +0000
Subject: [PATCH] - scheduler: the multiplier for both #jobs/day and #jobs in
 progress     is #CPUs + config.cuda_multiplier * #GPUs

svn path=/trunk/boinc/; revision=18085
---
 checkin_notes        |  7 +++++++
 sched/sched_send.cpp | 22 ++++++++++++----------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 83d03c8eb5..0379655527 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -4463,3 +4463,10 @@ David  12 May 2009
 
     sched/
         file_deleter.cpp
+
+David  12 May 2009
+    - scheduler: the multiplier for both #jobs/day and #jobs in progress
+        is #CPUs + config.cuda_multiplier * #GPUs
+
+    sched/
+        sched_send.cpp
diff --git a/sched/sched_send.cpp b/sched/sched_send.cpp
index 9b1bdb7304..0263007502 100644
--- a/sched/sched_send.cpp
+++ b/sched/sched_send.cpp
@@ -91,7 +91,9 @@ inline int effective_ncpus() {
     return ncpus;
 }
 
-// total_max_results_per is this multiplier times max_results_day
+// max results/day is this multiplier times config.max_results_day.
+// multiplier is:
+// # CPUs + config.cuda_multiplier*#GPUs
 //
 inline void get_max_results_day_multiplier() {
     int n = g_reply->host.p_ncpus;
@@ -102,25 +104,25 @@ inline void get_max_results_day_multiplier() {
         if (cp) {
             int m = cp->count;
             if (m > MAX_CUDA_DEVS) m = MAX_CUDA_DEVS;
-            //n += m*config.cuda_multiplier;
-            n = m*config.cuda_multiplier;
+            n += m*config.cuda_multiplier;
         }
     }
     g_wreq->max_results_day_multiplier = n;
 }
 
-// scale factor for max_wus_in_progress
+// max results in progress is this multiplier times config.max_wus_in_progress
+// multiplier is defined same as above.
 //
 inline void get_max_wus_in_progress_multiplier() {
     int n = g_reply->host.p_ncpus;
     if (n > config.max_ncpus) n = config.max_ncpus;
     if (n < 1) n = 1;
-    COPROC* cp = g_request->coprocs.lookup("CUDA");
-    if (cp) {
-        int m = cp->count;
-        if (m > MAX_CUDA_DEVS) m = MAX_CUDA_DEVS;
-        if (m > n) {
-            n = m;
+    if (config.cuda_multiplier) {
+        COPROC* cp = g_request->coprocs.lookup("CUDA");
+        if (cp) {
+            int m = cp->count;
+            if (m > MAX_CUDA_DEVS) m = MAX_CUDA_DEVS;
+            n += m*config.cuda_multiplier;
         }
     }
     g_wreq->max_wus_in_progress_multiplier = n;