From c94ca443c138257477da214d64d7caa6b0d7e5cb Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Wed, 6 Jun 2012 06:05:14 +0000
Subject: [PATCH] - scheduler: add example plan_class_spec.xml - scheduler:
 change gpu_type from "ati" to "amd" in plan class spec

svn path=/trunk/boinc/; revision=25741
---
 checkin_notes                    |   8 +++
 sched/plan_class_spec.cpp        |  20 ++++--
 sched/plan_class_spec.xml.sample | 107 +++++++++++++++++++++++++++++++
 3 files changed, 130 insertions(+), 5 deletions(-)
 create mode 100644 sched/plan_class_spec.xml.sample

diff --git a/checkin_notes b/checkin_notes
index 4a47ee96fc..d79c410047 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -4188,3 +4188,11 @@ David  5 June 2012
 
     sched/
         plan_class_spec.cpp,h
+
+David  5 June 2012
+    - scheduler: add example plan_class_spec.xml
+    - scheduler: change gpu_type from "ati" to "amd" in plan class spec
+
+    sched/
+        plan_class_spec.cpp
+        plan_class_spec.xml.sample
diff --git a/sched/plan_class_spec.cpp b/sched/plan_class_spec.cpp
index d3c84df119..0b20ba4427 100644
--- a/sched/plan_class_spec.cpp
+++ b/sched/plan_class_spec.cpp
@@ -226,9 +226,9 @@ bool PLAN_CLASS_SPEC::check(SCHEDULER_REQUEST& sreq, HOST_USAGE& hu) {
         }
     }
 
-    // ATI
+    // AMD
     //
-    if (!strcmp(gpu_type, "ati")) {
+    if (!strcmp(gpu_type, "amd")) {
         COPROC_ATI& cp = sreq.coprocs.ati;
         cpp = &cp;
 
@@ -612,7 +612,7 @@ int main() {
     g_wreq = &sreply.wreq;
 
     PLAN_CLASS_SPECS pcs;
-    int retval = pcs.parse_file("plan_class_spec.xml");
+    int retval = pcs.parse_file("plan_class_spec.xml.sample");
     if (retval) {
         printf("parse_file: %d\n");
         exit(1);
@@ -622,18 +622,28 @@ int main() {
 
     HOST_USAGE hu;
 
-    strcpy(sreq.host.p_features, "sse");
+    strcpy(sreq.host.p_features, "sse3");
     sreq.host.p_fpops =5e9;
     g_wreq->effective_ncpus = 4;
     if (1) {
         sreq.coprocs.nvidia.fake(18000, 512*MEGA, 490*MEGA, 1);
+        sreq.coprocs.nvidia.opencl_prop.opencl_device_version_int = 0;
+    } else {
+        sreq.coprocs.nvidia.count = 0;
+    }
+    if (1) {
+        sreq.coprocs.ati.fake(512*MEGA, 256*MEGA, 1);
+        sreq.coprocs.ati.have_cal = true;
+        sreq.coprocs.ati.opencl_prop.opencl_device_version_int = 0;
+    } else {
+        sreq.coprocs.ati.count = 0;
     }
 
     for (unsigned int i=0; i<pcs.classes.size(); i++) {
         bool b = pcs.check(sreq, pcs.classes[i].name, hu);
         if (b) {
             printf("%s: check succeeded\n", pcs.classes[i].name);
-            printf("ncudas: %f\nnatis: %f\ngpu_ram: %fMB\navg_ncpus: %f\nprojected_flops: %fG\npeak_flops: %fG\n",
+            printf("\tncudas: %f\n\tnatis: %f\n\tgpu_ram: %fMB\n\tavg_ncpus: %f\n\tprojected_flops: %fG\n\tpeak_flops: %fG\n",
                 hu.ncudas,
                 hu.natis,
                 hu.gpu_ram/1e6,
diff --git a/sched/plan_class_spec.xml.sample b/sched/plan_class_spec.xml.sample
new file mode 100644
index 0000000000..a4c015d77f
--- /dev/null
+++ b/sched/plan_class_spec.xml.sample
@@ -0,0 +1,107 @@
+<plan_classes>
+    <plan_class>
+        <name>                  mt          </name>
+        <min_ncpus>             2           </min_ncpus>
+        <max_threads>           16          </max_threads>
+        <projected_flops_scale> .99         </projected_flops_scale>
+    </plan_class>
+    <plan_class>
+        <name>                  ati         </name>
+        <gpu_type>              amd         </gpu_type>
+        <min_driver_version>    1000000     </min_driver_version>
+        <min_gpu_ram_mb>        250         </min_gpu_ram_mb>
+        <gpu_ram_used_mb>       250         </gpu_ram_used_mb>
+        <gpu_peak_flops_scale>  .2          </gpu_peak_flops_scale>
+        <cpu_frac>              .1          </cpu_frac>
+    </plan_class>
+    <plan_class>
+        <name>                  ati14       </name>
+        <gpu_type>              amd         </gpu_type>
+        <min_driver_version>    1400000     </min_driver_version>
+        <min_gpu_ram_mb>        250         </min_gpu_ram_mb>
+        <gpu_ram_used_mb>       250         </gpu_ram_used_mb>
+        <gpu_peak_flops_scale>  .23         </gpu_peak_flops_scale>
+        <cpu_frac>              .1          </cpu_frac>
+    </plan_class>
+    <plan_class>
+        <name>                  cuda        </name>
+        <gpu_type>              nvidia      </gpu_type>
+        <cuda/>
+        <min_nvidia_compcap>    100         </min_nvidia_compcap>
+        <max_nvidia_compcap>    200         </max_nvidia_compcap>
+        <min_cuda_version>      3000        </min_cuda_version>
+        <min_driver_version>    17700       </min_driver_version>
+        <min_gpu_ram_mb>        254         </min_gpu_ram_mb>
+        <gpu_ram_used_mb>       254         </gpu_ram_used_mb>
+        <gpu_peak_flops_scale>  .20         </gpu_peak_flops_scale>
+        <cpu_frac>              .01         </cpu_frac>
+    </plan_class>
+    <plan_class>
+        <name>                  cuda_fermi  </name>
+        <gpu_type>              nvidia      </gpu_type>
+        <cuda/>
+        <min_nvidia_compcap>    200         </min_nvidia_compcap>
+        <min_cuda_version>      3000        </min_cuda_version>
+        <min_driver_version>    19500       </min_driver_version>
+        <min_gpu_ram_mb>        384         </min_gpu_ram_mb>
+        <gpu_ram_used_mb>       384         </gpu_ram_used_mb>
+        <gpu_peak_flops_scale>  .22         </gpu_peak_flops_scale>
+        <cpu_frac>              .01         </cpu_frac>
+    </plan_class>
+    <plan_class>
+        <name>                  nci         </name>
+        <avg_ncpus>             .01         </avg_ncpus>
+        <projected_flops_scale> 1.01        </projected_flops_scale>
+    </plan_class>
+    <plan_class>
+        <name>                  sse3        </name>
+        <cpu_feature>           sse3        </cpu_feature>
+        <projected_flops_scale> 1.1         </projected_flops_scale>
+    </plan_class>
+    <plan_class>
+        <name>                  opencl_nvidia_101        </name>
+        <gpu_type>              nvidia      </gpu_type>
+        <opencl/>
+        <min_opencl_version>    101         <min_opencl_version>
+        <min_gpu_ram_mb>        256         </min_gpu_ram_mb>
+        <gpu_ram_used_mb>       256         </gpu_ram_used_mb>
+        <cpu_frac>              .1          </cpu_frac>
+        <gpu_peak_flops_scale>  .2          </gpu_peak_flops_scale>
+    </plan_class>
+    <plan_class>
+        <name>                  opencl_ati_101        </name>
+        <gpu_type>              amd         </gpu_type>
+        <opencl/>
+        <min_opencl_version>    101         <min_opencl_version>
+        <min_gpu_ram_mb>        256         </min_gpu_ram_mb>
+        <gpu_ram_used_mb>       256         </gpu_ram_used_mb>
+        <cpu_frac>              .1          </cpu_frac>
+        <gpu_peak_flops_scale>  .2          </gpu_peak_flops_scale>
+    </plan_class>
+    <plan_class>
+        <name>                  vbox_32     </name>
+        <virtualbox/>
+        <min_vbox_version>      30200       </min_vbox_version>
+    </plan_class>
+    <plan_class>
+        <name>                  vbox_64     </name>
+        <virtualbox/>
+        <is64bit/>
+        <min_vbox_version>      30200       </min_vbox_version>
+    </plan_class>
+    <plan_class>
+        <name>                  vbox_32_mt     </name>
+        <virtualbox/>
+        <min_vbox_version>      30200       </min_vbox_version>
+        <min_ncpus>             2           </min_ncpus>
+        <max_threads>           2           </max_threads>
+    </plan_class>
+    <plan_class>
+        <name>                  vbox_64_mt     </name>
+        <virtualbox/>
+        <is64bit/>
+        <min_vbox_version>      30200       </min_vbox_version>
+        <min_ncpus>             2           </min_ncpus>
+        <max_threads>           2           </max_threads>
+    </plan_class>
+</plan_classes>