Changeset 8b10fdf in sasmodels

Timestamp:

Oct 6, 2016 10:43:28 AM (8 years ago)

Author:

wojciech

Children:

3a8d205

Parents:

9acbd37

Message:

Import clean-ups in kerneldll

File:

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

sasmodels/kerneldll.py

@@ -74 +74 @@
 import ctypes as ct  # type: ignore
 import _ctypes as _ct
-from ctypes import c_void_p, c_int32, c_longdouble, c_double, c_float  # type: ignore
 import logging
 
@@ -112 +111 @@
     compiler = "unix"
 
-ARCH = "" if ct.sizeof(c_void_p) > 4 else "x86"  # 4 byte pointers on x86
+ARCH = "" if ct.sizeof(ct.c_void_p) > 4 else "x86"  # 4 byte pointers on x86
 if compiler == "unix":
     # Generic unix compile
@@ -242 +241 @@
     if not os.path.exists(dll):
         need_recompile = True
-    #elif getattr(sys, 'frozen', None) is not None:
-    #    # TODO: don't suppress time stamp
-    #    # Currently suppressing recompile when running in a frozen environment
-    #    need_recompile = False
     else:
         dll_time = os.path.getmtime(dll)
@@ -308 +303 @@
             raise
 
-        float_type = (c_float if self.dtype == generate.F32
-                      else c_double if self.dtype == generate.F64
-                      else c_longdouble)
+        float_type = (ct.c_float if self.dtype == generate.F32
+                      else ct.c_double if self.dtype == generate.F64
+                      else ct.c_longdouble)
 
         # int, int, int, int*, double*, double*, double*, double*, double
-        argtypes = [c_int32]*3 + [c_void_p]*4 + [float_type]
+        argtypes = [ct.c_int32]*3 + [ct.c_void_p]*4 + [float_type]
         names = [generate.kernel_name(self.info, variant)
                  for variant in ("Iq", "Iqxy", "Imagnetic")]
@@ -407 +402 @@
         #print("returned",self.q_input.q, self.result)
         pd_norm = self.result[self.q_input.nq]
-        scale = values[0]/(pd_norm if pd_norm!=0.0 else 1.0)
+        scale = values[0]/(pd_norm if pd_norm != 0.0 else 1.0)
         background = values[1]
         #print("scale",scale,background)