Merge pull request #15 from marius311/redirect

add stdout_to_master/stderr_to_master options, and minor readme fix

Author: simonbyrne

README.md

@@ -91,14 +91,14 @@ mpirun -np 5 julia cman-transport.jl TCP
 
 This launches a total of 5 processes, mpi rank 0 is the julia pid 1. mpi rank 1 is julia pid 2 and so on.
 
-The program must call `MPI.start(TCP_TRANSPORT_ALL)` with argument `TCP_TRANSPORT_ALL`.
+The program must call `MPIClusterManagers.start_main_loop(TCP_TRANSPORT_ALL)` with argument `TCP_TRANSPORT_ALL`.
 On mpi rank 0, it returns a `manager` which can be used with `@mpi_do`
 On other processes (i.e., the workers) the function does not return
 
 
 ### MPIManager: MPI transport - all processes execute MPI code
 
-`MPI.start` must be called with option `MPI_TRANSPORT_ALL` to use MPI as transport.
+`MPIClusterManagers.start_main_loop` must be called with option `MPI_TRANSPORT_ALL` to use MPI as transport.
 ```
 mpirun -np 5 julia cman-transport.jl MPI
 ```

src/mpimanager.jl

@@ -191,14 +191,14 @@ function Distributed.launch(mgr::MPIManager, params::Dict,
 end
 
 # Entry point for MPI worker processes for MPI_ON_WORKERS and TCP_TRANSPORT_ALL
-setup_worker(host, port) = setup_worker(host, port, nothing)
-function setup_worker(host, port, cookie)
+setup_worker(host, port; kwargs...) = setup_worker(host, port, nothing; kwargs...)
+function setup_worker(host, port, cookie; stdout_to_master=true, stderr_to_master=true)
     !MPI.Initialized() && MPI.Init()
     # Connect to the manager
     io = connect(IPv4(host), port)
     wait_connected(io)
-    redirect_stdout(io)
-    redirect_stderr(io)
+    stdout_to_master && redirect_stdout(io)
+    stderr_to_master && redirect_stderr(io)
 
     # Send our MPI rank to the manager
     rank = MPI.Comm_rank(MPI.COMM_WORLD)
@@ -326,7 +326,9 @@ end
 
 # Enter the MPI cluster manager's main loop (does not return on the workers)
 function start_main_loop(mode::TransportMode=TCP_TRANSPORT_ALL;
-                         comm::MPI.Comm=MPI.COMM_WORLD)
+                         comm::MPI.Comm=MPI.COMM_WORLD,
+                         stdout_to_master=true,
+                         stderr_to_master=true)
     !MPI.Initialized() && MPI.Init()
     @assert MPI.Initialized() && !MPI.Finalized()
     if mode == TCP_TRANSPORT_ALL
@@ -359,7 +361,7 @@ function start_main_loop(mode::TransportMode=TCP_TRANSPORT_ALL;
             (obj, status) = MPI.recv(0, 0, comm)
             (host, port, cookie) = obj
             # Call the regular worker entry point
-            setup_worker(host, port, cookie) # does not return
+            setup_worker(host, port, cookie, stdout_to_master=stdout_to_master, stderr_to_master=stderr_to_master) # does not return
         end
     elseif mode == MPI_TRANSPORT_ALL
         comm = MPI.Comm_dup(comm)