Changeset 34756fd in sasmodels for compare_many.py

Timestamp:

Dec 3, 2014 3:04:40 PM (10 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

3699587, 8a3e0af

Parents:

34d49af

Message:

add single to double comparison for the new models

File:

• compare_many.py (modified) (2 diffs)

compare_many.py

@@ -9 +9 @@
                      eval_opencl, eval_ctypes, make_data)
 
-def get_stats(target, model_eval, name, pars, data, index, dtype, cutoff):
-    value, _ = model_eval(name, pars, data, dtype='single', cutoff=cutoff)
+def get_stats(target, value, index):
     resid = abs(value-target)[index]
     relerr = resid/target[index]
@@ -45 +44 @@
 
         env = environment()
-        gpu_single = get_stats(target, eval_opencl, name, pars, data, index, 'single', cutoff)
+        gpu_single_value,_ = eval_opencl(name, pars, data, dtype='single', cutoff=cutoff)
+        gpu_single = get_stats(target, gpu_single_value, index)
         if env.has_double:
-            gpu_double = get_stats(target, eval_opencl, name, pars, data, index, 'double', cutoff)
+            gpu_double_value,_ = eval_opencl(name, pars, data, dtype='double', cutoff=cutoff)
+            gpu_double = get_stats(target, gpu_double_value, index)
         else:
             gpu_double = [0]*len(gpu_single)
-        cpu_double = get_stats(target, eval_ctypes, name, pars, data, index, 'double', cutoff)
+        cpu_double_value,_ =  eval_ctypes(name, pars, data, dtype='double', cutoff=cutoff)
+        cpu_double = get_stats(target, cpu_double_value, index)
+        single_double = get_stats(cpu_double_value, gpu_single_value, index)
 
-        values = list(gpu_single) + list(gpu_double) + list(cpu_double) + [v for _,v in sorted(pars.items())]
+        values = (list(gpu_single) + list(gpu_double) + list(cpu_double)
+                  + list(single_double) + [v for _,v in sorted(pars.items())])
         if gpu_single[0] > 5e-5:
             if first:
-                print_column_headers(pars,'GPU single|GPU double|CPU double'.split('|'))
+                print_column_headers(pars,'GPU single|GPU double|CPU double|single/double'.split('|'))
                 first = False
             print(("%d,"%seed)+','.join("%g"%v for v in values))