openmpi

ecmwf · Feb 18, 2025 · 82ae322 · 82ae322
1 parent 3bc2ef5
commit 82ae322
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -209,7 +209,11 @@ jobs:
     - name: Install MPI
       shell: bash -eux {0}
       run: |
-        FCFLAGS=-fPIC CFLAGS=-fPIC FFLAGS=-fPIC ${ATLAS_TOOLS}/install-mpi.sh --mpi openmpi --prefix  ${DEPS_DIR}/openmpi
+        if [[ "${{ matrix.os }}" =~ macos ]]; then
+            MPI_VERSION="--version 5.0.7"
+            echo "CACHE_SUFFIX=${CACHE_SUFFIX}-mpi_v5.0.7" >> $GITHUB_ENV
+        fi
+        FCFLAGS=-fPIC CFLAGS=-fPIC FFLAGS=-fPIC ${ATLAS_TOOLS}/install-mpi.sh --mpi openmpi ${MPI_VERSION} --prefix  ${DEPS_DIR}/openmpi
         [ -f ${DEPS_DIR}/openmpi/env.sh ] && source ${DEPS_DIR}/openmpi/env.sh
         [ -z ${MPI_HOME+x} ] || echo "MPI_HOME=${MPI_HOME}" >> $GITHUB_ENV
 

diff --git a/tools/install-mpi.sh b/tools/install-mpi.sh
@@ -60,9 +60,8 @@ case "$os" in
                 brew ls --versions mpich || brew install mpich
                 ;;
             openmpi)
-                brew list --versions
-                brew info openmpi
-                brew ls --versions openmpi || brew install [email protected]
+                brew info open-mpi
+                brew ls --versions open-mpi || brew install open-mpi@${OMPIVER}
                 echo "localhost slots=72" >> $(brew --prefix)/etc/openmpi-default-hostfile
                 echo "localhost slots=72" >> $(brew --prefix)/etc/prte-default-hostfile