Skip to content

Commit 0f5f455

Browse files
alexbarghi-nvalexbarghi-nv
authored
Merge branch 'release/25.12' into support-standard-sampling
2 parents 6befe11 + ec608df commit 0f5f455

File tree

13 files changed

+113
-51
lines changed

13 files changed

+113
-51
lines changed

‎.devcontainer/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ ENV HISTFILE="/home/coder/.cache/._bash_history"
4040
ENV AWS_ROLE_ARN="arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs"
4141
ENV SCCACHE_REGION="us-east-2"
4242
ENV SCCACHE_BUCKET="rapids-sccache-devs"
43+
ENV SCCACHE_S3_USE_PREPROCESSOR_CACHE_MODE=true
4344
ENV SCCACHE_IDLE_TIMEOUT=0
4445

4546
###

‎.github/workflows/build.yaml‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,27 +34,30 @@ concurrency:
3434
jobs:
3535
cpp-build:
3636
secrets: inherit
37-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@main
37+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@release/25.12
3838
with:
3939
build_type: ${{ inputs.build_type || 'branch' }}
4040
branch: ${{ inputs.branch }}
4141
date: ${{ inputs.date }}
42+
node_type: cpu8
4243
script: ci/build_cpp.sh
4344
sha: ${{ inputs.sha }}
45+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
4446
python-build:
4547
needs: [cpp-build]
4648
secrets: inherit
47-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@main
49+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@release/25.12
4850
with:
4951
build_type: ${{ inputs.build_type || 'branch' }}
5052
branch: ${{ inputs.branch }}
5153
date: ${{ inputs.date }}
5254
script: ci/build_python.sh
5355
sha: ${{ inputs.sha }}
56+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
5457
docs-build:
5558
needs: cpp-build
5659
secrets: inherit
57-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
60+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/25.12
5861
with:
5962
arch: "amd64"
6063
branch: ${{ inputs.branch }}
@@ -66,30 +69,32 @@ jobs:
6669
upload-conda:
6770
needs: [cpp-build, python-build]
6871
secrets: inherit
69-
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@main
72+
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@release/25.12
7073
with:
7174
build_type: ${{ inputs.build_type || 'branch' }}
7275
branch: ${{ inputs.branch }}
7376
date: ${{ inputs.date }}
7477
sha: ${{ inputs.sha }}
7578
wheel-build-cugraph-pyg:
7679
secrets: inherit
77-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
80+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/25.12
7881
with:
7982
# This selects "ARCH=amd64 + the latest supported Python + CUDA".
8083
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))]))
8184
build_type: ${{ inputs.build_type || 'branch' }}
8285
branch: ${{ inputs.branch }}
8386
sha: ${{ inputs.sha }}
8487
date: ${{ inputs.date }}
88+
node_type: cpu8
8589
script: ci/build_wheel_cugraph-pyg.sh
8690
package-name: cugraph-pyg
8791
package-type: python
8892
pure-wheel: true
93+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
8994
wheel-publish-cugraph-pyg:
9095
needs: wheel-build-cugraph-pyg
9196
secrets: inherit
92-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@main
97+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@release/25.12
9398
with:
9499
build_type: ${{ inputs.build_type || 'branch' }}
95100
branch: ${{ inputs.branch }}
@@ -99,33 +104,37 @@ jobs:
99104
package-type: python
100105
wheel-build-libwholegraph:
101106
secrets: inherit
102-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
107+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/25.12
103108
with:
104109
build_type: ${{ inputs.build_type || 'branch' }}
105110
branch: ${{ inputs.branch }}
106111
sha: ${{ inputs.sha }}
107112
date: ${{ inputs.date }}
113+
node_type: cpu8
108114
script: ci/build_wheel_libwholegraph.sh
109115
package-name: libwholegraph
110116
package-type: cpp
111117
# build for every combination of arch and CUDA version, but only for the latest Python
112118
matrix_filter: group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | map(max_by(.PY_VER|split(".")|map(tonumber)))
119+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
113120
wheel-build-pylibwholegraph:
114121
needs: wheel-build-libwholegraph
115122
secrets: inherit
116-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
123+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/25.12
117124
with:
118125
build_type: ${{ inputs.build_type || 'branch' }}
119126
branch: ${{ inputs.branch }}
120127
sha: ${{ inputs.sha }}
121128
date: ${{ inputs.date }}
129+
node_type: cpu8
122130
script: ci/build_wheel_pylibwholegraph.sh
123131
package-name: pylibwholegraph
124132
package-type: python
133+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
125134
wheel-publish-libwholegraph:
126135
needs: wheel-build-libwholegraph
127136
secrets: inherit
128-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@main
137+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@release/25.12
129138
with:
130139
build_type: ${{ inputs.build_type || 'branch' }}
131140
branch: ${{ inputs.branch }}
@@ -136,7 +145,7 @@ jobs:
136145
wheel-publish-pylibwholegraph:
137146
needs: wheel-build-pylibwholegraph
138147
secrets: inherit
139-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@main
148+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@release/25.12
140149
with:
141150
build_type: ${{ inputs.build_type || 'branch' }}
142151
branch: ${{ inputs.branch }}

‎.github/workflows/pr.yaml‎

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- wheel-build-cugraph-pyg
2929
- wheel-tests-cugraph-pyg
3030
secrets: inherit
31-
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@main
31+
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@release/25.12
3232
if: always()
3333
with:
3434
needs: ${{ toJSON(needs) }}
@@ -43,7 +43,7 @@ jobs:
4343
repo: cugraph-gnn
4444
changed-files:
4545
secrets: inherit
46-
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@main
46+
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@release/25.12
4747
with:
4848
files_yaml: |
4949
test_cpp:
@@ -81,7 +81,7 @@ jobs:
8181
- '!readme_pages/**'
8282
devcontainer:
8383
secrets: inherit
84-
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@main
84+
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@release/25.12
8585
with:
8686
arch: '["amd64", "arm64"]'
8787
cuda: '["13.0"]'
@@ -98,35 +98,39 @@ jobs:
9898
sccache --show-adv-stats | tee telemetry-artifacts/sccache-stats.txt;
9999
checks:
100100
secrets: inherit
101-
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@main
101+
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@release/25.12
102102
with:
103103
enable_check_generated_files: false
104104
conda-cpp-build:
105105
needs: checks
106106
secrets: inherit
107-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@main
107+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@release/25.12
108108
with:
109109
build_type: pull-request
110+
node_type: cpu8
110111
script: ci/build_cpp.sh
112+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
111113
conda-cpp-tests:
112114
needs: [conda-cpp-build, changed-files]
113115
secrets: inherit
114-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@main
116+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@release/25.12
115117
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_cpp
116118
with:
117119
build_type: pull-request
118120
script: ci/test_cpp.sh
121+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
119122
conda-python-build:
120123
needs: conda-cpp-build
121124
secrets: inherit
122-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@main
125+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@release/25.12
123126
with:
124127
build_type: pull-request
125128
script: ci/build_python.sh
129+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
126130
conda-notebook-tests:
127131
needs: [conda-python-build, changed-files]
128132
secrets: inherit
129-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
133+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/25.12
130134
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_notebooks
131135
with:
132136
build_type: pull-request
@@ -137,18 +141,19 @@ jobs:
137141
conda-python-tests:
138142
needs: [conda-python-build, changed-files]
139143
secrets: inherit
140-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@main
144+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@release/25.12
141145
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
142146
with:
143147
build_type: pull-request
144148
# TODO: remove the CUDA 13 exclusion here once there are pytorch CUDA 13 packages
145149
# ref: https://github.com/pytorch/pytorch/issues/159779
146150
matrix_filter: map(select(.ARCH == "amd64" and (.CUDA_VER | startswith("12"))))
147151
script: ci/test_python.sh
152+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
148153
docs-build:
149154
needs: conda-cpp-build
150155
secrets: inherit
151-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
156+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/25.12
152157
with:
153158
arch: "amd64"
154159
build_type: pull-request
@@ -157,50 +162,58 @@ jobs:
157162
wheel-build-libwholegraph:
158163
needs: checks
159164
secrets: inherit
160-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
165+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/25.12
161166
with:
162167
build_type: pull-request
163168
script: ci/build_wheel_libwholegraph.sh
169+
node_type: cpu8
164170
package-name: libwholegraph
165171
package-type: cpp
166172
# build for every combination of arch and CUDA version, but only for the latest Python
167173
matrix_filter: group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | map(max_by(.PY_VER|split(".")|map(tonumber)))
174+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
168175
wheel-build-pylibwholegraph:
169176
needs: [checks, wheel-build-libwholegraph]
170177
secrets: inherit
171-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
178+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/25.12
172179
with:
173180
build_type: pull-request
181+
node_type: cpu8
174182
script: ci/build_wheel_pylibwholegraph.sh
175183
package-name: pylibwholegraph
176184
package-type: python
185+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
177186
wheel-tests-pylibwholegraph:
178187
needs: [wheel-build-pylibwholegraph, changed-files]
179188
secrets: inherit
180-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@main
189+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@release/25.12
181190
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
182191
with:
183192
build_type: pull-request
184193
script: ci/test_wheel_pylibwholegraph.sh
185194
matrix_filter: map(select(.ARCH == "amd64"))
195+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
186196
wheel-build-cugraph-pyg:
187197
needs: checks
188198
secrets: inherit
189-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
199+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/25.12
190200
with:
191201
# This selects "ARCH=amd64 + the latest supported Python + CUDA".
192202
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))]))
193203
build_type: pull-request
204+
node_type: cpu8
194205
script: ci/build_wheel_cugraph-pyg.sh
195206
package-name: cugraph-pyg
196207
package-type: python
197208
pure-wheel: true
209+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
198210
wheel-tests-cugraph-pyg:
199211
needs: [wheel-build-pylibwholegraph, wheel-build-cugraph-pyg, changed-files]
200212
secrets: inherit
201-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@main
213+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@release/25.12
202214
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
203215
with:
204216
build_type: pull-request
205217
script: ci/test_wheel_cugraph-pyg.sh
206218
matrix_filter: map(select(.ARCH == "amd64"))
219+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN

‎.github/workflows/test.yaml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,17 @@ on:
2525
jobs:
2626
conda-cpp-tests:
2727
secrets: inherit
28-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@main
28+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@release/25.12
2929
with:
3030
build_type: ${{ inputs.build_type }}
3131
branch: ${{ inputs.branch }}
3232
date: ${{ inputs.date }}
3333
script: ci/test_cpp.sh
3434
sha: ${{ inputs.sha }}
35+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
3536
conda-notebook-tests:
3637
secrets: inherit
37-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
38+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/25.12
3839
with:
3940
build_type: ${{ inputs.build_type }}
4041
branch: ${{ inputs.branch }}
@@ -46,7 +47,7 @@ jobs:
4647
script: "ci/test_notebooks.sh"
4748
conda-python-tests:
4849
secrets: inherit
49-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@main
50+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@release/25.12
5051
with:
5152
build_type: ${{ inputs.build_type }}
5253
branch: ${{ inputs.branch }}
@@ -56,23 +57,26 @@ jobs:
5657
# TODO: remove the CUDA 13 exclusion here once there are pytorch CUDA 13 packages
5758
# ref: https://github.com/pytorch/pytorch/issues/159779
5859
matrix_filter: map(select(.ARCH == "amd64" and (.CUDA_VER | startswith("12"))))
60+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
5961
wheel-tests-pylibwholegraph:
6062
secrets: inherit
61-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@main
63+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@release/25.12
6264
with:
6365
build_type: ${{ inputs.build_type }}
6466
branch: ${{ inputs.branch }}
6567
date: ${{ inputs.date }}
6668
sha: ${{ inputs.sha }}
6769
script: ci/test_wheel_pylibwholegraph.sh
6870
matrix_filter: map(select(.ARCH == "amd64"))
71+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
6972
wheel-tests-cugraph-pyg:
7073
secrets: inherit
71-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@main
74+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@release/25.12
7275
with:
7376
build_type: ${{ inputs.build_type }}
7477
branch: ${{ inputs.branch }}
7578
date: ${{ inputs.date }}
7679
sha: ${{ inputs.sha }}
7780
script: ci/test_wheel_cugraph-pyg.sh
7881
matrix_filter: map(select(.ARCH == "amd64"))
82+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN

‎.github/workflows/trigger-breaking-change-alert.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
trigger-notifier:
1313
if: contains(github.event.pull_request.labels.*.name, 'breaking')
1414
secrets: inherit
15-
uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@main
15+
uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@release/25.12
1616
with:
1717
sender_login: ${{ github.event.sender.login }}
1818
sender_avatar: ${{ github.event.sender.avatar_url }}

‎RAPIDS_BRANCH‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
main
1+
release/25.12

‎ci/build_cpp.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
set -euo pipefail
66

77
source rapids-configure-sccache
8-
98
source rapids-date-string
109

1110
export CMAKE_GENERATOR=Ninja
@@ -14,7 +13,7 @@ rapids-print-env
1413

1514
rapids-logger "Begin cpp build"
1615

17-
sccache --zero-stats
16+
sccache --stop-server 2>/dev/null || true
1817

1918
RAPIDS_PACKAGE_VERSION=$(rapids-generate-version)
2019
export RAPIDS_PACKAGE_VERSION
@@ -30,3 +29,4 @@ rattler-build build --recipe conda/recipes/libwholegraph \
3029
"${RATTLER_CHANNELS[@]}"
3130

3231
sccache --show-adv-stats
32+
sccache --stop-server >/dev/null 2>&1 || true

0 commit comments

Comments
 (0)