@@ -46,10 +46,11 @@ if haskey(ENV, "JULIA_MPIEXEC")
46
46
if ENV [" JULIA_MPIEXEC" ] == " "
47
47
delete! (config, " mpiexec" )
48
48
else
49
- config[" mpiexec" ] = [ ENV [" JULIA_MPIEXEC" ], Base . shell_split ( get ( ENV , " JULIA_MPIEXEC_ARGS " , " " )) ... ]
49
+ config[" mpiexec" ] = ENV [" JULIA_MPIEXEC" ]
50
50
end
51
51
update_config = true
52
52
end
53
+
53
54
54
55
if update_config
55
56
open (config_toml, write= true ) do f
@@ -67,7 +68,7 @@ if binary == "system"
67
68
library = [" libmpi" , " libmpi_ibm" , " msmpi" , " libmpich" ]
68
69
end
69
70
path = get (config, " path" , " " )
70
- mpiexec = get (config, " mpiexec" , [ path == " " ? " mpiexec" : joinpath (path, " bin" , " mpiexec" )] )
71
+ mpiexec = get (config, " mpiexec" , path == " " ? " mpiexec" : joinpath (path, " bin" , " mpiexec" ))
71
72
abi = get (config, " abi" , " " )
72
73
73
74
const libmpi = find_library (library, path == " " ? [] : [joinpath (path, " lib" )])
@@ -117,7 +118,7 @@ if binary == "system"
117
118
const libmpi = $ libmpi
118
119
const mpiexec_cmd = $ mpiexec_cmd
119
120
const mpiexec_path = mpiexec_cmd[1 ]
120
- mpiexec (fn) = fn (mpiexec_cmd)
121
+ _mpiexec (fn) = fn (mpiexec_cmd)
121
122
$ abi_incl
122
123
123
124
using Requires
@@ -141,12 +142,12 @@ elseif binary == ""
141
142
deps = quote
142
143
if Sys. iswindows ()
143
144
using MicrosoftMPI_jll
144
- const mpiexec = MicrosoftMPI_jll. mpiexec
145
+ const _mpiexec = MicrosoftMPI_jll. mpiexec
145
146
const mpiexec_path = MicrosoftMPI_jll. mpiexec_path
146
147
include (" consts_microsoftmpi.jl" )
147
148
else
148
149
using MPICH_jll
149
- const mpiexec = MPICH_jll. mpiexec
150
+ const _mpiexec = MPICH_jll. mpiexec
150
151
const mpiexec_path = MPICH_jll. mpiexec_path
151
152
include (" consts_mpich.jl" )
152
153
end
@@ -166,7 +167,7 @@ elseif binary == "MPICH_jll"
166
167
deps = quote
167
168
using MPICH_jll
168
169
include (" consts_mpich.jl" )
169
- const mpiexec = MPICH_jll. mpiexec
170
+ const _mpiexec = MPICH_jll. mpiexec
170
171
const mpiexec_path = MPICH_jll. mpiexec_path
171
172
__init__deps () = nothing
172
173
end
@@ -175,7 +176,7 @@ elseif binary == "OpenMPI_jll"
175
176
deps = quote
176
177
using OpenMPI_jll
177
178
include (" consts_openmpi.jl" )
178
- const mpiexec = OpenMPI_jll. mpiexec
179
+ const _mpiexec = OpenMPI_jll. mpiexec
179
180
const mpiexec_path = OpenMPI_jll. mpiexec_path
180
181
181
182
function __init__deps ()
@@ -190,7 +191,7 @@ elseif binary == "MicrosoftMPI_jll"
190
191
deps = quote
191
192
using MicrosoftMPI_jll
192
193
include (" consts_microsoftmpi.jl" )
193
- const mpiexec = MicrosoftMPI_jll. mpiexec
194
+ const _mpiexec = MicrosoftMPI_jll. mpiexec
194
195
const mpiexec_path = MicrosoftMPI_jll. mpiexec_path
195
196
196
197
__init__deps () = nothing
0 commit comments