Skip to content

Commit d5d216c

Browse files
authored
Merge branch 'main' into nvvm
2 parents 64d19ab + e06b299 commit d5d216c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+3022
-4019
lines changed

.github/workflows/bandit.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,9 @@ jobs:
2020
security-events: write
2121
steps:
2222
- name: Perform Bandit Analysis
23-
uses: PyCQA/bandit-action@8a1b30610f61f3f792fe7556e888c9d7dffa52de
23+
# KEEP IN SYNC WITH bandit rev in .pre-commit-config.yaml
24+
# Current runner uses Python 3.8, so the action installs bandit==1.7.10
25+
# via `pip install bandit[sarif]`. If runner Python moves to >=3.9,
26+
# the action will resolve to 1.8.x and you'll need to bump pre-commit.
27+
# (Bandit >=1.8.0 dropped Python 3.8 via Requires-Python metadata.)
28+
uses: PyCQA/bandit-action@8a1b30610f61f3f792fe7556e888c9d7dffa52de # v1.0.0

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ jobs:
3131
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3232

3333
- name: Initialize CodeQL
34-
uses: github/codeql-action/init@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
34+
uses: github/codeql-action/init@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.30.0
3535
with:
3636
languages: ${{ matrix.language }}
3737
build-mode: ${{ matrix.build-mode }}
3838
queries: security-extended
3939

4040
- name: Perform CodeQL Analysis
41-
uses: github/codeql-action/analyze@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
41+
uses: github/codeql-action/analyze@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.30.0
4242
with:
4343
category: "/language:${{matrix.language}}"

.github/workflows/release.yml

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ on:
2424
required: true
2525
type: string
2626
run-id:
27-
description: "The GHA run ID that generated validated artifacts"
28-
required: true
27+
description: "The GHA run ID that generated validated artifacts (optional - will be auto-detected from git tag if not provided)"
28+
required: false
2929
type: string
30+
default: ""
3031
build-ctk-ver:
3132
type: string
3233
required: true
@@ -43,6 +44,32 @@ defaults:
4344
shell: bash --noprofile --norc -xeuo pipefail {0}
4445

4546
jobs:
47+
determine-run-id:
48+
runs-on: ubuntu-latest
49+
outputs:
50+
run-id: ${{ steps.lookup-run-id.outputs.run-id }}
51+
steps:
52+
- name: Checkout Source
53+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
54+
with:
55+
# fetch-depth: 0 is required so the lookup-run-id script can access all git tags
56+
fetch-depth: 0
57+
58+
- name: Determine Run ID
59+
id: lookup-run-id
60+
env:
61+
GH_TOKEN: ${{ github.token }}
62+
run: |
63+
if [[ -n "${{ inputs.run-id }}" ]]; then
64+
echo "Using provided run ID: ${{ inputs.run-id }}"
65+
echo "run-id=${{ inputs.run-id }}" >> $GITHUB_OUTPUT
66+
else
67+
echo "Auto-detecting run ID for tag: ${{ inputs.git-tag }}"
68+
RUN_ID=$(./ci/tools/lookup-run-id "${{ inputs.git-tag }}" "${{ github.repository }}")
69+
echo "Auto-detected run ID: $RUN_ID"
70+
echo "run-id=$RUN_ID" >> $GITHUB_OUTPUT
71+
fi
72+
4673
check-tag:
4774
runs-on: ubuntu-latest
4875
steps:
@@ -91,13 +118,14 @@ jobs:
91118
pull-requests: write
92119
needs:
93120
- check-tag
121+
- determine-run-id
94122
secrets: inherit
95123
uses: ./.github/workflows/build-docs.yml
96124
with:
97125
build-ctk-ver: ${{ inputs.build-ctk-ver }}
98126
component: ${{ inputs.component }}
99127
git-tag: ${{ inputs.git-tag }}
100-
run-id: ${{ inputs.run-id }}
128+
run-id: ${{ needs.determine-run-id.outputs.run-id }}
101129
is-release: true
102130

103131
upload-archive:
@@ -106,18 +134,20 @@ jobs:
106134
contents: write
107135
needs:
108136
- check-tag
137+
- determine-run-id
109138
secrets: inherit
110139
uses: ./.github/workflows/release-upload.yml
111140
with:
112141
git-tag: ${{ inputs.git-tag }}
113-
run-id: ${{ inputs.run-id }}
142+
run-id: ${{ needs.determine-run-id.outputs.run-id }}
114143
component: ${{ inputs.component }}
115144

116145
publish-wheels:
117146
name: Publish wheels
118147
runs-on: ubuntu-latest
119148
needs:
120149
- check-tag
150+
- determine-run-id
121151
environment:
122152
name: ${{ inputs.wheel-dst }}
123153
url: https://${{ (inputs.wheel-dst == 'testpypi' && 'test.') || '' }}pypi.org/p/${{ inputs.component }}/
@@ -131,7 +161,7 @@ jobs:
131161
env:
132162
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
133163
run: |
134-
./ci/tools/download-wheels "${{ inputs.run-id }}" "${{ inputs.component }}" "${{ github.repository }}" "dist"
164+
./ci/tools/download-wheels "${{ needs.determine-run-id.outputs.run-id }}" "${{ inputs.component }}" "${{ github.repository }}" "dist"
135165
136166
- name: Publish package distributions to PyPI
137167
if: ${{ inputs.wheel-dst == 'pypi' }}

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

Lines changed: 24 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -34,86 +34,43 @@ jobs:
3434
outputs:
3535
MATRIX: ${{ steps.compute-matrix.outputs.MATRIX }}
3636
steps:
37+
- name: Checkout ${{ github.event.repository.name }}
38+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
39+
with:
40+
fetch-depth: 1
41+
3742
- name: Validate Test Type
3843
run: |
3944
if [[ "$BUILD_TYPE" != "pull-request" ]] && [[ "$BUILD_TYPE" != "nightly" ]] && [[ "$BUILD_TYPE" != "branch" ]]; then
4045
echo "Invalid build type! Must be one of 'nightly', 'pull-request', or 'branch'."
4146
exit 1
4247
fi
48+
4349
- name: Compute Python Test Matrix
4450
id: compute-matrix
4551
run: |
46-
# Set a default GPU based upon architecture.
47-
gpu="l4"
48-
if [[ "${ARCH}" == "arm64" ]]; then
49-
gpu="a100"
50-
fi
51-
# Add a special entry for the H100 runner on amd64.
52-
special_runner=""
53-
if [[ "${ARCH}" == "amd64" ]]; then
54-
special_runner="- { ARCH: ${ARCH}, PY_VER: '3.13', CUDA_VER: '13.0.0', LOCAL_CTK: '1', GPU: 'H100', DRIVER: 'latest' }"
55-
fi
56-
57-
# Please keep the matrices sorted in ascending order by the following:
58-
#
59-
# [PY_VER, CUDA_VER, LOCAL_CTK, GPU, DRIVER]
60-
#
61-
# Note that DRIVER: `earliest` does not work with CUDA 12.9.0 and LOCAL_CTK: 0 does not work with CUDA 12.0.1.
62-
#
63-
export MATRICES="
64-
pull-request:
65-
- { ARCH: ${ARCH}, PY_VER: '3.9', CUDA_VER: '12.9.0', LOCAL_CTK: '0', GPU: ${gpu}, DRIVER: 'latest' }
66-
- { ARCH: ${ARCH}, PY_VER: '3.9', CUDA_VER: '13.0.0', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
67-
- { ARCH: ${ARCH}, PY_VER: '3.10', CUDA_VER: '12.9.0', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
68-
- { ARCH: ${ARCH}, PY_VER: '3.10', CUDA_VER: '13.0.0', LOCAL_CTK: '0', GPU: ${gpu}, DRIVER: 'latest' }
69-
- { ARCH: ${ARCH}, PY_VER: '3.11', CUDA_VER: '12.9.0', LOCAL_CTK: '0', GPU: ${gpu}, DRIVER: 'latest' }
70-
- { ARCH: ${ARCH}, PY_VER: '3.11', CUDA_VER: '13.0.0', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
71-
- { ARCH: ${ARCH}, PY_VER: '3.12', CUDA_VER: '12.9.0', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
72-
- { ARCH: ${ARCH}, PY_VER: '3.12', CUDA_VER: '13.0.0', LOCAL_CTK: '0', GPU: ${gpu}, DRIVER: 'latest' }
73-
- { ARCH: ${ARCH}, PY_VER: '3.13', CUDA_VER: '12.9.0', LOCAL_CTK: '0', GPU: ${gpu}, DRIVER: 'latest' }
74-
- { ARCH: ${ARCH}, PY_VER: '3.13', CUDA_VER: '13.0.0', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
75-
${special_runner}
76-
nightly:
77-
- { ARCH: ${ARCH}, PY_VER: '3.9', CUDA_VER: '11.8.0', LOCAL_CTK: '0', GPU: ${gpu}, DRIVER: 'earliest' }
78-
- { ARCH: ${ARCH}, PY_VER: '3.9', CUDA_VER: '11.8.0', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
79-
- { ARCH: ${ARCH}, PY_VER: '3.9', CUDA_VER: '12.0.1', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
80-
- { ARCH: ${ARCH}, PY_VER: '3.9', CUDA_VER: '12.9.0', LOCAL_CTK: '0', GPU: ${gpu}, DRIVER: 'latest' }
81-
- { ARCH: ${ARCH}, PY_VER: '3.9', CUDA_VER: '12.9.0', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
82-
- { ARCH: ${ARCH}, PY_VER: '3.10', CUDA_VER: '11.8.0', LOCAL_CTK: '0', GPU: ${gpu}, DRIVER: 'earliest' }
83-
- { ARCH: ${ARCH}, PY_VER: '3.10', CUDA_VER: '11.8.0', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
84-
- { ARCH: ${ARCH}, PY_VER: '3.10', CUDA_VER: '12.0.1', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
85-
- { ARCH: ${ARCH}, PY_VER: '3.10', CUDA_VER: '12.9.0', LOCAL_CTK: '0', GPU: ${gpu}, DRIVER: 'latest' }
86-
- { ARCH: ${ARCH}, PY_VER: '3.10', CUDA_VER: '12.9.0', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
87-
- { ARCH: ${ARCH}, PY_VER: '3.11', CUDA_VER: '11.8.0', LOCAL_CTK: '0', GPU: ${gpu}, DRIVER: 'earliest' }
88-
- { ARCH: ${ARCH}, PY_VER: '3.11', CUDA_VER: '11.8.0', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
89-
- { ARCH: ${ARCH}, PY_VER: '3.11', CUDA_VER: '12.0.1', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
90-
- { ARCH: ${ARCH}, PY_VER: '3.11', CUDA_VER: '12.9.0', LOCAL_CTK: '0', GPU: ${gpu}, DRIVER: 'latest' }
91-
- { ARCH: ${ARCH}, PY_VER: '3.11', CUDA_VER: '12.9.0', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
92-
- { ARCH: ${ARCH}, PY_VER: '3.12', CUDA_VER: '11.8.0', LOCAL_CTK: '0', GPU: ${gpu}, DRIVER: 'earliest' }
93-
- { ARCH: ${ARCH}, PY_VER: '3.12', CUDA_VER: '11.8.0', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
94-
- { ARCH: ${ARCH}, PY_VER: '3.12', CUDA_VER: '12.0.1', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
95-
- { ARCH: ${ARCH}, PY_VER: '3.12', CUDA_VER: '12.9.0', LOCAL_CTK: '0', GPU: ${gpu}, DRIVER: 'latest' }
96-
- { ARCH: ${ARCH}, PY_VER: '3.12', CUDA_VER: '12.9.0', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
97-
- { ARCH: ${ARCH}, PY_VER: '3.13', CUDA_VER: '11.8.0', LOCAL_CTK: '0', GPU: ${gpu}, DRIVER: 'earliest' }
98-
- { ARCH: ${ARCH}, PY_VER: '3.13', CUDA_VER: '11.8.0', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
99-
- { ARCH: ${ARCH}, PY_VER: '3.13', CUDA_VER: '12.0.1', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
100-
- { ARCH: ${ARCH}, PY_VER: '3.13', CUDA_VER: '12.9.0', LOCAL_CTK: '0', GPU: ${gpu}, DRIVER: 'latest' }
101-
- { ARCH: ${ARCH}, PY_VER: '3.13', CUDA_VER: '12.9.0', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
102-
${special_runner}
103-
"
104-
10552
# Use the nightly matrix for branch tests
10653
MATRIX_TYPE="${BUILD_TYPE}"
10754
if [[ "${MATRIX_TYPE}" == "branch" ]]; then
10855
MATRIX_TYPE="nightly"
10956
fi
110-
export MATRIX_TYPE
111-
TEST_MATRIX=$(yq -n 'env(MATRICES) | .[strenv(MATRIX_TYPE)]')
112-
export TEST_MATRIX
57+
58+
# Read base matrix from JSON file for the specific architecture
59+
TEST_MATRIX=$(jq --arg arch "$ARCH" --arg matrix_type "$MATRIX_TYPE" '
60+
.linux[$matrix_type] |
61+
map(select(.ARCH == $arch))
62+
' ci/test-matrix.json)
63+
64+
# Add special runner for amd64 if applicable
65+
if [[ "${ARCH}" == "amd64" ]]; then
66+
SPECIAL_RUNNERS=$(jq '
67+
.linux.special_runners.amd64
68+
' ci/test-matrix.json)
69+
TEST_MATRIX=$(jq --argjson special "$SPECIAL_RUNNERS" '. + $special' <<< "$TEST_MATRIX")
70+
fi
11371
11472
MATRIX="$(
115-
yq -n -o json 'env(TEST_MATRIX)' | \
116-
jq -c '${{ inputs.matrix_filter }} | if (. | length) > 0 then {include: .} else "Error: Empty matrix\n" | halt_error(1) end'
73+
jq -c '${{ inputs.matrix_filter }} | if (. | length) > 0 then {include: .} else "Error: Empty matrix\n" | halt_error(1) end' <<< "$TEST_MATRIX"
11774
)"
11875
11976
echo "MATRIX=${MATRIX}" | tee --append "${GITHUB_OUTPUT}"
@@ -298,6 +255,7 @@ jobs:
298255
- name: Run cuda.pathfinder tests with see_what_works
299256
env:
300257
CUDA_PATHFINDER_TEST_LOAD_NVIDIA_DYNAMIC_LIB_STRICTNESS: see_what_works
258+
CUDA_PATHFINDER_TEST_FIND_NVIDIA_HEADERS_STRICTNESS: see_what_works
301259
run: run-tests pathfinder
302260

303261
- name: Run cuda.bindings tests
@@ -325,11 +283,12 @@ jobs:
325283
run: |
326284
set -euo pipefail
327285
pushd cuda_pathfinder
328-
pip install --only-binary=:all: -v ".[nvidia_wheels_cu${TEST_CUDA_MAJOR},nvidia_wheels_host]"
286+
pip install --only-binary=:all: -v ".[test_nvidia_wheels_cu${TEST_CUDA_MAJOR},test_nvidia_wheels_host]"
329287
pip list
330288
popd
331289
332290
- name: Run cuda.pathfinder tests with all_must_work
333291
env:
334292
CUDA_PATHFINDER_TEST_LOAD_NVIDIA_DYNAMIC_LIB_STRICTNESS: all_must_work
293+
CUDA_PATHFINDER_TEST_FIND_NVIDIA_HEADERS_STRICTNESS: all_must_work
335294
run: run-tests pathfinder

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

Lines changed: 20 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ jobs:
3232
outputs:
3333
MATRIX: ${{ steps.compute-matrix.outputs.MATRIX }}
3434
steps:
35+
- name: Checkout ${{ github.event.repository.name }}
36+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
37+
with:
38+
fetch-depth: 1
39+
3540
- name: Validate Test Type
3641
run: |
3742
if [[ "$BUILD_TYPE" != "pull-request" ]] && [[ "$BUILD_TYPE" != "nightly" ]] && [[ "$BUILD_TYPE" != "branch" ]]; then
@@ -41,55 +46,42 @@ jobs:
4146
- name: Compute Python Test Matrix
4247
id: compute-matrix
4348
run: |
44-
# Please keep the matrices sorted in ascending order by the following:
45-
#
46-
# [PY_VER, CUDA_VER, LOCAL_CTK]
47-
#
48-
export MATRICES="
49-
pull-request:
50-
- { ARCH: ${ARCH}, PY_VER: '3.12', CUDA_VER: '12.9.0', LOCAL_CTK: '0' }
51-
- { ARCH: ${ARCH}, PY_VER: '3.12', CUDA_VER: '12.9.0', LOCAL_CTK: '1' }
52-
- { ARCH: ${ARCH}, PY_VER: '3.13', CUDA_VER: '13.0.0', LOCAL_CTK: '0' }
53-
- { ARCH: ${ARCH}, PY_VER: '3.13', CUDA_VER: '13.0.0', LOCAL_CTK: '1' }
54-
nightly:
55-
- { ARCH: ${ARCH}, PY_VER: '3.12', CUDA_VER: '11.8.0', LOCAL_CTK: '0' }
56-
- { ARCH: ${ARCH}, PY_VER: '3.12', CUDA_VER: '11.8.0', LOCAL_CTK: '1' }
57-
- { ARCH: ${ARCH}, PY_VER: '3.12', CUDA_VER: '12.9.0', LOCAL_CTK: '0' }
58-
- { ARCH: ${ARCH}, PY_VER: '3.12', CUDA_VER: '12.9.0', LOCAL_CTK: '1' }
59-
"
60-
6149
# Use the nightly matrix for branch tests
6250
MATRIX_TYPE="${BUILD_TYPE}"
6351
if [[ "${MATRIX_TYPE}" == "branch" ]]; then
6452
MATRIX_TYPE="nightly"
6553
fi
66-
export MATRIX_TYPE
67-
TEST_MATRIX=$(yq -n 'env(MATRICES) | .[strenv(MATRIX_TYPE)]')
68-
export TEST_MATRIX
54+
55+
# Read base matrix from JSON file for the specific architecture
56+
TEST_MATRIX=$(jq --arg arch "$ARCH" --arg matrix_type "$MATRIX_TYPE" '
57+
.windows[$matrix_type] |
58+
map(select(.ARCH == $arch))
59+
' ci/test-matrix.json)
6960
7061
MATRIX="$(
71-
yq -n -o json 'env(TEST_MATRIX)' | \
72-
jq -c '${{ inputs.matrix_filter }} | if (. | length) > 0 then {include: .} else "Error: Empty matrix\n" | halt_error(1) end'
62+
jq -c '${{ inputs.matrix_filter }} | if (. | length) > 0 then {include: .} else "Error: Empty matrix\n" | halt_error(1) end' <<< "$TEST_MATRIX"
7363
)"
7464
7565
echo "MATRIX=${MATRIX}" | tee --append "${GITHUB_OUTPUT}"
7666
7767
test:
78-
name: py${{ matrix.PY_VER }}, ${{ matrix.CUDA_VER }}, ${{ (matrix.LOCAL_CTK == '1' && 'local') || 'wheels' }}
68+
name: py${{ matrix.PY_VER }}, ${{ matrix.CUDA_VER }}, ${{ (matrix.LOCAL_CTK == '1' && 'local') || 'wheels' }}, GPU ${{ matrix.GPU }}
7969
# The build stage could fail but we want the CI to keep moving.
8070
needs: compute-matrix
8171
strategy:
8272
fail-fast: false
8373
matrix: ${{ fromJSON(needs.compute-matrix.outputs.MATRIX) }}
8474
if: ${{ github.repository_owner == 'nvidia' && !cancelled() }}
85-
runs-on: 'cuda-python-windows-gpu-github'
75+
runs-on: "windows-${{ matrix.ARCH }}-gpu-${{ matrix.GPU }}-${{ matrix.DRIVER }}-1"
8676
steps:
8777
- name: Checkout ${{ github.event.repository.name }}
8878
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
8979
with:
9080
fetch-depth: 0
9181

92-
# TODO: use setup-proxy-cache once we have self-hosted Windows runners
82+
- name: Setup proxy cache
83+
uses: nv-gha-runners/setup-proxy-cache@main
84+
continue-on-error: true
9385

9486
- name: Update driver
9587
run: |
@@ -98,20 +90,6 @@ jobs:
9890
- name: Ensure GPU is working
9991
run: nvidia-smi
10092

101-
- name: Install Git for Windows
102-
# the GPU runner image does not have Git Bash pre-installed...
103-
env:
104-
# doesn't seem there's an easy way to avoid hard-coding it?
105-
GFW_EXE_URL: https://github.com/git-for-windows/git/releases/download/v2.49.0.windows.1/PortableGit-2.49.0-64-bit.7z.exe
106-
run: |
107-
Invoke-WebRequest -Uri "$env:GFW_EXE_URL" -OutFile "PortableGit.7z.exe"
108-
# Self-extracting, see https://gitforwindows.org/zip-archives-extracting-the-released-archives.html
109-
Start-Process .\PortableGit.7z.exe -Wait -Verbose -ArgumentList '-y -gm2'
110-
ls -l PortableGit
111-
echo "$((Get-Location).Path)\\PortableGit\\bin" >> $env:GITHUB_PATH
112-
$env:Path += ";$((Get-Location).Path)\\PortableGit\\bin"
113-
bash --version
114-
11593
- name: Set environment variables
11694
env:
11795
BUILD_CUDA_VER: ${{ inputs.build-ctk-ver }}
@@ -143,21 +121,6 @@ jobs:
143121
name: ${{ env.CUDA_BINDINGS_ARTIFACT_NAME }}
144122
path: ${{ env.CUDA_BINDINGS_ARTIFACTS_DIR }}
145123

146-
- name: Install gh cli
147-
# the GPU runner image does not have gh pre-installed...
148-
env:
149-
# doesn't seem there's an easy way to avoid hard-coding it?
150-
GH_MSI_URL: https://github.com/cli/cli/releases/download/v2.67.0/gh_2.67.0_windows_amd64.msi
151-
run: |
152-
Invoke-WebRequest -Uri "$env:GH_MSI_URL" -OutFile "gh_installer.msi"
153-
Start-Process msiexec.exe -Wait -Verbose -ArgumentList '/i "gh_installer.msi" /qn'
154-
$GH_POSSIBLE_PATHS = "C:\\Program Files\\GitHub CLI", "C:\\Program Files (x86)\\GitHub CLI"
155-
foreach ($p in $GH_POSSIBLE_PATHS) {
156-
echo "$p" >> $env:GITHUB_PATH
157-
$env:Path += ";$p"
158-
}
159-
gh --version
160-
161124
- name: Install zstd
162125
# the GPU runner image does not have zstd pre-installed... and it's needed by actions/cache
163126
if: ${{ matrix.LOCAL_CTK == '1' }}
@@ -262,6 +225,7 @@ jobs:
262225
- name: Run cuda.pathfinder tests with see_what_works
263226
env:
264227
CUDA_PATHFINDER_TEST_LOAD_NVIDIA_DYNAMIC_LIB_STRICTNESS: see_what_works
228+
CUDA_PATHFINDER_TEST_FIND_NVIDIA_HEADERS_STRICTNESS: see_what_works
265229
shell: bash --noprofile --norc -xeuo pipefail {0}
266230
run: run-tests pathfinder
267231

@@ -292,12 +256,13 @@ jobs:
292256
shell: bash --noprofile --norc -xeuo pipefail {0}
293257
run: |
294258
pushd cuda_pathfinder
295-
pip install --only-binary=:all: -v ".[nvidia_wheels_cu${TEST_CUDA_MAJOR},nvidia_wheels_host]"
259+
pip install --only-binary=:all: -v ".[test_nvidia_wheels_cu${TEST_CUDA_MAJOR},test_nvidia_wheels_host]"
296260
pip list
297261
popd
298262
299263
- name: Run cuda.pathfinder tests with all_must_work
300264
env:
301265
CUDA_PATHFINDER_TEST_LOAD_NVIDIA_DYNAMIC_LIB_STRICTNESS: all_must_work
266+
CUDA_PATHFINDER_TEST_FIND_NVIDIA_HEADERS_STRICTNESS: all_must_work
302267
shell: bash --noprofile --norc -xeuo pipefail {0}
303268
run: run-tests pathfinder

0 commit comments

Comments
 (0)