Changeset 3c56da87 in sasmodels for sasmodels/kerneldll.py

Timestamp:

Mar 4, 2015 10:55:38 PM (9 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:

3a45c2c

Parents:

b89f519

Message:

lint cleanup

File:

• sasmodels/kerneldll.py (modified) (7 diffs)

sasmodels/kerneldll.py

@@ -19 +19 @@
     COMPILE = "gcc -shared -fPIC -std=c99 -O2 -Wall %(source)s -o %(output)s -lm"
 elif os.name == 'nt':
-    # make sure vcvarsall.bat is called first in order to set compiler, headers, lib paths, etc.
+    # call vcvarsall.bat before compiling to set path, headers, libs, etc.
     if "VCINSTALLDIR" in os.environ:
         # MSVC compiler is available, so use it.
@@ -25 +25 @@
         # TODO: maybe don't use randomized name for the c file
         COMPILE = "cl /nologo /Ox /MD /W3 /GS- /DNDEBUG /Tp%(source)s /openmp /link /DLL /INCREMENTAL:NO /MANIFEST /OUT:%(output)s"
-        # Can't find VCOMP90.DLL (don't know why), so remove openmp support from windows compiler build
+        # Can't find VCOMP90.DLL (don't know why), so remove openmp support
+        # from windows compiler build
         #COMPILE = "cl /nologo /Ox /MD /W3 /GS- /DNDEBUG /Tp%(source)s /link /DLL /INCREMENTAL:NO /MANIFEST /OUT:%(output)s"
     else:
@@ -123 +124 @@
         self.__dict__ = state
 
-    def __call__(self, input):
+    def __call__(self, q_input):
         if self.dll is None: self._load_dll()
-        kernel = self.Iqxy if input.is_2D else self.Iq
-        return DllKernel(kernel, self.info, input)
+        kernel = self.Iqxy if q_input.is_2D else self.Iq
+        return DllKernel(kernel, self.info, q_input)
 
+    # pylint: disable=no-self-use
     def make_input(self, q_vectors):
         """
@@ -150 +152 @@
     *info* is the module information
 
-    *input* is the DllInput q vectors at which the kernel should be
+    *q_input* is the DllInput q vectors at which the kernel should be
     evaluated.
 
@@ -161 +163 @@
     Call :meth:`release` when done with the kernel instance.
     """
-    def __init__(self, kernel, info, input):
+    def __init__(self, kernel, info, q_input):
         self.info = info
-        self.input = input
+        self.q_input = q_input
         self.kernel = kernel
-        self.res = np.empty(input.nq, input.dtype)
-        dim = '2d' if input.is_2D else '1d'
+        self.res = np.empty(q_input.nq, q_input.dtype)
+        dim = '2d' if q_input.is_2D else '1d'
         self.fixed_pars = info['partype']['fixed-'+dim]
         self.pd_pars = info['partype']['pd-'+dim]
@@ -174 +176 @@
 
     def __call__(self, fixed_pars, pd_pars, cutoff):
-        real = np.float32 if self.input.dtype == F32 else np.float64
+        real = np.float32 if self.q_input.dtype == F32 else np.float64
 
-        nq = c_int(self.input.nq)
+        nq = c_int(self.q_input.nq)
         if pd_pars:
             cutoff = real(cutoff)
             loops_N = [np.uint32(len(p[0])) for p in pd_pars]
             loops = np.hstack(pd_pars)
-            loops = np.ascontiguousarray(loops.T, self.input.dtype).flatten()
+            loops = np.ascontiguousarray(loops.T, self.q_input.dtype).flatten()
             p_loops = loops.ctypes.data
             dispersed = [p_loops, cutoff] + loops_N
@@ -187 +189 @@
             dispersed = []
         fixed = [real(p) for p in fixed_pars]
-        args = self.input.q_pointers + [self.p_res, nq] + dispersed + fixed
+        args = self.q_input.q_pointers + [self.p_res, nq] + dispersed + fixed
         #print pars
         self.kernel(*args)