Remove support for build variants

mpi4py · Oct 25, 2024 · eaf7bc2 · eaf7bc2
1 parent 65e359c
commit eaf7bc2
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 36 deletions.
diff --git a/.github/workflows/cd-wheel.yml b/.github/workflows/cd-wheel.yml
@@ -21,11 +21,6 @@ on:  # yamllint disable-line rule:truthy
         default: ''
         required: false
         type: string
-      variant:
-        description: 'Build variant'
-        default: ''
-        required: false
-        type: string
       os-arch:
         description: 'Target OS-Architecture'
         default: ''
@@ -50,14 +45,6 @@ on:  # yamllint disable-line rule:truthy
         default: ''
         required: false
         type: string
-      variant:
-        description: 'Build variant'
-        default: ''
-        type: choice
-        options:
-          - ''
-          - ofi
-          - ucx
       os-arch:
         description: "Target OS-Architecture"
         default: Linux-x86_64
@@ -77,7 +64,6 @@ env:
   MPINAME: '${{ inputs.mpiname }}'
   VERSION: '${{ inputs.version }}'
   RELEASE: '${{ inputs.release }}'
-  VARIANT: '${{ inputs.variant }}'
 
 jobs:
 
@@ -176,7 +162,7 @@ jobs:
         CIBW_TEST_COMMAND: >-
           bash {project}/cibw-check-mpi.sh
         CIBW_ENVIRONMENT_PASS: >-
-          MPINAME VARIANT RELEASE
+          MPINAME RELEASE
         CIBW_ENVIRONMENT_LINUX: >-
           SOURCE="/project/package/source"
           WORKDIR="/project/package/workdir"

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -23,14 +23,6 @@ on:  # yamllint disable-line rule:truthy
         default: ''
         required: false
         type: string
-      variant:
-        description: 'Build variant'
-        default: ''
-        type: choice
-        options:
-          - ''
-          - ofi
-          - ucx
       os-arch:
         description: "Target OS-Architecture"
         default: all
@@ -58,7 +50,6 @@ jobs:
       mpiname: ${{ inputs.mpiname }}
       version: ${{ inputs.version }}
       release: ${{ inputs.release }}
-      variant: ${{ inputs.variant }}
       os-arch: ${{ inputs.os-arch }}
 
   publish-anaconda:

diff --git a/build-wheel.sh b/build-wheel.sh
@@ -7,15 +7,17 @@ DESTDIR=package/install
 ARCHLIST=${ARCHLIST:-$(uname -m)}
 
 export CIBW_BUILD_FRONTEND='build'
-export CIBW_BUILD='cp312-*'
+export CIBW_BUILD='cp313-*'
 export CIBW_SKIP='*musllinux*'
 export CIBW_ARCHS=$ARCHLIST
 export CIBW_BEFORE_ALL='bash {project}/cibw-build-mpi.sh'
 export CIBW_TEST_COMMAND='bash {project}/cibw-check-mpi.sh'
-export CIBW_ENVIRONMENT_PASS='MPINAME VARIANT RELEASE SOURCE WORKDIR DESTDIR'
+export CIBW_ENVIRONMENT_PASS='MPINAME RELEASE SOURCE WORKDIR DESTDIR'
 export CIBW_REPAIR_WHEEL_COMMAND_MACOS='delocate-wheel --ignore-missing-dependencies --exclude libmpi --exclude libpmpi --require-archs {delocate_archs -w {dest_dir} -v {wheel}'
 
 if test "$(uname)" = Linux; then
+    containerengine=$(basename "$(command -v podman || command -v docker)")
+    export CIBW_CONTAINER_ENGINE=$containerengine
     export SOURCE="/project/$SOURCE"
     export WORKDIR="/host/$PWD/$WORKDIR"
     export DESTDIR="/host/$PWD/$DESTDIR"

diff --git a/check-wheel.sh b/check-wheel.sh
@@ -17,9 +17,7 @@ cd "$workdir"
 
 whlname=$(basename "$wheelfile")
 pkgname=${whlname%%-*}
-mpiname=${pkgname%_*}
-variant=${pkgname#"${mpiname}"}
-variant=${variant#_}
+mpiname=${pkgname}
 
 data=$(ls -d "$pkgname"-*.data/data)
 if test "$(uname)" = Linux; then
@@ -69,7 +67,7 @@ if test "$mpiname" = "mpich"; then
     libraries=(
         "$data"/lib/libmpi.*
     )
-    if test "$variant" = "ucx"; then
+    if test -d "$data"/lib/ucx; then
         libraries+=(
             "$data"/lib/libuc[mpst]*.*
             "$data"/lib/ucx/libuc*.*

diff --git a/cibw-build-mpi.sh b/cibw-build-mpi.sh
@@ -2,7 +2,6 @@
 set -euo pipefail
 
 mpiname="${MPINAME:-mpich}"
-variant="${VARIANT:-}"
 
 PROJECT=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 PACKAGE=$PROJECT/package
@@ -76,9 +75,6 @@ if test "$(uname)" = Darwin; then
         export MACOSX_DEPLOYMENT_TARGET="10.9"
         export ac_cv_func_aligned_alloc="no" # macOS>=10.15
     fi
-    if test "$variant" = ucx; then
-        echo "ERROR: UCX is not supported on macOS"; exit 1;
-    fi
 fi
 
 case $(uname) in

diff --git a/package/setup.py b/package/setup.py
@@ -17,9 +17,8 @@ def get_tag(self):
 
 
 mpiname = os.environ.get("MPINAME", "mpich")
-variant = os.environ.get("VARIANT", "")
 release = os.environ.get("RELEASE", "")
-pkgname = f"{mpiname}-{variant}" if variant else mpiname
+pkgname = mpiname
 
 if mpiname == "mpich":
     project = "MPICH"