Changeset 50b5464 in sasmodels

Timestamp:

Dec 4, 2017 8:12:20 AM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Children:

7a40b08

Parents:

bf88ef1

Message:

rearrange autoc to allow py2c translation to do whole program analysis

Location:

sasmodels

Files:

• autoc.py (modified) (4 diffs)
• codegen.py (modified) (1 diff)

sasmodels/autoc.py

@@ -65 +65 @@
 
     libs = []  # type: List[str]
+    snippets = []  # type: List[str]
+    constants = {} # type: Dict[str, Any]
     code = {}  # type: Dict[str, str]
     depends = {}  # type: Dict[str, List[str]]
@@ -90 +92 @@
                     translate.append((name, obj))
             elif isinstance(obj, float):
-                code[name] = "const double %s = %.15g\n"%(name, obj)
+                constants[name] = obj
+                snippets.append("const double %s = %.15g;"%(name, obj))
             elif isinstance(obj, int):
-                code[name] = "const int %s = %d\n"%(name, obj)
+                constants[name] = obj
+                snippets.append("const int %s = %d;"%(name, obj))
             elif isinstance(obj, (list, tuple, np.ndarray)):
+                constants[name] = obj
+                # extend constant arrays to a multiple of 4; not sure if this
+                # is necessary, but some OpenCL targets broke if the number
+                # of parameters in the parameter table was not a multiple of 4,
+                # so do it for all constant arrays to be safe.
+                if len(obj)%4 != 0:
+                    obj = list(obj) + [0.]*(4-len(obj))
                 vals = ", ".join("%.15g"%v for v in obj)
-                code[name] = "const double %s[] = {%s};\n" %(name, vals)
+                snippets.append("const double %s[] = {%s};" %(name, vals))
             elif isinstance(obj, special.Gauss):
+                constants["GAUSS_N"] = obj.n
+                constants["GAUSS_Z"] = obj.z
+                constants["GAUSS_W"] = obj.w
                 libs.append('lib/gauss%d.c'%obj.n)
                 source = (source.replace(name+'.n', 'GAUSS_N')
@@ -105 +119 @@
                                 % (name, str(type(obj))))
 
-        tree = ast.parse(source)
-        snippet = codegen.to_source(tree) #, filename, offset)
-        code[function_name] = snippet
+        # add (possibly modified) source to set of functions to compile
+        code[function_name] = (source, filename, offset)
 
     # remove duplicates from the dependecy list
@@ -115 +128 @@
             unique_libs.append(filename)
 
+    # translate source
+    functions = codegen.translate(
+        [code[name] for name in ordered_dag(depends) if name in code],
+        constants)
+
+    # update model info
     info.source = unique_libs
-    info.c_code = "\n".join(code[k] for k in ordered_dag(depends) if k in code)
-
+    info.c_code = "\n".join(snippets) +  functions
     info.Iq = info.Iqxy = info.form_volume = None
 

sasmodels/codegen.py

@@ -49 +49 @@
 UNARYOP_SYMBOLS[ast.USub] = '-'
 
+
+def translate(functions, constants):
+    # type: (List[Tuple[str, str, int]], Dict[str, Any]) -> str
+    snippets = []
+    for source, filename, offset in functions:
+        tree = ast.parse(source)
+        snippet = to_source(tree) #, filename, offset)
+        snippets.append(snippet)
+    return "\n".join(snippets)
 
 def to_source(node, indent_with=' ' * 4, add_line_information=False):