Merge branch 'main' into merge_wheel

Author: leofang

.github/workflows/build-wheel.yml

@@ -254,7 +254,7 @@ jobs:
 
       - name: Build cuda.bindings Cython tests
         run: |
-          pip install $(ls ${{ env.CUDA_BINDINGS_ARTIFACTS_DIR }}/*.whl)[test]
+          pip install ${{ env.CUDA_BINDINGS_ARTIFACTS_DIR }}/*.whl --group ./cuda_bindings/pyproject.toml:test
           pushd ${{ env.CUDA_BINDINGS_CYTHON_TESTS_DIR }}
           bash build_tests.sh
           popd
@@ -268,7 +268,7 @@ jobs:
 
       - name: Build cuda.core Cython tests
         run: |
-          pip install $(ls ${{ env.CUDA_CORE_ARTIFACTS_DIR }}/"cu${BUILD_CUDA_MAJOR}"/*.whl)[test]
+          pip install ${{ env.CUDA_CORE_ARTIFACTS_DIR }}/"cu${BUILD_CUDA_MAJOR}"/*.whl --group ./cuda_core/pyproject.toml:test
           pushd ${{ env.CUDA_CORE_CYTHON_TESTS_DIR }}
           bash build_tests.sh
           popd

.github/workflows/ci.yml

@@ -36,17 +36,38 @@ jobs:
           cuda_prev_build_ver=$(jq -r .cuda.prev_build.version ci/versions.json)
           echo "cuda_prev_build_ver=$cuda_prev_build_ver" >> $GITHUB_OUTPUT
 
+  should-skip:
+    runs-on: ubuntu-latest
+    outputs:
+      skip: ${{ steps.get-should-skip.outputs.skip }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8  # v5.0.0
+      - name: Compute whether to skip builds and tests
+        id: get-should-skip
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          set -euxo pipefail
+          if ${{ startsWith(github.ref_name, 'pull-request/') }}; then
+            skip="$(gh pr view "$(grep -Po '(\d+)$' <<< '${{ github.ref_name }}')" --json title --jq '.title | contains("[no-ci]")')"
+          else
+            skip=false
+          fi
+          echo "skip=${skip}" >> "$GITHUB_OUTPUT"
+
   # WARNING: make sure all of the build jobs are in sync
   build-linux-64:
     needs:
       - ci-vars
+      - should-skip
     strategy:
       fail-fast: false
       matrix:
         host-platform:
           - linux-64
     name: Build ${{ matrix.host-platform }}, CUDA ${{ needs.ci-vars.outputs.CUDA_BUILD_VER }}
-    if: ${{ github.repository_owner == 'nvidia' }}
+    if: ${{ github.repository_owner == 'nvidia' && !fromJSON(needs.should-skip.outputs.skip) }}
     secrets: inherit
     uses: ./.github/workflows/build-wheel.yml
     with:
@@ -58,13 +79,14 @@ jobs:
   build-linux-aarch64:
     needs:
       - ci-vars
+      - should-skip
     strategy:
       fail-fast: false
       matrix:
         host-platform:
           - linux-aarch64
     name: Build ${{ matrix.host-platform }}, CUDA ${{ needs.ci-vars.outputs.CUDA_BUILD_VER }}
-    if: ${{ github.repository_owner == 'nvidia' }}
+    if: ${{ github.repository_owner == 'nvidia' && !fromJSON(needs.should-skip.outputs.skip) }}
     secrets: inherit
     uses: ./.github/workflows/build-wheel.yml
     with:
@@ -76,13 +98,14 @@ jobs:
   build-windows:
     needs:
       - ci-vars
+      - should-skip
     strategy:
       fail-fast: false
       matrix:
         host-platform:
           - win-64
     name: Build ${{ matrix.host-platform }}, CUDA ${{ needs.ci-vars.outputs.CUDA_BUILD_VER }}
-    if: ${{ github.repository_owner == 'nvidia' }}
+    if: ${{ github.repository_owner == 'nvidia' && !fromJSON(needs.should-skip.outputs.skip) }}
     secrets: inherit
     uses: ./.github/workflows/build-wheel.yml
     with:
@@ -170,15 +193,12 @@ jobs:
 
   checks:
     name: Check job status
-    permissions:
-      checks: read
+    runs-on: ubuntu-latest
     needs:
-      - build-linux-64
       - test-linux-64
-      - build-linux-aarch64
       - test-linux-aarch64
-      - build-windows
       - test-windows
       - doc
-    secrets: inherit
-    uses: ./.github/workflows/status-check.yml
+    steps:
+      - name: Exit
+        run: exit 0

.github/workflows/status-check.yml

@@ -284,7 +284,7 @@ jobs:
         run: |
           set -euo pipefail
           pushd cuda_pathfinder
-          pip install --only-binary=:all: -v ".[test_nvidia_wheels_cu${TEST_CUDA_MAJOR},test_nvidia_wheels_host]"
+          pip install --only-binary=:all: -v . --group "test_nvidia_wheels_cu${TEST_CUDA_MAJOR}" --group test_nvidia_wheels_host
           pip list
           popd
 

.github/workflows/test-wheel-linux.yml

@@ -257,7 +257,7 @@ jobs:
         shell: bash --noprofile --norc -xeuo pipefail {0}
         run: |
           pushd cuda_pathfinder
-          pip install --only-binary=:all: -v ".[test_nvidia_wheels_cu${TEST_CUDA_MAJOR},test_nvidia_wheels_host]"
+          pip install --only-binary=:all: -v . --group "test_nvidia_wheels_cu${TEST_CUDA_MAJOR}" --group test_nvidia_wheels_host
           pip list
           popd
 

.github/workflows/test-wheel-windows.yml

@@ -24,7 +24,7 @@ test_module=${1}
 # (it is a direct dependency of bindings, and a transitive dependency of core)
 pushd ./cuda_pathfinder
 echo "Installing pathfinder wheel"
-pip install $(ls *.whl)[test]
+pip install ./*.whl --group test
 popd
 
 if [[ "${test_module}" == "pathfinder" ]]; then
@@ -38,15 +38,13 @@ if [[ "${test_module}" == "pathfinder" ]]; then
   echo "Number of \"INFO test_\" lines: $line_count"
   popd
 elif [[ "${test_module}" == "bindings" ]]; then
-  pushd "${CUDA_BINDINGS_ARTIFACTS_DIR}"
   echo "Installing bindings wheel"
+  pushd ./cuda_bindings
   if [[ "${LOCAL_CTK}" == 1 ]]; then
-    pip install $(ls *.whl)[test]
+    pip install "${CUDA_BINDINGS_ARTIFACTS_DIR}"/*.whl --group test
   else
-    pip install $(ls *.whl)[all,test]
+    pip install $(ls "${CUDA_BINDINGS_ARTIFACTS_DIR}"/*.whl)[all] --group test
   fi
-  popd
-  pushd ./cuda_bindings
   echo "Running bindings tests"
   ${SANITIZER_CMD} pytest -rxXs -v tests/
   if [[ "${SKIP_CYTHON_TEST}" == 0 ]]; then
@@ -57,33 +55,29 @@ elif [[ "${test_module}" == "core" ]]; then
   # If build/test majors match: cuda.bindings is installed in the previous step.
   # If mismatch: cuda.bindings is installed from the backport branch.
   if [[ "${SKIP_CUDA_BINDINGS_TEST}" == 1 ]]; then
-    pushd "${CUDA_BINDINGS_ARTIFACTS_DIR}"
     echo "Installing bindings wheel"
     if [[ "${LOCAL_CTK}" == 1 ]]; then
-      pip install *.whl
+      pip install "${CUDA_BINDINGS_ARTIFACTS_DIR}"/*.whl
     else
-      pip install $(ls *.whl)[all]
+      pip install $(ls "${CUDA_BINDINGS_ARTIFACTS_DIR}"/*.whl)[all]
     fi
-    popd
   fi
   TEST_CUDA_MAJOR="$(cut -d '.' -f 1 <<< ${CUDA_VER})"
-  pushd "${CUDA_CORE_ARTIFACTS_DIR}"
   echo "Installing core wheel"
 
   FREE_THREADING=""
   if python -c 'import sys; assert not sys._is_gil_enabled()' 2> /dev/null; then
     FREE_THREADING+="-ft"
   fi
 
+  pushd ./cuda_core
   if [[ "${LOCAL_CTK}" == 1 ]]; then
     # We already installed cuda-bindings, and all CTK components exist locally,
     # so just install the test dependencies.
-    pip install $(ls *.whl)["test-cu${TEST_CUDA_MAJOR}${FREE_THREADING}"]
+    pip install "${CUDA_CORE_ARTIFACTS_DIR}"/*.whl --group "test-cu${TEST_CUDA_MAJOR}${FREE_THREADING}"
   else
-    pip install $(ls *.whl)["cu${TEST_CUDA_MAJOR}","test-cu${TEST_CUDA_MAJOR}${FREE_THREADING}"]
+    pip install $(ls "${CUDA_CORE_ARTIFACTS_DIR}"/*.whl)["cu${TEST_CUDA_MAJOR}"] --group "test-cu${TEST_CUDA_MAJOR}${FREE_THREADING}"
   fi
-  popd
-  pushd ./cuda_core
   echo "Running core tests"
   ${SANITIZER_CMD} pytest -rxXs -v tests/
   # Currently our CI always installs the latest bindings (from either major version).

ci/tools/run-tests

@@ -1,6 +1,5 @@
 # SPDX-FileCopyrightText: Copyright (c) 2023-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: LicenseRef-NVIDIA-SOFTWARE-LICENSE
-
 [build-system]
 requires = ["setuptools>=77.0.0", "cython>=3.1,<3.2", "pyclibrary>=0.1.7"]
 build-backend = "setuptools.build_meta"
@@ -36,6 +35,7 @@ all = [
     "cuda-toolkit[cufile]==13.*; sys_platform == 'linux'",
 ]
 
+[dependency-groups]
 test = [
     "cython>=3.1,<3.2",
     "setuptools>=77.0.0",

cuda_bindings/pyproject.toml

@@ -49,10 +49,9 @@ dependencies = [
 [project.optional-dependencies]
 cu12 = ["cuda-bindings[all]==12.*"]
 cu13 = ["cuda-bindings[all]==13.*"]
-# TODO: these should all be in development dependencies; optional dependencies
-# are for features exposed to *users*, not a dumping ground for all tooling
-# needed to build and test the project
-test = ["cython>=3.1", "setuptools", "pytest>=6.2.4"]
+
+[dependency-groups]
+test = ["cython>=3.0", "setuptools", "pytest>=6.2.4"]
 test-cu12 = ["cuda-core[test]", "cupy-cuda12x; python_version < '3.14'", "cuda-toolkit[cudart]==12.*"]  # runtime headers needed by CuPy
 test-cu13 = ["cuda-core[test]", "cupy-cuda13x; python_version < '3.14'", "cuda-toolkit[cudart]==13.*"]  # runtime headers needed by CuPy
 # free threaded build, cupy doesn't support free-threaded builds yet, so avoid installing it for now

cuda_core/pyproject.toml

@@ -11,8 +11,8 @@ cuda-pathfinder: Utilities for locating CUDA components
 
 `cuda.pathfinder <https://nvidia.github.io/cuda-python/cuda-pathfinder/>`_
 aims to be a one-stop solution for locating CUDA components. Currently
-it supports locating and loading dynamic libraries (``.so``, ``.dll``);
-support for headers and other artifacts is in progress.
+it supports locating and loading dynamic libraries (``.so``, ``.dll``), and
+locating CTK header directories. Support for other artifacts is in progress.
 
 * `Documentation <https://nvidia.github.io/cuda-python/cuda-pathfinder/>`_
 * `Releases <https://nvidia.github.io/cuda-python/cuda-pathfinder/latest/release.html>`_

cuda_pathfinder/DESCRIPTION.rst

@@ -10,7 +10,7 @@ requires-python = ">=3.9"
 dynamic = ["version", "readme"]
 dependencies = []
 
-[project.optional-dependencies]
+[dependency-groups]
 test = [
     "pytest>=6.2.4",
 ]