Merge pull request #29 from JuliaParallel/sb/mpiflags

add mpiflags and support exeflags

Author: simonbyrne

.github/workflows/CI.yml

@@ -14,7 +14,7 @@ jobs:
       matrix:
         version:
           - '1'
-          - '1.5'
+          - '1.6'
           - 'nightly'
         os:
           - ubuntu-latest

Project.toml

@@ -11,7 +11,7 @@ Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
 
 [compat]
 MPI = "0.14, 0.15, 0.19"
-julia = "1"
+julia = "1.6"
 
 [extras]
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"

src/mpimanager.jl

@@ -121,6 +121,12 @@ function Base.show(io::IO, mgr::MPIManager)
     print(io, "MPI.MPIManager(np=$(mgr.np),launched=$(mgr.launched),mode=$(mgr.mode))")
 end
 
+Distributed.default_addprocs_params(::MPIManager) =
+    merge(Distributed.default_addprocs_params(),
+          Dict{Symbol,Any}(
+                :mpiexec        => nothing,
+                :mpiflags       => ``,
+          ))
 ################################################################################
 # Cluster Manager functionality required by Base, mostly targeting the
 # MPI_ON_WORKERS case
@@ -138,8 +144,9 @@ function Distributed.launch(mgr::MPIManager, params::Dict,
             end
             cookie = string(":cookie_",Distributed.cluster_cookie())
             setup_cmds = `import MPIClusterManagers\;MPIClusterManagers.setup_worker'('$(mgr.ip),$(mgr.port),$cookie')'`
-            MPI.mpiexec() do mpiexec_cmd
-                mpi_cmd = `$mpiexec_cmd -n $(mgr.np) $(params[:exename]) -e $(Base.shell_escape(setup_cmds))`
+            MPI.mpiexec() do mpiexec
+                mpiexec = something(params[:mpiexec], mpiexec)
+                mpi_cmd = `$mpiexec $(params[:mpiflags]) -n $(mgr.np) $(params[:exename]) $(params[:exeflags]) -e $(Base.shell_escape(setup_cmds))`
                 open(detach(mpi_cmd))
             end
             mgr.launched = true