Changeset 1ddb794 in sasmodels for sasmodels/autoc.py

Timestamp:

Dec 18, 2017 10:48:16 AM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Children:

8224d24

Parents:

98a4f14

Message:

python 2/3 compatibility

File:

• sasmodels/autoc.py (modified) (4 diffs)

sasmodels/autoc.py

@@ -72 +72 @@
         function_name, function = translate.pop(0)
         filename = function.__code__.co_filename
+        escaped_filename = filename.replace('\\', '\\\\')
         offset = function.__code__.co_firstlineno
         refs = function.__code__.co_names
@@ -93 +94 @@
             elif isinstance(obj, float):
                 constants[name] = obj
+                snippets.append('#line 1 "%s"' % escaped_filename)
                 snippets.append("const double %s = %.15g;"%(name, obj))
             elif isinstance(obj, int):
                 constants[name] = obj
+                snippets.append('#line 1 "%s"' % escaped_filename)
                 snippets.append("const int %s = %d;"%(name, obj))
             elif isinstance(obj, (list, tuple, np.ndarray)):
@@ -106 +109 @@
                     obj = list(obj) + [0.]*(4-len(obj))
                 vals = ", ".join("%.15g"%v for v in obj)
+                snippets.append('#line 1 "%s"' % escaped_filename)
                 snippets.append("const double %s[] = {%s};" %(name, vals))
             elif isinstance(obj, special.Gauss):
@@ -129 +133 @@
 
     # translate source
-    functions = py2c.translate(
-        [code[name] for name in ordered_dag(depends) if name in code],
-        constants)
-    snippets.clear()
-    snippets.append(functions)
-    #print("source", info.source)
-    print("\n".join(snippets))
-    try:
-        c_text = "\n".join(snippets)
-        translated = open ("_autoc.c", "a+")
-        translated.write (c_text)
-        translated.close()
-    except Exception as excp:
-        strErr = "Error:\n" + str(excp.args)
-        print(strErr)
-    #return
-#    raise RuntimeError("not yet converted...")
+    ordered_code = [code[name] for name in ordered_dag(depends) if name in code]
+    functions = py2c.translate(ordered_code, constants)
+    snippets.extend(functions)
 
     # update model info