Changeset 01c8d9e in sasmodels for sasmodels/generate.py

Timestamp:

Aug 7, 2018 12:32:18 PM (6 years ago)

Author:

Suczewski <ges3@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

c11d09f

Parents:

707cbdb

Message:

beta approximation, first pass

File:

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

sasmodels/generate.py

@@ -672 +672 @@
 
 # type in IQXY pattern could be single, float, double, long double, ...
-_IQXY_PATTERN = re.compile(r"(^|\s)double\s+I(?P<mode>q(ab?c|xy))\s*[(]",
+_IQXY_PATTERN = re.compile(r"(^|\s)double\s+I(?P<mode>q(ac|abc|xy))\s*[(]",
                            flags=re.MULTILINE)
 def find_xy_mode(source):
@@ -701 +701 @@
     return 'qa'
 
+# type in IQXY pattern could be single, float, double, long double, ...
+_FQ_PATTERN = re.compile(r"(^|\s)void\s+Fq[(]", flags=re.MULTILINE)
+def has_Fq(source):
+    for code in source:
+        m = _FQ_PATTERN.search(code)
+        if m is not None:
+            return True
+    return False
 
 def _add_source(source, code, path, lineno=1):
@@ -730 +738 @@
     # dispersion.  Need to be careful that necessary parameters are available
     # for computing volume even if we allow non-disperse volume parameters.
-
     partable = model_info.parameters
-
     # Load templates and user code
     kernel_header = load_template('kernel_header.c')
     kernel_code = load_template('kernel_iq.c')
     user_code = [(f, open(f).read()) for f in model_sources(model_info)]
-
     # Build initial sources
     source = []
@@ -743 +748 @@
     for path, code in user_code:
         _add_source(source, code, path)
-
     if model_info.c_code:
         _add_source(source, model_info.c_code, model_info.filename,
@@ -789 +793 @@
     source.append("\\\n".join(p.as_definition()
                               for p in partable.kernel_parameters))
-
     # Define the function calls
     if partable.form_volume_parameters:
@@ -800 +803 @@
         call_volume = "#define CALL_VOLUME(v) 1.0"
     source.append(call_volume)
-
     model_refs = _call_pars("_v.", partable.iq_parameters)
-    pars = ",".join(["_q"] + model_refs)
-    call_iq = "#define CALL_IQ(_q, _v) Iq(%s)" % pars
+    #create varaible BETA to turn on and off beta approximation
+    BETA = has_Fq(source)
+    if not BETA:
+        pars = ",".join(["_q"] + model_refs)
+        call_iq = "#define CALL_IQ(_q, _v) Iq(%s)" % pars
+    else:
+        pars = ",".join(["_q", "&_F1", "&_F2",] + model_refs)
+        call_iq = "#define CALL_IQ(_q, _F1, _F2, _v) Fq(%s)" % pars
     if xy_mode == 'qabc':
         pars = ",".join(["_qa", "_qb", "_qc"] + model_refs)
@@ -831 +839 @@
     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 BETA %d" %(1 if BETA else 0))
     source.append("#define MAX_PD %s"%partable.max_pd)
     source.append("#define NUM_PARS %d"%partable.npars)
@@ -839 +847 @@
     source.append("#define MAGNETIC_PARS %s"%",".join(str(k) for k in magpars))
     source.append("#define PROJECTION %d"%PROJECTION)
-
     # TODO: allow mixed python/opencl kernels?
-
     ocl = _kernels(kernel_code, call_iq, call_iqxy, clear_iqxy, model_info.name)
     dll = _kernels(kernel_code, call_iq, call_iqxy, clear_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]),
     }
-
+    #print(result['dll'])
     return result
 
@@ -1068 +1075 @@
         model_info = make_model_info(kernel_module)
         source = make_source(model_info)
-        print(source['dll'])
+        #print(source['dll'])