Changeset b8e5e21 in sasmodels for sasmodels/core.py

Timestamp:

Mar 16, 2016 8:22:29 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:

28da77d

Parents:

667a6f2

Message:

had structure_factor, has_2d and variants to info

File:

• sasmodels/core.py (modified) (3 diffs)

sasmodels/core.py

@@ -34 +34 @@
     return available_models
 
+def isstr(s):
+    """
+    Return True if *s* is a string-like object.
+    """
+    try: s + ''
+    except: return False
+    return True
+
+def load_model(model_name, **kw):
+    """
+    Load model info and build model.
+    """
+    return build_model(load_model_info(model_name), **kw)
 
 def load_model_info(model_name):
@@ -46 +59 @@
     return generate.make_model_info(kernel_module)
 
-
-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.
-
-    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
-
-
-def isstr(s):
-    """
-    Return True if *s* is a string-like object.
-    """
-    try: s + ''
-    except: return False
-    return True
 
 def build_model(model_info, dtype=None, platform="ocl"):
@@ -114 +100 @@
     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.
+
+    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
+
 
 def make_kernel(model, q_vectors):