From a8ed958cd694cb748c581667763681929287b844 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Wed, 3 Mar 2010 22:36:36 +0000
Subject: [PATCH] - scheduler: cuda_fermi class needs CUDA version 3.0+ -
 boinccmd: "result" -> "task"

svn path=/trunk/boinc/; revision=20784
---
 checkin_notes                | 11 +++++++++++
 client/boinc_cmd.cpp         | 10 +++++-----
 lib/gui_rpc_client_print.cpp |  6 +++---
 sched/sched_customize.cpp    | 20 ++++++++++++--------
 4 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 007d4250de..f1f34e00db 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -1591,3 +1591,14 @@ Rom    3 Mar 2010
 
     client/
         hostinfo_win.cpp
+
+David  3 Mar 2010
+    - scheduler: cuda_fermi class needs CUDA version 3.0+
+    - boinccmd: "result" -> "task"
+
+    sched/
+        sched_customize.cpp
+    lib/
+        gui_rpc_client_print.cpp
+    client/
+        boinc_cmd.cpp
diff --git a/client/boinc_cmd.cpp b/client/boinc_cmd.cpp
index 7a0337ed90..fdd42c0dc5 100644
--- a/client/boinc_cmd.cpp
+++ b/client/boinc_cmd.cpp
@@ -62,8 +62,8 @@ Commands:\n\
  --join_acct_mgr URL name passwd    attach account manager\n\
  --quit_acct_mgr                    quit current account manager\n\
  --get_state                        show entire state\n\
- --get_results                      show results\n\
- --get_simple_gui_info              show status of projects and active results\n\
+ --get_tasks                        show tasks\n\
+ --get_simple_gui_info              show status of projects and active tasks\n\
  --get_file_transfers               show file transfers\n\
  --get_project_status               show status of all attached projects\n\
  --get_disk_usage                   show disk usage\n\
@@ -73,7 +73,7 @@ Commands:\n\
  --get_notices [ seqno ]            show notices > seqno\n\
  --get_host_info\n\
  --version, -V                      show core client version\n\
- --result url result_name op        job operation\n\
+ --task url task_name op            task operation\n\
    op = suspend | resume | abort | graphics_window | graphics_fullscreen\n\
  --project URL op                   project operation\n\
    op = reset | detach | update | suspend | resume | nomorework | allowmorework\n\
@@ -218,7 +218,7 @@ int main(int argc, char** argv) {
         CC_STATE state;
         retval = rpc.get_state(state);
         if (!retval) state.print();
-    } else if (!strcmp(cmd, "--get_results")) {
+    } else if (!strcmp(cmd, "--get_tasks")) {
         RESULTS results;
         retval = rpc.get_results(results);
         if (!retval) results.print();
@@ -238,7 +238,7 @@ int main(int argc, char** argv) {
         DISK_USAGE du;
         retval = rpc.get_disk_usage(du);
         if (!retval) du.print();
-    } else if (!strcmp(cmd, "--result")) {
+    } else if (!strcmp(cmd, "--task")) {
         RESULT result;
         char* project_url = next_arg(argc, argv, i);
         result.project_url = project_url;
diff --git a/lib/gui_rpc_client_print.cpp b/lib/gui_rpc_client_print.cpp
index 6d1d341dc3..88ca9f9591 100644
--- a/lib/gui_rpc_client_print.cpp
+++ b/lib/gui_rpc_client_print.cpp
@@ -195,7 +195,7 @@ void SIMPLE_GUI_INFO::print() {
         printf("%d) -----------\n", i+1);
         projects[i]->print();
     }
-    printf("\n======== Results ========\n");
+    printf("\n======== Tasks ========\n");
     for (i=0; i<results.size(); i++) {
         printf("%d) -----------\n", i+1);
         results[i]->print();
@@ -224,7 +224,7 @@ void CC_STATE::print() {
         printf("%d) -----------\n", i+1);
         wus[i]->print();
     }
-    printf("\n======== Results ========\n");
+    printf("\n======== Tasks ========\n");
     for (i=0; i<results.size(); i++) {
         printf("%d) -----------\n", i+1);
         results[i]->print();
@@ -253,7 +253,7 @@ void DISK_USAGE::print() {
 
 void RESULTS::print() {
     unsigned int i;
-    printf("\n======== Results ========\n");
+    printf("\n======== Tasks ========\n");
     for (i=0; i<results.size(); i++) {
         printf("%d) -----------\n", i+1);
         results[i]->print();
diff --git a/sched/sched_customize.cpp b/sched/sched_customize.cpp
index c904b0b516..0e91d25fae 100644
--- a/sched/sched_customize.cpp
+++ b/sched/sched_customize.cpp
@@ -342,7 +342,18 @@ bool app_plan(SCHEDULER_REQUEST& sreq, char* plan_class, HOST_USAGE& hu) {
         // Old BOINC clients report display driver version;
         // newer ones report CUDA RT version
         //
-        if (!strcmp(plan_class, "cuda23") || !strcmp(plan_class, "cuda_fermi")) {
+        if (!strcmp(plan_class, "cuda_fermi")) {
+            int compute_capability = cp->prop.major*100 + cp->prop.minor;
+            if (compute_capability < 200) {
+                add_no_work_message("Fermi-class GPU needed");
+                return false;
+            }
+            if (cp->cuda_version < 3000) {
+                add_no_work_message("CUDA version 2.3 needed");
+                return false;
+            }
+            min_ram = PLAN_CUDA23_MIN_RAM;
+        } else if (!strcmp(plan_class, "cuda23")) {
             if (cp->cuda_version) {
                 if (cp->cuda_version < 2030) {
                     add_no_work_message("CUDA version 2.3 needed");
@@ -364,13 +375,6 @@ bool app_plan(SCHEDULER_REQUEST& sreq, char* plan_class, HOST_USAGE& hu) {
                 return false;
             }
             min_ram = PLAN_CUDA23_MIN_RAM;
-            if (!strcmp(plan_class, "cuda_fermi")) {
-                int compute_capability = cp->prop.major*100 + cp->prop.minor;
-                if (compute_capability < 200) {
-                    add_no_work_message("Fermi-class GPU needed");
-                    return false;
-                }
-            }
         } else {
             if (cp->display_driver_version && cp->display_driver_version < PLAN_CUDA_MIN_DRIVER_VERSION) {
                 if (config.debug_version_select) {