Skip to content

Commit 1c6d737

Browse files
authored
Merge branch 'main' into cybind-runtime
2 parents fe823c0 + ea0215f commit 1c6d737

48 files changed

Lines changed: 11448 additions & 580 deletions

Some content is hidden

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

.github/workflows/build-wheel.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,16 @@ jobs:
462462
cuda-version: ${{ inputs.prev-cuda-version }}
463463
cuda-path: "./cuda_toolkit_prev"
464464

465+
- name: Build cuda.core test binaries
466+
run: bash ${{ env.CUDA_CORE_TEST_BINARIES_DIR }}/build_test_binaries.sh
467+
468+
- name: Upload cuda.core test binaries
469+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
470+
with:
471+
name: ${{ env.CUDA_CORE_ARTIFACT_NAME }}-test-binaries
472+
path: ${{ env.CUDA_CORE_TEST_BINARIES_DIR }}/*.o
473+
if-no-files-found: error
474+
465475
- name: Download cuda.bindings build artifacts from the prior branch
466476
env:
467477
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,19 @@ jobs:
279279
pwd
280280
ls -lahR $CUDA_CORE_CYTHON_TESTS_DIR
281281
282+
- name: Download cuda.core test binaries
283+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
284+
with:
285+
name: ${{ env.CUDA_CORE_ARTIFACT_NAME }}-test-binaries
286+
path: ${{ env.CUDA_CORE_TEST_BINARIES_DIR }}
287+
run-id: ${{ inputs.run-id || github.run_id }}
288+
github-token: ${{ secrets.GITHUB_TOKEN }}
289+
290+
- name: Display structure of downloaded cuda.core test binaries
291+
run: |
292+
pwd
293+
ls -lahR $CUDA_CORE_TEST_BINARIES_DIR
294+
282295
- name: Set up Python ${{ matrix.PY_VER }}
283296
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
284297
with:

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,19 @@ jobs:
259259
Get-Location
260260
Get-ChildItem -Recurse -Force $env:CUDA_CORE_CYTHON_TESTS_DIR | Select-Object Mode, LastWriteTime, Length, FullName
261261
262+
- name: Download cuda.core test binaries
263+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
264+
with:
265+
name: ${{ env.CUDA_CORE_ARTIFACT_NAME }}-test-binaries
266+
path: ${{ env.CUDA_CORE_TEST_BINARIES_DIR }}
267+
run-id: ${{ inputs.run-id || github.run_id }}
268+
github-token: ${{ secrets.GITHUB_TOKEN }}
269+
270+
- name: Display structure of downloaded cuda.core test binaries
271+
run: |
272+
Get-Location
273+
Get-ChildItem -Recurse -Force $env:CUDA_CORE_TEST_BINARIES_DIR | Select-Object Mode, LastWriteTime, Length, FullName
274+
262275
- name: Set up Python ${{ matrix.PY_VER }}
263276
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
264277
with:

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ cache_driver
1919
cache_runtime
2020
cache_nvrtc
2121

22+
# cuda.core test object fixtures built locally / downloaded as CI artifacts
23+
cuda_core/tests/test_binaries/*.o
24+
2225
# CUDA Python specific (auto-generated)
2326
cuda_bindings/cuda/bindings/_internal/cudla.pyx
2427
cuda_bindings/cuda/bindings/_internal/driver.pyx

ci/tools/env-vars

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ CUDA_CORE_ARTIFACT_BASENAME="cuda-core-python${PYTHON_VERSION_FORMATTED}-${HOST_
3434
echo "CUDA_CORE_ARTIFACT_NAME=${CUDA_CORE_ARTIFACT_BASENAME}-${SHA}"
3535
echo "CUDA_CORE_ARTIFACTS_DIR=$(realpath "${REPO_DIR}/cuda_core/dist")"
3636
echo "CUDA_CORE_CYTHON_TESTS_DIR=$(realpath "${REPO_DIR}/cuda_core/tests/cython")"
37+
echo "CUDA_CORE_TEST_BINARIES_DIR=$(realpath "${REPO_DIR}/cuda_core/tests/test_binaries")"
3738
echo "PYTHON_VERSION_FORMATTED=${PYTHON_VERSION_FORMATTED}"
3839
} >> $GITHUB_ENV
3940

ci/tools/tests/test_fetch_ctk_redistrib.py

Lines changed: 0 additions & 221 deletions
This file was deleted.

cuda_bindings/AGENTS.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ subpackage in the `cuda-python` monorepo.
4141
- run: `pytest tests/cython/`
4242
- **Examples**: example coverage is pytest-based under `examples/`.
4343
- **Benchmarks**: run with `pytest --benchmark-only benchmarks/` when needed.
44-
- **Orchestrated run**: from repo root, `scripts/run_tests.sh bindings`.
4544

4645
## Build and environment notes
4746

cuda_bindings/pyproject.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
[build-system]
44
requires = [
55
"setuptools>=80.0.0",
6-
"setuptools_scm[simple]>=8,<10.1",
7-
"vcs-versioning<2.0",
6+
"setuptools_scm[simple]>=8,!=10.1",
87
"cython>=3.2,<3.3",
98
"cuda-pathfinder>=1.5",
109
]

cuda_core/AGENTS.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ This file describes `cuda_core`, the high-level Pythonic CUDA subpackage in the
4040
- run: `pytest tests/cython/`
4141
- **Examples**: validate affected examples in `examples/` when changing user
4242
workflows or public APIs.
43-
- **Orchestrated run**: from repo root, `scripts/run_tests.sh core`.
4443

4544
## Runtime/build environment notes
4645

cuda_core/README.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,6 @@ To run these tests:
2424
* `python -m pytest tests/` with editable installations
2525
* `pytest tests/` with installed packages
2626

27-
Alternatively, from the repository root you can use a simple script:
28-
29-
* `./scripts/run_tests.sh core` to run only `cuda_core` tests
30-
* `./scripts/run_tests.sh` to run all package tests (pathfinder → bindings → core)
31-
* `./scripts/run_tests.sh smoke` to run meta-level smoke tests under `tests/integration`
32-
3327
### Cython Unit Tests
3428

3529
Cython tests are located in `tests/cython` and need to be built. These builds have the same CUDA Toolkit header requirements as [those of cuda.bindings](https://nvidia.github.io/cuda-python/cuda-bindings/latest/install.html#requirements) where the major.minor version must match `cuda.bindings`. To build them:

0 commit comments

Comments
 (0)