Changeset 32e3c9b in sasmodels for sasmodels/generate.py

Timestamp:

Jul 21, 2016 2:08:04 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:

b966a96

Parents:

42356c8

Message:

dll version of magnetic sld

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
 
 
@@ -555 +557 @@
     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:
@@ -566 +568 @@
         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_MAGNETIC %d" % len(magpars))
+    source.append("#define MAGNETIC_PARS %s"%",".join(str(k) for k in magpars))
 
     # TODO: allow mixed python/opencl kernels?
@@ -584 +591 @@
     source = [
         # define the Iq kernel
-        "#define KERNEL_NAME %s_Iq"%name,
+        "#define KERNEL_NAME %s_Iq" % name,
         call_iq,
         kernel_code,
@@ -591 +598 @@
 
         # 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,
+        "#undef CALL_IQ",
+        "#undef KERNEL_NAME",
+
+        # define the Imagnetic kernel
+        "#define KERNEL_NAME %s_Imagnetic" % name,
+        "#define MAGNETIC 1",
+        call_iqxy,
+        kernel_code,
+        "#undef MAGNETIC",
         "#undef CALL_IQ",
         "#undef KERNEL_NAME",