Changeset cb6ecf4 in sasmodels for sasmodels/dll.py

Timestamp:

Feb 13, 2015 5:20:52 PM (9 years ago)

Author:

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:

b3f6bc3

Parents:

f5b9a6b

Message:

rename gen.py to generate.py for clarity

File:

• sasmodels/dll.py (modified) (3 diffs)

sasmodels/dll.py

@@ -10 +10 @@
 import numpy as np
 
-from . import gen
-
-from .gen import F32, F64
+from . import generate
+
+from .generate import F32, F64
 # Compiler platform details
 if sys.platform == 'darwin':
@@ -52 +52 @@
     import tempfile
 
-    source, info = gen.make(kernel_module)
-    source_files = gen.sources(info) + [info['filename']]
+    source, info = generate.make(kernel_module)
+    source_files = generate.sources(info) + [info['filename']]
     newest = max(os.path.getmtime(f) for f in source_files)
     dllpath = dll_path(info)
@@ -103 +103 @@
         self.dll = ct.CDLL(self.dllpath)
 
-        self.Iq = self.dll[gen.kernel_name(self.info, False)]
+        self.Iq = self.dll[generate.kernel_name(self.info, False)]
         self.Iq.argtypes = IQ_ARGS + [c_double]*Nfixed1d + [c_int]*Npd1d
 
-        self.Iqxy = self.dll[gen.kernel_name(self.info, True)]
+        self.Iqxy = self.dll[generate.kernel_name(self.info, True)]
         self.Iqxy.argtypes = IQXY_ARGS + [c_double]*Nfixed2d + [c_int]*Npd2d