Changeset 3199b17 in sasmodels for sasmodels/kernelpy.py

Timestamp:

Mar 6, 2019 2:24:03 PM (5 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

4453136

Parents:

00afc15

Message:

PEP 8 changes and improved consistency between OpenCL/CUDA/DLL code

File:

• sasmodels/kernelpy.py (modified) (11 diffs)

sasmodels/kernelpy.py

@@ -33 +33 @@
 logger = logging.getLogger(__name__)
 
+
 class PyModel(KernelModel):
     """
@@ -38 +39 @@
     """
     def __init__(self, model_info):
-        # Make sure Iq is available and vectorized
+        # Make sure Iq is available and vectorized.
         _create_default_functions(model_info)
         self.info = model_info
@@ -53 +54 @@
         """
         pass
+
 
 class PyInput(object):
@@ -91 +93 @@
         self.q = None
 
+
 class PyKernel(Kernel):
     """
@@ -131 +134 @@
         parameter_vector = np.empty(len(partable.call_parameters)-2, 'd')
 
-        # Create views into the array to hold the arguments
+        # Create views into the array to hold the arguments.
         offset = 0
         kernel_args, volume_args = [], []
@@ -174 +177 @@
                         else (lambda mode: 1.0))
 
-
-
     def _call_kernel(self, call_details, values, cutoff, magnetic, effective_radius_type):
         # type: (CallDetails, np.ndarray, np.ndarray, float, bool) -> np.ndarray
@@ -195 +196 @@
         self.q_input.release()
         self.q_input = None
+
 
 def _loops(parameters,    # type: np.ndarray
@@ -254 +256 @@
         total = np.zeros(nq, 'd')
         for loop_index in range(call_details.num_eval):
-            # update polydispersity parameter values
+            # Update polydispersity parameter values.
             if p0_index == p0_length:
                 pd_index = (loop_index//pd_stride)%pd_length
@@ -265 +267 @@
             p0_index += 1
             if weight > cutoff:
-                # Call the scattering function
+                # Call the scattering function.
                 # Assume that NaNs are only generated if the parameters are bad;
                 # exclude all q for that NaN.  Even better would be to have an
@@ -273 +275 @@
                     continue
 
-                # update value and norm
+                # Update value and norm.
                 total += weight * Iq
                 weight_norm += weight
@@ -293 +295 @@
     any functions that are not already marked as vectorized.
     """
-    # Note: must call create_vector_Iq before create_vector_Iqxy
+    # Note: Must call create_vector_Iq before create_vector_Iqxy.
     _create_vector_Iq(model_info)
     _create_vector_Iqxy(model_info)