Switch JULIA_MPIEXEC_ARGS back to runtime and apply if JLL is used (#411)

Fixed #410.

Author: simonbyrne

.travis.yml

@@ -32,12 +32,12 @@ env:
   - MPI_IMPL=none
   - MPI_IMPL=none
     JULIA_MPI_BINARY=OpenMPI_jll
-    JULIA_MPIEXEC_TEST_ARGS="--oversubscribe"
+    JULIA_MPIEXEC_ARGS="--oversubscribe"
   - MPI_IMPL=mpich
     JULIA_MPI_BINARY=system
   - MPI_IMPL=openmpi
     JULIA_MPI_BINARY=system
-    JULIA_MPIEXEC_TEST_ARGS="--oversubscribe"
+    JULIA_MPIEXEC_ARGS="--oversubscribe"
   - MPI_IMPL=intelmpi
     JULIA_MPI_BINARY=system
   - MPI_IMPL=mpich
@@ -46,7 +46,7 @@ env:
   - MPI_IMPL=openmpi
     JULIA_MPI_BINARY=system
     JULIA_MPI_ABI=unknown
-    JULIA_MPIEXEC_TEST_ARGS="--oversubscribe"
+    JULIA_MPIEXEC_ARGS="--oversubscribe"
 
 matrix:
   allow_failures: # issue 262

deps/build.jl

@@ -46,10 +46,11 @@ if haskey(ENV, "JULIA_MPIEXEC")
     if ENV["JULIA_MPIEXEC"] == ""
         delete!(config, "mpiexec")
     else
-        config["mpiexec"] = [ENV["JULIA_MPIEXEC"], Base.shell_split(get(ENV, "JULIA_MPIEXEC_ARGS", ""))...]
+        config["mpiexec"] = ENV["JULIA_MPIEXEC"]
     end
     update_config = true
 end
+    
 
 if update_config
     open(config_toml, write=true) do f
@@ -67,7 +68,7 @@ if binary == "system"
         library = ["libmpi", "libmpi_ibm", "msmpi", "libmpich"]
     end
     path    = get(config, "path", "")
-    mpiexec = get(config, "mpiexec", [path == "" ? "mpiexec" : joinpath(path, "bin", "mpiexec")])
+    mpiexec = get(config, "mpiexec", path == "" ? "mpiexec" : joinpath(path, "bin", "mpiexec"))
     abi     = get(config, "abi", "")
 
     const libmpi = find_library(library, path == "" ? [] : [joinpath(path, "lib")])
@@ -117,7 +118,7 @@ if binary == "system"
         const libmpi = $libmpi
         const mpiexec_cmd = $mpiexec_cmd
         const mpiexec_path = mpiexec_cmd[1]
-        mpiexec(fn) = fn(mpiexec_cmd)
+        _mpiexec(fn) = fn(mpiexec_cmd)
         $abi_incl
 
         using Requires
@@ -141,12 +142,12 @@ elseif binary == ""
     deps = quote
         if Sys.iswindows()
             using MicrosoftMPI_jll
-            const mpiexec = MicrosoftMPI_jll.mpiexec
+            const _mpiexec = MicrosoftMPI_jll.mpiexec
             const mpiexec_path = MicrosoftMPI_jll.mpiexec_path
             include("consts_microsoftmpi.jl")
         else
             using MPICH_jll
-            const mpiexec = MPICH_jll.mpiexec
+            const _mpiexec = MPICH_jll.mpiexec
             const mpiexec_path = MPICH_jll.mpiexec_path
             include("consts_mpich.jl")
         end
@@ -166,7 +167,7 @@ elseif binary ==  "MPICH_jll"
     deps = quote
         using MPICH_jll
         include("consts_mpich.jl")
-        const mpiexec = MPICH_jll.mpiexec
+        const _mpiexec = MPICH_jll.mpiexec
         const mpiexec_path = MPICH_jll.mpiexec_path
         __init__deps() = nothing
     end
@@ -175,7 +176,7 @@ elseif binary ==  "OpenMPI_jll"
     deps = quote
         using OpenMPI_jll
         include("consts_openmpi.jl")
-        const mpiexec = OpenMPI_jll.mpiexec
+        const _mpiexec = OpenMPI_jll.mpiexec
         const mpiexec_path = OpenMPI_jll.mpiexec_path
 
         function __init__deps()
@@ -190,7 +191,7 @@ elseif binary ==  "MicrosoftMPI_jll"
     deps = quote
         using MicrosoftMPI_jll
         include("consts_microsoftmpi.jl")
-        const mpiexec = MicrosoftMPI_jll.mpiexec
+        const _mpiexec = MicrosoftMPI_jll.mpiexec
         const mpiexec_path = MicrosoftMPI_jll.mpiexec_path
 
         __init__deps() = nothing

src/environment.jl

@@ -8,8 +8,9 @@ A wrapper function for the MPI launcher executable. Calls `fn(cmd)`, where `cmd`
 The behaviour of `mpiexec` can be controlled by the following environment variables:
 
 - `JULIA_MPIEXEC`: the name or path of the launcher executable (set at compile time).
-- `JULIA_MPIEXEC_ARGS`: additional arguments that are passed to the launcher. These are space seperated, supporting the same quoting rules as
-  Julia `Cmd` objects. These can be modified at run time.
+- `JULIA_MPIEXEC_ARGS`: additional arguments that are passed to the launcher. These are
+  space seperated, supporting the same quoting rules as Julia `Cmd` objects. These can be
+  modified at run time.
 
 # Usage
 
@@ -20,8 +21,9 @@ hello world
 hello world
 ```
 """
-mpiexec
-
+function mpiexec(fn)
+    _mpiexec(cmd -> fn(`$cmd $(Base.shell_split(get(ENV, "JULIA_MPIEXEC_ARGS", "")))`))
+end
 
 const REFCOUNT = Threads.Atomic{Int}(-1)
 

test/runtests.jl

@@ -15,19 +15,16 @@ if Sys.isunix()
     include("mpiexecjl.jl")
 end
 
-mpiexec_args = Base.shell_split(get(ENV, "JULIA_MPIEXEC_TEST_ARGS", ""))
-
 nprocs_str = get(ENV, "JULIA_MPI_TEST_NPROCS","")
 nprocs = nprocs_str == "" ? clamp(Sys.CPU_THREADS, 2, 4) : parse(Int, nprocs_str)
 testdir = @__DIR__
 istest(f) = endswith(f, ".jl") && startswith(f, "test_")
 testfiles = sort(filter(istest, readdir(testdir)))
 
-@info "Running MPI tests" ArrayType nprocs mpiexec_args
+@info "Running MPI tests" ArrayType nprocs
 
 @testset "$f" for f in testfiles
     mpiexec() do cmd
-        cmd = `$cmd $mpiexec_args`
         if f == "test_spawn.jl"
             run(`$cmd -n 1 $(Base.julia_cmd()) $(joinpath(testdir, f))`)
         elseif f == "test_threads.jl"