Fix nightly CI: single pip call, display step, numba cmd, Windows VC++

leofang · claude · leofang · commit 0b7cc50c5cea · 2026-04-29T03:54:09.000Z
- Install ALL wheels (pathfinder + bindings + core) and optional dep (torch/numba-cuda) in a single pip call so pip resolves everything together and avoids costly reinstall cycles from version conflicts - Fix "Display structure" step: show only artifact files (cuda_python*.whl, cuda_pathfinder/) instead of ls -lahR . which lists the entire repo - Fix numba-cuda test command: python -m numba.runtests numba.cuda.tests - Install Visual C++ Redistributable on Windows before PyTorch (pytorch/pytorch#166628) - run-tests now does pip list at the end of nightly installs Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
diff --git a/.github/workflows/test-wheel-linux.yml b/.github/workflows/test-wheel-linux.yml
@@ -205,7 +205,7 @@ jobs:
       - name: Display structure of downloaded cuda-python artifacts
         run: |
           pwd
-          ls -lahR .
+          ls -lah cuda_python*.whl cuda_pathfinder/
 
       - name: Display structure of downloaded cuda.bindings artifacts
         run: |
@@ -343,41 +343,31 @@ jobs:
           CUDA_PATHFINDER_TEST_FIND_NVIDIA_BITCODE_LIB_STRICTNESS: all_must_work
         run: run-tests pathfinder
 
-      # ── Nightly: install all cuda-python wheels ──
-      - name: Install cuda-python wheels for nightly testing
-        if: ${{ inputs.test-mode != 'standard' }}
+      # ── Nightly: install wheels + optional dep together ──
+      - name: Install cuda-python wheels + PyTorch
+        if: ${{ inputs.test-mode == 'nightly-pytorch' }}
         env:
           CUDA_VER: ${{ matrix.CUDA_VER }}
           LOCAL_CTK: ${{ matrix.LOCAL_CTK }}
-        run: run-tests nightly-install
+          TORCH_VER: ${{ matrix.TORCH_VER }}
+          TORCH_CUDA: ${{ matrix.TORCH_CUDA }}
+        run: run-tests nightly-pytorch
 
-      # ── Nightly: PyTorch interop tests ──
-      - name: Install PyTorch
-        if: ${{ inputs.test-mode == 'nightly-pytorch' }}
-        run: |
-          TORCH_VER="${{ matrix.TORCH_VER }}"
-          TORCH_CUDA="${{ matrix.TORCH_CUDA }}"
-          if [[ "$TORCH_VER" == "latest" ]]; then
-            pip install torch --index-url "https://download.pytorch.org/whl/${TORCH_CUDA}"
-          else
-            pip install "torch==${TORCH_VER}" --index-url "https://download.pytorch.org/whl/${TORCH_CUDA}"
-          fi
-          python -c "import torch; print(f'PyTorch {torch.__version__}, CUDA {torch.version.cuda}')"
+      - name: Install cuda-python wheels + numba-cuda
+        if: ${{ inputs.test-mode == 'nightly-numba-cuda' }}
+        env:
+          CUDA_VER: ${{ matrix.CUDA_VER }}
+          LOCAL_CTK: ${{ matrix.LOCAL_CTK }}
+        run: run-tests nightly-numba-cuda
 
+      # ── Nightly: run tests ──
       - name: Run PyTorch interop tests
         if: ${{ inputs.test-mode == 'nightly-pytorch' }}
         run: |
           pushd cuda_core
           pytest -rxXs -v --durations=0 tests/test_utils.py tests/example_tests/
           popd
 
-      # ── Nightly: numba-cuda tests ──
-      - name: Install numba-cuda
-        if: ${{ inputs.test-mode == 'nightly-numba-cuda' }}
-        run: |
-          pip install numba-cuda
-          python -c "import numba_cuda; print(f'numba-cuda installed')"
-
       - name: Run numba-cuda tests
         if: ${{ inputs.test-mode == 'nightly-numba-cuda' }}
-        run: python -m numba_cuda.numba.cuda.tests
+        run: python -m numba.runtests numba.cuda.tests
diff --git a/.github/workflows/test-wheel-windows.yml b/.github/workflows/test-wheel-windows.yml
@@ -191,7 +191,8 @@ jobs:
       - name: Display structure of downloaded cuda-python artifacts
         run: |
           Get-Location
-          Get-ChildItem -Recurse -Force | Select-Object Mode, LastWriteTime, Length, FullName
+          Get-ChildItem cuda_python*.whl | Select-Object Mode, LastWriteTime, Length, FullName
+          Get-ChildItem cuda_pathfinder/ | Select-Object Mode, LastWriteTime, Length, FullName
 
       - name: Display structure of downloaded cuda.bindings artifacts
         run: |
@@ -320,29 +321,33 @@ jobs:
         shell: bash --noprofile --norc -xeuo pipefail {0}
         run: run-tests pathfinder
 
-      # ── Nightly: install all cuda-python wheels ──
-      - name: Install cuda-python wheels for nightly testing
-        if: ${{ inputs.test-mode != 'standard' }}
+      # ── Nightly: install wheels + optional dep together ──
+      - name: Install Visual C++ Redistributable (required by PyTorch on Windows)
+        if: ${{ inputs.test-mode == 'nightly-pytorch' }}
+        run: |
+          Invoke-WebRequest -Uri "https://aka.ms/vs/17/release/vc_redist.x64.exe" -OutFile "vc_redist.x64.exe"
+          Start-Process -FilePath ".\vc_redist.x64.exe" -ArgumentList "/install", "/quiet", "/norestart" -Wait
+          Remove-Item "vc_redist.x64.exe"
+
+      - name: Install cuda-python wheels + PyTorch
+        if: ${{ inputs.test-mode == 'nightly-pytorch' }}
         env:
           CUDA_VER: ${{ matrix.CUDA_VER }}
           LOCAL_CTK: ${{ matrix.LOCAL_CTK }}
+          TORCH_VER: ${{ matrix.TORCH_VER }}
+          TORCH_CUDA: ${{ matrix.TORCH_CUDA }}
         shell: bash --noprofile --norc -xeuo pipefail {0}
-        run: run-tests nightly-install
+        run: run-tests nightly-pytorch
 
-      # ── Nightly: PyTorch interop tests ──
-      - name: Install PyTorch
-        if: ${{ inputs.test-mode == 'nightly-pytorch' }}
+      - name: Install cuda-python wheels + numba-cuda
+        if: ${{ inputs.test-mode == 'nightly-numba-cuda' }}
+        env:
+          CUDA_VER: ${{ matrix.CUDA_VER }}
+          LOCAL_CTK: ${{ matrix.LOCAL_CTK }}
         shell: bash --noprofile --norc -xeuo pipefail {0}
-        run: |
-          TORCH_VER="${{ matrix.TORCH_VER }}"
-          TORCH_CUDA="${{ matrix.TORCH_CUDA }}"
-          if [[ "$TORCH_VER" == "latest" ]]; then
-            pip install torch --index-url "https://download.pytorch.org/whl/${TORCH_CUDA}"
-          else
-            pip install "torch==${TORCH_VER}" --index-url "https://download.pytorch.org/whl/${TORCH_CUDA}"
-          fi
-          python -c "import torch; print(f'PyTorch {torch.__version__}, CUDA {torch.version.cuda}')"
+        run: run-tests nightly-numba-cuda
 
+      # ── Nightly: run tests ──
       - name: Run PyTorch interop tests
         if: ${{ inputs.test-mode == 'nightly-pytorch' }}
         shell: bash --noprofile --norc -xeuo pipefail {0}
@@ -351,15 +356,7 @@ jobs:
           pytest -rxXs -v --durations=0 tests/test_utils.py tests/example_tests/
           popd
 
-      # ── Nightly: numba-cuda tests ──
-      - name: Install numba-cuda
-        if: ${{ inputs.test-mode == 'nightly-numba-cuda' }}
-        shell: bash --noprofile --norc -xeuo pipefail {0}
-        run: |
-          pip install numba-cuda
-          python -c "import numba_cuda; print(f'numba-cuda installed')"
-
       - name: Run numba-cuda tests
         if: ${{ inputs.test-mode == 'nightly-numba-cuda' }}
         shell: bash --noprofile --norc -xeuo pipefail {0}
-        run: python -m numba_cuda.numba.cuda.tests
+        run: python -m numba.runtests numba.cuda.tests
diff --git a/ci/tools/run-tests b/ci/tools/run-tests
@@ -13,19 +13,22 @@ if [[ ${#} -ne 1 ]]; then
   echo "Error: This script requires exactly 1 argument. You provided ${#}"
   exit 1
 fi
-if [[ "${1}" != "bindings" && "${1}" != "core" && "${1}" != "pathfinder" && "${1}" != "nightly-install" ]]; then
-  echo "Error: Invalid test module '${1}'. Must be 'bindings', 'core', 'pathfinder', or 'nightly-install'"
+if [[ "${1}" != "bindings" && "${1}" != "core" && "${1}" != "pathfinder" && "${1}" != "nightly-pytorch" && "${1}" != "nightly-numba-cuda" ]]; then
+  echo "Error: Invalid test module '${1}'. Must be 'bindings', 'core', 'pathfinder', 'nightly-pytorch', or 'nightly-numba-cuda'"
   exit 1
 fi
 
 test_module=${1}
 
-# Unconditionally install pathfinder wheel
-# (it is a direct dependency of bindings, and a transitive dependency of core)
-pushd ./cuda_pathfinder
-echo "Installing pathfinder wheel"
-pip install ./*.whl --group test
-popd
+# For standard modes, install pathfinder up front (it is a direct dependency
+# of bindings, and a transitive dependency of core).  Nightly modes install
+# all wheels together in a single pip call further below.
+if [[ "${test_module}" != "nightly-pytorch" && "${test_module}" != "nightly-numba-cuda" ]]; then
+  pushd ./cuda_pathfinder
+  echo "Installing pathfinder wheel"
+  pip install ./*.whl --group test
+  popd
+fi
 
 if [[ "${test_module}" == "pathfinder" ]]; then
   pushd ./cuda_pathfinder
@@ -91,35 +94,68 @@ elif [[ "${test_module}" == "core" ]]; then
     ${SANITIZER_CMD} pytest -rxXs -v --durations=0 --randomly-dont-reorganize tests/cython
   fi
   popd
-elif [[ "${test_module}" == "nightly-install" ]]; then
-  # Install all wheels (pathfinder already installed above) without running tests.
-  # Used by nightly optional-dependency pipelines (pytorch, numba-cuda).
-  echo "Installing bindings wheel"
-  pushd ./cuda_bindings
-  if [[ "${LOCAL_CTK}" == 1 ]]; then
-    pip install "${CUDA_BINDINGS_ARTIFACTS_DIR}"/*.whl
-  else
-    pip install $(ls "${CUDA_BINDINGS_ARTIFACTS_DIR}"/*.whl)[all]
-  fi
-  popd
+elif [[ "${test_module}" == "nightly-pytorch" || "${test_module}" == "nightly-numba-cuda" ]]; then
+  # Nightly optional-dependency testing.
+  # Install ALL wheels (pathfinder + bindings + core) and the optional dep
+  # in a single pip call so pip resolves version constraints in one shot
+  # and avoids costly uninstall/reinstall cycles.
+  #
+  # We pushd into cuda_core/ so that --group reads test dependency groups
+  # from cuda_core/pyproject.toml (needed for numpy, cupy, ml_dtypes, etc.).
+  # All other wheel paths use ../ to reach the repo root.
 
   TEST_CUDA_MAJOR="$(cut -d '.' -f 1 <<< ${CUDA_VER})"
-  echo "Installing core wheel"
+  CUDA_VER_MINOR="$(cut -d '.' -f 1-2 <<< "${CUDA_VER}")"
 
   FREE_THREADING=""
   if python -c 'import sys; assert not sys._is_gil_enabled()' 2> /dev/null; then
     FREE_THREADING+="-ft"
   fi
 
+  # Resolve the pathfinder wheel path before pushd (it's relative to repo root).
+  # CUDA_BINDINGS_ARTIFACTS_DIR and CUDA_CORE_ARTIFACTS_DIR are already absolute
+  # (set via realpath in env-vars).
+  PATHFINDER_WHL=($(realpath ./cuda_pathfinder/*.whl))
+
   pushd ./cuda_core
-  CUDA_VER_MINOR="$(cut -d '.' -f 1-2 <<< "${CUDA_VER}")"
-  WHL_EXTRA=("${CUDA_CORE_ARTIFACTS_DIR}"/*.whl)
+
+  # Build wheel specs (paths are absolute, so pushd doesn't affect them)
+  BINDINGS_WHL=("${CUDA_BINDINGS_ARTIFACTS_DIR}"/*.whl)
   if [[ "${LOCAL_CTK}" != 1 ]]; then
-    WHL_EXTRA=("${WHL_EXTRA[0]}[cu${TEST_CUDA_MAJOR}]")
+    BINDINGS_WHL=("${BINDINGS_WHL[0]}[all]")
   fi
-  pip install "${WHL_EXTRA[@]}" --group "test-cu${TEST_CUDA_MAJOR}${FREE_THREADING}" "cuda-toolkit==${CUDA_VER_MINOR}.*"
+
+  CORE_WHL=("${CUDA_CORE_ARTIFACTS_DIR}"/*.whl)
+  if [[ "${LOCAL_CTK}" != 1 ]]; then
+    CORE_WHL=("${CORE_WHL[0]}[cu${TEST_CUDA_MAJOR}]")
+  fi
+
+  # All packages in one pip call: pathfinder + bindings + core + test deps + optional dep
+  PIP_ARGS=(
+    "${PATHFINDER_WHL[@]}"
+    "${BINDINGS_WHL[@]}"
+    "${CORE_WHL[@]}"
+    --group "test-cu${TEST_CUDA_MAJOR}${FREE_THREADING}"
+    "cuda-toolkit==${CUDA_VER_MINOR}.*"
+  )
+
+  if [[ "${test_module}" == "nightly-pytorch" ]]; then
+    # TORCH_VER and TORCH_CUDA must be set by the caller.
+    echo "Installing pathfinder + bindings + core + test deps + PyTorch ${TORCH_VER} (${TORCH_CUDA})"
+    if [[ "${TORCH_VER}" == "latest" ]]; then
+      PIP_ARGS+=(torch)
+    else
+      PIP_ARGS+=("torch==${TORCH_VER}")
+    fi
+    PIP_ARGS+=(--extra-index-url "https://download.pytorch.org/whl/${TORCH_CUDA}")
+  elif [[ "${test_module}" == "nightly-numba-cuda" ]]; then
+    echo "Installing pathfinder + bindings + core + test deps + numba-cuda"
+    PIP_ARGS+=("numba-cuda[cu${TEST_CUDA_MAJOR}]")
+  fi
+
+  pip install "${PIP_ARGS[@]}"
   popd
 
-  echo "All cuda-python wheels installed for nightly testing"
-  pip list | grep -i "cuda\|pathfinder"
+  echo "Nightly install complete — installed packages:"
+  pip list
 fi
