Changes in / [ddfdb16:8224d24] in sasmodels

Location:

sasmodels

Files:

• autoc.py (modified) (4 diffs)
• kerneldll.py (modified) (1 diff)
• py2c.py (modified) (6 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
@@ -91 +92 @@
                     # not special: add function to translate stack
                     translate.append((name, obj))
-            elif isinstance(obj, float):
+            elif isinstance(obj, (int, float, list, tuple, np.ndarray)):
                 constants[name] = obj
-                snippets.append("const double %s = %.15g;"%(name, obj))
-            elif isinstance(obj, int):
-                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)
-                snippets.append("const double %s[] = {%s};" %(name, vals))
+                # Claim all constants are declared on line 1
+                snippets.append('#line 1 "%s"'%escaped_filename)
+                snippets.append(define_constant(name, obj))
             elif isinstance(obj, special.Gauss):
-                constants["GAUSS_N"] = obj.n
-                constants["GAUSS_Z"] = obj.z
-                constants["GAUSS_W"] = obj.w
+                #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')
@@ -129 +119 @@
 
     # 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
@@ -151 +127 @@
     info.c_code = "\n".join(snippets)
     info.Iq = info.Iqxy = info.form_volume = None
+
+def define_constant(name, value):
+    if isinstance(value, int):
+        parts = ["int ", name, " = ", "%d"%value, ";"]
+    elif isinstance(value, float):
+        parts = ["double ", name, " = ", "%.15g"%value, ";"]
+    else:
+        # 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(value)%4 != 0:
+            value = list(value) + [0.]*(4 - len(value)%4)
+        elements = ["%.15g"%v for v in value]
+        parts = ["double ", name, "[]", " = ",
+                 "{\n   ", ", ".join(elements), "\n};"]
+    return "".join(parts)
 
 

sasmodels/kerneldll.py

@@ -185 +185 @@
         subprocess.check_output(command, shell=shell, stderr=subprocess.STDOUT)
     except subprocess.CalledProcessError as exc:
-        raise RuntimeError("compile failed.\n%s\n%s"%(command_str, exc.output))
+        raise RuntimeError("compile failed.\n%s\n%s"
+                           % (command_str, exc.output.decode()))
     if not os.path.exists(output):
         raise RuntimeError("compile failed.  File is in %r"%source)

sasmodels/py2c.py

@@ -244 +244 @@
 # for C
         for arg in node.args:
-            self.arguments.append(arg.arg)
+            # CRUFT: 2.7 uses arg.id, 3.x uses arg.arg
+            try:
+                arg_name = arg.arg
+            except AttributeError:
+                arg_name = arg.id
+            self.arguments.append(arg_name)
 
         padding = [None] *(len(node.args) - len(node.defaults))
         for arg, default in zip(node.args, padding + node.defaults):
             if default is not None:
-                self.warnings.append("Default Parameter unknown to C")
-                w_str = "Default Parameters are unknown to C: '" + arg.arg + \
-                        " = " + str(default.n) + "'"
+                # CRUFT: 2.7 uses arg.id, 3.x uses arg.arg
+                # CRUFT: 2.7 uses arg.id, 3.x uses arg.arg
+                try:
+                    arg_name = arg.arg
+                except AttributeError:
+                    arg_name = arg.id
+                w_str = ("Default Parameters are unknown to C: '%s = %s"
+                         % arg_name, str(default.n))
                 self.warnings.append(w_str)
 
@@ -304 +314 @@
         if(len(self.Tuples) > 0):
             tplTargets = list(self.Tuples)
-            self.Tuples.clear()
+            del self.Tuples[:]
         self.write_c(' = ')
         self.is_sequence = False
@@ -402 +412 @@
                 self.c_proc.insert(start_var, c_dcl + "\n")
                 start_var += 1
-        self.C_Vars.clear()
-        self.C_IntVars.clear()
-        self.C_Vectors.clear()
-        self.C_Pointers.clear()
+        del self.C_Vars[:]
+        del self.C_IntVars[:]
+        del self.C_Vectors[:]
+        del self.C_Pointers[:]
         self.C_DclPointers
         if(fLine == True):
@@ -418 +428 @@
             self.c_proc.insert(start_var, "    double " + s + ";\n")
             self.c_proc.insert(start_var + 1, "\n")
-
-    def writeInclude(self):
-        if(self.MathIncludeed == False):
-            self.add_c_line("#include <math.h>\n")
-            self.add_c_line("static double pi = 3.14159265359;\n")
-            self.MathIncludeed = True
 
     def ListToString(self, strings):
@@ -783 +787 @@
         if ((name not in self.C_Functions) and (name not in self.C_Vars) and \
             (name not in self.C_IntVars) and (name not in self.arguments) and \
-            (name not in self.C_Constants) and (name.isnumeric() == False)):
+            (name not in self.C_Constants) and (name.isdigit() == False)):
             if(self.InSubscript):
                 self.C_IntVars.append(node.id)
@@ -1043 +1047 @@
         print(tree_source)
 
-def add_constants(sniplets, c_constants):
-    sniplets.append("#include <math.h>")
-    sniplets.append("")
-    vars = c_constants.keys()
-    for c_var in vars:
-        c_values = c_constants[c_var]
-        if isinstance(c_values, (int, float)):
-            parts = ["double ", c_var, " = ", "%.15g"%c_values, ";"]
-        else:
-            elements = ["%.15g"%v for v in c_values]
-            parts = ["double ", c_var, "[]", " = ", "{\n   ", ", ".join(elements), "\n};"]
-        sniplets.append("".join(parts))
-
 def translate(functions, constants=0):
-    sniplets = []
-    add_constants (sniplets, constants)
-    for source,fname,line_no in functions:
-        line_directive = '#line %d "%s"' %(line_no,fname)
-        line_directive = line_directive.replace('\\','\\\\')
-#        sniplets.append(line_directive)
+    snippets = []
+    #snippets.append("#include <math.h>")
+    #snippets.append("")
+    for source, fname, line_no in functions:
+        line_directive = '#line %d "%s"'%(line_no, fname.replace('\\', '\\\\'))
+        snippets.append(line_directive)
         tree = ast.parse(source)
-        sniplet = to_source(tree, functions, constants) # in the future add filename, offset, constants
-        sniplets.append(sniplet)
-    c_code = "\n".join(sniplets)
-    f_out = open ("xlate.c", "w+")
-    f_out.write (c_code)
-    f_out.close()
-    return("\n".join(sniplets))
+        # in the future add filename, offset, constants
+        c_code = to_source(tree, functions, constants)
+        snippets.append(c_code)
+    return snippets
 
 def get_file_names():