fix tests

Author: simonbyrne

.github/workflows/UnitTests.yml

@@ -90,23 +90,15 @@ jobs:
       with:
         version: ${{ matrix.julia_version }}
 
-    # https://discourse.julialang.org/t/recommendation-cache-julia-artifacts-in-ci-services/35484
-    - name: Cache artifacts
-      uses: actions/cache@v1
-      env:
-        cache-name: cache-artifacts
-      with:
-        path: ~/.julia/artifacts
-        key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
-        restore-keys: |
-          ${{ runner.os }}-test-${{ env.cache-name }}-
-          ${{ runner.os }}-test-
-          ${{ runner.os }}-
+    - uses: julia-actions/cache@v1
 
-    - name: "add MPIPreferences"
-      run: julia --project -e 'using Pkg; Pkg.develop(path="lib/MPIPreferences")'
-    - name: "Use system binary"
-      run: julia --project -e 'using MPIPreferences; MPIPreferences.use_system_binary()'
+    - name: add MPIPreferences, use system
+      shell: julia --color=yes --project=test {0}
+      run: |
+        using Pkg
+        Pkg.develop(path="lib/MPIPreferences")
+        using MPIPreferences
+        MPIPreferences.use_system_binary(export_prefs=true)
     - uses: julia-actions/julia-buildpkg@latest
     - uses: julia-actions/julia-runtest@latest
       env:
@@ -153,16 +145,14 @@ jobs:
 
     - uses: julia-actions/cache@v1
 
-    - name: add MPIPreferences
-      shell: julia --color=yes --project=. {0}
+    - name: add MPIPreferences, use system
+      shell: julia --color=yes --project=test {0}
       run: |
         using Pkg
         Pkg.develop(path="lib/MPIPreferences")
-    - name: Use system binary
-      shell: julia --color=yes --project=. {0}
-      run: |
         using MPIPreferences
-        MPIPreferences.use_system_binary()
+        MPIPreferences.use_system_binary(export_prefs=true)
+
     - uses: julia-actions/julia-buildpkg@latest
     - uses: julia-actions/julia-runtest@latest
 
@@ -221,18 +211,7 @@ jobs:
       with:
         version: ${{ matrix.julia_version }}
 
-    # https://discourse.julialang.org/t/recommendation-cache-julia-artifacts-in-ci-services/35484
-    - name: Cache artifacts
-      uses: actions/cache@v1
-      env:
-        cache-name: cache-artifacts
-      with:
-        path: ~/.julia/artifacts
-        key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
-        restore-keys: |
-          ${{ runner.os }}-test-${{ env.cache-name }}-
-          ${{ runner.os }}-test-
-          ${{ runner.os }}-
+    - uses: julia-actions/cache@v1
 
     # we can't use the usual actions here as we need to ensure the environment variables are set
     - name: "Build package"

Project.toml

@@ -22,11 +22,3 @@ Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
 DocStringExtensions = "0.8"
 Requires = "~0.5, 1.0"
 julia = "1.6"
-
-[extras]
-CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
-DoubleFloats = "497a8b3b-efae-58df-a0af-a86822472b78"
-Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
-
-[targets]
-test = ["CUDA", "DoubleFloats", "Test"]

lib/MPIPreferences/src/MPIPreferences.jl

@@ -13,7 +13,7 @@ elseif binary == "MPICH_jll"
 elseif binary == "OpenMPI_jll"
     "OpenMPI"
 elseif binary == "MPItrampoline_jll"
-    "MPItrampoline"
+    "MPIwrapper"
 else
     error("Unknown binary: $binary")
 end
@@ -26,21 +26,25 @@ module System
     mpiexec(f) = f(`$mpiexec_path`)
 end
 
-function use_jll_binary(binary = Sys.iswindows() ? "MicrosoftMPI_jll" : "MPICH_jll")
+function use_jll_binary(binary = Sys.iswindows() ? "MicrosoftMPI_jll" : "MPICH_jll";export_prefs=false, force=true)
     binary in ["MicrosoftMPI_jll", "MPICH_jll", "OpenMPI_jll", "MPItrampoline_jll"] ||
         error("Unknown jll: $binary")
-    @set_preferences!(
+    set_preferences!(MPIPreferences,
         "binary" => binary,
         "libmpi" => nothing,
         "abi" => nothing,
-        "mpiexec" => nothing
+        "mpiexec" => nothing;
+        export_prefs=export_prefs,
+        force=force
     )
 end
 
 function use_system_binary(;
         library=["libmpi", "libmpi_ibm", "msmpi", "libmpich", "libmpitrampoline"],
         mpiexec="mpiexec",
         abi=nothing,
+        export_prefs=false,
+        force=true,
     )
 
     libmpi = find_library(library)
@@ -53,11 +57,13 @@ function use_system_binary(;
     if mpiexec isa Cmd
         mpiexec = collect(mpiexec)
     end
-    @set_preferences!(
+    set_preferences!(MPIPreferences,
         "binary" => "system",
         "libmpi" => libmpi,
         "abi" => abi,
         "mpiexec" => mpiexec,
+        export_prefs=export_prefs,
+        force=force
     )
 end
 
@@ -142,6 +148,12 @@ function identify_abi(libmpi)
         if (m = match(r"^FUJITSU MPI Library (\d+.\d+.\d+)", version_string)) !== nothing
             version = VersionNumber(m.captures[1])
         end
+    elseif startswith(version_string, "MPIwrapper")
+        impl = "MPIwrapper"
+        # MPIwrapper 2.2.2
+        if (m = match(r"^MPIwrapper Version:\t(\d+.\d+.\d+\w*)", version_string)) !== nothing
+            version = VersionNumber(m.captures[1])
+        end
     end
     # 3) determine the abi from the implementation + version
     if (impl == "MPICH" && version >= v"3.1" ||
@@ -154,6 +166,8 @@ function identify_abi(libmpi)
         abi = "OpenMPI"
     elseif impl == "MicrosoftMPI"
         abi = "MicrosoftMPI"
+    elseif impl == "MPIwrapper"
+        abi = "MPIwrapper"
     else
         abi = "unknown"
     end

src/MPI.jl

@@ -42,6 +42,9 @@ elseif MPIPreferences.binary == "OpenMPI_jll"
     import OpenMPI_jll: libmpi, mpiexec
 elseif MPIPreferences.binary == "MicrosoftMPI_jll"
     import MicrosoftMPI_jll: libmpi, mpiexec
+elseif MPIPreferences.binary == "MPItrampoline_jll"
+    import MPItrampoline_jll: libmpi, mpiexec
+    const libmpiconstants = MPItrampoline_jll.libload_time_mpi_constants_path
 else
     error("Unknown MPI binary: $(MPIPreferences.binary)")
 end

src/consts/consts.jl

@@ -33,8 +33,8 @@ elseif MPIPreferences.abi == "OpenMPI"
     include("openmpi.jl")
 elseif MPIPreferences.abi == "MicrosofMPI"
     include("microsoftmpi.jl")
-elseif MPIPreferences.abi == "MPItrampoline"
-    include("mpitrampoline.jl")
+elseif MPIPreferences.abi == "MPIwrapper"
+    include("mpiwrapper.jl")
 else
     error("Unknown MPI ABI")
 end

test/Project.toml

@@ -0,0 +1,5 @@
+[deps]
+CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
+DoubleFloats = "497a8b3b-efae-58df-a0af-a86822472b78"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+MPIPreferences = "3da0fdf6-3ccc-4f1b-acd9-58baa6c99267"

test/runtests.jl

@@ -1,5 +1,9 @@
 using Test, MPI
 
+using MPIPreferences
+
+@show MPIPreferences.abi MPIPreferences.binary
+
 # load test packages to trigger precompilation
 using DoubleFloats
 if get(ENV, "JULIA_MPI_TEST_ARRAYTYPE", "") == "CuArray"