Changeset 2817 for trunk

Timestamp:

11/13/2008 04:10:19 PM (8 weeks ago)

Author:

guyer

Message:

Add comment to --inline to indicate what Python code or binOp generated it

Location:

trunk/fipy

Files:

• tools/inline/inline.py (modified) (5 diffs)
• variables/operatorVariable.py (modified) (3 diffs)
• variables/variable.py (modified) (6 diffs)

trunk/fipy/tools/inline/inline.py

@@ -1 @@
-import sys
+import inspect
+
 from fipy.tools import numerix
 from fipy.tools.inline import inlineFlagOn
@@ -9 +10 @@
         return pythonFn(*args)
                          
-def _runInline(code_in, converters=None, verbose=0, **args):
+def _frameComment(code, level=2):
+    frame = inspect.getouterframes(inspect.currentframe())[level]
+
+    # note: 
+    # don't use #line because it actually makes it harder 
+    # to find the offending code in both the C++ source and in the Python
+    #line %d "%s"
+    
+    return '''
+/* 
+    %s:%d
+
+    %s 
+*/
+''' % (frame[1], frame[2] - len(code.splitlines()), frame[3])
+
+def _runInline(code_in, converters=None, verbose=0, comment=None, **args):
     argsKeys = args.keys()
     dimList = ['i', 'j', 'k']
@@ -35 +52 @@
         code = 'int ' + ','.join(declarations) + ';\n' + loops + "\t" * dimensions + code_in + enders
 
+    if comment is None:
+        comment = _frameComment(code_in)
+        
+    code = "\n" + comment + "\n" + code
+    
     from scipy import weave
 
@@ -50 +72 @@
                  extra_compile_args =['-O3'])
                  
-def _runIterateElementInline(code_in, converters=None, verbose=0, **args):
+def _runIterateElementInline(code_in, converters=None, verbose=0, comment=None, **args):
     loops = """
 int i;
@@ -70 +92 @@
 """
         
+    indent = "\t" * rank
+    
     code = """
     #define ITEM(arr,i,vec) (arr[arrayIndex(arr##_array, i, vec)])
                     
     int vec[%(rank)d];
-    %(loops)s%(indent)s%(code)s%(enders)s
+    %(loops)s%(indent)s%(code_in)s%(enders)s
                     
     #undef ITEM
-    """ % {
-        'rank': rank, 
-        'loops': loops, 
-        'indent': "\t" * rank, 
-        'code': code_in, 
-        'enders': enders
-    }
+    """ % locals()
+
+    if comment is None:
+        comment = _frameComment(code_in)
+
+    code = "\n" + comment + "\n" + code
 
     from scipy import weave

trunk/fipy/variables/operatorVariable.py

@@ -35 +35 @@
 def _OperatorVariableClass(baseClass=None):
     class _OperatorVariable(baseClass):
-        def __init__(self, op, var, opShape=(), canInline=True, unit=None, *args, **kwargs):
+        def __init__(self, op, var, opShape=(), canInline=True, unit=None, inlineComment=None, *args, **kwargs):
             self.op = op
             self.var = var
@@ -53 +53 @@
             self.dontCacheMe()
 
+            self.comment = inlineComment
+
         def _calcValue(self):
             if not self.canInline:
@@ -61 +63 @@
 
         def _calcValueIn(self):
-            return self._execInline()
+            return self._execInline(comment=self.comment)
 
         def _calcValuePy(self):

trunk/fipy/variables/variable.py

@@ -37 +37 @@
 import sys
 import os
+import inspect
 
 from fipy.tools.dimensions import physicalField
@@ -667 +668 @@
         return Variable
         
-    def _execInline(self):
+    def _execInline(self, comment=None):
         """
         Gets the stack from _getCstring() which calls _getRepresentation()
@@ -750 +751 @@
                 argDict['result'] = numerix.reshape(argDict['result'], (1,))
 
-            inline._runInline(string, converters=None, **argDict)
+            inline._runInline(string, converters=None, comment=comment, **argDict)
 
             if resultShape == ():
@@ -803 +804 @@
         return operatorVariable._OperatorVariableClass(baseClass=baseClass)
             
+    def _inlineComment(self, level=3):
+        frame = inspect.getouterframes(inspect.currentframe())[level]
+
+        # note: 
+        # don't use #line because it actually makes it harder 
+        # to find the offending code in both the C++ source and in the Python
+        #line %d "%s"
+        
+        if frame[4] is not None:
+            code = "\n".join(frame[4])
+        else:
+            code = ""
+            
+        return '''
+/* 
+    %s:%d
+    
+    %s
+ */
+        ''' % (frame[1], frame[2], code)
+         
+
     def _UnaryOperatorVariable(self, op, operatorClass=None, opShape=None, canInline=True, unit=None):
         """
@@ -826 +849 @@
             canInline = False
 
-        return unOp(op=op, var=[self], opShape=opShape, canInline=canInline, unit=unit)
+        var = unOp(op=op, var=[self], opShape=opShape, canInline=canInline, unit=unit, inlineComment=self._inlineComment())
+#         var.comment = self._frameComment(level=7)
+        
+        return var
 
     def _shapeClassAndOther(self, opShape, operatorClass, other):
@@ -872 +898 @@
         binOp = binaryOperatorVariable._BinaryOperatorVariable(operatorClass)
         
-        return binOp(op=op, var=[self, other], opShape=opShape, canInline=canInline, unit=unit)
+        var = binOp(op=op, var=[self, other], opShape=opShape, canInline=canInline, unit=unit, inlineComment=self._inlineComment())
+#         var.comment = self._frameComment(level=7)
+
+        return var
     
     def __add__(self, other):