Changeset 5d316e9 in sasmodels for sasmodels/compare.py

Timestamp:

Dec 8, 2015 8:08:51 AM (8 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:

cf404cb

Parents:

eaca9eb

Message:

support fast and loose single precision and half precision

File:

• sasmodels/compare.py (modified) (8 diffs)

sasmodels/compare.py

@@ -190 +190 @@
     return value, average_time
 
-def eval_opencl(model_definition, pars, data, dtype='single', Nevals=1, cutoff=0.):
+def eval_opencl(model_definition, pars, data, dtype='single', Nevals=1,
+                cutoff=0., fast=False):
     try:
-        model = core.load_model(model_definition, dtype=dtype, platform="ocl")
+        model = core.load_model(model_definition, dtype=dtype,
+                                platform="ocl", fast=fast)
     except Exception as exc:
         print(exc)
         print("... trying again with single precision")
-        model = core.load_model(model_definition, dtype='single', platform="ocl")
+        model = core.load_model(model_definition, dtype='single',
+                                platform="ocl", fast=fast)
     calculator = DirectModel(data, model, cutoff=cutoff)
     value = None  # silence the linter
@@ -259 +262 @@
     dtype = ('longdouble' if '-quad' in opts
              else 'double' if '-double' in opts
+             else 'half' if '-half' in opts
              else 'single')
     cutoff = float(opt_values.get('-cutoff','1e-5'))
+    fast = "-fast" in opts and dtype is 'single'
 
     # randomize parameters
@@ -282 +287 @@
         base_name = target.name
         base, base_time = eval_ctypes(target, pars, data,
-                         dtype='longdouble', cutoff=0., Nevals=Ncomp)
+                dtype='longdouble', cutoff=0., Nevals=Ncomp)
     elif Nbase > 0 and "-ctypes" in opts and "-sasview" in opts:
         try:
@@ -295 +300 @@
     elif Nbase > 0:
         base, base_time = eval_opencl(model_definition, pars, data,
-                                    dtype=dtype, cutoff=cutoff, Nevals=Nbase)
+                dtype=dtype, cutoff=cutoff, Nevals=Nbase, fast=fast)
         base_name = "ocl"
         print("opencl t=%.1f ms, intensity=%.0f"%(base_time, sum(base)))
@@ -304 +309 @@
     if Ncomp > 0 and "-ctypes" in opts:
         comp, comp_time = eval_ctypes(model_definition, pars, data,
-                                    dtype=dtype, cutoff=cutoff, Nevals=Ncomp)
+                dtype=dtype, cutoff=cutoff, Nevals=Ncomp)
         comp_name = "ctypes"
         print("ctypes t=%.1f ms, intensity=%.0f"%(comp_time, sum(comp)))
@@ -398 +403 @@
 
     -plot*/-noplot plots or suppress the plot of the model
-    -single*/-double/-quad use single/double/quad precision for comparison
+    -half/-single*/-double/-quad/-fast sets the calculation precision
     -lowq*/-midq/-highq/-exq use q values up to 0.05, 0.2, 1.0, 10.0
     -Nq=128 sets the number of Q points in the data set
@@ -411 +416 @@
     -hist/-nohist* plot histogram of relative error
     -res=0 sets the resolution width dQ/Q if calculating with resolution
-    -accuracy=Low resolution accuracy Low, Mid, High, Xhigh
+    -accuracy=Low accuracy of the resolution calculation Low, Mid, High, Xhigh
 
 Key=value pairs allow you to set specific values to any of the model
@@ -421 +426 @@
 
 NAME_OPTIONS = set([
-    'plot','noplot',
-    'single','double','quad',
-    'lowq','midq','highq','exq',
-    '2d','1d',
-    'preset','random',
-    'poly','mono',
-    'sasview','ctypes',
-    'nopars','pars',
-    'rel','abs',
+    'plot', 'noplot',
+    'half', 'single', 'double', 'quad', 'fast',
+    'lowq', 'midq', 'highq', 'exq',
+    '2d', '1d',
+    'preset', 'random',
+    'poly', 'mono',
+    'sasview', 'ctypes',
+    'nopars', 'pars',
+    'rel', 'abs',
     'linear', 'log', 'q4',
-    'hist','nohist',
+    'hist', 'nohist',
     ])
 VALUE_OPTIONS = [