Changeset a4280bd in sasmodels for sasmodels/generate.py

Timestamp:

Jul 25, 2016 11:54:30 PM (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:

2f5c6d4

Parents:

2c74c11

Message:

restructure magnetic models to use less code

File:

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

sasmodels/generate.py

@@ -487 +487 @@
     source.append(code)
 
-
 def make_source(model_info):
-    # type: (ModelInfo) -> str
+    # type: (ModelInfo) -> Dict[str, str]
     """
     Generate the OpenCL/ctypes kernel from the module info.
@@ -575 +574 @@
     # Fill in definitions for numbers of parameters
     source.append("#define MAX_PD %s"%partable.max_pd)
-    source.append("#define NPARS %d"%partable.npars)
+    source.append("#define NUM_PARS %d"%partable.npars)
+    source.append("#define NUM_VALUES %d" % partable.nvalues)
     source.append("#define NUM_MAGNETIC %d" % partable.nmagnetic)
-    source.append("#define NUM_VALUES %d" % partable.nvalues)
     source.append("#define MAGNETIC_PARS %s"%",".join(str(k) for k in magpars))
+    for k,v in enumerate(magpars[:3]):
+        source.append("#define MAGNETIC_PAR%d %d"%(k+1, v))
 
     # TODO: allow mixed python/opencl kernels?
 
-    source.append("#if defined(USE_OPENCL)")
-    source.extend(_add_kernels(ocl_code, call_iq, call_iqxy, model_info.name))
-    source.append("#else /* !USE_OPENCL */")
-    source.extend(_add_kernels(dll_code, call_iq, call_iqxy, model_info.name))
-    source.append("#endif /* !USE_OPENCL */")
-    return '\n'.join(source)
-
-
-def _add_kernels(kernel, call_iq, call_iqxy, name):
+    ocl = kernels(ocl_code, call_iq, call_iqxy, model_info.name)
+    dll = kernels(dll_code, call_iq, call_iqxy, model_info.name)
+    result = {
+        'dll': '\n'.join(source+dll[0]+dll[1]+dll[2]),
+        'opencl': '\n'.join(source+ocl[0]+ocl[1]+ocl[2]),
+    }
+
+    return result
+
+
+def kernels(kernel, call_iq, call_iqxy, name):
     # type: ([str,str], str, str, str) -> List[str]
     code = kernel[0]
@@ -598 +601 @@
         "#define KERNEL_NAME %s_Iq" % name,
         call_iq,
-        '#line 1 "%s-Iq"' % path,
+        '#line 1 "%s Iq"' % path,
         code,
         "#undef CALL_IQ",
@@ -608 +611 @@
         "#define KERNEL_NAME %s_Iqxy" % name,
         call_iqxy,
-        '#line 1 "%s-Iqxy"' % path,
+        '#line 1 "%s Iqxy"' % path,
         code,
         "#undef CALL_IQ",
@@ -619 +622 @@
         "#define MAGNETIC 1",
         call_iqxy,
-        '#line 1 "%s-Imagnetic"' % path,
+        '#line 1 "%s Imagnetic"' % path,
         code,
         "#undef MAGNETIC",
@@ -625 +628 @@
         "#undef KERNEL_NAME",
     ]
-    return iq+iqxy+imagnetic
+
+    return iq, iqxy, imagnetic
 
 
@@ -739 +743 @@
         model_info = make_model_info(kernel_module)
         source = make_source(model_info)
-        print(source)
+        print(source['dll'])