refactor: remove 3.10 branching, set py-api from command line

Author: gforsyth

.github/workflows/build.yaml

@@ -147,6 +147,8 @@ jobs:
       script: ci/build_python.sh
       sha: ${{ inputs.sha }}
       sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
+      # Build a conda package for each CUDA x ARCH x minimum supported Python version
+      matrix_filter: group_by({CUDA_VER, ARCH}) | map(min_by(.PY_VER | split(".") | map(tonumber)))
   upload-conda:
     needs: [cpp-build, python-build]
     secrets: inherit
@@ -215,6 +217,8 @@ jobs:
       package-name: cuvs
       sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
       package-type: python
+      # Build a wheel for each CUDA x ARCH x minimum supported Python version
+      matrix_filter: group_by({CUDA_VER, ARCH}) | map(min_by(.PY_VER | split(".") | map(tonumber)))
   wheel-publish-cuvs:
     needs: wheel-build-cuvs
     secrets: inherit
@@ -226,3 +230,4 @@ jobs:
       date: ${{ inputs.date }}
       package-name: cuvs
       package-type: python
+      publish-wheel-search-key: cuvs_wheel_python_abi3

.github/workflows/pr.yaml

@@ -341,6 +341,8 @@ jobs:
     with:
       build_type: pull-request
       script: ci/build_python.sh
+      # Build a conda package for each CUDA x ARCH x minimum supported Python version
+      matrix_filter: group_by({CUDA_VER, ARCH}) | map(min_by(.PY_VER | split(".") | map(tonumber)))
   conda-python-tests:
     needs: [conda-python-build, changed-files]
     secrets: inherit
@@ -492,10 +494,8 @@ jobs:
       package-name: cuvs
       package-type: python
       sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
-      # Build a wheel for each CUDA x ARCH x PY_VER (3.10 and 3.11)
-      # When we drop Python 3.10, this can be simplified to:
-      # matrix_filter: map(select(.PY_VER == "3.11")) | unique_by({CUDA_VER, ARCH})
-      matrix_filter: map(select(.PY_VER == "3.11" or .PY_VER == "3.10")) | unique_by({CUDA_VER, ARCH, PY_VER})
+      # Build a wheel for each CUDA x ARCH x minimum supported Python version
+      matrix_filter: group_by({CUDA_VER, ARCH}) | map(min_by(.PY_VER | split(".") | map(tonumber)))
   wheel-tests-cuvs:
     needs: [wheel-build-cuvs, changed-files]
     secrets: inherit

ci/build_wheel.sh

@@ -6,6 +6,22 @@ set -euo pipefail
 
 package_name=$1
 package_dir=$2
+shift 2
+
+# Parse optional flags
+stable_abi=false
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --stable)
+      stable_abi=true
+      shift
+      ;;
+    *)
+      echo "Unknown option: $1" >&2
+      exit 1
+      ;;
+  esac
+done
 
 source rapids-configure-sccache
 source rapids-date-string
@@ -53,6 +69,12 @@ RAPIDS_PIP_WHEEL_ARGS=(
   --no-deps
   --disable-pip-version-check
 )
+
+# Add py-api setting for stable ABI builds
+if [[ "${stable_abi}" == "true" ]] && [[ -n "${RAPIDS_PY_API:-}" ]]; then
+  RAPIDS_PIP_WHEEL_ARGS+=(--config-settings="skbuild.wheel.py-api=${RAPIDS_PY_API}")
+fi
+
 # Only use --build-constraint when build isolation is enabled.
 #
 # Passing '--build-constraint' and '--no-build-isolation` together results in an error from 'pip',

ci/build_wheel_cuvs.sh

@@ -6,11 +6,6 @@ set -euo pipefail
 
 source rapids-init-pip
 
-# Only use stable ABI package for Python >= 3.11
-if [[ "${RAPIDS_PY_VERSION}" != "3.10" ]]; then
-  source ./ci/use_upstream_sabi_wheels.sh
-fi
-
 package_dir="python/cuvs"
 
 RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen "${RAPIDS_CUDA_VERSION}")"
@@ -23,11 +18,13 @@ RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen "${RAPIDS_CUDA_VERSION}")"
 LIBCUVS_WHEELHOUSE=$(RAPIDS_PY_WHEEL_NAME="libcuvs_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-github cpp)
 echo "libcuvs-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo "${LIBCUVS_WHEELHOUSE}"/libcuvs_*.whl)" >> "${PIP_CONSTRAINT}"
 
-ci/build_wheel.sh cuvs ${package_dir}
+# TODO: move this variable into `ci-wheel`
+# Format Python limited API version string
+RAPIDS_PY_API="cp${RAPIDS_PY_VERSION//./}"
+export RAPIDS_PY_API
+
+ci/build_wheel.sh cuvs ${package_dir} --stable
 ci/validate_wheel.sh ${package_dir} "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}"
 
-# Only use stable ABI package naming for Python >= 3.11
-if [[ "${RAPIDS_PY_VERSION}" != "3.10" ]]; then
-  RAPIDS_PACKAGE_NAME="$(rapids-package-name wheel_python cuvs --stable --cuda)"
-  export RAPIDS_PACKAGE_NAME
-fi
+RAPIDS_PACKAGE_NAME="$(rapids-package-name wheel_python cuvs --stable --cuda)"
+export RAPIDS_PACKAGE_NAME

ci/build_wheel_libcuvs.sh

@@ -9,11 +9,6 @@ source rapids-init-pip
 package_name="libcuvs"
 package_dir="python/libcuvs"
 
-# Only use stable ABI package for Python >= 3.11
-if [[ "${RAPIDS_PY_VERSION}" != "3.10" ]]; then
-  source ./ci/use_upstream_sabi_wheels.sh
-fi
-
 rapids-logger "Generating build requirements"
 matrix_selectors="cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION};cuda_suffixed=true"
 

ci/test_wheel_cuvs.sh

@@ -11,13 +11,7 @@ rm -rf /usr/lib64/libnccl*
 
 RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen "${RAPIDS_CUDA_VERSION}")"
 LIBCUVS_WHEELHOUSE=$(RAPIDS_PY_WHEEL_NAME="libcuvs_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-github cpp)
-
-if [[ "${RAPIDS_PY_VERSION}" != "3.10" ]]; then
-    CUVS_WHEELHOUSE=$(rapids-download-from-github "$(rapids-package-name "wheel_python" cuvs --stable --cuda "$RAPIDS_CUDA_VERSION")")
-    source ./ci/use_upstream_sabi_wheels.sh
-else
-    CUVS_WHEELHOUSE=$(RAPIDS_PY_WHEEL_NAME="cuvs_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-github python)
-fi
+CUVS_WHEELHOUSE=$(rapids-download-from-github "$(rapids-package-name "wheel_python" cuvs --stable --cuda "$RAPIDS_CUDA_VERSION")")
 
 # echo to expand wildcard before adding `[extra]` requires for pip
 rapids-pip-retry install \

ci/use_upstream_sabi_wheels.sh

@@ -102,10 +102,6 @@ provider = "scikit_build_core.metadata.regex"
 input = "cuvs/VERSION"
 regex = "(?P<value>.*)"
 
-[[tool.scikit-build.overrides]]
-if.python-version = ">=3.11"
-wheel.py-api = "cp311"
-
 [tool.rapids-build-backend]
 requires = [
     "cmake>=3.30.4",