Changeset df776db in sasmodels for sasmodels/generate.py

Timestamp:

Jul 27, 2016 3:56:54 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:

739aad4

Parents:

8357f66 (diff), 63c6a08 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'polydisp': adds magnetism; some models still broken

File:

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

sasmodels/generate.py

@@ -387 +387 @@
 
 
-def kernel_name(model_info, is_2d):
-    # type: (ModelInfo, bool) -> str
+def kernel_name(model_info, variant):
+    # type: (ModelInfo, str) -> str
     """
     Name of the exported kernel symbol.
-    """
-    return model_info.name + "_" + ("Iqxy" if is_2d else "Iq")
+
+    *variant* is "Iq", "Iqxy" or "Imagnetic".
+    """
+    return model_info.name + "_" + variant
 
 
@@ -485 +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.
@@ -539 +540 @@
 
     # Define the parameter table
+    # TODO: plug in current line number
+    source.append('#line 542 "sasmodels/generate.py"')
     source.append("#define PARAMETER_TABLE \\")
     source.append("\\\n".join(p.as_definition()
@@ -556 +559 @@
     refs = ["_q[_i]"] + _call_pars("_v.", partable.iq_parameters)
     call_iq = "#define CALL_IQ(_q,_i,_v) Iq(%s)" % (",".join(refs))
-    if _have_Iqxy(user_code):
+    if _have_Iqxy(user_code) or isinstance(model_info.Iqxy, str):
         # Call 2D model
-        refs = ["q[2*_i]", "q[2*_i+1]"] + _call_pars("_v.", partable.iqxy_parameters)
+        refs = ["_q[2*_i]", "_q[2*_i+1]"] + _call_pars("_v.", partable.iqxy_parameters)
         call_iqxy = "#define CALL_IQ(_q,_i,_v) Iqxy(%s)" % (",".join(refs))
     else:
         # Call 1D model with sqrt(qx^2 + qy^2)
-        warnings.warn("Creating Iqxy = Iq(sqrt(qx^2 + qy^2))")
+        #warnings.warn("Creating Iqxy = Iq(sqrt(qx^2 + qy^2))")
         # still defined:: refs = ["q[i]"] + _call_pars("v", iq_parameters)
         pars_sqrt = ["sqrt(_q[2*_i]*_q[2*_i]+_q[2*_i+1]*_q[2*_i+1])"] + refs[1:]
         call_iqxy = "#define CALL_IQ(_q,_i,_v) Iq(%s)" % (",".join(pars_sqrt))
 
+    magpars = [k-2 for k,p in enumerate(partable.call_parameters)
+               if p.type == 'sld']
+
     # 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 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[0], call_iq, call_iqxy, model_info.name))
-    source.append("#else /* !USE_OPENCL */")
-    source.extend(_add_kernels(dll_code[0], call_iq, call_iqxy, model_info.name))
-    source.append("#endif /* !USE_OPENCL */")
-    return '\n'.join(source)
-
-
-def _add_kernels(kernel_code, call_iq, call_iqxy, name):
-    # type: (str, str, str, str) -> List[str]
-    source = [
+    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]
+    path = kernel[1].replace('\\', '\\\\')
+    iq = [
         # define the Iq kernel
-        "#define KERNEL_NAME %s_Iq"%name,
+        "#define KERNEL_NAME %s_Iq" % name,
         call_iq,
-        kernel_code,
+        '#line 1 "%s Iq"' % path,
+        code,
         "#undef CALL_IQ",
         "#undef KERNEL_NAME",
-
+        ]
+
+    iqxy = [
         # define the Iqxy kernel from the same source with different #defines
-        "#define KERNEL_NAME %s_Iqxy"%name,
+        "#define KERNEL_NAME %s_Iqxy" % name,
         call_iqxy,
-        kernel_code,
+        '#line 1 "%s Iqxy"' % path,
+        code,
+        "#undef CALL_IQ",
+        "#undef KERNEL_NAME",
+         ]
+
+    imagnetic = [
+        # define the Imagnetic kernel
+        "#define KERNEL_NAME %s_Imagnetic" % name,
+        "#define MAGNETIC 1",
+        call_iqxy,
+        '#line 1 "%s Imagnetic"' % path,
+        code,
+        "#undef MAGNETIC",
         "#undef CALL_IQ",
         "#undef KERNEL_NAME",
     ]
-    return source
+
+    return iq, iqxy, imagnetic
 
 
@@ -712 +744 @@
         model_info = make_model_info(kernel_module)
         source = make_source(model_info)
-        print(source)
+        print(source['dll'])