Skip to content

Commit 6f8ddb3

Browse files
merge/resolve
2 parents 1b59b5c + 2df2c59 commit 6f8ddb3

Some content is hidden

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

79 files changed

+3722
-1249
lines changed

.gitattributes

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
2+
# SPDX-License-Identifier: BSD-2-Clause
3+
4+
# SCM syntax highlighting & preventing 3-way merges
5+
pixi.lock merge=binary linguist-language=YAML linguist-generated=true

.github/workflows/pr.yaml

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,11 @@ jobs:
1919
- compute-matrix
2020
- build-conda
2121
- test-conda
22-
- test-conda-ctypes-binding
2322
- test-simulator
2423
- build-wheels
2524
- build-wheels-windows
2625
- test-wheels-windows
2726
- test-wheels
28-
- test-wheels-ctypes-binding
2927
- test-wheels-deps-wheels
3028
- test-thirdparty
3129
- build-docs
@@ -80,18 +78,6 @@ jobs:
8078
script: "ci/test_conda.sh"
8179
run_codecov: false
8280
matrix: ${{ needs.compute-matrix.outputs.TEST_MATRIX }}
83-
test-conda-ctypes-binding:
84-
needs:
85-
- build-conda
86-
- compute-matrix
87-
uses: ./.github/workflows/conda-python-tests.yaml
88-
with:
89-
build_type: pull-request
90-
script: "ci/test_conda_ctypes_binding.sh"
91-
run_codecov: false
92-
# This selects "ARCH=amd64 and CUDA >=12, with the latest supported Python for each CUDA major version".
93-
matrix: ${{ needs.compute-matrix.outputs.TEST_MATRIX }}
94-
matrix_filter: map(select(.ARCH == "amd64" and (.CUDA_VER | split(".") | .[0] | tonumber >= 12))) | group_by(.CUDA_VER|split(".")|map(tonumber)|.[0]) | map(max_by([(.PY_VER|split(".")|map(tonumber)), (.CUDA_VER|split(".")|map(tonumber))]))
9581
test-simulator:
9682
needs:
9783
- build-conda
@@ -124,17 +110,6 @@ jobs:
124110
build_type: pull-request
125111
script: "ci/test_wheel.sh false"
126112
matrix: ${{ needs.compute-matrix.outputs.TEST_MATRIX }}
127-
test-wheels-ctypes-binding:
128-
needs:
129-
- build-wheels
130-
- compute-matrix
131-
uses: ./.github/workflows/wheels-test.yaml
132-
with:
133-
build_type: pull-request
134-
script: "ci/test_wheel_ctypes_binding.sh"
135-
# This selects "ARCH=amd64 and CUDA >=12, with the latest supported Python for each CUDA major version".
136-
matrix: ${{ needs.compute-matrix.outputs.TEST_MATRIX }}
137-
matrix_filter: map(select(.ARCH == "amd64" and (.CUDA_VER | split(".") | .[0] | tonumber >= 12))) | group_by(.CUDA_VER|split(".")|map(tonumber)|.[0]) | map(max_by([(.PY_VER|split(".")|map(tonumber)), (.CUDA_VER|split(".")|map(tonumber))]))
138113
test-wheels-deps-wheels:
139114
needs:
140115
- build-wheels

.gitignore

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,14 @@ build
88
*.so
99
numba_cuda/numba/cuda/tests/cudadrv/test_device_functions.*
1010
numba_cuda/numba/cuda/tests/cudadrv/undefined_extern.*
11+
testing/*.a
12+
testing/*.cubin
13+
testing/*.fatbin
14+
testing/*.ltoir
15+
testing/*.ltoir.o
16+
testing/*.o
17+
testing/*.ptx
18+
# pixi environments
19+
.pixi/*
20+
!.pixi/config.toml
21+
*.log

.spdx-ignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,4 @@ numba_cuda/numba/cuda/include/*/cuda_*.hpp
3232

3333
# GitHub configuration files
3434
.github/CODEOWNERS
35+
pixi.lock

README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,19 @@ they are compiled for the appropriate compute capability.
3737
```
3838
cd testing
3939
# Optionally, build test binaries and point to their location for the test suite
40-
make
40+
make -j $(nproc)
4141
export NUMBA_CUDA_TEST_BIN_DIR=`pwd`
4242
# Execute tests
4343
pytest -n auto -v
4444
```
4545

46+
Alternatively, you can use [pixi](https://pixi.sh/latest/installation/) to wrap all of that up for you:
47+
48+
```
49+
# run tests against CUDA 13
50+
pixi run -e cu13 test -n auto -v
51+
```
52+
4653

4754
Testing should discover the `numba.cuda` module from the `numba_cuda` package. You
4855
can check where `numba.cuda` files are being located by running

ci/coverage_report.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,17 @@ rapids-logger "Install wheel with test dependencies and coverage tools"
1010
package=$(realpath wheel/numba_cuda*.whl)
1111
echo "Package path: ${package}"
1212
python -m pip install \
13-
"${package}[test]" \
13+
"${package}" \
1414
"cuda-python==${CUDA_VER_MAJOR_MINOR%.*}.*" \
1515
"cuda-core==0.3.*" \
1616
pytest-cov \
17-
coverage
17+
coverage \
18+
--group test
1819

1920
rapids-logger "Build test binaries"
2021
export NUMBA_CUDA_TEST_BIN_DIR=`pwd`/testing
2122
pushd $NUMBA_CUDA_TEST_BIN_DIR
22-
make
23+
make -j $(nproc)
2324

2425
rapids-logger "Check GPU usage"
2526
nvidia-smi

ci/test_conda.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ nvidia-smi
6666
rapids-logger "Build test binaries"
6767
export NUMBA_CUDA_TEST_BIN_DIR=`pwd`/testing
6868
pushd $NUMBA_CUDA_TEST_BIN_DIR
69-
make
69+
make -j $(nproc)
7070

7171
rapids-logger "Show Numba system info"
7272
python -m numba --sysinfo

ci/test_conda_ctypes_binding.sh

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

ci/test_thirdparty.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ CUDA_VER_MAJOR_MINOR=${CUDA_VER%.*}
99
rapids-logger "Install cuDF Wheel"
1010

1111
pip install \
12-
--extra-index-url=https://pypi.anaconda.org/rapidsai-wheels-nightly/simple \
13-
"cudf-cu12>=25.10.0a0,<=25.10" "dask-cuda>=25.10.0a0,<=25.10"
12+
--extra-index-url=https://pypi.nvidia.com \
13+
"cudf-cu12==25.10.*"
1414

1515

1616
rapids-logger "Remove Extraneous numba-cuda"
@@ -20,10 +20,12 @@ rapids-logger "Install wheel with test dependencies"
2020
package=$(realpath wheel/numba_cuda*.whl)
2121
echo "Package path: ${package}"
2222
python -m pip install \
23-
"${package}[test]" \
23+
"${package}" \
2424
"cuda-python==${CUDA_VER_MAJOR_MINOR%.*}.*" \
2525
"cuda-core==0.3.*" \
2626
"nvidia-nvjitlink-cu12" \
27+
--group test
28+
2729

2830

2931
rapids-logger "Shallow clone cuDF repository"

ci/test_wheel.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ $CUDA_VER_MAJOR = ($env:CUDA_VER -split '\.')[0] -join '.'
3131
rapids-logger "Install wheel with test dependencies"
3232
$package = Resolve-Path wheel\numba_cuda*.whl | Select-Object -ExpandProperty Path
3333
echo "Package path: $package"
34-
python -m pip install "${package}[cu${CUDA_VER_MAJOR},test-cu${CUDA_VER_MAJOR}]"
34+
python -m pip install "${package}[cu${CUDA_VER_MAJOR}]" --group "test-cu${CUDA_VER_MAJOR}"
3535
python -m pip install "llvmlite<0.45" "numba==0.61.*" # WAR for https://github.com/numba/llvmlite/issues/1297
3636

3737

0 commit comments

Comments
 (0)