Skip to content

Commit 50f4c10

Browse files
raydouglassraydouglass
committed
Merge pull request #18945 from rapidsai/branch-25.06
2 parents 6bc4206 + 81c066b commit 50f4c10

File tree

1,010 files changed

+43753
-25733
lines changed

Some content is hidden

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

1,010 files changed

+43753
-25733
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:25.04-cpp-cuda11.8-mambaforge-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:25.06-cpp-cuda11.8-mambaforge-ubuntu22.04"
99
}
1010
},
1111
"runArgs": [
1212
"--rm",
1313
"--name",
14-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.04-cuda11.8-conda"
14+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.06-cuda11.8-conda"
1515
],
1616
"hostRequirements": {"gpu": "optional"},
1717
"features": {
18-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.4": {}
18+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.6": {}
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:25.04-cpp-cuda11.8-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:25.06-cpp-cuda11.8-ubuntu22.04"
99
}
1010
},
1111
"runArgs": [
1212
"--rm",
1313
"--name",
14-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.04-cuda11.8-pip"
14+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.06-cuda11.8-pip"
1515
],
1616
"hostRequirements": {"gpu": "optional"},
1717
"features": {
18-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.4": {}
18+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.6": {}
1919
},
2020
"overrideFeatureInstallOrder": [
2121
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
"args": {
66
"CUDA": "12.8",
77
"PYTHON_PACKAGE_MANAGER": "conda",
8-
"BASE": "rapidsai/devcontainers:25.04-cpp-mambaforge-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:25.06-cpp-mambaforge-ubuntu22.04"
99
}
1010
},
1111
"runArgs": [
1212
"--rm",
1313
"--name",
14-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.04-cuda12.8-conda"
14+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.06-cuda12.8-conda"
1515
],
1616
"hostRequirements": {
1717
"gpu": "optional"
1818
},
1919
"features": {
20-
"ghcr.io/rapidsai/devcontainers/features/cuda:25.4": {
20+
"ghcr.io/rapidsai/devcontainers/features/cuda:25.6": {
2121
"version": "12.8",
2222
"installCompilers": false,
2323
"installProfilers": true,
@@ -38,7 +38,7 @@
3838
"installnvJPEG": false,
3939
"pruneStaticLibs": true
4040
},
41-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.4": {}
41+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.6": {}
4242
},
4343
"overrideFeatureInstallOrder": [
4444
"ghcr.io/rapidsai/devcontainers/features/cuda",

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
"args": {
66
"CUDA": "12.8",
77
"PYTHON_PACKAGE_MANAGER": "pip",
8-
"BASE": "rapidsai/devcontainers:25.04-cpp-cuda12.8-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:25.06-cpp-cuda12.8-ubuntu22.04"
99
}
1010
},
1111
"runArgs": [
1212
"--rm",
1313
"--name",
14-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.04-cuda12.8-pip"
14+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.06-cuda12.8-pip"
1515
],
1616
"hostRequirements": {
1717
"gpu": "optional"
1818
},
1919
"features": {
20-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.4": {}
20+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.6": {}
2121
},
2222
"overrideFeatureInstallOrder": [
2323
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"

‎.github/workflows/build.yaml

Lines changed: 29 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -40,50 +40,51 @@ jobs:
4040
cpp-build:
4141
needs: [telemetry-setup]
4242
secrets: inherit
43-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.04
43+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.06
4444
with:
4545
build_type: ${{ inputs.build_type || 'branch' }}
4646
branch: ${{ inputs.branch }}
4747
date: ${{ inputs.date }}
48+
script: ci/build_cpp.sh
4849
sha: ${{ inputs.sha }}
4950
node_type: "cpu16"
5051
python-build:
5152
needs: [telemetry-setup, cpp-build]
5253
secrets: inherit
53-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.04
54+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.06
5455
with:
5556
build_type: ${{ inputs.build_type || 'branch' }}
5657
branch: ${{ inputs.branch }}
5758
date: ${{ inputs.date }}
59+
script: ci/build_python.sh
5860
sha: ${{ inputs.sha }}
5961
upload-conda:
6062
needs: [cpp-build, python-build]
6163
secrets: inherit
62-
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-25.04
64+
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-25.06
6365
with:
6466
build_type: ${{ inputs.build_type || 'branch' }}
6567
branch: ${{ inputs.branch }}
6668
date: ${{ inputs.date }}
6769
sha: ${{ inputs.sha }}
68-
skip_upload_pkgs: libcudf-example
6970
docs-build:
7071
if: github.ref_type == 'branch'
7172
needs: python-build
7273
secrets: inherit
73-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.04
74+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.06
7475
with:
7576
arch: "amd64"
7677
branch: ${{ inputs.branch }}
7778
build_type: ${{ inputs.build_type || 'branch' }}
7879
container_image: "rapidsai/ci-conda:latest"
7980
date: ${{ inputs.date }}
8081
node_type: "gpu-l4-latest-1"
81-
run_script: "ci/build_docs.sh"
82+
script: "ci/build_docs.sh"
8283
sha: ${{ inputs.sha }}
8384
wheel-build-libcudf:
8485
needs: [telemetry-setup]
8586
secrets: inherit
86-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.04
87+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06
8788
with:
8889
# build for every combination of arch and CUDA version, but only for the latest Python
8990
matrix_filter: group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | map(max_by(.PY_VER|split(".")|map(tonumber)))
@@ -93,10 +94,12 @@ jobs:
9394
date: ${{ inputs.date }}
9495
node_type: "cpu16"
9596
script: ci/build_wheel_libcudf.sh
97+
package-name: libcudf
98+
package-type: cpp
9699
wheel-publish-libcudf:
97100
needs: wheel-build-libcudf
98101
secrets: inherit
99-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.04
102+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.06
100103
with:
101104
build_type: ${{ inputs.build_type || 'branch' }}
102105
branch: ${{ inputs.branch }}
@@ -107,17 +110,19 @@ jobs:
107110
wheel-build-pylibcudf:
108111
needs: [telemetry-setup, wheel-build-libcudf]
109112
secrets: inherit
110-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.04
113+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06
111114
with:
112115
build_type: ${{ inputs.build_type || 'branch' }}
113116
branch: ${{ inputs.branch }}
114117
sha: ${{ inputs.sha }}
115118
date: ${{ inputs.date }}
116119
script: ci/build_wheel_pylibcudf.sh
120+
package-name: pylibcudf
121+
package-type: python
117122
wheel-publish-pylibcudf:
118123
needs: wheel-build-pylibcudf
119124
secrets: inherit
120-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.04
125+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.06
121126
with:
122127
build_type: ${{ inputs.build_type || 'branch' }}
123128
branch: ${{ inputs.branch }}
@@ -128,17 +133,19 @@ jobs:
128133
wheel-build-cudf:
129134
needs: [telemetry-setup, wheel-build-pylibcudf]
130135
secrets: inherit
131-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.04
136+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06
132137
with:
133138
build_type: ${{ inputs.build_type || 'branch' }}
134139
branch: ${{ inputs.branch }}
135140
sha: ${{ inputs.sha }}
136141
date: ${{ inputs.date }}
137142
script: ci/build_wheel_cudf.sh
143+
package-name: cudf
144+
package-type: python
138145
wheel-publish-cudf:
139146
needs: wheel-build-cudf
140147
secrets: inherit
141-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.04
148+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.06
142149
with:
143150
build_type: ${{ inputs.build_type || 'branch' }}
144151
branch: ${{ inputs.branch }}
@@ -149,7 +156,7 @@ jobs:
149156
wheel-build-dask-cudf:
150157
needs: [telemetry-setup, wheel-build-cudf]
151158
secrets: inherit
152-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.04
159+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06
153160
with:
154161
# This selects "ARCH=amd64 + the latest supported Python + CUDA".
155162
matrix_filter: map(select(.ARCH == "amd64")) | group_by(.CUDA_VER|split(".")|map(tonumber)|.[0]) | map(max_by([(.PY_VER|split(".")|map(tonumber)), (.CUDA_VER|split(".")|map(tonumber))]))
@@ -158,10 +165,13 @@ jobs:
158165
sha: ${{ inputs.sha }}
159166
date: ${{ inputs.date }}
160167
script: ci/build_wheel_dask_cudf.sh
168+
package-name: dask_cudf
169+
package-type: python
170+
pure-wheel: true
161171
wheel-publish-dask-cudf:
162172
needs: wheel-build-dask-cudf
163173
secrets: inherit
164-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.04
174+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.06
165175
with:
166176
build_type: ${{ inputs.build_type || 'branch' }}
167177
branch: ${{ inputs.branch }}
@@ -172,7 +182,7 @@ jobs:
172182
wheel-build-cudf-polars:
173183
needs: [telemetry-setup, wheel-build-pylibcudf]
174184
secrets: inherit
175-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.04
185+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06
176186
with:
177187
# This selects "ARCH=amd64 + the latest supported Python + CUDA".
178188
matrix_filter: map(select(.ARCH == "amd64")) | group_by(.CUDA_VER|split(".")|map(tonumber)|.[0]) | map(max_by([(.PY_VER|split(".")|map(tonumber)), (.CUDA_VER|split(".")|map(tonumber))]))
@@ -181,10 +191,13 @@ jobs:
181191
sha: ${{ inputs.sha }}
182192
date: ${{ inputs.date }}
183193
script: ci/build_wheel_cudf_polars.sh
194+
package-name: cudf_polars
195+
package-type: python
196+
pure-wheel: true
184197
wheel-publish-cudf-polars:
185198
needs: wheel-build-cudf-polars
186199
secrets: inherit
187-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.04
200+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.06
188201
with:
189202
build_type: ${{ inputs.build_type || 'branch' }}
190203
branch: ${{ inputs.branch }}

‎.github/workflows/pandas-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
pandas-tests:
1818
# run the Pandas unit tests
1919
secrets: inherit
20-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.04
20+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.06
2121
with:
2222
# This selects "ARCH=amd64 + the latest supported Python + CUDA".
2323
matrix_filter: map(select(.ARCH == "amd64")) | group_by(.CUDA_VER|split(".")|map(tonumber)|.[0]) | map(max_by([(.PY_VER|split(".")|map(tonumber)), (.CUDA_VER|split(".")|map(tonumber))]))

0 commit comments

Comments
 (0)