Skip to content

Commit 66bf6bb

Browse files
rwgkrwgk
committed
Merge main into orin_fixes
Preserve the Orin device-API skip while adopting cuda.core's bindings floor, simplify now-obsolete test guards, and move the UUID fix note to the upcoming release.
2 parents 497203c + 45a4ced commit 66bf6bb

129 files changed

Lines changed: 3791 additions & 3272 deletions

File tree

Some content is hidden

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

‎.github/RELEASE-core.md‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,14 @@ platforms as appropriate for each release.
6262
## Check (or update if needed) the dependency requirements
6363

6464
Review `cuda_core/pyproject.toml` and verify that all dependency
65-
requirements are current.
66-
67-
Update the cuda_core dependency in `cuda_python/setup.py`.
65+
requirements are current. The `cu12`/`cu13` extras declare the
66+
`cuda-bindings` floors; see "Bumping the cuda-bindings floor" in
67+
`cuda_core/AGENTS.md`.
68+
69+
Update the `cuda-core` pin in `cuda_python/setup.py` to the new minor
70+
series (`cuda-core~=X.Y.0`), and plan a `cuda-python` release right after
71+
this one. Until that release, `pip install cuda-python` resolves to the
72+
previous `cuda-core`.
6873

6974
---
7075

‎.github/workflows/backport.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-FileCopyrightText: Copyright (c) 2024-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
1+
# SPDX-FileCopyrightText: Copyright (c) 2024-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
22
#
33
# SPDX-License-Identifier: Apache-2.0
44

@@ -43,7 +43,7 @@ jobs:
4343
echo "OLD_BRANCH=${OLD_BRANCH}" >> $GITHUB_ENV
4444
4545
- name: Create backport pull requests
46-
uses: korthout/backport-action@2e830a1d0b8269505846ddd407a70876913ad1f8 # v4.6.0
46+
uses: korthout/backport-action@8560fb503c275d433c56f05a2f64850093baa9f7 # v4.7.0
4747
with:
4848
copy_assignees: true
4949
copy_labels_pattern: true
@@ -67,7 +67,7 @@ jobs:
6767
run: echo "BACKPORT_BRANCH=${{ inputs.backport-branch }}" >> $GITHUB_ENV
6868

6969
- name: Create backport pull requests
70-
uses: korthout/backport-action@2e830a1d0b8269505846ddd407a70876913ad1f8 # v4.6.0
70+
uses: korthout/backport-action@8560fb503c275d433c56f05a2f64850093baa9f7 # v4.7.0
7171
with:
7272
copy_assignees: true
7373
copy_labels_pattern: true

‎.github/workflows/bandit.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2727

2828
- name: Install uv
29-
uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
29+
uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
3030
with:
3131
enable-cache: false
3232

@@ -45,6 +45,6 @@ jobs:
4545
with:
4646
args: "check --select S --ignore ${{ steps.ignore-codes.outputs.codes }} --output-format sarif --output-file results.sarif"
4747
- name: Upload SARIF file
48-
uses: github/codeql-action/upload-sarif@cdf488f595d80d6e07e03d4674febd5ab45fa938 # v4.37.9
48+
uses: github/codeql-action/upload-sarif@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2
4949
with:
5050
sarif_file: results.sarif

‎.github/workflows/build-docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
# TODO: This workflow runs on GH-hosted runner and cannot use the proxy cache
8484

8585
- name: Set up miniforge
86-
uses: conda-incubator/setup-miniconda@8ee1f361103df19b6f8c8655fd3967a8ecb162d5 # v4.0.1
86+
uses: conda-incubator/setup-miniconda@be893c923ea9cf1cf7cd510fbdde27c7e18cbdcb # v4.1.0
8787
with:
8888
activate-environment: cuda-python-docs
8989
environment-file: ./cuda_python/docs/environment-docs.yml

‎.github/workflows/ci-pixi-lockfile-freshness-check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
pull-requests: read
6262
steps:
6363
- name: Checkout ${{ github.event.repository.name }}
64-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
64+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
6565
with:
6666
fetch-depth: 0
6767
persist-credentials: false

‎.github/workflows/ci-pixi-lockfile-refresh.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
cancel-in-progress: false
3737
steps:
3838
- name: Checkout ${{ github.event.repository.name }}
39-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
39+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
4040
with:
4141
fetch-depth: 0
4242
ref: ${{ github.event.repository.default_branch }}

‎.github/workflows/coverage.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ jobs:
8080
uses: ./.github/actions/install_unix_deps
8181
continue-on-error: false
8282
with:
83-
dependencies: "tree rsync libsqlite3-0 g++ jq wget libgl1 libegl1"
84-
dependent_exes: "tree rsync libsqlite3-0 g++ jq wget libgl1 libegl1"
83+
dependencies: "tree rsync libsqlite3-0 g++ jq wget libgl1 libegl1 yq"
84+
dependent_exes: "tree rsync libsqlite3-0 g++ jq wget libgl1 libegl1 yq"
8585

8686
- name: Setup proxy cache
8787
uses: nv-gha-runners/setup-proxy-cache@main

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,9 @@ jobs:
144144
# for artifact fetching, graphics libs, g++ required for cffi in
145145
# example; util-linux for `nsenter` (custom-DRIVER rows re-exec
146146
# install_gpu_driver.sh onto the host through nsenter)
147-
dependencies: "jq wget libgl1 libegl1 g++ util-linux"
148-
dependent_exes: "jq wget"
147+
# yq: ci/tools/env-vars reads ci/versions.yml with it
148+
dependencies: "jq wget libgl1 libegl1 g++ util-linux yq"
149+
dependent_exes: "jq wget yq"
149150

150151
- name: Install GPU driver
151152
if: ${{ matrix.DRIVER != 'latest' && matrix.DRIVER != 'earliest' }}
@@ -252,14 +253,14 @@ jobs:
252253
fi
253254
254255
- name: Display structure of downloaded cuda-python artifacts
255-
if: ${{ env.TEST_PYTHON == 'true' && env.BINDINGS_SOURCE != 'published' }}
256+
if: ${{ env.TEST_PYTHON == 'true' && env.BINDINGS_SOURCE != 'floor' }}
256257
run: |
257258
pwd
258259
ls -lah cuda_python*.whl cuda_pathfinder/
259260
260261
- name: Display structure of downloaded cuda.bindings artifacts
261262
if: ${{ (env.TEST_BINDINGS == 'true' || env.TEST_CORE == 'true' || env.TEST_PYTHON == 'true') &&
262-
env.BINDINGS_SOURCE != 'published' }}
263+
env.BINDINGS_SOURCE != 'floor' }}
263264
run: |
264265
pwd
265266
ls -lahR $CUDA_BINDINGS_ARTIFACTS_DIR

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,14 +232,14 @@ jobs:
232232
fi
233233
234234
- name: Display structure of downloaded cuda-python artifacts
235-
if: ${{ env.TEST_PYTHON == 'true' && env.BINDINGS_SOURCE != 'published' }}
235+
if: ${{ env.TEST_PYTHON == 'true' && env.BINDINGS_SOURCE != 'floor' }}
236236
run: |
237237
Get-Location
238238
Get-ChildItem cuda_python*.whl | Select-Object Mode, LastWriteTime, Length, FullName
239239
240240
- name: Display structure of downloaded cuda.bindings artifacts
241241
if: ${{ (env.TEST_BINDINGS == 'true' || env.TEST_CORE == 'true' || env.TEST_PYTHON == 'true') &&
242-
env.BINDINGS_SOURCE != 'published' }}
242+
env.BINDINGS_SOURCE != 'floor' }}
243243
run: |
244244
Get-Location
245245
Get-ChildItem -Recurse -Force $env:CUDA_BINDINGS_ARTIFACTS_DIR | Select-Object Mode, LastWriteTime, Length, FullName

‎.pre-commit-config.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,15 @@ repos:
4242
pass_filenames: false
4343
verbose: true
4444

45+
- id: check-cuda-core-bindings-floor
46+
name: Check the cuda-bindings floor against ci/versions.yml and the docs
47+
entry: python ./toolshed/check_cuda_core_bindings_floor.py
48+
language: python
49+
files: ^(cuda_core/pyproject\.toml|ci/versions\.yml|cuda_core/cuda/core/_bindings_floor\.py|cuda_core/docs/source/.*\.rst|toolshed/check_cuda_core_bindings_floor\.py)$
50+
pass_filenames: false
51+
additional_dependencies:
52+
- "tomli>=1.1.0; python_version < '3.11'"
53+
4554
- id: check-spdx
4655
name: Check SPDX Headers
4756
entry: python ./toolshed/check_spdx.py

0 commit comments

Comments
 (0)