Changeset 72a081d in sasmodels

Timestamp:

Mar 19, 2016 6:52:46 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:

f3d7abd

Parents:

ce43de0

Message:

refactor product/mixture; add load model from path; default compare to -cutoff=0

Location:

sasmodels

Files:

• compare.py (modified) (5 diffs)
• core.py (modified) (5 diffs)
• mixture.py (added)
• product.py (modified) (1 diff)
• sasview_model.py (modified) (3 diffs)

sasmodels/compare.py

@@ -369 +369 @@
             model = MultiplicationModel(P, S)
         else:
-            raise ValueError("mixture models not handled yet")
+            raise ValueError("sasview mixture models not supported by compare")
     else:
         model = get_model(model_info['oldname'])
@@ -424 +424 @@
     Return a model calculator using the OpenCL calculation engine.
     """
-    def builder(model_info):
-        try:
-            return core.build_model(model_info, dtype=dtype, platform="ocl")
-        except Exception as exc:
-            print(exc)
-            print("... trying again with single precision")
-            return core.build_model(model_info, dtype='single', platform="ocl")
-    if model_info['composition']:
-        composition_type, parts = model_info['composition']
-        if composition_type == 'product':
-            P, S = [builder(p) for p in parts]
-            model = product.ProductModel(P, S)
-        else:
-            raise ValueError("mixture models not handled yet")
-    else:
-        model = builder(model_info)
+    try:
+        model = core.build_model(model_info, dtype=dtype, platform="ocl")
+    except Exception as exc:
+        print(exc)
+        print("... trying again with single precision")
+        model = core.build_model(model_info, dtype='single', platform="ocl")
     calculator = DirectModel(data, model, cutoff=cutoff)
     calculator.engine = "OCL%s"%DTYPE_MAP[dtype]
@@ -450 +440 @@
     if dtype == 'quad':
         dtype = 'longdouble'
-    def builder(model_info):
-        return core.build_model(model_info, dtype=dtype, platform="dll")
-
-    if model_info['composition']:
-        composition_type, parts = model_info['composition']
-        if composition_type == 'product':
-            P, S = [builder(p) for p in parts]
-            model = product.ProductModel(P, S)
-        else:
-            raise ValueError("mixture models not handled yet")
-    else:
-        model = builder(model_info)
+    model = core.build_model(model_info, dtype=dtype, platform="dll")
     calculator = DirectModel(data, model, cutoff=cutoff)
     calculator.engine = "OMP%s"%DTYPE_MAP[dtype]
@@ -715 +694 @@
         print("expected parameters: model N1 N2")
 
-    def _get_info(name):
-        try:
-            model_info = core.load_model_info(name)
-        except ImportError, exc:
-            print(str(exc))
-            print("Use one of:\n    " + models)
-            sys.exit(1)
-        return model_info
-
     name = args[0]
-    if '*' in name:
-        parts = [_get_info(k) for k in name.split('*')]
-        model_info = product.make_product_info(*parts)
-    else:
-        model_info = _get_info(name)
+    try:
+        model_info = core.load_model_info(name)
+    except ImportError, exc:
+        print(str(exc))
+        print("Could not find model; use one of:\n    " + models)
+        sys.exit(1)
 
     invalid = [o[1:] for o in flags
@@ -749 +720 @@
         'res'       : 0.0,
         'accuracy'  : 'Low',
-        'cutoff'    : 1e-5,
+        'cutoff'    : 0.0,
         'seed'      : -1,  # default to preset
         'mono'      : False,

sasmodels/core.py

@@ -3 +3 @@
 """
 
-from os.path import basename, dirname, join as joinpath
+from os.path import basename, dirname, join as joinpath, splitext
 from glob import glob
+import imp
 
 import numpy as np
@@ -11 +12 @@
 from . import weights
 from . import generate
-
+# TODO: remove circular references between product and core
+# product uses call_ER/call_VR, core uses make_product_info/ProductModel
+#from . import product
+from . import mixture
 from . import kernelpy
 from . import kerneldll
@@ -46 +50 @@
     Load model info and build model.
     """
+    return build_model(load_model_info(model_name), **kw)
+
+def load_model_info_from_path(path):
+    # Pull off the last .ext if it exists; there may be others
+    name = basename(splitext(path)[0])
+
+    # Not cleaning name since don't need to be able to reload this
+    # model later
+    # Should probably turf the model from sys.modules after we are done...
+
+    # Placing the model in the 'sasmodels.custom' name space, even
+    # though it doesn't actually exist.  imp.load_source doesn't seem
+    # to care.
+    kernel_module = imp.load_source('sasmodels.custom.'+name, path)
+
+    # Now that we have the module, we can load it as usual
+    model_info = generate.make_model_info(kernel_module)
+    return model_info
+
+def load_model_info(model_name):
+    """
+    Load a model definition given the model name.
+
+    This returns a handle to the module defining the model.  This can be
+    used with functions in generate to build the docs or extract model info.
+    """
     parts = model_name.split('+')
     if len(parts) > 1:
-        from .mixture import MixtureModel
-        models = [load_model(p, **kw) for p in parts]
-        return MixtureModel(models)
+        model_info_list = [load_model_info(p) for p in parts]
+        return mixture.make_mixture_info(model_info_list)
 
     parts = model_name.split('*')
     if len(parts) > 1:
+        from . import product
         # Note: currently have circular reference
-        from .product import ProductModel
         if len(parts) > 2:
             raise ValueError("use P*S to apply structure factor S to model P")
-        P, Q = [load_model(p, **kw) for p in parts]
-        return ProductModel(P, Q)
-
-    return build_model(load_model_info(model_name), **kw)
-
-def load_model_info(model_name):
-    """
-    Load a model definition given the model name.
-
-    This returns a handle to the module defining the model.  This can be
-    used with functions in generate to build the docs or extract model info.
-    """
+        P_info, Q_info = [load_model_info(p) for p in parts]
+        return product.make_product_info(P_info, Q_info)
+
     #import sys; print "\n".join(sys.path)
     __import__('sasmodels.models.'+model_name)
@@ -95 +115 @@
     otherwise it uses the default "ocl".
     """
-    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)
+    composition = model_info.get('composition', None)
+    if composition is not None:
+        composition_type, parts = composition
+        models = [build_model(p, dtype=dtype, platform=platform) for p in parts]
+        if composition_type == 'mixture':
+            return mixture.MixtureModel(model_info, models)
+        elif composition_type == 'product':
+            from . import product
+            P, S = parts
+            return product.ProductModel(model_info, P, S)
+        else:
+            raise ValueError('unknown mixture type %s'%composition_type)
 
     ## for debugging:
@@ -109 +136 @@
     # 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)
     if (platform == "dll"
             or not HAVE_OPENCL

sasmodels/product.py

@@ -68 +68 @@
 
 class ProductModel(object):
-    def __init__(self, P, S):
+    def __init__(self, model_info, P, S):
+        self.info = model_info
         self.P = P
         self.S = S
-        self.info = make_product_info(P.info, S.info)
 
     def __call__(self, q_vectors):

sasmodels/sasview_model.py

@@ -16 +16 @@
 import math
 from copy import deepcopy
-import warnings
 import collections
 
@@ -22 +21 @@
 
 from . import core
+from . import generate
+from . import custom
 
 def standard_models():
     return [make_class(model_name) for model_name in core.list_models()]
 
-def make_class(model_name, namestyle='name'):
+# TODO: rename to make_class_from_name and update sasview
+def make_class(model_name):
     """
     Load the sasview model defined in *kernel_module*.
@@ -37 +39 @@
     """
     model_info = core.load_model_info(model_name)
+    return make_class_from_info(model_info)
+
+def make_class_from_file(path):
+    model_info = core.load_model_info_from_path(path)
+    return make_class_from_info(model_info)
+
+def make_class_from_info(model_info):
     def __init__(self, multfactor=1):
         SasviewModel.__init__(self)
     attrs = dict(__init__=__init__, _model_info=model_info)
-    ConstructedModel = type(model_info[namestyle], (SasviewModel,), attrs)
+    ConstructedModel = type(model_info['name'], (SasviewModel,), attrs)
     return ConstructedModel