Skip to content

Commit 54ebccb

Browse files
committed
fix MPItrampoline
1 parent 926342b commit 54ebccb

File tree

1 file changed

+17
-3
lines changed

1 file changed

+17
-3
lines changed

.github/workflows/UnitTests.yml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ jobs:
6464
julia_arch: x86
6565

6666
fail-fast: false
67+
env:
68+
JULIA_MPI_TEST_BINARY: OpenMPI_jll
69+
JULIA_MPI_TEST_ABI: OpenMPI
6770

6871
runs-on: ${{ matrix.os }}
6972

@@ -107,6 +110,8 @@ jobs:
107110
fail-fast: false
108111

109112
runs-on: macos-latest
113+
env:
114+
JULIA_MPI_TEST_BINARY: system
110115

111116
steps:
112117
- name: Checkout
@@ -158,8 +163,7 @@ jobs:
158163
runs-on: ubuntu-20.04
159164

160165
env:
161-
JULIA_MPI_BINARY: system
162-
JULIA_MPI_PATH: /usr
166+
JULIA_MPI_TEST_BINARY: system
163167
OMPI_MCA_btl_base_warn_component_unused: 0
164168

165169
steps:
@@ -329,6 +333,9 @@ jobs:
329333
fail-fast: false
330334

331335
runs-on: ${{ matrix.os }}
336+
env:
337+
JULIA_MPI_TEST_BINARY: MPItrampoline_jll
338+
JULIA_MPI_TEST_ABI: MPIwrapper
332339

333340
steps:
334341
- name: Checkout
@@ -340,13 +347,20 @@ jobs:
340347

341348
- uses: julia-actions/cache@v1
342349

343-
- name: add MPIPreferences, use system
350+
- name: add MPIPreferences
351+
shell: julia --color=yes --project=. {0}
352+
run: |
353+
using Pkg
354+
Pkg.develop(path="lib/MPIPreferences")
355+
356+
- name: use OpenMPI_jll
344357
shell: julia --color=yes --project=test {0}
345358
run: |
346359
using Pkg
347360
Pkg.develop(path="lib/MPIPreferences")
348361
using MPIPreferences
349362
MPIPreferences.use_jll_binary("MPItrampoline_jll", export_prefs=true)
363+
rm("test/Manifest.toml")
350364
351365
- uses: julia-actions/julia-runtest@latest
352366

0 commit comments

Comments
 (0)