Skip to content
This repository was archived by the owner on Jul 28, 2025. It is now read-only.

Commit aee16ed

Browse files
AyodeAweAyodeAwe
committed
Merge remote-tracking branch 'upstream/branch-25.02'
2 parents 312aa4d + 3b98358 commit aee16ed

File tree

84 files changed

+1195
-1310
lines changed

Some content is hidden

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

84 files changed

+1195
-1310
lines changed

‎.devcontainer/cuda11.8-conda/devcontainer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
"args": {
66
"CUDA": "11.8",
77
"PYTHON_PACKAGE_MANAGER": "conda",
8-
"BASE": "rapidsai/devcontainers:24.12-cpp-cuda11.8-mambaforge-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:25.02-cpp-cuda11.8-mambaforge-ubuntu22.04"
99
}
1010
},
1111
"runArgs": [
1212
"--rm",
1313
"--name",
14-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-24.12-cuda11.8-conda"
14+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.02-cuda11.8-conda"
1515
],
1616
"hostRequirements": {"gpu": "optional"},
1717
"features": {
18-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:24.12": {}
18+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.2": {}
1919
},
2020
"overrideFeatureInstallOrder": [
2121
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"

‎.devcontainer/cuda11.8-pip/devcontainer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
"args": {
66
"CUDA": "11.8",
77
"PYTHON_PACKAGE_MANAGER": "pip",
8-
"BASE": "rapidsai/devcontainers:24.12-cpp-cuda11.8-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:25.02-cpp-cuda11.8-ubuntu22.04"
99
}
1010
},
1111
"runArgs": [
1212
"--rm",
1313
"--name",
14-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-24.12-cuda11.8-pip"
14+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.02-cuda11.8-pip"
1515
],
1616
"hostRequirements": {"gpu": "optional"},
1717
"features": {
18-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:24.12": {}
18+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.2": {}
1919
},
2020
"overrideFeatureInstallOrder": [
2121
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"

‎.devcontainer/cuda12.5-conda/devcontainer.json renamed to ‎.devcontainer/cuda12.8-conda/devcontainer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@
33
"context": "${localWorkspaceFolder}/.devcontainer",
44
"dockerfile": "${localWorkspaceFolder}/.devcontainer/Dockerfile",
55
"args": {
6-
"CUDA": "12.5",
6+
"CUDA": "12.8",
77
"PYTHON_PACKAGE_MANAGER": "conda",
8-
"BASE": "rapidsai/devcontainers:24.12-cpp-mambaforge-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:25.02-cpp-mambaforge-ubuntu22.04"
99
}
1010
},
1111
"runArgs": [
1212
"--rm",
1313
"--name",
14-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-24.12-cuda12.5-conda"
14+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.02-cuda12.8-conda"
1515
],
1616
"hostRequirements": {"gpu": "optional"},
1717
"features": {
18-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:24.12": {}
18+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.2": {}
1919
},
2020
"overrideFeatureInstallOrder": [
2121
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"
2222
],
23-
"initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-cuda12.5-envs}"],
23+
"initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-cuda12.8-envs}"],
2424
"postAttachCommand": ["/bin/bash", "-c", "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; . rapids-post-attach-command; fi"],
2525
"workspaceFolder": "/home/coder",
2626
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/cuspatial,type=bind,consistency=consistent",
@@ -29,7 +29,7 @@
2929
"source=${localWorkspaceFolder}/../.cache,target=/home/coder/.cache,type=bind,consistency=consistent",
3030
"source=${localWorkspaceFolder}/../.config,target=/home/coder/.config,type=bind,consistency=consistent",
3131
"source=${localWorkspaceFolder}/../.conda/pkgs,target=/home/coder/.conda/pkgs,type=bind,consistency=consistent",
32-
"source=${localWorkspaceFolder}/../.conda/${localWorkspaceFolderBasename}-cuda12.5-envs,target=/home/coder/.conda/envs,type=bind,consistency=consistent"
32+
"source=${localWorkspaceFolder}/../.conda/${localWorkspaceFolderBasename}-cuda12.8-envs,target=/home/coder/.conda/envs,type=bind,consistency=consistent"
3333
],
3434
"customizations": {
3535
"vscode": {

‎.devcontainer/cuda12.5-pip/devcontainer.json renamed to ‎.devcontainer/cuda12.8-pip/devcontainer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,32 @@
33
"context": "${localWorkspaceFolder}/.devcontainer",
44
"dockerfile": "${localWorkspaceFolder}/.devcontainer/Dockerfile",
55
"args": {
6-
"CUDA": "12.5",
6+
"CUDA": "12.8",
77
"PYTHON_PACKAGE_MANAGER": "pip",
8-
"BASE": "rapidsai/devcontainers:24.12-cpp-cuda12.5-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:25.02-cpp-cuda12.8-ubuntu22.04"
99
}
1010
},
1111
"runArgs": [
1212
"--rm",
1313
"--name",
14-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-24.12-cuda12.5-pip"
14+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.02-cuda12.8-pip"
1515
],
1616
"hostRequirements": {"gpu": "optional"},
1717
"features": {
18-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:24.12": {}
18+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.2": {}
1919
},
2020
"overrideFeatureInstallOrder": [
2121
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"
2222
],
23-
"initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config/pip,local/share/${localWorkspaceFolderBasename}-cuda12.5-venvs}"],
23+
"initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config/pip,local/share/${localWorkspaceFolderBasename}-cuda12.8-venvs}"],
2424
"postAttachCommand": ["/bin/bash", "-c", "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; . rapids-post-attach-command; fi"],
2525
"workspaceFolder": "/home/coder",
2626
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/cuspatial,type=bind,consistency=consistent",
2727
"mounts": [
2828
"source=${localWorkspaceFolder}/../.aws,target=/home/coder/.aws,type=bind,consistency=consistent",
2929
"source=${localWorkspaceFolder}/../.cache,target=/home/coder/.cache,type=bind,consistency=consistent",
3030
"source=${localWorkspaceFolder}/../.config,target=/home/coder/.config,type=bind,consistency=consistent",
31-
"source=${localWorkspaceFolder}/../.local/share/${localWorkspaceFolderBasename}-cuda12.5-venvs,target=/home/coder/.local/share/venvs,type=bind,consistency=consistent"
31+
"source=${localWorkspaceFolder}/../.local/share/${localWorkspaceFolderBasename}-cuda12.8-venvs,target=/home/coder/.local/share/venvs,type=bind,consistency=consistent"
3232
],
3333
"customizations": {
3434
"vscode": {

‎.github/copy-pr-bot.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
# https://docs.gha-runners.nvidia.com/apps/copy-pr-bot/
33

44
enabled: true
5+
auto_sync_draft: false

‎.github/workflows/build.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ concurrency:
2828
jobs:
2929
cpp-build:
3030
secrets: inherit
31-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.12
31+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.02
3232
with:
3333
build_type: ${{ inputs.build_type || 'branch' }}
3434
branch: ${{ inputs.branch }}
@@ -37,7 +37,7 @@ jobs:
3737
python-build:
3838
needs: [cpp-build]
3939
secrets: inherit
40-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.12
40+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.02
4141
with:
4242
build_type: ${{ inputs.build_type || 'branch' }}
4343
branch: ${{ inputs.branch }}
@@ -46,7 +46,7 @@ jobs:
4646
upload-conda:
4747
needs: [cpp-build, python-build]
4848
secrets: inherit
49-
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-24.12
49+
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-25.02
5050
with:
5151
build_type: ${{ inputs.build_type || 'branch' }}
5252
branch: ${{ inputs.branch }}
@@ -56,7 +56,7 @@ jobs:
5656
if: github.ref_type == 'branch'
5757
needs: python-build
5858
secrets: inherit
59-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.12
59+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.02
6060
with:
6161
arch: "amd64"
6262
branch: ${{ inputs.branch }}
@@ -68,7 +68,7 @@ jobs:
6868
sha: ${{ inputs.sha }}
6969
wheel-build-libcuspatial:
7070
secrets: inherit
71-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12
71+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.02
7272
with:
7373
# build for every combination of arch and CUDA version, but only for the latest Python
7474
matrix_filter: group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | map(max_by(.PY_VER|split(".")|map(tonumber)))
@@ -80,7 +80,7 @@ jobs:
8080
wheel-publish-libcuspatial:
8181
needs: wheel-build-libcuspatial
8282
secrets: inherit
83-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.12
83+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.02
8484
with:
8585
build_type: ${{ inputs.build_type || 'branch' }}
8686
branch: ${{ inputs.branch }}
@@ -89,9 +89,9 @@ jobs:
8989
package-name: libcuspatial
9090
package-type: cpp
9191
wheel-build-cuspatial:
92-
needs: wheel-publish-libcuspatial
92+
needs: wheel-build-libcuspatial
9393
secrets: inherit
94-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12
94+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.02
9595
with:
9696
build_type: ${{ inputs.build_type || 'branch' }}
9797
branch: ${{ inputs.branch }}
@@ -101,7 +101,7 @@ jobs:
101101
wheel-publish-cuspatial:
102102
needs: wheel-build-cuspatial
103103
secrets: inherit
104-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.12
104+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.02
105105
with:
106106
build_type: ${{ inputs.build_type || 'branch' }}
107107
branch: ${{ inputs.branch }}
@@ -111,7 +111,7 @@ jobs:
111111
package-type: python
112112
wheel-build-cuproj:
113113
secrets: inherit
114-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12
114+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.02
115115
with:
116116
build_type: ${{ inputs.build_type || 'branch' }}
117117
branch: ${{ inputs.branch }}
@@ -121,7 +121,7 @@ jobs:
121121
wheel-publish-cuproj:
122122
needs: wheel-build-cuproj
123123
secrets: inherit
124-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.12
124+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.02
125125
with:
126126
build_type: ${{ inputs.build_type || 'branch' }}
127127
branch: ${{ inputs.branch }}

‎.github/workflows/pr.yaml

Lines changed: 32 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ concurrency:
1212
jobs:
1313
pr-builder:
1414
needs:
15+
- check-nightly-ci
1516
- changed-files
1617
- checks
1718
- conda-cpp-build
@@ -28,13 +29,25 @@ jobs:
2829
- wheel-tests-cuproj
2930
- devcontainer
3031
secrets: inherit
31-
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.12
32+
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-25.02
3233
if: always()
3334
with:
3435
needs: ${{ toJSON(needs) }}
36+
check-nightly-ci:
37+
# Switch to ubuntu-latest once it defaults to a version of Ubuntu that
38+
# provides at least Python 3.11 (see
39+
# https://docs.python.org/3/library/datetime.html#datetime.date.fromisoformat)
40+
runs-on: ubuntu-24.04
41+
env:
42+
RAPIDS_GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
43+
steps:
44+
- name: Check if nightly CI is passing
45+
uses: rapidsai/shared-actions/check_nightly_success/dispatch@main
46+
with:
47+
repo: cuspatial
3548
changed-files:
3649
secrets: inherit
37-
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@branch-24.12
50+
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@branch-25.02
3851
with:
3952
files_yaml: |
4053
test_cpp:
@@ -64,46 +77,46 @@ jobs:
6477
- '!notebooks/**'
6578
checks:
6679
secrets: inherit
67-
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.12
80+
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-25.02
6881
with:
6982
enable_check_generated_files: false
7083
conda-cpp-build:
7184
needs: checks
7285
secrets: inherit
73-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.12
86+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.02
7487
with:
7588
build_type: pull-request
7689
conda-cpp-checks:
7790
needs: conda-cpp-build
7891
secrets: inherit
79-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@branch-24.12
92+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@branch-25.02
8093
with:
8194
build_type: pull-request
8295
enable_check_symbols: true
8396
conda-cpp-tests:
8497
needs: [conda-cpp-build, changed-files]
8598
secrets: inherit
86-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.12
99+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-25.02
87100
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_cpp
88101
with:
89102
build_type: pull-request
90103
conda-python-build:
91104
needs: conda-cpp-build
92105
secrets: inherit
93-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.12
106+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.02
94107
with:
95108
build_type: pull-request
96109
conda-python-tests:
97110
needs: [conda-python-build, changed-files]
98111
secrets: inherit
99-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.12
100-
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_cpp
112+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.02
113+
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
101114
with:
102115
build_type: pull-request
103116
conda-notebook-tests:
104117
needs: [conda-python-build, changed-files]
105118
secrets: inherit
106-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.12
119+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.02
107120
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_notebooks
108121
with:
109122
build_type: pull-request
@@ -114,7 +127,7 @@ jobs:
114127
docs-build:
115128
needs: conda-python-build
116129
secrets: inherit
117-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.12
130+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.02
118131
with:
119132
build_type: pull-request
120133
node_type: "gpu-v100-latest-1"
@@ -124,7 +137,7 @@ jobs:
124137
wheel-build-libcuspatial:
125138
needs: checks
126139
secrets: inherit
127-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12
140+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.02
128141
with:
129142
# build for every combination of arch and CUDA version, but only for the latest Python
130143
matrix_filter: group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | map(max_by(.PY_VER|split(".")|map(tonumber)))
@@ -133,39 +146,40 @@ jobs:
133146
wheel-build-cuspatial:
134147
needs: [checks, wheel-build-libcuspatial]
135148
secrets: inherit
136-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12
149+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.02
137150
with:
138151
build_type: pull-request
139152
script: ci/build_wheel_cuspatial.sh
140153
wheel-tests-cuspatial:
141154
needs: [wheel-build-cuspatial, changed-files]
142155
secrets: inherit
143-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.12
156+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.02
144157
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
145158
with:
146159
build_type: pull-request
147160
script: ci/test_wheel_cuspatial.sh
148161
wheel-build-cuproj:
149162
needs: checks
150163
secrets: inherit
151-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12
164+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.02
152165
with:
153166
build_type: pull-request
154167
script: ci/build_wheel_cuproj.sh
155168
wheel-tests-cuproj:
156169
needs: [wheel-build-cuspatial, wheel-build-cuproj, changed-files]
157170
secrets: inherit
158-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.12
171+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.02
159172
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
160173
with:
161174
build_type: pull-request
162175
script: ci/test_wheel_cuproj.sh
163176
devcontainer:
164177
secrets: inherit
165-
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.12
178+
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-25.02
166179
with:
180+
node_type: "cpu32"
167181
arch: '["amd64"]'
168-
cuda: '["12.5"]'
182+
cuda: '["12.8"]'
169183
build_command: |
170184
sccache -z;
171185
build-all -DBUILD_TESTS=ON -DBUILD_BENCHMARKS=ON --verbose;

0 commit comments

Comments
 (0)