Changeset 7bf4757 in sasmodels

Timestamp:

May 6, 2016 3:08:14 AM (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:

3a45c2c, e9d10a6

Parents:

306e354

Message:

move precompile all models functionality into core; default dll models to double precision

Files:

• gen_so.py (deleted)
• sasmodels/core.py (modified) (2 diffs)

sasmodels/core.py

@@ -7 +7 @@
     ]
 
+import os
 from os.path import basename, dirname, join as joinpath, splitext
 from glob import glob
@@ -139 +140 @@
     # open(model_info['name']+'.c','w').write(source)
     # source = open(model_info['name']+'.cl','r').read()
-    source = generate.make_source(model_info)
-    if dtype is None:
-        dtype = 'single' if model_info['single'] else 'double'
     if callable(model_info.get('Iq', None)):
         return kernelpy.PyModel(model_info)
+    source = generate.make_source(model_info)
+    default_dtype = 'single' if model_info['single'] else 'double'
+    ocl_dtype = default_dtype if dtype is None else dtype
+    dll_dtype = 'double' if dtype is None else dtype
     if (platform == "dll"
             or not HAVE_OPENCL
-            or not kernelcl.environment().has_type(dtype)):
-        return kerneldll.load_dll(source, model_info, dtype)
-    else:
-        return kernelcl.GpuModel(source, model_info, dtype)
-
-def precompile_dll(model_name, dtype="double"):
-    """
-    Precompile the dll for a model.
-
-    Returns the path to the compiled model, or None if the model is a pure
-    python model.
+            or not kernelcl.environment().has_type(ocl_dtype)):
+        return kerneldll.load_dll(source, model_info, dll_dtype)
+    else:
+        return kernelcl.GpuModel(source, model_info, ocl_dtype)
+
+def precompile_dlls(path, dtype="double"):
+    """
+    Precompile the dlls for all builtin models, returning a list of dll paths.
+
+    *path* is the directory in which to save the dlls.  It will be created if
+    it does not already exist.
 
     This can be used when build the windows distribution of sasmodels
-    (which may be missing the OpenCL driver and the dll compiler), or
-    otherwise sharing models with windows users who do not have a compiler.
-
-    See :func:`sasmodels.kerneldll.make_dll` for details on controlling the
-    dll path and the allowed floating point precision.
-    """
-    model_info = load_model_info(model_name)
-    source = generate.make_source(model_info)
-    return kerneldll.make_dll(source, model_info, dtype=dtype) if source else None
-
+    which may be missing the OpenCL driver and the dll compiler.
+    """
+    if not os.path.exists(path):
+        os.makedirs(path)
+    compiled_dlls = []
+    for model_name in list_models():
+        model_info = load_model_info(model_name)
+        source = generate.make_source(model_info)
+        if source:
+            old_path = kerneldll.DLL_PATH
+            try:
+                kerneldll.DLL_PATH = path
+                dll = kerneldll.make_dll(source, model_info, dtype=dtype)
+            finally:
+                kerneldll.DLL_PATH = old_path
+            compiled_dlls.append(dll)
+    return compiled_dlls
 
 def get_weights(model_info, pars, name):