Changeset 4747 for mpich2/branches/release/mpich2-1.1/src/pm/mpd/mpdlib.py

Timestamp:

06/16/09 16:39:07 (9 months ago)

Author:

goodell

Message:

Merge process mapping fixes from trunk -> mpich2-1.1 branch.

This commit significantly reduces the amount of time that MPI_Init takes
when using mpd on systems with many nodes.

This is the merge of 4 commits:
r4666 - Merging process mapping code into trunk
r4671 - Fixed srcdir typo in the mpd makefile
r4705 - Prevent mpds from crashing when jobs are launched that don't use all hosts.
r4706 - Multiple fixes for mpd's new process mapping capability.

Files:

• mpich2/branches/release/mpich2-1.1/src/pm/mpd/mpdlib.py (modified) (1 diff)

mpich2/branches/release/mpich2-1.1/src/pm/mpd/mpdlib.py

@@ -480 +480 @@
                     try:
                         mpd_signum = 0
-                        (readyToRecv,unused1,unused2) = select.select([self.sock],[],[],timeout)
+                        if timeout == -1:
+                            # use -1 to indicate indefinite timeout
+                            (readyToRecv,unused1,unused2) = select.select([self.sock],[],[])
+                        else:
+                            (readyToRecv,unused1,unused2) = select.select([self.sock],[],[],timeout)
                         break;
                     except os.error, errinfo: