Skip to content

Commit 9ba8f66

Browse files
jameslambjameslamb
committed
Merge branch 'remove-torch-reqs' of github.com:jameslamb/cugraph into remove-torch-reqs
2 parents 5174ced + b9e3ced commit 9ba8f66

14 files changed

Lines changed: 100 additions & 50 deletions

‎.github/workflows/build.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ concurrency:
3535
jobs:
3636
cpp-build:
3737
secrets: inherit
38-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@python-3.14
38+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@release/26.04
3939
with:
4040
build_type: ${{ inputs.build_type || 'branch' }}
4141
branch: ${{ inputs.branch }}
@@ -46,7 +46,7 @@ jobs:
4646
python-build:
4747
needs: [cpp-build]
4848
secrets: inherit
49-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@python-3.14
49+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@release/26.04
5050
with:
5151
build_type: ${{ inputs.build_type || 'branch' }}
5252
branch: ${{ inputs.branch }}
@@ -58,7 +58,7 @@ jobs:
5858
upload-conda:
5959
needs: [cpp-build, python-build]
6060
secrets: inherit
61-
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@python-3.14
61+
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@release/26.04
6262
with:
6363
build_type: ${{ inputs.build_type || 'branch' }}
6464
branch: ${{ inputs.branch }}
@@ -68,7 +68,7 @@ jobs:
6868
if: github.ref_type == 'branch'
6969
needs: python-build
7070
secrets: inherit
71-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@python-3.14
71+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/26.04
7272
with:
7373
arch: "amd64"
7474
branch: ${{ inputs.branch }}
@@ -80,7 +80,7 @@ jobs:
8080
sha: ${{ inputs.sha }}
8181
wheel-build-libcugraph:
8282
secrets: inherit
83-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@python-3.14
83+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/26.04
8484
with:
8585
# build for every combination of arch and CUDA version, but only for the latest Python version
8686
matrix_filter: group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | map(max_by(.PY_VER|split(".")|map(tonumber)))
@@ -95,7 +95,7 @@ jobs:
9595
wheel-publish-libcugraph:
9696
needs: wheel-build-libcugraph
9797
secrets: inherit
98-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@python-3.14
98+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@release/26.04
9999
with:
100100
build_type: ${{ inputs.build_type || 'branch' }}
101101
branch: ${{ inputs.branch }}
@@ -106,7 +106,7 @@ jobs:
106106
wheel-build-pylibcugraph:
107107
needs: wheel-build-libcugraph
108108
secrets: inherit
109-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@python-3.14
109+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/26.04
110110
with:
111111
build_type: ${{ inputs.build_type || 'branch' }}
112112
branch: ${{ inputs.branch }}
@@ -121,7 +121,7 @@ jobs:
121121
wheel-publish-pylibcugraph:
122122
needs: wheel-build-pylibcugraph
123123
secrets: inherit
124-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@python-3.14
124+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@release/26.04
125125
with:
126126
build_type: ${{ inputs.build_type || 'branch' }}
127127
branch: ${{ inputs.branch }}
@@ -133,7 +133,7 @@ jobs:
133133
wheel-build-cugraph:
134134
needs: wheel-build-pylibcugraph
135135
secrets: inherit
136-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@python-3.14
136+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/26.04
137137
with:
138138
build_type: ${{ inputs.build_type || 'branch' }}
139139
branch: ${{ inputs.branch }}
@@ -148,7 +148,7 @@ jobs:
148148
wheel-publish-cugraph:
149149
needs: wheel-build-cugraph
150150
secrets: inherit
151-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@python-3.14
151+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@release/26.04
152152
with:
153153
build_type: ${{ inputs.build_type || 'branch' }}
154154
branch: ${{ inputs.branch }}

‎.github/workflows/pr.yaml‎

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ jobs:
1919
- conda-notebook-tests
2020
- conda-python-build
2121
- conda-python-tests
22+
- conda-python-tests-nightly
2223
- docs-build
2324
- wheel-build-libcugraph
2425
- wheel-build-pylibcugraph
@@ -28,7 +29,7 @@ jobs:
2829
- telemetry-setup
2930
- devcontainer
3031
secrets: inherit
31-
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@python-3.14
32+
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@release/26.04
3233
if: always()
3334
with:
3435
needs: ${{ toJSON(needs) }}
@@ -62,7 +63,7 @@ jobs:
6263
changed-files:
6364
secrets: inherit
6465
needs: telemetry-setup
65-
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@python-3.14
66+
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@release/26.04
6667
with:
6768
files_yaml: |
6869
build_docs:
@@ -215,37 +216,37 @@ jobs:
215216
checks:
216217
secrets: inherit
217218
needs: telemetry-setup
218-
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@python-3.14
219+
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@release/26.04
219220
with:
220221
enable_check_generated_files: false
221222
ignored_pr_jobs: telemetry-summarize
222223
conda-cpp-build:
223224
needs: checks
224225
secrets: inherit
225-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@python-3.14
226+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@release/26.04
226227
with:
227228
build_type: pull-request
228229
node_type: cpu16
229230
script: ci/build_cpp.sh
230231
conda-cpp-tests:
231232
needs: [conda-cpp-build, changed-files]
232233
secrets: inherit
233-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@python-3.14
234+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@release/26.04
234235
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_cpp
235236
with:
236237
build_type: pull-request
237238
script: ci/test_cpp.sh
238239
conda-cpp-checks:
239240
needs: conda-cpp-build
240241
secrets: inherit
241-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@python-3.14
242+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@release/26.04
242243
with:
243244
build_type: pull-request
244245
symbol_exclusions: (cugraph::ops|hornet|void writeEdgeCountsKernel|void markUniqueOffsetsKernel)
245246
conda-python-build:
246247
needs: conda-cpp-build
247248
secrets: inherit
248-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@python-3.14
249+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@release/26.04
249250
with:
250251
build_type: pull-request
251252
script: ci/build_python.sh
@@ -254,17 +255,28 @@ jobs:
254255
conda-python-tests:
255256
needs: [conda-python-build, changed-files]
256257
secrets: inherit
257-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@python-3.14
258+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@release/26.04
258259
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python_conda
259260
with:
260261
build_type: pull-request
261262
script: ci/test_python.sh
262263
# Skip failing tests on RTX PRO 6000 (Blackwell). xref: https://github.com/rapidsai/cugraph/issues/5421
263264
matrix_filter: map(select(.GPU != "rtxpro6000"))
265+
conda-python-tests-nightly:
266+
needs: [conda-python-build, changed-files]
267+
secrets: inherit
268+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@release/26.04
269+
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python_conda
270+
with:
271+
build_type: pull-request
272+
script: ci/test_python.sh
273+
# Skip failing tests on RTX PRO 6000 (Blackwell). xref: https://github.com/rapidsai/cugraph/issues/5421
274+
matrix_filter: map(select(.GPU != "rtxpro6000"))
275+
matrix_type: nightly
264276
conda-notebook-tests:
265277
needs: [conda-python-build, changed-files]
266278
secrets: inherit
267-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@python-3.14
279+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/26.04
268280
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_notebooks
269281
with:
270282
build_type: pull-request
@@ -275,7 +287,7 @@ jobs:
275287
docs-build:
276288
needs: [conda-python-build, changed-files]
277289
secrets: inherit
278-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@python-3.14
290+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/26.04
279291
if: fromJSON(needs.changed-files.outputs.changed_file_groups).build_docs
280292
with:
281293
build_type: pull-request
@@ -286,7 +298,7 @@ jobs:
286298
wheel-build-libcugraph:
287299
needs: checks
288300
secrets: inherit
289-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@python-3.14
301+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/26.04
290302
with:
291303
# build for every combination of arch and CUDA version, but only for the latest Python
292304
matrix_filter: group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | map(max_by(.PY_VER|split(".")|map(tonumber)))
@@ -298,7 +310,7 @@ jobs:
298310
wheel-build-pylibcugraph:
299311
needs: wheel-build-libcugraph
300312
secrets: inherit
301-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@python-3.14
313+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/26.04
302314
with:
303315
build_type: pull-request
304316
node_type: cpu8
@@ -310,15 +322,15 @@ jobs:
310322
wheel-tests-pylibcugraph:
311323
needs: [wheel-build-pylibcugraph, changed-files]
312324
secrets: inherit
313-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@python-3.14
325+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@release/26.04
314326
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python_wheels
315327
with:
316328
build_type: pull-request
317329
script: ci/test_wheel_pylibcugraph.sh
318330
wheel-build-cugraph:
319331
needs: wheel-build-pylibcugraph
320332
secrets: inherit
321-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@python-3.14
333+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/26.04
322334
with:
323335
build_type: pull-request
324336
node_type: cpu8
@@ -330,7 +342,7 @@ jobs:
330342
wheel-tests-cugraph:
331343
needs: [wheel-build-cugraph, changed-files]
332344
secrets: inherit
333-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@python-3.14
345+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@release/26.04
334346
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python_wheels
335347
with:
336348
build_type: pull-request
@@ -340,7 +352,7 @@ jobs:
340352
devcontainer:
341353
secrets: inherit
342354
needs: telemetry-setup
343-
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@python-3.14
355+
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@release/26.04
344356
with:
345357
arch: '["amd64", "arm64"]'
346358
cuda: '["13.1"]'

‎.github/workflows/test.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ on:
2525
jobs:
2626
conda-cpp-checks:
2727
secrets: inherit
28-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@python-3.14
28+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@release/26.04
2929
with:
3030
build_type: ${{ inputs.build_type }}
3131
branch: ${{ inputs.branch }}
@@ -34,7 +34,7 @@ jobs:
3434
symbol_exclusions: (cugraph::ops|hornet|void writeEdgeCountsKernel|void markUniqueOffsetsKernel)
3535
conda-cpp-tests:
3636
secrets: inherit
37-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@python-3.14
37+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@release/26.04
3838
with:
3939
build_type: ${{ inputs.build_type }}
4040
branch: ${{ inputs.branch }}
@@ -43,7 +43,7 @@ jobs:
4343
sha: ${{ inputs.sha }}
4444
conda-python-tests:
4545
secrets: inherit
46-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@python-3.14
46+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@release/26.04
4747
with:
4848
build_type: ${{ inputs.build_type }}
4949
branch: ${{ inputs.branch }}
@@ -54,7 +54,7 @@ jobs:
5454
matrix_filter: map(select(.GPU != "rtxpro6000"))
5555
wheel-tests-pylibcugraph:
5656
secrets: inherit
57-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@python-3.14
57+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@release/26.04
5858
with:
5959
build_type: ${{ inputs.build_type }}
6060
branch: ${{ inputs.branch }}
@@ -63,7 +63,7 @@ jobs:
6363
script: ci/test_wheel_pylibcugraph.sh
6464
wheel-tests-cugraph:
6565
secrets: inherit
66-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@python-3.14
66+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@release/26.04
6767
with:
6868
build_type: ${{ inputs.build_type }}
6969
branch: ${{ inputs.branch }}

‎.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@python-3.14
15+
uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@release/26.04
1616
with:
1717
sender_login: ${{ github.event.sender.login }}
1818
sender_avatar: ${{ github.event.sender.avatar_url }}

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ repos:
101101
^[.]pre-commit-config[.]yaml$|
102102
[.]rst$|
103103
^conda/environments/|
104+
RAPIDS_BRANCH|
104105
[.](png)$
105106
- id: verify-pyproject-license
106107
# ignore the top-level pyproject.toml, which doesn't

‎RAPIDS_BRANCH‎

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

‎ci/download-torch-wheels.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ TORCH_WHEEL_DIR="${1}"
2525
rapids-dependency-file-generator \
2626
--output requirements \
2727
--file-key "torch_only" \
28-
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION};dependencies=${RAPIDS_DEPENDENCIES}" \
28+
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION};dependencies=${RAPIDS_DEPENDENCIES};require_gpu=true" \
2929
| tee ./torch-constraints.txt
3030

3131
rapids-pip-retry download \

‎ci/test_python.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ rapids-logger "Generate Python testing dependencies"
2020
rapids-dependency-file-generator \
2121
--output conda \
2222
--file-key test_python \
23-
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" \
23+
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION};dependencies=${RAPIDS_DEPENDENCIES};require_gpu=true" \
2424
--prepend-channel "${CPP_CHANNEL}" \
2525
--prepend-channel "${PYTHON_CHANNEL}" \
2626
| tee env.yaml

‎ci/test_wheel_cugraph.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ fi
4141
#
4242
rapids-pip-retry install \
4343
--prefer-binary \
44+
--constraint "${PIP_CONSTRAINT}" \
4445
"$(echo "${CUGRAPH_WHEELHOUSE}"/cugraph*.whl)[test]" \
4546
"${PYLIBCUGRAPH_WHEELHOUSE}"/pylibcugraph*.whl \
4647
"${LIBCUGRAPH_WHEELHOUSE}"/libcugraph*.whl \

‎conda/environments/all_cuda-129_arch-aarch64.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ dependencies:
5454
- pytest-cov
5555
- pytest-xdist
5656
- python-louvain
57-
- pytorch>=2.9
57+
- pytorch>=2.4.1
5858
- raft-dask==26.4.*,>=0.0.0a0
5959
- rapids-build-backend>=0.4.0,<0.5.0
6060
- rapids-dask-dependency==26.4.*,>=0.0.0a0

0 commit comments

Comments
 (0)