Changeset 8224d24 in sasmodels

Timestamp:

Dec 18, 2017 11:17:26 AM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Children:

1941ec6

Parents:

1ddb794 (diff), ddfdb16 (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' of ​https://github.com/omereis/sasmodels

Location:

sasmodels

Files:

• autoc.py (modified) (2 diffs)
• py2c.py (modified) (20 diffs)
• kerneldll.py (modified) (1 diff)

sasmodels/autoc.py

@@ -92 +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('#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)):
-                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('#line 1 "%s"' % escaped_filename)
-                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')
@@ -142 +128 @@
     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)
+
 
 # Modified from the following:

sasmodels/py2c.py

@@ -57 +57 @@
 12/15/2017, OE: Precedence maintained by writing opening and closing
                 parenthesesm '(',')', in procedure 'visit_BinOp'.
+12/18/2017, OE: Added call to 'add_current_line()' at the beginning
+                of visit_Return
+
 """
 import ast
@@ -99 +102 @@
 
 
-#def to_source(node, indent_with=' ' * 4, add_line_information=False):
-def to_source(node, func_name):
+def to_source(node, func_name, constants=None):
     """This function can convert a node tree back into python sourcecode.
     This is useful for debugging purposes, especially if you're dealing with
@@ -118 +120 @@
     number information of statement nodes.
     """
-    generator = SourceGenerator(' ' * 4, False)
-#    generator.required_functions = func_name
+    generator = SourceGenerator(' ' * 4, False, constants)
     generator.visit(node)
 
-#    return ''.join(generator.result)
     return ''.join(generator.c_proc)
 
@@ -138 +138 @@
     """
 
-    def __init__(self, indent_with, add_line_information=False):
+    def __init__(self, indent_with, add_line_information=False, constants=None):
         self.result = []
         self.indent_with = indent_with
@@ -160 +160 @@
         self.C_Functions = []
         self.C_Vectors = []
+        self.C_Constants = constants
         self.SubRef = False
         self.InSubscript = False
@@ -262 +263 @@
                          % arg_name, str(default.n))
                 self.warnings.append(w_str)
-#                self.write_python('=')
-#                self.visit(default)
 
     def decorators(self, node):
@@ -321 +320 @@
         self.visit(node.value)
         self.add_semi_colon()
-#        self.write_c(';')
         self.add_current_line()
         for n, item in enumerate(self.Tuples):
@@ -347 +345 @@
         self.visit(node.value)
         self.add_semi_colon()
-#        self.write_c(';')
         self.add_current_line()
 
@@ -408 +405 @@
             fLine = True
             start_var += 1
-#        if(len(self.C_IntVars) > 0):
-#            s = self.listToDeclare(self.C_IntVars)
-#            self.c_proc.insert(start_var, "    int " + s + ";\n")
-#            fLine = True
-#            start_var += 1
         if(len(self.C_Vectors) > 0):
             s = self.listToDeclare(self.C_Vectors)
@@ -446 +438 @@
 
     def getMethodSignature(self):
-#        args_str = ListToString(self.arguments)
         args_str = ''
         for n in range(len(self.arguments)):
@@ -453 +444 @@
                 args_str += ", "
         return(args_str)
-#        self.strMethodSignature = 'double ' + self.name + '(' + args_str + ")"
 
     def InsertSignature(self):
@@ -473 +463 @@
         self.arguments = []
         self.name = node.name
-#        if self.name not in self.required_functions[0]:
-#           return
         print("Parsing '" + self.name + "'")
         args_str = ""
@@ -480 +468 @@
         self.visit(node.args)
         self.getMethodSignature()
-# for C
         self.signature_line = len(self.c_proc)
-#        self.add_c_line(self.strMethodSignature)
         self.add_c_line("\n{")
         start_vars = len(self.c_proc) + 1
@@ -557 +543 @@
         if(hasattr(node,'value')):
             line_number = node.value.lineno
-        elif hasattr(node,'iter'):
-            if hasattr(node.iter,'lineno'):
+        elif hasattr(node, 'iter'):
+            if hasattr(node.iter, 'lineno'):
                 line_number = node.iter.lineno
         return(line_number)
@@ -599 +585 @@
 # Iterator name is in node.target.id.
         self.add_current_line()
-#        if(len(self.current_statement) > 0):
-#            self.add_c_line(self.current_statement)
-#            self.current_statement = ''
         fForDone = False
         self.current_statement = ''
@@ -701 +684 @@
 
     def visit_Return(self, node):
-        self.newline(node)
+        self.add_current_line()
         if node.value is None:
             self.write_c('return')
@@ -802 +785 @@
             name = node.id
 #       add variable to C_Vars if it ins't there yet, not an argument and not a number
-        if((name not in self.C_Functions) and (name not in self.C_Vars) and \
+        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.isdigit() == False)):
+            (name not in self.C_Constants) and (name.isdigit() == False)):
             if(self.InSubscript):
                 self.C_IntVars.append(node.id)
@@ -947 +930 @@
 
     def visit_Subscript(self, node):
-        if(node.value.id not in self.C_Pointers):
-            self.C_Pointers.append(node.value.id)
+        if (node.value.id not in self.C_Constants):
+            if(node.value.id not in self.C_Pointers):
+                self.C_Pointers.append(node.value.id)
         self.SubRef = True
         self.visit(node.value)
@@ -1048 +1032 @@
                 self.visit(if_)
 
-#    def visit_excepthandler(self, node):
-#        self.newline(node)
-#        self.write_python('except')
-#        if node.type is not None:
-#            self.write_python(' ')
-#            self.visit(node.type)
-#            if node.name is not None:
-#                self.write_python(' as ')
-#                self.visit(node.name)
-#        self.body(node.body)
-
     def visit_arguments(self, node):
         self.signature(node)
-
-def Iq1(q, porod_scale, porod_exp, lorentz_scale, lorentz_length, peak_pos, lorentz_exp=17):
-    z1 = z2 = z = abs(q - peak_pos) * lorentz_length
-    if(q > p):
-        q = p + 17
-        p = q - 5
-    z3 = -8
-    inten = (porod_scale / q ** porod_exp
-                + lorentz_scale /(1 + z ** lorentz_exp))
-    return inten
-
-def Iq(q, porod_scale, porod_exp, lorentz_scale, lorentz_length, peak_pos, lorentz_exp=17):
-    z1 = z2 = z = abs(q - peak_pos) * lorentz_length
-    if(q > p):
-        q = p + 17
-        p = q - 5
-    elif(q == p):
-        q = p * q
-        q *= z1
-        p = z1
-    elif(q == 17):
-        q = p * q - 17
-    else:
-        q += 7
-    z3 = -8
-    inten = (porod_scale / q ** porod_exp
-                + lorentz_scale /(1 + z ** lorentz_exp))
-    return inten
 
 def print_function(f=None):
@@ -1104 +1049 @@
 def translate(functions, constants=0):
     snippets = []
+    #snippets.append("#include <math.h>")
+    #snippets.append("")
     for source, fname, line_no in functions:
-        line_directive = '#line %d "%s"'%(line_no, fname.replace('\\','\\\\'))
+        line_directive = '#line %d "%s"'%(line_no, fname.replace('\\', '\\\\'))
         snippets.append(line_directive)
         tree = ast.parse(source)
         # in the future add filename, offset, constants
-        c_code = to_source(tree, functions)
+        c_code = to_source(tree, functions, constants)
         snippets.append(c_code)
     return snippets

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)