Changeset 1e2a1ba in sasmodels for sasmodels/sasview_model.py

Timestamp:

Apr 5, 2016 12:06:36 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:

d2bb604

Parents:

ea05c87 (diff), 4d76711 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'origin/master' into polydisp

Conflicts:

sasmodels/core.py
sasmodels/custom/init.py
sasmodels/direct_model.py
sasmodels/generate.py
sasmodels/kernelpy.py
sasmodels/sasview_model.py

File:

• sasmodels/sasview_model.py (modified) (4 diffs)

sasmodels/sasview_model.py

@@ -13 +13 @@
 using :func:`sasmodels.convert.convert`.
 """
+from __future__ import print_function
 
 import math
 from copy import deepcopy
 import collections
+import traceback
+import logging
 
 import numpy as np
 
 from . import core
+from . import custom
+from . import generate
 from . import weights
 
-def standard_models():
-    return [make_class(model_name) for model_name in core.list_models()]
-
-# TODO: rename to make_class_from_name and update sasview
-def make_class(model_name):
-    """
-    Load the sasview model defined in *kernel_module*.
-
-    Returns a class that can be used directly as a sasview model.t
-    """
-    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 load_standard_models():
+    """
+    Load and return the list of predefined models.
+
+    If there is an error loading a model, then a traceback is logged and the
+    model is not returned.
+    """
+    models = []
+    for name in core.list_models():
+        try:
+            models.append(_make_standard_model(name))
+        except:
+            logging.error(traceback.format_exc())
+    return models
+
+
+def load_custom_model(path):
+    """
+    Load a custom model given the model path.
+    """
+    kernel_module = custom.load_custom_kernel_module(path)
+    model_info = generate.make_model_info(kernel_module)
+    return _make_model_from_info(model_info)
+
+
+def _make_standard_model(name):
+    """
+    Load the sasview model defined by *name*.
+
+    *name* can be a standard model name or a path to a custom model.
+
+    Returns a class that can be used directly as a sasview model.
+    """
+    kernel_module = generate.load_kernel_module(name)
+    model_info = generate.make_model_info(kernel_module)
+    return _make_model_from_info(model_info)
+
+
+def _make_model_from_info(model_info):
+    """
+    Convert *model_info* into a SasView model wrapper.
+    """
     def __init__(self, multfactor=1):
         SasviewModel.__init__(self)
@@ -47 +76 @@
     return ConstructedModel
 
+
 class SasviewModel(object):
     """
     Sasview wrapper for opencl/ctypes model.
     """
+    _model_info = {}
     def __init__(self):
         self._model = None
@@ -116 +147 @@
     def __get_state__(self):
         state = self.__dict__.copy()
-        state.pop('_kernel')
+        state.pop('_model')
         # May need to reload model info on set state since it has pointers
         # to python implementations of Iq, etc.
@@ -408 +439 @@
 
 def test_model():
-    Cylinder = make_class('cylinder')
+    """
+    Test that a sasview model (cylinder) can be run.
+    """
+    Cylinder = _make_standard_model('cylinder')
     cylinder = Cylinder()
     return cylinder.evalDistribution([0.1,0.1])
 
+
+def test_model_list():
+    """
+    Make sure that all models build as sasview models.
+    """
+    from .exception import annotate_exception
+    for name in core.list_models():
+        try:
+            _make_standard_model(name)
+        except:
+            annotate_exception("when loading "+name)
+            raise
+
 if __name__ == "__main__":
     print("cylinder(0.1,0.1)=%g"%test_model())