Support MPIABI

Author: eschnett

src/api/api.jl

@@ -8,18 +8,21 @@ export MPI_Aint, MPI_Count, MPI_Offset, MPI_Status,
 import MPIPreferences
 using Libdl
 
-if MPIPreferences.binary == "MPICH_jll"
-    import MPICH_jll: MPICH_jll, libmpi, libmpi_handle, mpiexec
-    const libmpiconstants = nothing
-elseif MPIPreferences.binary == "OpenMPI_jll"
-    import OpenMPI_jll: OpenMPI_jll, libmpi, libmpi_handle, mpiexec
+if MPIPreferences.binary == "MPIABI_jll"
+    import MPIABI_jll: MPIABI_jll, libmpi, libmpi_handle, mpiexec
     const libmpiconstants = nothing
-elseif MPIPreferences.binary == "MicrosoftMPI_jll"
-    import MicrosoftMPI_jll: MicrosoftMPI_jll, libmpi, libmpi_handle, mpiexec
+elseif MPIPreferences.binary == "MPICH_jll"
+    import MPICH_jll: MPICH_jll, libmpi, libmpi_handle, mpiexec
     const libmpiconstants = nothing
 elseif MPIPreferences.binary == "MPItrampoline_jll"
     import MPItrampoline_jll: MPItrampoline_jll, libmpi, libmpi_handle, mpiexec
     const libmpiconstants = MPItrampoline_jll.libload_time_mpi_constants_path
+elseif MPIPreferences.binary == "MicrosoftMPI_jll"
+    import MicrosoftMPI_jll: MicrosoftMPI_jll, libmpi, libmpi_handle, mpiexec
+    const libmpiconstants = nothing
+elseif MPIPreferences.binary == "OpenMPI_jll"
+    import OpenMPI_jll: OpenMPI_jll, libmpi, libmpi_handle, mpiexec
+    const libmpiconstants = nothing
 elseif MPIPreferences.binary == "system"
     import MPIPreferences.System: libmpi, libmpi_handle, mpiexec
     const libmpiconstants = nothing
@@ -33,7 +36,7 @@ const initexprs = Any[]
 """
     @const_ref name T expr
 
-Defines an constant binding
+Defines a constant binding
 ```julia
 const name = Ref{T}()
 ```
@@ -48,14 +51,16 @@ macro const_ref(name, T, expr)
     :(const $(esc(name)) = Ref{$T}())
 end
 
-@static if MPIPreferences.abi == "MPICH"
+@static if MPIPreferences.abi == "MPIABI"
+    include("mpiabi.jl")
+elseif MPIPreferences.abi == "MPICH"
     include("mpich.jl")
-elseif MPIPreferences.abi == "OpenMPI"
-    include("openmpi.jl")
-elseif MPIPreferences.abi == "MicrosoftMPI"
-    include("microsoftmpi.jl")
 elseif MPIPreferences.abi == "MPItrampoline"
     include("mpitrampoline.jl")
+elseif MPIPreferences.abi == "MicrosoftMPI"
+    include("microsoftmpi.jl")
+elseif MPIPreferences.abi == "OpenMPI"
+    include("openmpi.jl")
 elseif MPIPreferences.abi == "HPE MPT"
     include("mpt.jl")
 else

src/implementations.jl

@@ -98,14 +98,16 @@ function versioninfo(io::IO=stdout)
     println(io, "Package versions")
     println(io, "  MPI.jl:             ", PkgVersion.@Version)
     println(io, "  MPIPreferences.jl:  ", PkgVersion.Version(MPIPreferences))
-    if MPIPreferences.binary == "MPICH_jll"
+    if MPIPreferences.binary == "MPIABI_jll"
+        println(io, "  MPIABI_jll:          ", PkgVersion.Version(API.MPICH_jll))
+    elseif MPIPreferences.binary == "MPICH_jll"
         println(io, "  MPICH_jll:          ", PkgVersion.Version(API.MPICH_jll))
-    elseif MPIPreferences.binary == "OpenMPI_jll"
-        println(io, "  OpenMPI_jll:        ", PkgVersion.Version(API.OpenMPI_jll))
-    elseif MPIPreferences.binary == "MicrosoftMPI_jll"
-        println(io, "  MicrosoftMPI_jll:   ", PkgVersion.Version(API.MicrosoftMPI_jll))
     elseif MPIPreferences.binary == "MPItrampoline_jll"
         println(io, "  MPItrampoline_jll   ", PkgVersion.Version(API.MPItrampoline_jll))
+    elseif MPIPreferences.binary == "MicrosoftMPI_jll"
+        println(io, "  MicrosoftMPI_jll:   ", PkgVersion.Version(API.MicrosoftMPI_jll))
+    elseif MPIPreferences.binary == "OpenMPI_jll"
+        println(io, "  OpenMPI_jll:        ", PkgVersion.Version(API.OpenMPI_jll))
     end
 
     println(io)