mpich: Support for multiple versions

Author: dalcinl

.github/workflows/cd-wheel.yml

@@ -6,14 +6,19 @@ permissions:
 on:  # yamllint disable-line rule:truthy
   workflow_call:
     inputs:
+      mpiname:
+        description: 'MPI'
+        default: 'mpich'
+        required: false
+        type: string
       variant:
         description: 'Variant'
         default: ''
         required: false
         type: string
       version:
         description: 'Version'
-        default: '4.1.2'
+        default: ''
         required: false
         type: string
       release:
@@ -28,6 +33,12 @@ on:  # yamllint disable-line rule:truthy
         type: string
   workflow_dispatch:
     inputs:
+      mpiname:
+        description: 'MPI'
+        default: 'mpich'
+        type: choice
+        options:
+          - mpich
       variant:
         description: 'Variant'
         default: ''
@@ -38,7 +49,7 @@ on:  # yamllint disable-line rule:truthy
           - ucx
       version:
         description: 'Version'
-        default: '4.1.2'
+        default: ''
         required: false
         type: string
       release:
@@ -62,7 +73,7 @@ on:  # yamllint disable-line rule:truthy
           - macOS-x86_64
 
 env:
-  MPINAME: 'mpich'
+  MPINAME: '${{ inputs.mpiname }}'
   VARIANT: '${{ inputs.variant }}'
   VERSION: '${{ inputs.version }}'
   RELEASE: '${{ inputs.release }}'

.github/workflows/cd.yml

@@ -6,6 +6,12 @@ permissions:
 on:  # yamllint disable-line rule:truthy
   workflow_dispatch:
     inputs:
+      mpiname:
+        description: 'MPI'
+        default: 'mpich'
+        type: choice
+        options:
+          - mpich
       variant:
         description: 'Variant'
         default: ''
@@ -16,7 +22,7 @@ on:  # yamllint disable-line rule:truthy
           - ucx
       version:
         description: 'Version'
-        default: '4.1.2'
+        default: ''
         required: false
         type: string
       release:
@@ -48,6 +54,7 @@ jobs:
   wheel:
     uses: ./.github/workflows/cd-wheel.yml
     with:
+      mpiname: ${{ inputs.mpiname }}
       variant: ${{ inputs.variant }}
       version: ${{ inputs.version }}
       release: ${{ inputs.release }}
@@ -59,7 +66,7 @@ jobs:
     runs-on: ubuntu-latest
     environment:
       name: anaconda
-      url:  https://anaconda.org/mpi4py/mpich
+      url:  https://anaconda.org/mpi4py/${{ inputs.mpiname }}
 
     steps:
 

bootstrap.sh

@@ -4,7 +4,7 @@ set -euo pipefail
 mpiname=${MPINAME:-mpich}
 
 if test "$mpiname" = "mpich"; then
-    version=${VERSION:-4.1.2}
+    version=${VERSION:-4.2.0}
     urlbase="https://www.mpich.org/static/downloads/$version"
     tarball="$mpiname-$version.tar.gz"
     license=COPYRIGHT
@@ -14,7 +14,7 @@ SOURCE=package/source
 if test ! -d "$SOURCE"; then
     if test ! -f "$tarball"; then
         echo downloading "$urlbase"/"$tarball"...
-        curl -sO "$urlbase"/"$tarball"
+        curl -fsO "$urlbase"/"$tarball"
     else
         echo reusing "$tarball"...
     fi

check-wheel.sh

@@ -38,6 +38,7 @@ if test "$(uname)" = Darwin; then
     runpath='@executable_path/../lib/|@loader_path/'
     soregex='\..*\.dylib'
     runlibs='lib(mpi|pmpi|System)'$soregex
+    runlibs=$runlibs'|(Foundation|IOKit)\.framework'
     print-runpath() { otool -l "$1" | sed -n '/RPATH/{n;n;p;}'; }
     print-needed()  { otool -L "$1" | sed 1,1d; }
     if test -f "$data"/lib/libucp.dylib; then

cibw-build-mpi.sh

@@ -10,6 +10,7 @@ DESTDIR=${DESTDIR:-$PWD/package/install}
 PREFIX=${PREFIX:-"/opt/$mpiname"}
 
 if test "$mpiname" = "mpich"; then
+    version=$(sed -n 's/MPICH_VERSION=\(.*\)/\1/p' "$SOURCE"/maint/Version)
     options=(
         CC=cc
         CXX=c++
@@ -24,7 +25,13 @@ if test "$mpiname" = "mpich"; then
         --disable-static
         --disable-doc
     )
+    if test "${version%%.*}" -lt 4; then
+        options=("${options[@]/--disable-cxx}")
+        export FCFLAGS=-fallow-argument-mismatch
+        export FFLAGS=-fallow-argument-mismatch
+    fi
     if test "$(uname)" = Darwin; then
+        options+=(--disable-opencl --disable-libxml2)
         export MPICH_MPICC_LDFLAGS="-Wl,-rpath,$PREFIX/lib"
         export MPICH_MPICXX_LDFLAGS="-Wl,-rpath,$PREFIX/lib"
         export MPICH_MPIFORT_LDFLAGS="-Wl,-rpath,$PREFIX/lib"
@@ -65,6 +72,7 @@ cd "${DESTDIR}${PREFIX}"
 rm -f  include/*cxx.h
 rm -f  include/*.mod
 rm -f  include/*f.h
+rm -fr include/rdma
 rm -f  bin/mpif77
 rm -f  bin/mpif90
 rm -f  bin/mpifort
@@ -86,22 +94,33 @@ rm -f  lib/libuc[mpst]*.la
 rm -f  lib/ucx/libuct_*.la
 rm -fr lib/cmake
 
+headers=(mpi.h)
+scripts=(mpicc mpicxx)
+executables=(mpichversion mpivars)
+
+cd "${DESTDIR}${PREFIX}/include"
+for header in "${headers[@]}"; do
+    sed -i.orig 's:^#include "mpicxx.h"::g' "$header"
+    rm "$header".orig
+done
+
 cd "${DESTDIR}${PREFIX}/bin"
-for script in mpicc mpicxx; do
+for script in "${scripts[@]}"; do
     # shellcheck disable=SC2016
     topdir='$(CDPATH= cd -- "$(dirname -- "$0")/.." \&\& pwd -P)'
-    sed -i.orig s:^prefix=.*:prefix="$topdir": $script
-    sed -i.orig s:"$PREFIX":\"\$\{prefix\}\":g $script
-    sed -i.orig s:-Wl,-commons,use_dylibs::g $script
-    sed -i.orig s:/usr/bin/bash:/bin/bash:g $script
-    rm $script.orig
+    sed -i.orig s:^prefix=.*:prefix="$topdir": "$script"
+    sed -i.orig s:"$PREFIX":\"\$\{prefix\}\":g "$script"
+    sed -i.orig s:-Wl,-commons,use_dylibs::g "$script"
+    sed -i.orig s:/usr/bin/bash:/bin/bash:g "$script"
+    sed -i.orig s:-lmpicxx::g "$script"
+    rm "$script".orig
 done
 
 if test "$(uname)" = Linux; then
     libmpi="libmpi.so.12"
     cd "${DESTDIR}${PREFIX}/bin"
-    for exe in mpichversion mpivars; do
-        patchelf --set-rpath "\$ORIGIN/../lib" $exe
+    for exe in "${executables[@]}"; do
+        patchelf --set-rpath "\$ORIGIN/../lib" "$exe"
     done
     cd "${DESTDIR}${PREFIX}/lib"
     if test -f "$libmpi".*.*; then
@@ -116,7 +135,7 @@ if test "$(uname)" = Linux; then
                 ln -sf "$lib" "${lib%.*}"
             fi
             patchelf --set-rpath "\$ORIGIN" "$lib"
-            for exe in mpichversion mpivars; do
+            for exe in "${executables[@]}"; do
                 patchelf --remove-needed "$lib" "../bin/$exe"
             done
         done
@@ -136,7 +155,7 @@ if test "$(uname)" = Darwin; then
     libmpi="libmpi.12.dylib"
     libpmpi="libpmpi.12.dylib"
     cd "${DESTDIR}${PREFIX}/bin"
-    for exe in mpichversion mpivars; do
+    for exe in "${executables[@]}"; do
         install_name_tool -change "$libdir/$libmpi" "@rpath/$libmpi" "$exe"
         install_name_tool -change "$libdir/$libpmpi" "@rpath/$libpmpi" "$exe"
         install_name_tool -add_rpath "@executable_path/../lib/" "$exe"
@@ -147,20 +166,6 @@ if test "$(uname)" = Darwin; then
         install_name_tool -add_rpath "@loader_path/" "$lib"
     done
     install_name_tool -change "$libdir/$libpmpi" "@rpath/$libpmpi" "$libmpi"
-    if test -f libucp.dylib; then  # TODO: UCX is not supported on macOS
-        for lib in libuc[mpst]*.?.dylib; do
-            install_name_tool -id "@rpath/$lib" "$lib"
-            install_name_tool -add_rpath "@loader_path/" "$lib"
-            for dep in libuc[mst].?.dylib; do
-                install_name_tool -change "$libdir/$dep" "@rpath/$dep" "$lib"
-            done
-        done
-        for exe in mpichversion mpivars; do
-            for dep in libuc[mpst].?.dylib; do
-                install_name_tool -change "$libdir/$dep" "/" "../bin/$exe"
-            done
-        done
-    fi
 fi
 
 } # fixup-mpich()

cibw-check-mpi.sh

@@ -29,12 +29,12 @@ ln -s helloworld.c helloworld.cxx
 
 RUN() { echo + "$@"; "$@"; }
 
-if test "$mpiname" == "mpich"; then
+if test "$mpiname" = "mpich"; then
     RUN command -v mpichversion
     RUN mpichversion
 fi
 
-if test "$mpiname" == "mpich"; then
+if test "$mpiname" = "mpich"; then
     RUN command -v mpivars
     RUN mpivars -nodesc | grep 'Category .* has'
 fi