Changeset a5b8477 in sasmodels for sasmodels/kernelcl.py

Timestamp:

Apr 13, 2016 8:17:10 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:

0ce5710

Parents:

60f03de

Message:

update docs to work with the new ModelInfo/ParameterTable? classes

File:

• sasmodels/kernelcl.py (modified) (5 diffs)

sasmodels/kernelcl.py

@@ -49 +49 @@
 """
 from __future__ import print_function
+
 import os
 import warnings
@@ -68 +69 @@
 from . import generate
 from .kernel import KernelModel, Kernel
+
+try:
+    from typing import Tuple, Callable, Any
+    from .modelinfo import ModelInfo
+    from .details import CallDetails
+except ImportError:
+    pass
 
 # The max loops number is limited by the amount of local memory available
@@ -441 +449 @@
     Call :meth:`release` when done with the kernel instance.
     """
-    def __init__(self, kernel, model_info, q_vectors, dtype):
-        max_pd = model_info.max_pd
-        npars = len(model_info.parameters)-2
-        q_input = GpuInput(q_vectors, dtype)
-        self.dtype = dtype
-        self.dim = '2d' if q_input.is_2d else '1d'
+    def __init__(self, kernel, model_info, q_vectors):
+        # type: (KernelModel, ModelInfo, List[np.ndarray]) -> None
+        max_pd = model_info.parameters.max_pd
+        npars = len(model_info.parameters.kernel_parameters)-2
+        q_input = GpuInput(q_vectors, kernel.dtype)
         self.kernel = kernel
         self.info = model_info
+        self.dtype = kernel.dtype
+        self.dim = '2d' if q_input.is_2d else '1d'
         self.pd_stop_index = 4*max_pd-1
         # plus three for the normalization values
@@ -456 +465 @@
         # Note: res may be shorter than res_b if global_size != nq
         env = environment()
-        self.queue = env.get_queue(dtype)
+        self.queue = env.get_queue(kernel.dtype)
 
         # details is int32 data, padded to an 8 integer boundary
         size = ((max_pd*5 + npars*3 + 2 + 7)//8)*8
         self.result_b = cl.Buffer(self.queue.context, mf.READ_WRITE,
-                               q_input.global_size[0] * q_input.dtype.itemsize)
+                               q_input.global_size[0] * kernel.dtype.itemsize)
         self.q_input = q_input # allocated by GpuInput above
 
@@ -467 +476 @@
 
     def __call__(self, call_details, weights, values, cutoff):
+        # type: (CallDetails, np.ndarray, np.ndarray, float) -> np.ndarray
         real = (np.float32 if self.q_input.dtype == generate.F32
                 else np.float64 if self.q_input.dtype == generate.F64