Skip to content

Commit 4aceb9a

Browse files
raydouglassraydouglass
committed
Merge pull request #220 from rapidsai/branch-25.06
2 parents 8767211 + 004d100 commit 4aceb9a

File tree

138 files changed

+3816
-9849
lines changed

Some content is hidden

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

138 files changed

+3816
-9849
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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@
55
"args": {
66
"CUDA": "11.8",
77
"PYTHON_PACKAGE_MANAGER": "pip",
8-
"BASE": "rapidsai/devcontainers:25.04-cpp-cuda11.8-ucx1.18.0-openmpi-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:25.06-cpp-cuda11.8-ucx1.18.0-openmpi-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/cuda:25.4": {
18+
"ghcr.io/rapidsai/devcontainers/features/cuda:25.6": {
1919
"version": "11.8",
2020
"installcuBLAS": true,
2121
"installcuSOLVER": true,
2222
"installcuRAND": true,
2323
"installcuSPARSE": true
2424
},
25-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.4": {}
25+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.6": {}
2626
},
2727
"overrideFeatureInstallOrder": [
2828
"ghcr.io/rapidsai/devcontainers/features/cuda",

‎.devcontainer/cuda12.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": "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": {"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-pip/devcontainer.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@
55
"args": {
66
"CUDA": "12.8",
77
"PYTHON_PACKAGE_MANAGER": "pip",
8-
"BASE": "rapidsai/devcontainers:25.04-cpp-cuda12.8-ucx1.18.0-openmpi-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:25.06-cpp-cuda12.8-ucx1.18.0-openmpi-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": {"gpu": "optional"},
1717
"features": {
18-
"ghcr.io/rapidsai/devcontainers/features/cuda:25.4": {
18+
"ghcr.io/rapidsai/devcontainers/features/cuda:25.6": {
1919
"version": "12.8",
2020
"installcuBLAS": true,
2121
"installcuSOLVER": true,
2222
"installcuRAND": true,
2323
"installcuSPARSE": true
2424
},
25-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.4": {}
25+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.6": {}
2626
},
2727
"overrideFeatureInstallOrder": [
2828
"ghcr.io/rapidsai/devcontainers/features/cuda",

‎.github/workflows/build.yaml‎

Lines changed: 51 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,55 +28,63 @@ concurrency:
2828
jobs:
2929
cpp-build:
3030
secrets: inherit
31-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.04
31+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.06
3232
with:
3333
build_type: ${{ inputs.build_type || 'branch' }}
3434
branch: ${{ inputs.branch }}
3535
date: ${{ inputs.date }}
36+
script: ci/build_cpp.sh
3637
sha: ${{ inputs.sha }}
3738
python-build:
3839
needs: [cpp-build]
3940
secrets: inherit
40-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.04
41+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.06
4142
with:
4243
build_type: ${{ inputs.build_type || 'branch' }}
4344
branch: ${{ inputs.branch }}
4445
date: ${{ inputs.date }}
46+
script: ci/build_python.sh
4547
sha: ${{ inputs.sha }}
4648
docs-build:
4749
needs: cpp-build
4850
secrets: inherit
49-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.04
51+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.06
5052
with:
5153
arch: "amd64"
5254
branch: ${{ inputs.branch }}
5355
build_type: ${{ inputs.build_type || 'branch' }}
5456
container_image: "rapidsai/ci-conda:latest"
5557
date: ${{ inputs.date }}
56-
run_script: "ci/build_docs.sh"
58+
script: "ci/build_docs.sh"
5759
sha: ${{ inputs.sha }}
5860
upload-conda:
5961
needs: [cpp-build, python-build]
6062
secrets: inherit
61-
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-25.04
63+
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-25.06
6264
with:
6365
build_type: ${{ inputs.build_type || 'branch' }}
6466
branch: ${{ inputs.branch }}
6567
date: ${{ inputs.date }}
6668
sha: ${{ inputs.sha }}
6769
wheel-build-cugraph-dgl:
6870
secrets: inherit
69-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.04
71+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06
7072
with:
73+
# This selects "ARCH=amd64 + Python 3.12 + CUDA".
74+
# Note that we don't support DGL on Python 3.13 so we don't build DGL on Python 3.13
75+
matrix_filter: map(select(.ARCH == "amd64", .PY_VER == "3.12")) | group_by(.CUDA_VER|split(".")|map(tonumber)|.[0]) | map(max_by([.CUDA_VER]|map(split(".")|map(tonumber))))
7176
build_type: ${{ inputs.build_type || 'branch' }}
7277
branch: ${{ inputs.branch }}
7378
sha: ${{ inputs.sha }}
7479
date: ${{ inputs.date }}
7580
script: ci/build_wheel_cugraph-dgl.sh
81+
package-name: cugraph-dgl
82+
package-type: python
83+
pure-wheel: true
7684
wheel-publish-cugraph-dgl:
7785
needs: wheel-build-cugraph-dgl
7886
secrets: inherit
79-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.04
87+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.06
8088
with:
8189
build_type: ${{ inputs.build_type || 'branch' }}
8290
branch: ${{ inputs.branch }}
@@ -86,37 +94,69 @@ jobs:
8694
package-type: python
8795
wheel-build-cugraph-pyg:
8896
secrets: inherit
89-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.04
97+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06
9098
with:
99+
# This selects "ARCH=amd64 + the latest supported Python + CUDA".
100+
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))]))
91101
build_type: ${{ inputs.build_type || 'branch' }}
92102
branch: ${{ inputs.branch }}
93103
sha: ${{ inputs.sha }}
94104
date: ${{ inputs.date }}
95105
script: ci/build_wheel_cugraph-pyg.sh
106+
package-name: cugraph-pyg
107+
package-type: python
108+
pure-wheel: true
96109
wheel-publish-cugraph-pyg:
97110
needs: wheel-build-cugraph-pyg
98111
secrets: inherit
99-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.04
112+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.06
100113
with:
101114
build_type: ${{ inputs.build_type || 'branch' }}
102115
branch: ${{ inputs.branch }}
103116
sha: ${{ inputs.sha }}
104117
date: ${{ inputs.date }}
105118
package-name: cugraph-pyg
106119
package-type: python
120+
wheel-build-libwholegraph:
121+
secrets: inherit
122+
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
123+
with:
124+
build_type: ${{ inputs.build_type || 'branch' }}
125+
branch: ${{ inputs.branch }}
126+
sha: ${{ inputs.sha }}
127+
date: ${{ inputs.date }}
128+
script: ci/build_wheel_libwholegraph.sh
129+
package-name: libwholegraph
130+
package-type: cpp
131+
# build for every combination of arch and CUDA version, but only for the latest Python
132+
matrix_filter: group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | map(max_by(.PY_VER|split(".")|map(tonumber)))
107133
wheel-build-pylibwholegraph:
134+
needs: wheel-build-libwholegraph
108135
secrets: inherit
109-
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
110137
with:
111138
build_type: ${{ inputs.build_type || 'branch' }}
112139
branch: ${{ inputs.branch }}
113140
sha: ${{ inputs.sha }}
114141
date: ${{ inputs.date }}
115142
script: ci/build_wheel_pylibwholegraph.sh
143+
package-name: pylibwholegraph
144+
package-type: python
145+
wheel-publish-libwholegraph:
146+
needs: wheel-build-libwholegraph
147+
secrets: inherit
148+
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
149+
with:
150+
build_type: ${{ inputs.build_type || 'branch' }}
151+
branch: ${{ inputs.branch }}
152+
sha: ${{ inputs.sha }}
153+
date: ${{ inputs.date }}
154+
package-name: libwholegraph
155+
package-type: cpp
116156
wheel-publish-pylibwholegraph:
117157
needs: wheel-build-pylibwholegraph
118158
secrets: inherit
119-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.04
159+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.06
120160
with:
121161
build_type: ${{ inputs.build_type || 'branch' }}
122162
branch: ${{ inputs.branch }}

0 commit comments

Comments
 (0)