Author: bugman
Date: Sun Oct 27 14:45:25 2013
New Revision: 21246
URL: http://svn.gna.org/viewcvs/relax?rev=21246&view=rev
Log:
Merged revisions 21245 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r21245 | bugman | 2013-10-27 14:39:57 +0100 (Sun, 27 Oct 2013) | 6 lines
Fix for bug #21233 (https://gna.org/bugs/?21233) - the missing mpi4py
multi-processor messages.
When multiple commands were being sent to one slave, the captured IO was
being overwritten by each
executed command. Therefore the slave would only return the printouts from
the last command.
........
Modified:
branches/relax_disp/ (props changed)
branches/relax_disp/multi/processor.py
Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Oct 27 14:45:25 2013
@@ -1,1 +1,1 @@
-/trunk:1-21187
+/trunk:1-21245
Modified: branches/relax_disp/multi/processor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/multi/processor.py?rev=21246&r1=21245&r2=21246&view=diff
==============================================================================
--- branches/relax_disp/multi/processor.py (original)
+++ branches/relax_disp/multi/processor.py Sun Oct 27 14:45:25 2013
@@ -525,19 +525,19 @@
else:
self.result_list = None
+ # Capture the standard IO streams for the slaves.
+ self.stdio_capture()
+
# Execute each command, one by one.
for i, command in enumerate(commands):
- # Capture the standard IO streams for the slaves.
- self.stdio_capture()
-
# Set the completed flag if this is the last command.
completed = (i == len(commands)-1)
# Execute the calculation.
command.run(self, completed)
- # Restore the IO.
- self.stdio_restore()
+ # Restore the IO.
+ self.stdio_restore()
# Process the batched results.
if self.batched_returns:
r21246 - in /branches/relax_disp: ./ multi/processor.py