Changeset 87985ca in sasmodels for sasmodels

Timestamp:

Sep 2, 2014 12:35:23 PM (10 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:

19dcb933

Parents:

f4cf580

Message:

clean up source tree

Location:

sasmodels

Files:

• bumps_model.py (modified) (2 diffs)
• models/cylinder_onefile.py (deleted)
• sasview_model.py (modified) (2 diffs)

sasmodels/bumps_model.py

@@ -6 +6 @@
 
 import numpy as np
+
+try:
+    from .gpu import load_model as _loader
+except ImportError,exc:
+    warnings.warn(str(exc))
+    warnings.warn("OpenCL not available --- using ctypes instead")
+    from .dll import load_model as _loader
+
+def load_model(modelname, dtype='single'):
+    """
+    Load model by name.
+    """
+    sasmodels = __import__('sasmodels.models.'+modelname)
+    module = getattr(sasmodels.models, modelname, None)
+    model = _loader(module, dtype=dtype)
+    return model
 
 
@@ -235 +251 @@
         partype = model.info['partype']
 
+        # remember inputs so we can inspect from outside
+        self.data = data
+        self.model = model
+
         # interpret data
-        self.data = data
         if hasattr(data, 'qx_data'):
             self.index = (data.mask==0) & (~np.isnan(data.data))

sasmodels/sasview_model.py

@@ +1 @@
+"""
+Sasview model constructor.
+
+Given a module defining an OpenCL kernel such as sasmodels.models.cylinder,
+create a sasview model class to run that kernel as follows::
+
+    from sasmodels.sasview_model import make_class
+    from sasmodels.models import cylinder
+    CylinderModel = make_class(cylinder, dtype='single')
+
+The model parameters for sasmodels are different from those in sasview.
+When reloading previously saved models, the parameters should be converted
+using :func:`sasmodels.convert.convert`.
+"""
+
+# TODO: add a sasview=>sasmodels parameter translation layer
+# this will allow us to use the new sasmodels as drop in replacements, and
+# delay renaming parameters until all models have been converted.
+
 import math
 from copy import deepcopy
@@ -16 +35 @@
     """
     Load the sasview model defined in *kernel_module*.
-    :param kernel_module:
-    :param dtype:
-    :return:
+
+    Returns a class that can be used directly as a sasview model.
     """
     model =  load_model(kernel_module, dtype=dtype)