Changeset cb6ecf4 in sasmodels

Timestamp:

Feb 13, 2015 5:20:52 PM (10 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

Files:

• doc/genmodel.py (modified) (1 diff)
• sasmodels/dll.py (modified) (3 diffs)
• sasmodels/generate.py (moved) (moved from sasmodels/gen.py)
• sasmodels/gpu.py (modified) (7 diffs)

doc/genmodel.py

@@ -12 +12 @@
 
 # Load the doc string from the module definition file and store it in rst
-from sasmodels import gen
-docstr = gen.doc(module)
+from sasmodels import generate
+docstr = generate.doc(module)
 open(sys.argv[2],'w').write(docstr)

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
 

sasmodels/gpu.py

@@ -27 +27 @@
 from pyopencl import mem_flags as mf
 
-from . import gen
+from . import generate
 
 F64_DEFS = """\
@@ -50 +50 @@
     so models can be defined without using too many resources.
     """
-    source, info = gen.make(kernel_module)
+    source, info = generate.make(kernel_module)
     ## for debugging, save source to a .cl file, edit it, and reload as model
     #open(info['name']+'.cl','w').write(source)
@@ -112 +112 @@
     """
     dtype = np.dtype(dtype)
-    if dtype==gen.F64 and not all(has_double(d) for d in context.devices):
+    if dtype==generate.F64 and not all(has_double(d) for d in context.devices):
         raise RuntimeError("Double precision not supported for devices")
 
-    header = F64_DEFS if dtype == gen.F64 else ""
-    if dtype == gen.F32:
-        source = gen.use_single(source)
+    header = F64_DEFS if dtype == generate.F64 else ""
+    if dtype == generate.F32:
+        source = generate.use_single(source)
     # Note: USE_SINCOS makes the intel cpu slower under opencl
     if context.devices[0].type == cl.device_type.GPU:
@@ -170 +170 @@
     is an optional extension which may not be available on all devices.
     """
-    def __init__(self, source, info, dtype=gen.F32):
+    def __init__(self, source, info, dtype=generate.F32):
         self.info = info
         self.source = source
@@ -189 +189 @@
         if self.program is None:
             self.program = environment().compile_program(self.info['name'],self.source, self.dtype)
-        kernel_name = gen.kernel_name(self.info, input.is_2D)
+        kernel_name = generate.kernel_name(self.info, input.is_2D)
         kernel = getattr(self.program, kernel_name)
         return GpuKernel(kernel, self.info, input)
@@ -233 +233 @@
     buffer will be released when the data object is freed.
     """
-    def __init__(self, q_vectors, dtype=gen.F32):
+    def __init__(self, q_vectors, dtype=generate.F32):
         env = environment()
         self.nq = q_vectors[0].size
@@ -294 +294 @@
 
     def __call__(self, pars, pd_pars, cutoff=1e-5):
-        real = np.float32 if self.input.dtype == gen.F32 else np.float64
+        real = np.float32 if self.input.dtype == generate.F32 else np.float64
         fixed = [real(p) for p in pars]
         cutoff = real(cutoff)