Changeset 0ff62d4 in sasmodels

Timestamp:

Apr 15, 2016 10:31:35 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:

f2f67a6

Parents:

8f6817d

Message:

refactor: move dispersion_mesh alongside build_details in kernel.py

Location:

sasmodels

Files:

• details.py (modified) (2 diffs)
• direct_model.py (modified) (4 diffs)
• kernel.py (modified) (2 diffs)
• model_test.py (modified) (3 diffs)
• product.py (modified) (1 diff)
• sasview_model.py (modified) (3 diffs)

sasmodels/details.py

@@ -83 +83 @@
         print("theta par", self.buffer[-1])
 
-def build_details(kernel, pairs):
-    values, weights = zip(*pairs)
-    if max([len(w) for w in weights]) > 1:
-        call_details = poly_details(kernel.info, weights)
-    else:
-        call_details = mono_details(kernel.info)
-    weights, values = [np.hstack(v) for v in (weights, values)]
-    weights = weights.astype(dtype=kernel.dtype)
-    values = values.astype(dtype=kernel.dtype)
-    return call_details, weights, values
-
 def mono_details(model_info):
     call_details = CallDetails(model_info)
@@ -139 +128 @@
     raise NotImplementedError("Can't handle constraints yet")
 
-
-try:
-    np.meshgrid([])
-    meshgrid = np.meshgrid
-except ValueError:
-    # CRUFT: np.meshgrid requires multiple vectors
-    def meshgrid(*args):
-        if len(args) > 1:
-            return np.meshgrid(*args)
-        else:
-            return [np.asarray(v) for v in args]
-
-def dispersion_mesh(model_info, pars):
-    """
-    Create a mesh grid of dispersion parameters and weights.
-
-    Returns [p1,p2,...],w where pj is a vector of values for parameter j
-    and w is a vector containing the products for weights for each
-    parameter set in the vector.
-    """
-    value, weight = zip(*pars)
-    weight = [w if w else [1.] for w in weight]
-    weight = np.vstack([v.flatten() for v in meshgrid(*weight)])
-    weight = np.prod(weight, axis=0)
-    value = [v.flatten() for v in meshgrid(*value)]
-    lengths = [par.length for par in model_info.parameters.kernel_parameters
-               if par.type == 'volume']
-    if any(n > 1 for n in lengths):
-        pars = []
-        offset = 0
-        for n in lengths:
-            pars.append(np.vstack(value[offset:offset+n]) if n > 1 else value[offset])
-            offset += n
-        value = pars
-    return value, weight
-
-

sasmodels/direct_model.py

@@ -30 +30 @@
 from . import resolution
 from . import resolution2d
-from . import details
+from . import kernel
 
 try:
@@ -41 +41 @@
     from .modelinfo import Parameter, ParameterSet
 
-def call_kernel(kernel, pars, cutoff=0., mono=False):
+def call_kernel(calculator, pars, cutoff=0., mono=False):
     # type: (Kernel, ParameterSet, float, bool) -> np.ndarray
     """
@@ -55 +55 @@
     *mono* is True if polydispersity should be set to none on all parameters.
     """
-    parameters = kernel.info.parameters
+    parameters = calculator.info.parameters
     if mono:
         active = lambda name: False
-    elif kernel.dim == '1d':
+    elif calculator.dim == '1d':
         active = lambda name: name in parameters.pd_1d
-    elif kernel.dim == '2d':
+    elif calculator.dim == '2d':
         active = lambda name: name in parameters.pd_2d
     else:
@@ -69 +69 @@
                 for p in parameters.call_parameters]
 
-    call_details, weights, values = details.build_details(kernel, vw_pairs)
-    return kernel(call_details, weights, values, cutoff)
+    call_details, weights, values = kernel.build_details(calculator, vw_pairs)
+    return calculator(call_details, weights, values, cutoff)
 
 def get_weights(parameter, values):

sasmodels/kernel.py

@@ -10 +10 @@
 """
 
+import numpy as np
+from .details import mono_details, poly_details
+
 try:
     from typing import List
+except ImportError:
+    pass
+else:
     from .details import CallDetails
     from .modelinfo import ModelInfo
     import numpy as np  # type: ignore
-except ImportError:
-    pass
 
 class KernelModel(object):
@@ -42 +46 @@
         # type: () -> None
         pass
+
+try:
+    np.meshgrid([])
+    meshgrid = np.meshgrid
+except ValueError:
+    # CRUFT: np.meshgrid requires multiple vectors
+    def meshgrid(*args):
+        if len(args) > 1:
+            return np.meshgrid(*args)
+        else:
+            return [np.asarray(v) for v in args]
+
+def dispersion_mesh(model_info, pars):
+    """
+    Create a mesh grid of dispersion parameters and weights.
+
+    Returns [p1,p2,...],w where pj is a vector of values for parameter j
+    and w is a vector containing the products for weights for each
+    parameter set in the vector.
+    """
+    value, weight = zip(*pars)
+    weight = [w if w else [1.] for w in weight]
+    weight = np.vstack([v.flatten() for v in meshgrid(*weight)])
+    weight = np.prod(weight, axis=0)
+    value = [v.flatten() for v in meshgrid(*value)]
+    lengths = [par.length for par in model_info.parameters.kernel_parameters
+               if par.type == 'volume']
+    if any(n > 1 for n in lengths):
+        pars = []
+        offset = 0
+        for n in lengths:
+            pars.append(np.vstack(value[offset:offset+n]) if n > 1 else value[offset])
+            offset += n
+        value = pars
+    return value, weight
+
+
+
+def build_details(kernel, pairs):
+    # type: (Kernel, Tuple[List[np.ndarray], List[np.ndarray]]) -> Tuple[CallDetails, np.ndarray, np.ndarray]
+    """
+    Construct the kernel call details object for calling the particular kernel.
+    """
+    values, weights = zip(*pairs)
+    if max([len(w) for w in weights]) > 1:
+        call_details = poly_details(kernel.info, weights)
+    else:
+        call_details = mono_details(kernel.info)
+    weights, values = [np.hstack(v) for v in (weights, values)]
+    weights = weights.astype(dtype=kernel.dtype)
+    values = values.astype(dtype=kernel.dtype)
+    return call_details, weights, values
+

sasmodels/model_test.py

@@ -51 +51 @@
 
 from .core import list_models, load_model_info, build_model, HAVE_OPENCL
-from .details import dispersion_mesh
+from .kernel import dispersion_mesh
 from .direct_model import call_kernel, get_weights
 from .exception import annotate_exception
@@ -62 +62 @@
 else:
     from .modelinfo import ParameterTable, ParameterSet, TestCondition, ModelInfo
-    from .kernelpy import PyModel, PyInput, PyKernel, DType
+    from .kernel import KernelModel
 
 def call_ER(model_info, pars):
@@ -226 +226 @@
 
         def run_one(self, model, test):
-            # type: (PyModel, TestCondition) -> None
+            # type: (KernelModel, TestCondition) -> None
             user_pars, x, y = test
             pars = expand_pars(self.info.parameters, user_pars)

sasmodels/product.py

@@ -13 +13 @@
 import numpy as np  # type: ignore
 
-from .details import dispersion_mesh
 from .modelinfo import suffix_parameter, ParameterTable, ModelInfo
-from .kernel import KernelModel, Kernel
+from .kernel import KernelModel, Kernel, dispersion_mesh
 
 try:

sasmodels/sasview_model.py

@@ -27 +27 @@
 from . import generate
 from . import weights
-from . import details
 from . import modelinfo
+from . import kernel
 
 try:
@@ -502 +502 @@
         pairs = [self._get_weights(p)
                  for p in self._model_info.parameters.call_parameters]
-        call_details, weight, value = details.build_details(kernel, pairs)
+        call_details, weight, value = kernel.build_details(kernel, pairs)
         result = kernel(call_details, weight, value, cutoff=self.cutoff)
         kernel.release()
@@ -577 +577 @@
                 for p in self._model_info.parameters.call_parameters
                 if p.type == 'volume']
-        return details.dispersion_mesh(self._model_info, pars)
+        return kernel.dispersion_mesh(self._model_info, pars)
 
     def _get_weights(self, par):