Skip to content

Commit 0f6c421

Browse files
AyodeAweAyodeAwe
committed
Merge remote-tracking branch 'upstream/branch-25.04'
2 parents 264b952 + 4c203b2 commit 0f6c421

Some content is hidden

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

56 files changed

+1621
-557
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.02-cpp-cuda11.8-mambaforge-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:25.04-cpp-cuda11.8-mambaforge-ubuntu22.04"
99
}
1010
},
1111
"runArgs": [
1212
"--rm",
1313
"--name",
14-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.02-cuda11.8-conda"
14+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.04-cuda11.8-conda"
1515
],
1616
"hostRequirements": {"gpu": "optional"},
1717
"features": {
18-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.2": {}
18+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.4": {}
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.02-cpp-cuda11.8-ucx1.18.0-openmpi-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:25.04-cpp-cuda11.8-ucx1.18.0-openmpi-ubuntu22.04"
99
}
1010
},
1111
"runArgs": [
1212
"--rm",
1313
"--name",
14-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.02-cuda11.8-pip"
14+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.04-cuda11.8-pip"
1515
],
1616
"hostRequirements": {"gpu": "optional"},
1717
"features": {
18-
"ghcr.io/rapidsai/devcontainers/features/cuda:25.2": {
18+
"ghcr.io/rapidsai/devcontainers/features/cuda:25.4": {
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.2": {}
25+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.4": {}
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.02-cpp-mambaforge-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:25.04-cpp-mambaforge-ubuntu22.04"
99
}
1010
},
1111
"runArgs": [
1212
"--rm",
1313
"--name",
14-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.02-cuda12.8-conda"
14+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.04-cuda12.8-conda"
1515
],
1616
"hostRequirements": {"gpu": "optional"},
1717
"features": {
18-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.2": {}
18+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.4": {}
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.02-cpp-cuda12.8-ucx1.18.0-openmpi-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:25.04-cpp-cuda12.8-ucx1.18.0-openmpi-ubuntu22.04"
99
}
1010
},
1111
"runArgs": [
1212
"--rm",
1313
"--name",
14-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.02-cuda12.8-pip"
14+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.04-cuda12.8-pip"
1515
],
1616
"hostRequirements": {"gpu": "optional"},
1717
"features": {
18-
"ghcr.io/rapidsai/devcontainers/features/cuda:25.2": {
18+
"ghcr.io/rapidsai/devcontainers/features/cuda:25.4": {
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.2": {}
25+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.4": {}
2626
},
2727
"overrideFeatureInstallOrder": [
2828
"ghcr.io/rapidsai/devcontainers/features/cuda",

‎.github/CODEOWNERS‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,6 @@ cpp/ @rapidsai/wholegraph-cpp-codeowners
2727
/build.sh @rapidsai/packaging-codeowners
2828
pyproject.toml @rapidsai/packaging-codeowners
2929
VERSION @rapidsai/packaging-codeowners
30+
31+
# notebooks code owners
32+
*.ipynb @rapidsai/cugraph-notebook-codeowners

‎.github/workflows/build.yaml‎

Lines changed: 10 additions & 10 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-25.02
31+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.04
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-25.02
40+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.04
4141
with:
4242
build_type: ${{ inputs.build_type || 'branch' }}
4343
branch: ${{ inputs.branch }}
@@ -46,7 +46,7 @@ jobs:
4646
docs-build:
4747
needs: cpp-build
4848
secrets: inherit
49-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.02
49+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.04
5050
with:
5151
arch: "amd64"
5252
branch: ${{ inputs.branch }}
@@ -58,15 +58,15 @@ jobs:
5858
upload-conda:
5959
needs: [cpp-build, python-build]
6060
secrets: inherit
61-
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-25.02
61+
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-25.04
6262
with:
6363
build_type: ${{ inputs.build_type || 'branch' }}
6464
branch: ${{ inputs.branch }}
6565
date: ${{ inputs.date }}
6666
sha: ${{ inputs.sha }}
6767
wheel-build-cugraph-dgl:
6868
secrets: inherit
69-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.02
69+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.04
7070
with:
7171
build_type: ${{ inputs.build_type || 'branch' }}
7272
branch: ${{ inputs.branch }}
@@ -76,7 +76,7 @@ jobs:
7676
wheel-publish-cugraph-dgl:
7777
needs: wheel-build-cugraph-dgl
7878
secrets: inherit
79-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.02
79+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.04
8080
with:
8181
build_type: ${{ inputs.build_type || 'branch' }}
8282
branch: ${{ inputs.branch }}
@@ -86,7 +86,7 @@ jobs:
8686
package-type: python
8787
wheel-build-cugraph-pyg:
8888
secrets: inherit
89-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.02
89+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.04
9090
with:
9191
build_type: ${{ inputs.build_type || 'branch' }}
9292
branch: ${{ inputs.branch }}
@@ -96,7 +96,7 @@ jobs:
9696
wheel-publish-cugraph-pyg:
9797
needs: wheel-build-cugraph-pyg
9898
secrets: inherit
99-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.02
99+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.04
100100
with:
101101
build_type: ${{ inputs.build_type || 'branch' }}
102102
branch: ${{ inputs.branch }}
@@ -106,7 +106,7 @@ jobs:
106106
package-type: python
107107
wheel-build-pylibwholegraph:
108108
secrets: inherit
109-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.02
109+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.04
110110
with:
111111
build_type: ${{ inputs.build_type || 'branch' }}
112112
branch: ${{ inputs.branch }}
@@ -116,7 +116,7 @@ jobs:
116116
wheel-publish-pylibwholegraph:
117117
needs: wheel-build-pylibwholegraph
118118
secrets: inherit
119-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.02
119+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.04
120120
with:
121121
build_type: ${{ inputs.build_type || 'branch' }}
122122
branch: ${{ inputs.branch }}

‎.github/workflows/pr.yaml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- wheel-build-cugraph-pyg
3030
- wheel-tests-cugraph-pyg
3131
secrets: inherit
32-
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-25.02
32+
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-25.04
3333
if: always()
3434
with:
3535
needs: ${{ toJSON(needs) }}
@@ -47,7 +47,7 @@ jobs:
4747
repo: cugraph-gnn
4848
changed-files:
4949
secrets: inherit
50-
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@branch-25.02
50+
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@branch-25.04
5151
with:
5252
files_yaml: |
5353
test_cpp:
@@ -76,7 +76,7 @@ jobs:
7676
- '!readme_pages/**'
7777
devcontainer:
7878
secrets: inherit
79-
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-25.02
79+
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-25.04
8080
with:
8181
arch: '["amd64"]'
8282
cuda: '["12.8"]'
@@ -86,51 +86,51 @@ jobs:
8686
sccache -s;
8787
checks:
8888
secrets: inherit
89-
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-25.02
89+
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-25.04
9090
with:
9191
enable_check_generated_files: false
9292
conda-cpp-build:
9393
needs: checks
9494
secrets: inherit
95-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.02
95+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.04
9696
with:
9797
build_type: pull-request
9898
conda-cpp-tests:
9999
needs: [conda-cpp-build, changed-files]
100100
secrets: inherit
101-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-25.02
101+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-25.04
102102
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_cpp
103103
with:
104104
build_type: pull-request
105105
conda-python-build:
106106
needs: conda-cpp-build
107107
secrets: inherit
108-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.02
108+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.04
109109
with:
110110
build_type: pull-request
111111
conda-notebook-tests:
112112
needs: [conda-python-build, changed-files]
113113
secrets: inherit
114-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.02
114+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.04
115115
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_notebooks
116116
with:
117117
build_type: pull-request
118-
node_type: "gpu-v100-latest-1"
118+
node_type: "gpu-l4-latest-1"
119119
arch: "amd64"
120-
container_image: "rapidsai/ci-conda:cuda11.8.0-ubuntu22.04-py3.12"
120+
container_image: "rapidsai/ci-conda:latest"
121121
run_script: "ci/test_notebooks.sh"
122122
conda-python-tests:
123123
needs: [conda-python-build, changed-files]
124124
secrets: inherit
125-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.02
125+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.04
126126
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
127127
with:
128128
build_type: pull-request
129129
matrix_filter: map(select(.ARCH == "amd64"))
130130
docs-build:
131131
needs: conda-cpp-build
132132
secrets: inherit
133-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.02
133+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.04
134134
with:
135135
arch: "amd64"
136136
build_type: pull-request
@@ -139,14 +139,14 @@ jobs:
139139
wheel-build-pylibwholegraph:
140140
needs: checks
141141
secrets: inherit
142-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.02
142+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.04
143143
with:
144144
build_type: pull-request
145145
script: ci/build_wheel_pylibwholegraph.sh
146146
wheel-tests-pylibwholegraph:
147147
needs: [wheel-build-pylibwholegraph, changed-files]
148148
secrets: inherit
149-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.02
149+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.04
150150
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
151151
with:
152152
build_type: pull-request
@@ -155,14 +155,14 @@ jobs:
155155
wheel-build-cugraph-dgl:
156156
needs: checks
157157
secrets: inherit
158-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.02
158+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.04
159159
with:
160160
build_type: pull-request
161161
script: ci/build_wheel_cugraph-dgl.sh
162162
wheel-tests-cugraph-dgl:
163163
needs: [wheel-build-pylibwholegraph, wheel-build-cugraph-dgl, changed-files]
164164
secrets: inherit
165-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.02
165+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.04
166166
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
167167
with:
168168
build_type: pull-request
@@ -171,14 +171,14 @@ jobs:
171171
wheel-build-cugraph-pyg:
172172
needs: checks
173173
secrets: inherit
174-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.02
174+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.04
175175
with:
176176
build_type: pull-request
177177
script: ci/build_wheel_cugraph-pyg.sh
178178
wheel-tests-cugraph-pyg:
179179
needs: [wheel-build-pylibwholegraph, wheel-build-cugraph-pyg, changed-files]
180180
secrets: inherit
181-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.02
181+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.04
182182
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
183183
with:
184184
build_type: pull-request

0 commit comments

Comments
 (0)