Changeset aa4946b in sasmodels for sasmodels/direct_model.py

Timestamp:

Mar 11, 2015 9:15:40 PM (9 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:

af1d68c

Parents:

49d1d42f

Message:

refactor so kernels are loaded via core.load_model

File:

• sasmodels/direct_model.py (modified) (2 diffs)

sasmodels/direct_model.py

@@ -3 +3 @@
 import numpy as np
 
-from .core import load_model_definition, make_kernel, call_kernel
-from .core import load_model_cl as load_model
-if load_model is None:
-    warnings.warn("unable to load opencl; using ctypes instead")
-    from .core import load_model_dll as load_model
+from .core import load_model_definition, load_model, make_kernel
+from .core import call_kernel, call_ER, call_VR
 
 class DirectModel:
-    def __init__(self, name, q_vectors, dtype='single'):
+    def __init__(self, name, q_vectors=None, dtype='single'):
         self.model_definition = load_model_definition(name)
         self.model = load_model(self.model_definition, dtype=dtype)
-        q_vectors = [np.ascontiguousarray(q,dtype=dtype) for q in q_vectors]
-        self.kernel = make_kernel(self.model, q_vectors)
+        if q_vectors is not None:
+            q_vectors = [np.ascontiguousarray(q,dtype=dtype) for q in q_vectors]
+            self.kernel = make_kernel(self.model, q_vectors)
     def __call__(self, **pars):
         return call_kernel(self.kernel, pars)
+    def ER(self, **pars):
+        return call_ER(self.model.info, pars)
+    def VR(self, **pars):
+        return call_VR(self.model.info, pars)
 
 def demo():
@@ -24 +26 @@
         sys.exit(1)
     model_name = sys.argv[1]
-    values = [float(v) for v in sys.argv[2].split(',')]
-    if len(values) == 1:
-        q = values[0]
-        q_vectors = [[q]]
-    elif len(values) == 2:
-        qx,qy = values
-        q_vectors = [[qx],[qy]]
+    call = sys.argv[2].upper()
+    if call in ("ER","VR"):
+        q_vectors = None
     else:
-        print "use q or qx,qy"
-        sys.exit(1)
+        values = [float(v) for v in sys.argv[2].split(',')]
+        if len(values) == 1:
+            q = values[0]
+            q_vectors = [[q]]
+        elif len(values) == 2:
+            qx,qy = values
+            q_vectors = [[qx],[qy]]
+        else:
+            print "use q or qx,qy or ER or VR"
+            sys.exit(1)
     model = DirectModel(model_name, q_vectors)
     pars = dict((k,float(v))
                 for pair in sys.argv[3:]
                 for k,v in [pair.split('=')])
-    Iq = model(**pars)
-    print Iq[0]
+    if call == "ER":
+        print model.ER(**pars)
+    elif call == "VR":
+        print model.VR(**pars)
+    else:
+        Iq = model(**pars)
+        print Iq[0]
 
 if __name__ == "__main__":