Rename ABI from MPIwrapper to MPItrampoline (#549)

JuliaParallel · Apr 14, 2022 · 3b8963c · 3b8963c · vchuravy · Apr 14, 2022
1 parent 890ee6e
commit 3b8963c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/UnitTests.yml b/.github/workflows/UnitTests.yml
@@ -356,7 +356,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     env:
       JULIA_MPI_TEST_BINARY: MPItrampoline_jll
-      JULIA_MPI_TEST_ABI: MPIwrapper
+      JULIA_MPI_TEST_ABI: MPItrampoline
 
     steps:
     - name: Checkout
@@ -407,7 +407,7 @@ jobs:
 
     env:
       JULIA_MPI_TEST_BINARY: MPItrampoline_jll
-      JULIA_MPI_TEST_ABI: MPIwrapper
+      JULIA_MPI_TEST_ABI: MPItrampoline
       MPITRAMPOLINE_LIB: /usr/local/lib/libmpiwrapper.so
       MPITRAMPOLINE_MPIEXEC: /usr/bin/mpiexec
       OMPI_MCA_btl_base_warn_component_unused: 0

diff --git a/lib/MPIPreferences/src/MPIPreferences.jl b/lib/MPIPreferences/src/MPIPreferences.jl
@@ -13,7 +13,7 @@ elseif binary == "MPICH_jll"
 elseif binary == "OpenMPI_jll"
     "OpenMPI"
 elseif binary == "MPItrampoline_jll"
-    "MPIwrapper"
+    "MPItrampoline"
 else
     error("Unknown binary: $binary")
 end
@@ -168,7 +168,7 @@ function identify_abi(libmpi)
     elseif impl == "MicrosoftMPI"
         abi = "MicrosoftMPI"
     elseif impl == "MPIwrapper"
-        abi = "MPIwrapper"
+        abi = "MPItrampoline"
     else
         abi = "unknown"
     end

diff --git a/src/consts/consts.jl b/src/consts/consts.jl
@@ -33,8 +33,8 @@ elseif MPIPreferences.abi == "OpenMPI"
     include("openmpi.jl")
 elseif MPIPreferences.abi == "MicrosoftMPI"
     include("microsoftmpi.jl")
-elseif MPIPreferences.abi == "MPIwrapper"
-    include("mpiwrapper.jl")
+elseif MPIPreferences.abi == "MPItrampoline"
+    include("mpitrampoline.jl")
 else
     error("Unknown MPI ABI $(MPIPreferences.abi)")
 end

diff --git a/src/consts/mpiwrapper.jl → src/consts/mpitrampoline.jl b/src/consts/mpiwrapper.jl → src/consts/mpitrampoline.jl