Skip to content

Commit

Permalink
Allow OpenMPI_jll v5 (#875)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
giordano authored Sep 8, 2024
1 parent d9acc7c commit 4a3e596
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 54 deletions.
56 changes: 3 additions & 53 deletions .github/workflows/UnitTests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,17 +91,16 @@ jobs:
- "1.6"
- "1"
- "nightly"
julia_arch: [x64, x86]
exclude:
- os: macos-13
julia_arch: x86
julia_arch: [x64]

fail-fast: false
env:
JULIA_MPI_TEST_BINARY: OpenMPI_jll
JULIA_MPI_TEST_ABI: OpenMPI
OMPI_MCA_btl_base_warn_component_unused: 0
OMPI_MCA_rmaps_base_oversubscribe: true
# Allow oversubscription
PRTE_MCA_rmaps_default_mapping_policy: :oversubscribe

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

Expand Down Expand Up @@ -577,52 +576,3 @@ jobs:
MPIPreferences.use_system_binary()
- uses: julia-actions/julia-runtest@v1


# TODO: Can remove this once we can use OpenMPI_jll v5
test-spack-openmpi5:
timeout-minutes: 20
strategy:
matrix:
include:
- container: ghcr.io/juliaparallel/github-actions-buildcache:openmpi5-jq
name: "OpenMPI 5.0.2"

fail-fast: false

runs-on: ubuntu-22.04
container: ${{ matrix.container }}
name: "Test ${{ matrix.name }}"

env:
JULIA_MPI_TEST_BINARY: system
JULIA_MPI_TEST_ABI: OpenMPI
# Allow running as root
OMPI_ALLOW_RUN_AS_ROOT: 1
OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: 1
# Allow oversubscription
PRTE_MCA_rmaps_default_mapping_policy: :oversubscribe

steps:
- name: Checkout
uses: actions/checkout@v4

- uses: julia-actions/setup-julia@v1
with:
version: "1"

- uses: julia-actions/cache@v2
- name: add MPIPreferences
shell: julia --color=yes --project=. {0}
run: |
using Pkg
Pkg.develop(path="lib/MPIPreferences")
Pkg.precompile()
- name: use system MPI
shell: julia --color=yes --project=. {0}
run: |
using MPIPreferences
MPIPreferences.use_system_binary()
- uses: julia-actions/julia-runtest@v1
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Libdl = "1"
MPICH_jll = "4"
MPIPreferences = "0.1.8"
MPItrampoline_jll = "5"
OpenMPI_jll = "4"
OpenMPI_jll = "4, 5"
PkgVersion = "0.3"
PrecompileTools = "1.0.1"
Requires = "~0.5, 1.0"
Expand Down

0 comments on commit 4a3e596

Please sign in to comment.