Skip to content

Commit 6e1d132

Browse files
committed
Fix mpi tests with project directory
1 parent c04e714 commit 6e1d132

File tree

2 files changed

+32
-8
lines changed

2 files changed

+32
-8
lines changed

test/core/test_halo_exchange.jl

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,10 @@ end
316316
@test dh.chunk.storage.b_int[:,3:4] ≈ randbint[:,1:2]
317317
end
318318
"""
319-
cmd = `$(Peridynamics.MPI.mpiexec()) -n 2 $(Base.julia_cmd()) --project -e $(mpi_cmd)`
319+
mpiexec = Peridynamics.MPI.mpiexec()
320+
jlcmd = Base.julia_cmd()
321+
pdir = normpath(joinpath(@__DIR__, "..", ".."))
322+
cmd = `$(mpiexec) -n 2 $(jlcmd) --project=$(pdir) -e $(mpi_cmd)`
320323
@test success(cmd) # does not print anything
321324
# for debugging use the run command:
322325
# run(cmd)
@@ -363,7 +366,10 @@ end
363366
@test dh.chunk.storage.position[:,1:2] ≈ position[:,1:2] + randpos[:,3:4]
364367
end
365368
"""
366-
cmd = `$(Peridynamics.MPI.mpiexec()) -n 2 $(Base.julia_cmd()) --project -e $(mpi_cmd)`
369+
mpiexec = Peridynamics.MPI.mpiexec()
370+
jlcmd = Base.julia_cmd()
371+
pdir = normpath(joinpath(@__DIR__, "..", ".."))
372+
cmd = `$(mpiexec) -n 2 $(jlcmd) --project=$(pdir) -e $(mpi_cmd)`
367373
@test success(cmd) # does not print anything
368374
# for debugging use the run command:
369375
# run(cmd)

test/integration/mpi_threads_comparison.jl

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,10 @@
4747
end
4848
sim_bb(30, "$path_mpi")
4949
"""
50-
run(`$(Peridynamics.MPI.mpiexec()) -n 2 $(Base.julia_cmd()) --project -e $(mpi_cmd)`)
50+
mpiexec = Peridynamics.MPI.mpiexec()
51+
jlcmd = Base.julia_cmd()
52+
pdir = normpath(joinpath(@__DIR__, "..", ".."))
53+
run(`$(mpiexec) -n 2 $(jlcmd) --project=$(pdir) -e $(mpi_cmd)`)
5154

5255
@test isdir(path_threads_vtk)
5356
@test isdir(path_mpi_vtk)
@@ -112,7 +115,10 @@ end
112115
end
113116
sim_bb(30, "$path_mpi")
114117
"""
115-
run(`$(Peridynamics.MPI.mpiexec()) -n 2 $(Base.julia_cmd()) --project -e $(mpi_cmd)`)
118+
mpiexec = Peridynamics.MPI.mpiexec()
119+
jlcmd = Base.julia_cmd()
120+
pdir = normpath(joinpath(@__DIR__, "..", ".."))
121+
run(`$(mpiexec) -n 2 $(jlcmd) --project=$(pdir) -e $(mpi_cmd)`)
116122

117123
@test isdir(path_threads_vtk)
118124
@test isdir(path_mpi_vtk)
@@ -182,7 +188,10 @@ end
182188
end
183189
sim_bb(30, "$path_mpi")
184190
"""
185-
run(`$(Peridynamics.MPI.mpiexec()) -n 2 $(Base.julia_cmd()) --project -e $(mpi_cmd)`)
191+
mpiexec = Peridynamics.MPI.mpiexec()
192+
jlcmd = Base.julia_cmd()
193+
pdir = normpath(joinpath(@__DIR__, "..", ".."))
194+
run(`$(mpiexec) -n 2 $(jlcmd) --project=$(pdir) -e $(mpi_cmd)`)
186195

187196
@test isdir(path_threads_vtk)
188197
@test isdir(path_mpi_vtk)
@@ -247,7 +256,10 @@ end
247256
end
248257
sim_osb(30, "$path_mpi")
249258
"""
250-
run(`$(Peridynamics.MPI.mpiexec()) -n 2 $(Base.julia_cmd()) --project -e $(mpi_cmd)`)
259+
mpiexec = Peridynamics.MPI.mpiexec()
260+
jlcmd = Base.julia_cmd()
261+
pdir = normpath(joinpath(@__DIR__, "..", ".."))
262+
run(`$(mpiexec) -n 2 $(jlcmd) --project=$(pdir) -e $(mpi_cmd)`)
251263

252264
@test isdir(path_threads_vtk)
253265
@test isdir(path_mpi_vtk)
@@ -312,7 +324,10 @@ end
312324
end
313325
sim_cc(30, "$path_mpi")
314326
"""
315-
run(`$(Peridynamics.MPI.mpiexec()) -n 2 $(Base.julia_cmd()) --project -e $(mpi_cmd)`)
327+
mpiexec = Peridynamics.MPI.mpiexec()
328+
jlcmd = Base.julia_cmd()
329+
pdir = normpath(joinpath(@__DIR__, "..", ".."))
330+
run(`$(mpiexec) -n 2 $(jlcmd) --project=$(pdir) -e $(mpi_cmd)`)
316331

317332
@test isdir(path_threads_vtk)
318333
@test isdir(path_mpi_vtk)
@@ -378,7 +393,10 @@ end
378393
end
379394
sim_bac(30, "$path_mpi")
380395
"""
381-
run(`$(Peridynamics.MPI.mpiexec()) -n 2 $(Base.julia_cmd()) --project -e $(mpi_cmd)`)
396+
mpiexec = Peridynamics.MPI.mpiexec()
397+
jlcmd = Base.julia_cmd()
398+
pdir = normpath(joinpath(@__DIR__, "..", ".."))
399+
run(`$(mpiexec) -n 2 $(jlcmd) --project=$(pdir) -e $(mpi_cmd)`)
382400

383401
@test isdir(path_threads_vtk)
384402
@test isdir(path_mpi_vtk)

0 commit comments

Comments
 (0)