Changeset 665 for trunk/python

Timestamp:

Apr 6, 2007, 6:06:24 PM (18 years ago)

Author:

dkearney

Message:

Updates to Rappture::Utils::progress for all languages
removed the dependancy on Rappture.Units from within number.py, it should only depend on Rappture which will include Rappture.Units
added Rappture.Units as a module to load when people import Rappture in python.
added -V pbs variable to queue.py to include qsub environment variables in the submitted job.
updated setup.py.in to install Rappture.Utils
added progress bar to all app-fermi examples showing how to use the Rappture::Utils::progress function in all languages.
added destructor definitions to Node classes in src2/core

Location:

trunk/python

Files:

• Rappture/PyRpUnits.cc (modified) (1 diff)
• Rappture/PyRpUtils.cc (added)
• Rappture/__init__.py (modified) (1 diff)
• Rappture/number.py (modified) (1 diff)
• Rappture/queue.py (modified) (1 diff)
• setup.py.in (modified) (2 diffs)

trunk/python/Rappture/PyRpUnits.cc

@@ -498 +498 @@
 };
 
-PyDoc_STRVAR(module_doc, "RpUnits Module for Python.");
+PyDoc_STRVAR(module_doc, "Rappture Units Module for Python.");
 
 /* Initialization function for the module */

trunk/python/Rappture/__init__.py

@@ -6 +6 @@
 import queue as queue
 import tools as tools
+import Units
+import Utils

trunk/python/Rappture/number.py

@@ -10 +10 @@
 # ======================================================================
 import Rappture
-import Rappture.Units
 
 class number:

trunk/python/Rappture/queue.py

@@ -294 +294 @@
 #PBS -mn
 #PBS -N %s
+#PBS -V
 cd $PBS_O_WORKDIR
 

trunk/python/setup.py.in

@@ -3 +3 @@
 rp_install_dir = '@prefix@'
 
-module = Extension('Rappture.Units',
+units_module = Extension('Rappture.Units',
                    include_dirs = [rp_install_dir+'/include'],
                    sources = [ 'Rappture/PyRpUnits.cc' ],
                    library_dirs = [ rp_install_dir+'/lib' ],
                    libraries = [ 'rappture', 'scew' ] )
+
+utils_module = Extension('Rappture.Utils',
+                   include_dirs = [rp_install_dir+'/include'],
+                   sources = [ 'Rappture/PyRpUtils.cc' ],
+                   library_dirs = [ rp_install_dir+'/lib' ],
+                   libraries = [ 'rappture' ] )
 
 setup(  name='Rappture',
@@ -20 +26 @@
                      'Rappture.tools',
                      'Rappture.result'],
-        ext_modules=[module]
+        ext_modules=[   units_module,
+                        utils_module    ]
   )