Changeset 2611 for trunk

Timestamp:

06/23/2008 12:21:00 PM (7 months ago)

Author:

wd15

Message:

Moved the inline flag check to the import (init.py) so that it is done only once. The inline tests were broken. After a compile failure the inline tests were being switched off as weave does not get to do its exit strategy and so sys.argv was being permanently changed

Location:

trunk/fipy/tools/inline

Files:

• __init__.py (modified) (1 diff)
• inline.py (modified) (3 diffs)

trunk/fipy/tools/inline/__init__.py

@@ +1 @@
+import sys
+
+if '--inline' in sys.argv[1:]:
+    inlineFlagOn = True
+else:
+    inlineFlagOn = False

trunk/fipy/tools/inline/inline.py

@@ -1 +1 @@
 import sys
-from fipy.tools import numerix 
+from fipy.tools import numerix
+from fipy.tools.inline import inlineFlagOn
 
 def _optionalInline(inlineFn, pythonFn, *args):
-    if '--inline' in sys.argv[1:]:
+    if inlineFlagOn:
         return inlineFn(*args)
     else:
@@ -39 +40 @@
         if hasattr(args[key], 'dtype') and args[key].dtype.char == '?':
             args[key] = args[key].astype('B')
-            
+
     weave.inline(code,
                  args.keys(),
@@ -48 +49 @@
                  verbose = 0 or verbose,
                  extra_compile_args =['-O3'])
-
                  
 def _runIterateElementInline(code_in, converters=None, verbose=0, **args):