[cig-commits] r4956 - in cs/pythia/trunk/pythia: mpi mpi/scripts pyre/inventory/odb pyre/scripts

[leif at geodynamics.org]

Author: leif
Date: 2006-10-12 06:20:00 -0700 (Thu, 12 Oct 2006)
New Revision: 4956

Modified:
   cs/pythia/trunk/pythia/mpi/Launcher.py
   cs/pythia/trunk/pythia/mpi/LauncherMPICH.py
   cs/pythia/trunk/pythia/mpi/pympi.h
   cs/pythia/trunk/pythia/mpi/scripts/mpistart.py
   cs/pythia/trunk/pythia/pyre/inventory/odb/Curator.py
   cs/pythia/trunk/pythia/pyre/scripts/jobstart.py
Log:
Minor mpi/launcher/scheduler- and namespace-related
bug fixes for pythia 0.8.1.0b2.


Modified: cs/pythia/trunk/pythia/mpi/Launcher.py
===================================================================
--- cs/pythia/trunk/pythia/mpi/Launcher.py	2006-10-12 08:15:53 UTC (rev 4955)
+++ cs/pythia/trunk/pythia/mpi/Launcher.py	2006-10-12 13:20:00 UTC (rev 4956)
@@ -32,7 +32,7 @@
 
 
     def launch(self):
-        import os
+        import os, sys
 
         self.executable = os.path.abspath(self.executable)
 
@@ -75,7 +75,7 @@
 
     def _appendMpiRunArgs(self, args):
         args.append(self.extra)
-        args.append("-np %d" % self.nodes)
+        args.extend(['-np', '%d' % self.nodes])
         
         # use only the specific nodes specified explicitly
         if self.nodelist:

Modified: cs/pythia/trunk/pythia/mpi/LauncherMPICH.py
===================================================================
--- cs/pythia/trunk/pythia/mpi/LauncherMPICH.py	2006-10-12 08:15:53 UTC (rev 4955)
+++ cs/pythia/trunk/pythia/mpi/LauncherMPICH.py	2006-10-12 13:20:00 UTC (rev 4956)
@@ -33,7 +33,7 @@
         for node in self.nodelist:
             file.write((nodegen + '\n') % node)
         file.close()
-        args.append("-machinefile %s" % machinefile)
+        args.extend(['-machinefile', machinefile])
 
 
 # end of file 

Modified: cs/pythia/trunk/pythia/mpi/pympi.h
===================================================================
--- cs/pythia/trunk/pythia/mpi/pympi.h	2006-10-12 08:15:53 UTC (rev 4955)
+++ cs/pythia/trunk/pythia/mpi/pympi.h	2006-10-12 13:20:00 UTC (rev 4956)
@@ -1,4 +1,4 @@
-// 
+/* 
 //  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // 
 //                        California Institute of Technology
@@ -7,7 +7,7 @@
 //  <LicenseText>
 // 
 //  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// 
+*/ 
 
 #if !defined(mpi_pympi_h)
 #define mpi_pympi_h
@@ -21,10 +21,10 @@
 extern "C" {
 #endif
 
-    struct PyMPICommObject {
+    typedef struct {
         PyObject_HEAD
         MPI_Comm comm;
-    };
+    } PyMPICommObject;
 
 #ifdef __cplusplus
 }

Modified: cs/pythia/trunk/pythia/mpi/scripts/mpistart.py
===================================================================
--- cs/pythia/trunk/pythia/mpi/scripts/mpistart.py	2006-10-12 08:15:53 UTC (rev 4955)
+++ cs/pythia/trunk/pythia/mpi/scripts/mpistart.py	2006-10-12 13:20:00 UTC (rev 4956)
@@ -11,7 +11,7 @@
 #
 
 
-from mpi import mpistart
+from pythia.mpi import mpistart
 mpistart()
 
 

Modified: cs/pythia/trunk/pythia/pyre/inventory/odb/Curator.py
===================================================================
--- cs/pythia/trunk/pythia/pyre/inventory/odb/Curator.py	2006-10-12 08:15:53 UTC (rev 4955)
+++ cs/pythia/trunk/pythia/pyre/inventory/odb/Curator.py	2006-10-12 13:20:00 UTC (rev 4956)
@@ -193,8 +193,10 @@
         # create the built-in depositories
         from pkg_resources import resource_listdir, resource_isdir, resource_exists, resource_filename, Requirement
         pythia = Requirement.parse("pythia")
-        entries = resource_listdir(pythia, "")
+        namespace = "pythia"
+        entries = resource_listdir(pythia, namespace)
         for entry in entries:
+            entry = namespace + '/' + entry
             if resource_isdir(pythia, entry):
                 vault = entry + '/__vault__.odb'
                 if resource_exists(pythia, vault):

Modified: cs/pythia/trunk/pythia/pyre/scripts/jobstart.py
===================================================================
--- cs/pythia/trunk/pythia/pyre/scripts/jobstart.py	2006-10-12 08:15:53 UTC (rev 4955)
+++ cs/pythia/trunk/pythia/pyre/scripts/jobstart.py	2006-10-12 13:20:00 UTC (rev 4956)
@@ -11,7 +11,7 @@
 #
 
 
-from pyre.schedulers import jobstart
+from pythia.pyre.schedulers import jobstart
 jobstart()