Skip to content

Commit 9df6b89

Browse files
nv-rliunv-rliu
authored
Merge branch 'branch-25.04' into fix-25.04-mg-bc
2 parents dd39407 + cf82d77 commit 9df6b89

File tree

14 files changed

+399
-64
lines changed

14 files changed

+399
-64
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"args": {
66
"CUDA": "11.8",
77
"PYTHON_PACKAGE_MANAGER": "pip",
8-
"BASE": "rapidsai/devcontainers:25.04-cpp-cuda11.8-ucx1.17.0-openmpi-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:25.04-cpp-cuda11.8-ucx1.18.0-openmpi-ubuntu22.04"
99
}
1010
},
1111
"runArgs": [

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"runArgs": [
1212
"--rm",
1313
"--name",
14-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.04-cuda12.5-conda"
14+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.04-cuda12.8-conda"
1515
],
1616
"hostRequirements": {"gpu": "optional"},
1717
"features": {

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
"args": {
66
"CUDA": "12.8",
77
"PYTHON_PACKAGE_MANAGER": "pip",
8-
"BASE": "rapidsai/devcontainers:25.04-cpp-cuda12.5-ucx1.17.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.04-cuda12.5-pip"
14+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.04-cuda12.8-pip"
1515
],
1616
"hostRequirements": {"gpu": "optional"},
1717
"features": {
1818
"ghcr.io/rapidsai/devcontainers/features/cuda:25.4": {
19-
"version": "12.5",
19+
"version": "12.8",
2020
"installcuBLAS": true,
2121
"installcuSOLVER": true,
2222
"installcuRAND": true,

‎.github/workflows/build.yaml

+11-11
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.04
31+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@nvks-runners
3232
with:
3333
build_type: ${{ inputs.build_type || 'branch' }}
3434
branch: ${{ inputs.branch }}
@@ -38,7 +38,7 @@ jobs:
3838
python-build:
3939
needs: [cpp-build]
4040
secrets: inherit
41-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.04
41+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@nvks-runners
4242
with:
4343
build_type: ${{ inputs.build_type || 'branch' }}
4444
branch: ${{ inputs.branch }}
@@ -47,7 +47,7 @@ jobs:
4747
upload-conda:
4848
needs: [cpp-build, python-build]
4949
secrets: inherit
50-
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-25.04
50+
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@nvks-runners
5151
with:
5252
build_type: ${{ inputs.build_type || 'branch' }}
5353
branch: ${{ inputs.branch }}
@@ -57,19 +57,19 @@ jobs:
5757
if: github.ref_type == 'branch'
5858
needs: python-build
5959
secrets: inherit
60-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.04
60+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@nvks-runners
6161
with:
6262
arch: "amd64"
6363
branch: ${{ inputs.branch }}
6464
build_type: ${{ inputs.build_type || 'branch' }}
6565
container_image: "rapidsai/ci-conda:cuda11.8.0-ubuntu22.04-py3.10"
6666
date: ${{ inputs.date }}
67-
node_type: "gpu-v100-latest-1"
67+
node_type: "gpu-l4-latest-1"
6868
run_script: "ci/build_docs.sh"
6969
sha: ${{ inputs.sha }}
7070
wheel-build-libcugraph:
7171
secrets: inherit
72-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.04
72+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@nvks-runners
7373
with:
7474
build_type: ${{ inputs.build_type || 'branch' }}
7575
branch: ${{ inputs.branch }}
@@ -80,7 +80,7 @@ jobs:
8080
wheel-publish-libcugraph:
8181
needs: wheel-build-libcugraph
8282
secrets: inherit
83-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.04
83+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@nvks-runners
8484
with:
8585
build_type: ${{ inputs.build_type || 'branch' }}
8686
branch: ${{ inputs.branch }}
@@ -91,7 +91,7 @@ jobs:
9191
wheel-build-pylibcugraph:
9292
needs: wheel-build-libcugraph
9393
secrets: inherit
94-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.04
94+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@nvks-runners
9595
with:
9696
build_type: ${{ inputs.build_type || 'branch' }}
9797
branch: ${{ inputs.branch }}
@@ -101,7 +101,7 @@ jobs:
101101
wheel-publish-pylibcugraph:
102102
needs: wheel-build-pylibcugraph
103103
secrets: inherit
104-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.04
104+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@nvks-runners
105105
with:
106106
build_type: ${{ inputs.build_type || 'branch' }}
107107
branch: ${{ inputs.branch }}
@@ -112,7 +112,7 @@ jobs:
112112
wheel-build-cugraph:
113113
needs: wheel-build-pylibcugraph
114114
secrets: inherit
115-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.04
115+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@nvks-runners
116116
with:
117117
build_type: ${{ inputs.build_type || 'branch' }}
118118
branch: ${{ inputs.branch }}
@@ -122,7 +122,7 @@ jobs:
122122
wheel-publish-cugraph:
123123
needs: wheel-build-cugraph
124124
secrets: inherit
125-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.04
125+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@nvks-runners
126126
with:
127127
build_type: ${{ inputs.build_type || 'branch' }}
128128
branch: ${{ inputs.branch }}

‎.github/workflows/pr.yaml

+18-18
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- telemetry-setup
3232
- devcontainer
3333
secrets: inherit
34-
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-25.04
34+
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@nvks-runners
3535
if: always()
3636
with:
3737
needs: ${{ toJSON(needs) }}
@@ -59,7 +59,7 @@ jobs:
5959
changed-files:
6060
secrets: inherit
6161
needs: telemetry-setup
62-
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@branch-25.04
62+
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@nvks-runners
6363
with:
6464
files_yaml: |
6565
test_cpp:
@@ -90,70 +90,70 @@ jobs:
9090
checks:
9191
secrets: inherit
9292
needs: telemetry-setup
93-
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-25.04
93+
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@nvks-runners
9494
with:
9595
enable_check_generated_files: false
9696
ignored_pr_jobs: telemetry-summarize
9797
conda-cpp-build:
9898
needs: checks
9999
secrets: inherit
100-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.04
100+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@nvks-runners
101101
with:
102102
build_type: pull-request
103103
node_type: cpu32
104104
conda-cpp-tests:
105105
needs: [conda-cpp-build, changed-files]
106106
secrets: inherit
107-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-25.04
107+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@nvks-runners
108108
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_cpp
109109
with:
110110
build_type: pull-request
111111
conda-cpp-checks:
112112
needs: conda-cpp-build
113113
secrets: inherit
114-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@branch-25.04
114+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@nvks-runners
115115
with:
116116
build_type: pull-request
117117
enable_check_symbols: true
118118
symbol_exclusions: (cugraph::ops|hornet|void writeEdgeCountsKernel|void markUniqueOffsetsKernel)
119119
conda-python-build:
120120
needs: conda-cpp-build
121121
secrets: inherit
122-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.04
122+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@nvks-runners
123123
with:
124124
build_type: pull-request
125125
conda-python-tests:
126126
needs: [conda-python-build, changed-files]
127127
secrets: inherit
128-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.04
128+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@nvks-runners
129129
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
130130
with:
131131
build_type: pull-request
132132
conda-notebook-tests:
133133
needs: [conda-python-build, changed-files]
134134
secrets: inherit
135-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.04
135+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@nvks-runners
136136
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_notebooks
137137
with:
138138
build_type: pull-request
139-
node_type: "gpu-v100-latest-1"
139+
node_type: "gpu-l4-latest-1"
140140
arch: "amd64"
141141
container_image: "rapidsai/ci-conda:cuda11.8.0-ubuntu22.04-py3.10"
142142
run_script: "ci/test_notebooks.sh"
143143
docs-build:
144144
needs: conda-python-build
145145
secrets: inherit
146-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.04
146+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@nvks-runners
147147
with:
148148
build_type: pull-request
149-
node_type: "gpu-v100-latest-1"
149+
node_type: "gpu-l4-latest-1"
150150
arch: "amd64"
151151
container_image: "rapidsai/ci-conda:cuda11.8.0-ubuntu22.04-py3.10"
152152
run_script: "ci/build_docs.sh"
153153
wheel-build-libcugraph:
154154
needs: checks
155155
secrets: inherit
156-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.04
156+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@nvks-runners
157157
with:
158158
# build for every combination of arch and CUDA version, but only for the latest Python
159159
matrix_filter: group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | map(max_by(.PY_VER|split(".")|map(tonumber)))
@@ -162,37 +162,37 @@ jobs:
162162
wheel-build-pylibcugraph:
163163
needs: wheel-build-libcugraph
164164
secrets: inherit
165-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.04
165+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@nvks-runners
166166
with:
167167
build_type: pull-request
168168
script: ci/build_wheel_pylibcugraph.sh
169169
wheel-tests-pylibcugraph:
170170
needs: [wheel-build-pylibcugraph, changed-files]
171171
secrets: inherit
172-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.04
172+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@nvks-runners
173173
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
174174
with:
175175
build_type: pull-request
176176
script: ci/test_wheel_pylibcugraph.sh
177177
wheel-build-cugraph:
178178
needs: wheel-build-pylibcugraph
179179
secrets: inherit
180-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.04
180+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@nvks-runners
181181
with:
182182
build_type: pull-request
183183
script: ci/build_wheel_cugraph.sh
184184
wheel-tests-cugraph:
185185
needs: [wheel-build-cugraph, changed-files]
186186
secrets: inherit
187-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.04
187+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@nvks-runners
188188
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
189189
with:
190190
build_type: pull-request
191191
script: ci/test_wheel_cugraph.sh
192192
devcontainer:
193193
secrets: inherit
194194
needs: telemetry-setup
195-
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-25.04
195+
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@nvks-runners
196196
with:
197197
arch: '["amd64"]'
198198
cuda: '["12.8"]'

‎.github/workflows/test.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
jobs:
1717
conda-cpp-checks:
1818
secrets: inherit
19-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@branch-25.04
19+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@nvks-runners
2020
with:
2121
build_type: nightly
2222
branch: ${{ inputs.branch }}
@@ -26,23 +26,23 @@ jobs:
2626
symbol_exclusions: (cugraph::ops|hornet|void writeEdgeCountsKernel|void markUniqueOffsetsKernel)
2727
conda-cpp-tests:
2828
secrets: inherit
29-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-25.04
29+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@nvks-runners
3030
with:
3131
build_type: nightly
3232
branch: ${{ inputs.branch }}
3333
date: ${{ inputs.date }}
3434
sha: ${{ inputs.sha }}
3535
conda-python-tests:
3636
secrets: inherit
37-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.04
37+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@nvks-runners
3838
with:
3939
build_type: nightly
4040
branch: ${{ inputs.branch }}
4141
date: ${{ inputs.date }}
4242
sha: ${{ inputs.sha }}
4343
wheel-tests-pylibcugraph:
4444
secrets: inherit
45-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.04
45+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@nvks-runners
4646
with:
4747
build_type: nightly
4848
branch: ${{ inputs.branch }}
@@ -51,7 +51,7 @@ jobs:
5151
script: ci/test_wheel_pylibcugraph.sh
5252
wheel-tests-cugraph:
5353
secrets: inherit
54-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.04
54+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@nvks-runners
5555
with:
5656
build_type: nightly
5757
branch: ${{ inputs.branch }}

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

+1-1
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@branch-25.04
15+
uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@nvks-runners
1616
with:
1717
sender_login: ${{ github.event.sender.login }}
1818
sender_avatar: ${{ github.event.sender.avatar_url }}

‎README.md

+13-11
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,13 @@ The [cugraph-docs repository](https://github.com/rapidsai/cugraph-docs) contains
5151

5252
## Table of contents
5353
- Installation
54-
- [Getting cuGraph Packages](./docs/cugraph/source/installation/getting_cugraph.md)
55-
- [Building from Source](./docs/cugraph/source/installation/source_build.md)
56-
- [Contributing to cuGraph](./readme_pages/CONTRIBUTING.md)
54+
- [Getting cuGraph Packages](https://docs.rapids.ai/api/cugraph/stable/installation/getting_cugraph/)
55+
- [Building from Source](https://docs.rapids.ai/api/cugraph/stable/installation/source_build/)
56+
- [Contributing to cuGraph](https://docs.rapids.ai/contributing/)
5757
- General
58-
- [Latest News](./readme_pages/news.md)
59-
- [Current list of algorithms](./docs/cugraph/source/graph_support/algorithms.md)
60-
- [Blogs and Presentation](./docs/cugraph/source/tutorials/cugraph_blogs.rst)
61-
- [Performance](./readme_pages/performance/performance.md)
58+
- [Latest News](https://docs.rapids.ai/api/cugraph/nightly/)
59+
- [Current list of algorithms](https://docs.rapids.ai/api/cugraph/stable/graph_support/algorithms/)
60+
- [Blogs and Presentation](https://docs.rapids.ai/api/cugraph/nightly/tutorials/cugraph_blogs/)
6261
- Packages
6362
- [cuGraph Python](./readme_pages/cugraph_python.md)
6463
- [Property Graph](./readme_pages/property_graph.md)
@@ -69,11 +68,14 @@ The [cugraph-docs repository](https://github.com/rapidsai/cugraph-docs) contains
6968
- [cugraph-service](./readme_pages/cugraph_service.md)
7069
- API Docs
7170
- Python
72-
- [Python Nightly](https://docs.rapids.ai/api/cugraph/nightly/)
73-
- [Python Stable](https://docs.rapids.ai/api/cugraph/stable/)
71+
- [Python Nightly](https://docs.rapids.ai/api/cugraph/nightly/api_docs/cugraph/)
72+
- [Python Stable](https://docs.rapids.ai/api/cugraph/stable/api_docs/cugraph/)
73+
- C
74+
- [C Nightly](https://docs.rapids.ai/api/cugraph/nightly/api_docs/cugraph_c/)
75+
- [C Stable](https://docs.rapids.ai/api/cugraph/stable/api_docs/cugraph_c/)
7476
- C++
75-
- [C++ Nightly](https://docs.rapids.ai/api/libcugraph/nightly/)
76-
- [C++ Stable](https://docs.rapids.ai/api/libcugraph/stable/)
77+
- [C++ Nightly](https://docs.rapids.ai/api/cugraph/nightly/api_docs/cugraph_cpp/)
78+
- (Will be available when 25.02 is released)[C++ Stable](https://docs.rapids.ai/api/cugraph/stable/api_docs/cugraph_cpp/)
7779
- References
7880
- [RAPIDS](https://rapids.ai/)
7981
- [ARROW](https://arrow.apache.org/)

‎cpp/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -548,6 +548,7 @@ add_library(cugraph_c
548548
src/c_api/allgather.cpp
549549
src/c_api/decompress_to_edgelist.cpp
550550
src/c_api/edgelist.cpp
551+
src/c_api/renumber_arbitrary_edgelist.cu
551552
)
552553
add_library(cugraph::cugraph_c ALIAS cugraph_c)
553554

0 commit comments

Comments
 (0)