Changeset 40a87fa in sasmodels for sasmodels/kerneldll.py

Timestamp:

Aug 8, 2016 9:24:11 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:

2472141

Parents:

2d65d51

Message:

lint and latex cleanup

File:

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

sasmodels/kerneldll.py

@@ -48 +48 @@
 import sys
 import os
-from os.path import join as joinpath, split as splitpath, splitext
+from os.path import join as joinpath, splitext
 import subprocess
 import tempfile
@@ -100 +100 @@
         CC.append("-fopenmp")
     def compile_command(source, output):
+        """unix compiler command"""
         return CC + [source, "-o", output, "-lm"]
 elif compiler == "msvc":
@@ -115 +116 @@
     LN = "/link /DLL /INCREMENTAL:NO /MANIFEST".split()
     def compile_command(source, output):
+        """MSVC compiler command"""
         return CC + ["/Tp%s"%source] + LN + ["/OUT:%s"%output]
 elif compiler == "tinycc":
@@ -120 +122 @@
     CC = [tinycc.TCC] + "-shared -rdynamic -Wall".split()
     def compile_command(source, output):
+        """tinycc compiler command"""
         return CC + [source, "-o", output]
 elif compiler == "mingw":
@@ -127 +130 @@
         CC.append("-fopenmp")
     def compile_command(source, output):
+        """mingw compiler command"""
         return CC + [source, "-o", output, "-lm"]
 
@@ -142 +146 @@
 
 def compile(source, output):
+    # type: (str, str) -> None
+    """
+    Compile *source* producing *output*.
+
+    Raises RuntimeError if the compile failed or the output wasn't produced.
+    """
     command = compile_command(source=source, output=output)
     command_str = " ".join('"%s"'%p if ' ' in p else p for p in command)
@@ -219 +229 @@
         need_recompile = dll_time < newest_source
     if need_recompile:
-        basename = os.path.splitext(os.path.basename(dll))[0] + "_"
-        fd, filename = tempfile.mkstemp(suffix=".c", prefix=basename)
+        basename = splitext(os.path.basename(dll))[0] + "_"
+        system_fd, filename = tempfile.mkstemp(suffix=".c", prefix=basename)
         source = generate.convert_type(source, dtype)
-        with os.fdopen(fd, "w") as file:
-            file.write(source)
+        with os.fdopen(system_fd, "w") as file_handle:
+            file_handle.write(source)
         compile(source=filename, output=dll)
         # comment the following to keep the generated c file
@@ -260 +270 @@
     Call :meth:`release` when done with the kernel.
     """
-    
     def __init__(self, dllpath, model_info, dtype=generate.F32):
         # type: (str, ModelInfo, np.dtype) -> None
@@ -266 +275 @@
         self.dllpath = dllpath
         self._dll = None  # type: ct.CDLL
+        self._kernels = None # type: List[Callable, Callable]
         self.dtype = np.dtype(dtype)
 
@@ -277 +287 @@
             raise
 
-        fp = (c_float if self.dtype == generate.F32
-              else c_double if self.dtype == generate.F64
-              else c_longdouble)
+        float_type = (c_float if self.dtype == generate.F32
+                      else c_double if self.dtype == generate.F64
+                      else c_longdouble)
 
         # int, int, int, int*, double*, double*, double*, double*, double
-        argtypes = [c_int32]*3 + [c_void_p]*4 + [fp]
+        argtypes = [c_int32]*3 + [c_void_p]*4 + [float_type]
         names = [generate.kernel_name(self.info, variant)
                  for variant in ("Iq", "Iqxy", "Imagnetic")]
@@ -316 +326 @@
             #dll = ct.cdll.LoadLibrary(self.dllpath)
             dll = ct.CDLL(self.dllpath)
-            libHandle = dll._handle
-            #libHandle = ct.c_void_p(dll._handle)
+            dll_handle = dll._handle
+            #dll_handle = ct.c_void_p(dll._handle)
             del dll, self._dll
             self._dll = None
-            ct.windll.kernel32.FreeLibrary(libHandle)
-        else:    
-            pass 
+            ct.windll.kernel32.FreeLibrary(dll_handle)
+        else:
+            pass