Skip to content

Commit d31daf9

Browse files
brandon-b-millerbrandon-b-miller
committed
merge/resolve/address
2 parents f0a7672 + 2567b28 commit d31daf9

File tree

220 files changed

+54751
-2716
lines changed

Some content is hidden

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

220 files changed

+54751
-2716
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/conda-python-build.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
if: "!cancelled()"
105105
uses: actions/upload-artifact@v4
106106
with:
107-
name: conda-repo
107+
name: conda-repo-py${{ matrix.PY_VER }}-${{ matrix.ARCH }}
108108
path: "/tmp/conda-bld-output"
109109
- name: Publish conda package
110110
if: inputs.upload_to_anaconda

‎.github/workflows/conda-python-tests.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,9 @@ jobs:
9797
ref: ${{ inputs.sha }}
9898
fetch-depth: 0
9999
- uses: actions/download-artifact@v4
100-
name: conda-repo
100+
with:
101+
name: conda-repo-py${{ matrix.PY_VER }}-${{ matrix.ARCH }}
102+
path: conda-repo
101103
- name: Display structure of downloaded files
102104
run: ls -R
103105
- name: Standardize repository information

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
env:
5050
RAPIDS_ARTIFACTS_DIR: ${{ github.workspace }}/artifacts
5151
container:
52-
image: rapidsai/ci-conda:latest
52+
image: rapidsai/ci-conda:cuda13.0.0-ubuntu24.04-py3.13
5353
env:
5454
RAPIDS_BUILD_TYPE: ${{ inputs.build_type }}
5555
steps:
@@ -59,7 +59,9 @@ jobs:
5959
ref: ${{ inputs.sha }}
6060
fetch-depth: 0
6161
- uses: actions/download-artifact@v4
62-
name: conda-repo
62+
with:
63+
name: conda-repo-py3.13-amd64
64+
path: conda-repo
6365
- name: Display structure of downloaded files
6466
run: ls -R
6567
- name: Standardize repository information

‎.github/workflows/pr.yaml‎

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,11 @@ jobs:
1919
- compute-matrix
2020
- build-conda
2121
- test-conda
22-
- test-conda-ctypes-binding
2322
- test-simulator
2423
- build-wheels
24+
- build-wheels-windows
2525
- test-wheels-windows
2626
- test-wheels
27-
- test-wheels-ctypes-binding
2827
- test-wheels-deps-wheels
2928
- test-thirdparty
3029
- build-docs
@@ -79,18 +78,6 @@ jobs:
7978
script: "ci/test_conda.sh"
8079
run_codecov: false
8180
matrix: ${{ needs.compute-matrix.outputs.TEST_MATRIX }}
82-
test-conda-ctypes-binding:
83-
needs:
84-
- build-conda
85-
- compute-matrix
86-
uses: ./.github/workflows/conda-python-tests.yaml
87-
with:
88-
build_type: pull-request
89-
script: "ci/test_conda_ctypes_binding.sh"
90-
run_codecov: false
91-
# This selects "ARCH=amd64 and CUDA >=12, with the latest supported Python for each CUDA major version".
92-
matrix: ${{ needs.compute-matrix.outputs.TEST_MATRIX }}
93-
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))]))
9481
test-simulator:
9582
needs:
9683
- build-conda
@@ -108,10 +95,11 @@ jobs:
10895
build_type: pull-request
10996
script: "ci/build_wheel.sh"
11097
matrix: ${{ needs.compute-matrix.outputs.BUILD_MATRIX }}
98+
build-wheels-windows:
99+
uses: ./.github/workflows/wheel-windows-build.yaml
111100
test-wheels-windows:
112101
needs:
113-
- build-wheels
114-
- compute-matrix
102+
- build-wheels-windows
115103
uses: ./.github/workflows/wheel-windows-tests.yaml
116104
test-wheels:
117105
needs:
@@ -122,17 +110,6 @@ jobs:
122110
build_type: pull-request
123111
script: "ci/test_wheel.sh false"
124112
matrix: ${{ needs.compute-matrix.outputs.TEST_MATRIX }}
125-
test-wheels-ctypes-binding:
126-
needs:
127-
- build-wheels
128-
- compute-matrix
129-
uses: ./.github/workflows/wheels-test.yaml
130-
with:
131-
build_type: pull-request
132-
script: "ci/test_wheel_ctypes_binding.sh"
133-
# This selects "ARCH=amd64 and CUDA >=12, with the latest supported Python for each CUDA major version".
134-
matrix: ${{ needs.compute-matrix.outputs.TEST_MATRIX }}
135-
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))]))
136113
test-wheels-deps-wheels:
137114
needs:
138115
- build-wheels
@@ -169,4 +146,4 @@ jobs:
169146
build_type: pull-request
170147
script: "ci/coverage_report.sh"
171148
matrix: ${{ needs.compute-matrix.outputs.TEST_MATRIX }}
172-
matrix_filter: 'map(select(.ARCH == "amd64" and .CUDA_VER == "12.9.1" and .PY_VER == "3.11")) | .[0:1]'
149+
matrix_filter: 'map(select(.ARCH == "amd64" and .CUDA_VER == "12.9.1" and .PY_VER == "3.12")) | .[0:1]'

‎.github/workflows/simulator-test.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,9 @@ jobs:
8686
ref: ${{ inputs.sha }}
8787
fetch-depth: 0
8888
- uses: actions/download-artifact@v4
89-
name: conda-repo
89+
with:
90+
name: conda-repo-py${{ matrix.PY_VER }}-${{ matrix.ARCH }}
91+
path: conda-repo
9092
- name: Display structure of downloaded files
9193
run: ls -R
9294
- name: Standardize repository information

‎.github/workflows/wheel-windows-build.yaml‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
2+
# SPDX-License-Identifier: BSD-2-Clause
3+
4+
name: "CI: Build wheel on Windows"
5+
6+
on:
7+
workflow_call:
8+
inputs:
9+
sha:
10+
type: string
11+
repo:
12+
type: string
13+
script:
14+
type: string
15+
default: "./ci/build_wheel.ps1"
16+
17+
jobs:
18+
build:
19+
name: ${{ matrix.PY_VER }}, windows
20+
strategy:
21+
fail-fast: false
22+
matrix:
23+
PY_VER:
24+
- "3.10"
25+
- "3.11"
26+
- "3.12"
27+
- "3.13"
28+
runs-on: windows-2022
29+
steps:
30+
- uses: actions/checkout@v4
31+
with:
32+
repository: ${{ inputs.repo }}
33+
ref: ${{ inputs.sha }}
34+
fetch-depth: 0
35+
36+
- name: Set up Python ${{ matrix.PY_VER }}
37+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
38+
with:
39+
python-version: ${{ matrix.PY_VER }}
40+
41+
- name: Set up MSVC
42+
uses: ilammy/msvc-dev-cmd@v1 # TODO: ask admin to allow pinning commits
43+
44+
- name: Python build
45+
run: |
46+
${{ inputs.script }}
47+
env:
48+
CUDA_VER: "12.8.0"
49+
50+
- name: Upload wheel
51+
if: "!cancelled()"
52+
uses: actions/upload-artifact@v4
53+
with:
54+
name: wheel-py${{ matrix.PY_VER }}-windows
55+
path: ${{ env.wheel_path }}

‎.github/workflows/wheel-windows-tests.yaml‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,16 @@ on:
1515
default: "./ci/test_wheel.ps1"
1616

1717
jobs:
18-
compute-matrix:
19-
runs-on: ubuntu-latest
20-
outputs:
21-
MATRIX: ${{ steps.compute-matrix.outputs.MATRIX }}
22-
steps:
23-
- name: Compute Python Test Matrix
24-
id: compute-matrix
25-
run: |
26-
set -eo pipefail
27-
export TEST_MATRIX="{ ARCH: 'amd64', PY_VER: '3.12', CUDA_VER: '12.8.0' }"
28-
MATRIX=$(yq -n -o json 'env(TEST_MATRIX)' | jq -c)
29-
echo "MATRIX=${MATRIX}" | tee --append "${GITHUB_OUTPUT}"
3018
tests:
31-
name: ${{ matrix.CUDA_VER }}, ${{ matrix.PY_VER }}, ${{ matrix.ARCH }}, windows
32-
needs: compute-matrix
19+
name: ${{ matrix.PY_VER }}, windows
3320
strategy:
3421
fail-fast: false
35-
matrix: ${{ fromJSON('{"ARCH":["amd64"],"PY_VER":["3.12"],"CUDA_VER":["12.8.0"]}') }}
22+
matrix:
23+
PY_VER:
24+
- "3.10"
25+
- "3.11"
26+
- "3.12"
27+
- "3.13"
3628
runs-on: "cuda-python-windows-gpu-github"
3729
steps:
3830
- uses: actions/checkout@v4
@@ -49,7 +41,9 @@ jobs:
4941
run: nvidia-smi
5042

5143
- uses: actions/download-artifact@v4
52-
name: wheel
44+
with:
45+
name: wheel-py${{ matrix.PY_VER }}-windows
46+
path: wheel
5347

5448
- name: Display structure of downloaded files
5549
run: Get-ChildItem -Recurse
@@ -63,4 +57,4 @@ jobs:
6357
run: |
6458
${{ inputs.script }}
6559
env:
66-
CUDA_VER: ${{ matrix.CUDA_VER }}
60+
CUDA_VER: "12.8.0"

‎.github/workflows/wheels-build.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,11 @@ jobs:
152152
if: "!cancelled()"
153153
uses: actions/upload-artifact@v4
154154
with:
155-
name: sdist
155+
name: sdist-py${{ matrix.PY_VER }}-${{ matrix.ARCH }}
156156
path: ${{ env.sdist_path }}
157157
- name: Upload wheel
158158
if: "!cancelled()"
159159
uses: actions/upload-artifact@v4
160160
with:
161-
name: wheel
161+
name: wheel-py${{ matrix.PY_VER }}-${{ matrix.ARCH }}
162162
path: ${{ env.wheel_path }}

‎.github/workflows/wheels-test.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,9 @@ jobs:
115115
fetch-depth: 0 # unshallow fetch for setuptools-scm
116116
persist-credentials: false
117117
- uses: actions/download-artifact@v4
118-
name: wheel
118+
with:
119+
name: wheel-py${{ matrix.PY_VER }}-${{ matrix.ARCH }}
120+
path: wheel
119121
- name: Display structure of downloaded files
120122
run: ls -R
121123
- name: Standardize repository information

0 commit comments

Comments
 (0)