Skip to content

Commit 3e52a3a

Browse files
committed
a few misc fixes
1 parent b400fb6 commit 3e52a3a

File tree

3 files changed

+19
-18
lines changed

3 files changed

+19
-18
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![Docs latest](https://img.shields.io/badge/docs-latest-blue.svg)](https://juliaparallel.github.io/MPI.jl/latest/)
44
[![Docs stable](https://img.shields.io/badge/docs-stable-blue.svg)](https://juliaparallel.github.io/MPI.jl/stable/)
5-
[![Build Status](https://travis-ci.org/JuliaParallel/MPI.jl.svg?branch=master)](https://travis-ci.org/JuliaParallel/MPI.jl)
5+
[![Build Status](https://travis-ci.com/JuliaParallel/MPI.jl.svg?branch=master)](https://travis-ci.com/JuliaParallel/MPI.jl)
66
[![Build status](https://ci.appveyor.com/api/projects/status/e8mr8rx8sjryyba6/branch/master?svg=true)](https://ci.appveyor.com/project/eschnett/mpi-jl/branch/master)
77
[![Build status](https://gitlab.com/JuliaGPU/MPI.jl/badges/master/pipeline.svg)](https://gitlab.com/JuliaGPU/MPI.jl/pipelines)
88
[![codecov.io](https://codecov.io/github/JuliaParallel/MPI.jl/coverage.svg?branch=master)](https://codecov.io/github/JuliaParallel/MPI.jl?branch=master)

deps/build.jl

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ if binary == "system"
8080

8181
_doc_external(fname) = ""
8282
include(joinpath("..","src","implementations.jl"))
83-
83+
8484
if abi === ""
8585
# 3. check ABI
8686
impl, version = identify_implementation()
@@ -95,6 +95,9 @@ if binary == "system"
9595
else
9696
abi = "unknown"
9797
end
98+
@info "MPI implementation detected" impl version abi
99+
else
100+
@info "MPI implementation config" abi
98101
end
99102
if abi == "MPICH"
100103
abi_incl = :(include("consts_mpich.jl"))
@@ -136,9 +139,13 @@ elseif binary == ""
136139
deps = quote
137140
if Sys.iswindows()
138141
using MicrosoftMPI_jll
142+
const mpiexec = MicrosoftMPI_jll.mpiexec
143+
const mpiexec_path = MicrosoftMPI_jll.mpiexec_path
139144
include("consts_microsoftmpi.jl")
140145
else
141146
using MPICH_jll
147+
const mpiexec = MPICH_jll.mpiexec
148+
const mpiexec_path = MPICH_jll.mpiexec_path
142149
include("consts_mpich.jl")
143150
end
144151

@@ -157,13 +164,17 @@ elseif binary == "MPICH_jll"
157164
deps = quote
158165
using MPICH_jll
159166
include("consts_mpich.jl")
167+
const mpiexec = MPICH_jll.mpiexec
168+
const mpiexec_path = MPICH_jll.mpiexec_path
160169
__init__deps() = nothing
161170
end
162171
elseif binary == "OpenMPI_jll"
163172
@info "using OpenMPI_jll"
164173
deps = quote
165174
using OpenMPI_jll
166175
include("consts_openmpi.jl")
176+
const mpiexec = OpenMPI_jll.mpiexec
177+
const mpiexec_path = OpenMPI_jll.mpiexec_path
167178

168179
function __init__deps()
169180
# Required for OpenMPI relocateable binaries
@@ -177,6 +188,9 @@ elseif binary == "MicrosoftMPI_jll"
177188
deps = quote
178189
using MicrosoftMPI_jll
179190
include("consts_microsoftmpi.jl")
191+
const mpiexec = MicrosoftMPI_jll.mpiexec
192+
const mpiexec_path = MicrosoftMPI_jll.mpiexec_path
193+
180194
__init__deps() = nothing
181195
end
182196
else

test/runtests.jl

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,8 @@ end
88

99
args = Base.shell_split(get(ENV, "JULIA_MPIEXEC_TEST_ARGS", ""))
1010

11-
12-
# Code coverage command line options; must correspond to src/julia.h
13-
# and src/ui/repl.c
14-
const JL_LOG_NONE = 0
15-
const JL_LOG_USER = 1
16-
const JL_LOG_ALL = 2
17-
const coverage_opts =
18-
Dict{Int, String}(JL_LOG_NONE => "none",
19-
JL_LOG_USER => "user",
20-
JL_LOG_ALL => "all")
21-
2211
function runtests()
2312
nprocs = clamp(Sys.CPU_THREADS, 2, 4)
24-
exename = joinpath(Sys.BINDIR, Base.julia_exename())
2513
testdir = dirname(@__FILE__)
2614
istest(f) = endswith(f, ".jl") && startswith(f, "test_")
2715
testfiles = sort(filter(istest, readdir(testdir)))
@@ -30,17 +18,16 @@ function runtests()
3018
printstyled("Running MPI.jl tests\n"; color=:white)
3119

3220
for f in testfiles
33-
coverage_opt = coverage_opts[Base.JLOptions().code_coverage]
3421
mpiexec() do cmd
3522
cmd = `$cmd $args`
3623
if f == "test_spawn.jl"
37-
run(`$cmd -n 1 $exename --code-coverage=$coverage_opt $(joinpath(testdir, f))`)
24+
run(`$cmd -n 1 $(Base.julia_cmd()) $(joinpath(testdir, f))`)
3825
elseif f == "test_threads.jl"
3926
withenv("JULIA_NUM_THREAD" => "4") do
40-
run(`$cmd -n $nprocs $exename --code-coverage=$coverage_opt $(joinpath(testdir, f))`)
27+
run(`$cmd -n $nprocs $(Base.julia_cmd()) $(joinpath(testdir, f))`)
4128
end
4229
else
43-
run(`$cmd -n $nprocs $exename --code-coverage=$coverage_opt $(joinpath(testdir, f))`)
30+
run(`$cmd -n $nprocs $(Base.julia_cmd()) $(joinpath(testdir, f))`)
4431
end
4532
end
4633
Base.with_output_color(:green,stdout) do io

0 commit comments

Comments
 (0)