Skip to content

Commit 4a3e596

Browse files
authored
Allow OpenMPI_jll v5 (#875)
* Allow `OpenMPI_jll` v5 * [CI] Remove `test-spack-openmpi5` job and run `test-openmpi-jll` jobs only on 64-bit 32-bit systems aren't supported by upstream OpenMPI anymore. * [CI] Allow oversubscription with OpenMPI v5
1 parent d9acc7c commit 4a3e596

File tree

2 files changed

+4
-54
lines changed

2 files changed

+4
-54
lines changed

.github/workflows/UnitTests.yml

Lines changed: 3 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -91,17 +91,16 @@ jobs:
9191
- "1.6"
9292
- "1"
9393
- "nightly"
94-
julia_arch: [x64, x86]
95-
exclude:
96-
- os: macos-13
97-
julia_arch: x86
94+
julia_arch: [x64]
9895

9996
fail-fast: false
10097
env:
10198
JULIA_MPI_TEST_BINARY: OpenMPI_jll
10299
JULIA_MPI_TEST_ABI: OpenMPI
103100
OMPI_MCA_btl_base_warn_component_unused: 0
104101
OMPI_MCA_rmaps_base_oversubscribe: true
102+
# Allow oversubscription
103+
PRTE_MCA_rmaps_default_mapping_policy: :oversubscribe
105104

106105
runs-on: ${{ matrix.os }}
107106

@@ -577,52 +576,3 @@ jobs:
577576
MPIPreferences.use_system_binary()
578577
579578
- uses: julia-actions/julia-runtest@v1
580-
581-
582-
# TODO: Can remove this once we can use OpenMPI_jll v5
583-
test-spack-openmpi5:
584-
timeout-minutes: 20
585-
strategy:
586-
matrix:
587-
include:
588-
- container: ghcr.io/juliaparallel/github-actions-buildcache:openmpi5-jq
589-
name: "OpenMPI 5.0.2"
590-
591-
fail-fast: false
592-
593-
runs-on: ubuntu-22.04
594-
container: ${{ matrix.container }}
595-
name: "Test ${{ matrix.name }}"
596-
597-
env:
598-
JULIA_MPI_TEST_BINARY: system
599-
JULIA_MPI_TEST_ABI: OpenMPI
600-
# Allow running as root
601-
OMPI_ALLOW_RUN_AS_ROOT: 1
602-
OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: 1
603-
# Allow oversubscription
604-
PRTE_MCA_rmaps_default_mapping_policy: :oversubscribe
605-
606-
steps:
607-
- name: Checkout
608-
uses: actions/checkout@v4
609-
610-
- uses: julia-actions/setup-julia@v1
611-
with:
612-
version: "1"
613-
614-
- uses: julia-actions/cache@v2
615-
- name: add MPIPreferences
616-
shell: julia --color=yes --project=. {0}
617-
run: |
618-
using Pkg
619-
Pkg.develop(path="lib/MPIPreferences")
620-
Pkg.precompile()
621-
622-
- name: use system MPI
623-
shell: julia --color=yes --project=. {0}
624-
run: |
625-
using MPIPreferences
626-
MPIPreferences.use_system_binary()
627-
628-
- uses: julia-actions/julia-runtest@v1

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Libdl = "1"
2727
MPICH_jll = "4"
2828
MPIPreferences = "0.1.8"
2929
MPItrampoline_jll = "5"
30-
OpenMPI_jll = "4"
30+
OpenMPI_jll = "4, 5"
3131
PkgVersion = "0.3"
3232
PrecompileTools = "1.0.1"
3333
Requires = "~0.5, 1.0"

0 commit comments

Comments
 (0)