Changeset 17bbadd in sasmodels for sasmodels/kerneldll.py

Timestamp:

Mar 15, 2016 12:47:12 PM (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:

754e27b

Parents:

5ceb7d0

Message:

refactor so all model defintion queries use model_info; better documentation of model_info structure; initial implementation of product model (broken)

File:

• sasmodels/kerneldll.py (modified) (10 diffs)

sasmodels/kerneldll.py

@@ -89 +89 @@
 
 
-def dll_path(info, dtype="double"):
-    """
-    Path to the compiled model defined by *info*.
+def dll_path(model_info, dtype="double"):
+    """
+    Path to the compiled model defined by *model_info*.
     """
     from os.path import join as joinpath, split as splitpath, splitext
-    basename = splitext(splitpath(info['filename'])[1])[0]
+    basename = splitext(splitpath(model_info['filename'])[1])[0]
     if np.dtype(dtype) == generate.F32:
         basename += "32"
@@ -104 +104 @@
 
 
-def make_dll(source, info, dtype="double"):
+def make_dll(source, model_info, dtype="double"):
     """
     Load the compiled model defined by *kernel_module*.
@@ -123 +123 @@
     models are allowed as DLLs.
     """
-    if callable(info.get('Iq', None)):
-        return PyModel(info)
+    if callable(model_info.get('Iq', None)):
+        return PyModel(model_info)
 
     dtype = np.dtype(dtype)
@@ -133 +133 @@
 
     if dtype == generate.F32: # 32-bit dll
-        tempfile_prefix = 'sas_'+info['name']+'32_'
+        tempfile_prefix = 'sas_' + model_info['name'] + '32_'
     elif dtype == generate.F64:
-        tempfile_prefix = 'sas_'+info['name']+'64_'
+        tempfile_prefix = 'sas_' + model_info['name'] + '64_'
     else:
-        tempfile_prefix = 'sas_'+info['name']+'128_'
+        tempfile_prefix = 'sas_' + model_info['name'] + '128_'
 
     source = generate.convert_type(source, dtype)
-    source_files = generate.model_sources(info) + [info['filename']]
-    dll = dll_path(info, dtype)
+    source_files = generate.model_sources(model_info) + [model_info['filename']]
+    dll = dll_path(model_info, dtype)
     newest = max(os.path.getmtime(f) for f in source_files)
     if not os.path.exists(dll) or os.path.getmtime(dll) < newest:
@@ -159 +159 @@
 
 
-def load_dll(source, info, dtype="double"):
+def load_dll(source, model_info, dtype="double"):
     """
     Create and load a dll corresponding to the source, info pair returned
@@ -167 +167 @@
     allowed floating point precision.
     """
-    filename = make_dll(source, info, dtype=dtype)
-    return DllModel(filename, info, dtype=dtype)
+    filename = make_dll(source, model_info, dtype=dtype)
+    return DllModel(filename, model_info, dtype=dtype)
 
 
@@ -178 +178 @@
     ctypes wrapper for a single model.
 
-    *source* and *info* are the model source and interface as returned
+    *source* and *model_info* are the model source and interface as returned
     from :func:`gen.make`.
 
@@ -188 +188 @@
     Call :meth:`release` when done with the kernel.
     """
-    def __init__(self, dllpath, info, dtype=generate.F32):
-        self.info = info
+    def __init__(self, dllpath, model_info, dtype=generate.F32):
+        self.info = model_info
         self.dllpath = dllpath
         self.dll = None
@@ -244 +244 @@
     *kernel* is the c function to call.
 
-    *info* is the module information
+    *model_info* is the module information
 
     *q_input* is the DllInput q vectors at which the kernel should be
@@ -257 +257 @@
     Call :meth:`release` when done with the kernel instance.
     """
-    def __init__(self, kernel, info, q_input):
-        self.info = info
+    def __init__(self, kernel, model_info, q_input):
+        self.info = model_info
         self.q_input = q_input
         self.kernel = kernel
         self.res = np.empty(q_input.nq, q_input.dtype)
         dim = '2d' if q_input.is_2d else '1d'
-        self.fixed_pars = info['partype']['fixed-'+dim]
-        self.pd_pars = info['partype']['pd-'+dim]
+        self.fixed_pars = model_info['partype']['fixed-' + dim]
+        self.pd_pars = model_info['partype']['pd-' + dim]
 
         # In dll kernel, but not in opencl kernel