From a57fd9663b8d0f33cb69642d1bd74b95a88afa10 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Thu, 16 Dec 2021 11:41:56 -0500 Subject: [PATCH 1/3] Simplify handling the default MPI implementation --- deps/build.jl | 40 ++-------------------------------------- 1 file changed, 2 insertions(+), 38 deletions(-) diff --git a/deps/build.jl b/deps/build.jl index 92ed8bf2b..9530e9a23 100644 --- a/deps/build.jl +++ b/deps/build.jl @@ -77,7 +77,8 @@ if update_config end end -binary = get(config, "binary", "") +default_binary = Sys.iswindows() ? "MicrosoftMPI_jll" : "MPICH_jll" +binary = get(config, "binary", default_binary) # 2. generate deps.jl if binary == "system" @@ -131,43 +132,6 @@ if binary == "system" end end -elseif binary == "" - - @info "using default MPI jll" - - if Sys.iswindows() - using MicrosoftMPI_jll - # run(MicrosoftMPI_jll.generate_compile_time_mpi_constants()) - cp("compile_time_mpi_constants_msmpi_$(Sys.ARCH).jl", "compile_time_mpi_constants.jl"; force=true) - else - using MPICH_jll - run(MPICH_jll.generate_compile_time_mpi_constants()) - end - - deps = quote - if Sys.iswindows() - using MicrosoftMPI_jll - const libmpiconstants = MicrosoftMPI_jll.libload_time_mpi_constants - const _mpiexec = MicrosoftMPI_jll.mpiexec - const mpiexec_path = MicrosoftMPI_jll.mpiexec_path - else - using MPICH_jll - const libmpiconstants = MPICH_jll.libload_time_mpi_constants - const _mpiexec = MPICH_jll.mpiexec - const mpiexec_path = MPICH_jll.mpiexec_path - end - - function __init__deps() - if (haskey(ENV, "SLURM_JOBID") || haskey(ENV, "PBS_JOBID") || haskey(ENV, "LSB_JOBID")) && - get(ENV, "JULIA_MPI_CLUSTER_WARN", "") != "n" - @warn """ - You appear to be using MPI.jl with the default MPI binary on a cluster. - We recommend using the system-provided MPI, see the Configuration section of the MPI.jl docs. - """ - end - end - end - elseif binary == "MPICH_jll" @info "using MPICH_jll" From e2b2605e29032e424e1e906f6eca311735ed0da8 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Thu, 16 Dec 2021 11:45:19 -0500 Subject: [PATCH 2/3] Change default MPI from MPICH_jll to MPItrampoline_jll --- deps/build.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/build.jl b/deps/build.jl index 9530e9a23..7cfb0d623 100644 --- a/deps/build.jl +++ b/deps/build.jl @@ -77,7 +77,7 @@ if update_config end end -default_binary = Sys.iswindows() ? "MicrosoftMPI_jll" : "MPICH_jll" +default_binary = Sys.iswindows() ? "MicrosoftMPI_jll" : "MPItrampoline_jll" binary = get(config, "binary", default_binary) # 2. generate deps.jl From 8f2bb2cd9deb7f61a4186bd5ae4dce0f32e06fa5 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Wed, 12 Jan 2022 11:35:30 -0500 Subject: [PATCH 3/3] Correct version to 0.19.3 --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 8492f3ab7..9a6d30c78 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "MPI" uuid = "da04e1cc-30fd-572f-bb4f-1f8673147195" authors = [] -version = "0.19.0" +version = "0.19.3" [deps] Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"