Changeset da63656 in sasmodels for sasmodels/generate.py

Timestamp:

May 4, 2016 11:37:42 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:

24d5b30

Parents:

13b99fd (diff), 47e498b (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 'master' into polydisp

Conflicts:

sasmodels/generate.py
sasmodels/kerneldll.py

File:

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

sasmodels/generate.py

@@ -387 +387 @@
         with open(path) as fid:
             _template_cache[filename] = (mtime, fid.read(), path)
-    return _template_cache[filename][1]
+    return _template_cache[filename][1], path
 
 
@@ -393 +393 @@
 double %(name)s(%(pars)s);
 double %(name)s(%(pars)s) {
+#line %(line)d "%(filename)s"
     %(body)s
 }
@@ -398 +399 @@
 """
 
-def _gen_fn(name, pars, body):
-    # type: (str, List[Parameter], str) -> str
+def _gen_fn(name, pars, body, filename, line):
+    # type: (str, List[Parameter], str, str, int) -> str
     """
     Generate a function given pars and body.
@@ -411 +412 @@
     """
     par_decl = ', '.join(p.as_function_argument() for p in pars) if pars else 'void'
-    return _FN_TEMPLATE % {'name': name, 'body': body, 'pars': par_decl}
+    return _FN_TEMPLATE % {
+        'name': name, 'pars': par_decl, 'body': body,
+        'filename': filename.replace('\\', '\\\\'), 'line': line,
+    }
 
 def _call_pars(prefix, pars):
@@ -438 +442 @@
     line instead.
     """
-    for code in sources:
+    for code, path in sources:
         if _IQXY_PATTERN.search(code):
             return True
     else:
         return False
+
+def _add_source(source, code, path):
+    """
+    Add a file to the list of source code chunks, tagged with path and line.
+    """
+    path = path.replace('\\','\\\\')
+    source.append('#line 1 "%s"'%path)
+    source.append(code)
 
 def make_source(model_info):
@@ -474 +486 @@
     ocl_code = load_template('kernel_iq.cl')
     #ocl_code = load_template('kernel_iq_local.cl')
-    user_code = [open(f).read() for f in model_sources(model_info)]
+    user_code = [(f, open(f).read()) for f in model_sources(model_info)]
 
     # Build initial sources
-    source = [kernel_header] + user_code
+    source = []
+    _add_source(source, *kernel_header)
+    for path, code in user_code:
+        _add_source(source, code, path)
 
     # Make parameters for q, qx, qy so that we can use them in declarations
@@ -484 +499 @@
     if isinstance(model_info.form_volume, str):
         pars = partable.form_volume_parameters
-        source.append(_gen_fn('form_volume', pars, model_info.form_volume))
+        source.append(_gen_fn('form_volume', pars, model_info.form_volume,
+                              model_info.filename, model_info._form_volume_line))
     if isinstance(model_info.Iq, str):
         pars = [q] + partable.iq_parameters
-        source.append(_gen_fn('Iq', pars, model_info.Iq))
+        source.append(_gen_fn('Iq', pars, model_info.Iq,
+                              model_info.filename, model_info._Iq_line))
     if isinstance(model_info.Iqxy, str):
         pars = [qx, qy] + partable.iqxy_parameters
-        source.append(_gen_fn('Iqxy', pars, model_info.Iqxy))
+        source.append(_gen_fn('Iqxy', pars, model_info.Iqxy,
+                              model_info.filename, model_info._Iqxy_line))
 
     # Define the parameter table
@@ -528 +546 @@
 
     source.append("#if defined(USE_OPENCL)")
-    source.extend(_add_kernels(ocl_code, call_iq, call_iqxy, model_info.name))
+    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, call_iq, call_iqxy, model_info.name))
+    source.extend(_add_kernels(dll_code[0], call_iq, call_iqxy, model_info.name))
     source.append("#endif /* !USE_OPENCL */")
     return '\n'.join(source)
@@ -569 +587 @@
         kernel_module = getattr(models, model_name, None)
     return kernel_module
-
-
 
 section_marker = re.compile(r'\A(?P<first>[%s])(?P=first)*\Z'