Skip to content

Commit a76c384

Browse files
authored
Merge branch 'main' into vk/typing
2 parents 93c4e9b + 4033ba7 commit a76c384

File tree

11 files changed

+2066
-11
lines changed

11 files changed

+2066
-11
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

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,7 @@ testing/*.ltoir
1515
testing/*.ltoir.o
1616
testing/*.o
1717
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

ci/coverage_report.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@ 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

ci/test_thirdparty.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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

ci/test_wheel.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@ package=$(realpath wheel/numba_cuda*.whl)
1111
echo "Package path: ${package}"
1212

1313
DEPENDENCIES=(
14-
"${package}[test]"
14+
"${package}"
1515
"cuda-python==${CUDA_VER_MAJOR_MINOR%.*}.*"
1616
"cuda-core==0.3.*"
17+
"--group"
18+
"test"
1719
)
1820

1921
# Constrain oldest supported dependencies for testing

ci/test_wheel_ctypes_binding.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ rapids-logger "Install wheel with testing dependencies"
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 \
15+
--group test
1516

1617
# FIXME: Find a way to build the tests that does not depend on the CUDA Python bindings
1718
#rapids-logger "Build tests"

ci/test_wheel_deps_wheels.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ rapids-logger "Install wheel with test dependencies"
1111
package=$(realpath wheel/numba_cuda*.whl)
1212
echo "Package path: ${package}"
1313
# TODO: control minor version pinning to honor TEST_MATRIX once the cuda-toolkit metapackage is up
14-
python -m pip install "${package}[cu${CUDA_VER_MAJOR},test-cu${CUDA_VER_MAJOR}]"
14+
python -m pip install "${package}[cu${CUDA_VER_MAJOR}]" --group "test-cu${CUDA_VER_MAJOR}"
1515

1616
rapids-logger "Build test binaries"
1717

pixi.lock

Lines changed: 2025 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)