Skip to content

Commit e6e43af

Browse files
acostadonacostadon
authored
Merge branch 'branch-25.08' into bench_nb
2 parents f846531 + 6a53358 commit e6e43af

File tree

147 files changed

+8891
-3189
lines changed

Some content is hidden

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

147 files changed

+8891
-3189
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ datasets/*
8484

8585
## Doxygen and Docs
8686
cpp/doxygen/html
87+
cpp/doxygen/xml
8788
docs/cugraph/lib*
8889
docs/cugraph/api/*
8990

‎README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
Libraries supporting GNNs are now located in the [cugraph-gnn repository](https://github.com/rapidsai/cugraph-gnn)
44

55
* [pylibwholegraph](https://github.com/rapidsai/cugraph-gnn/tree/HEAD/python/) - the [Wholegraph](https://docs.rapids.ai/api/cugraph/nightly/wholegraph/) library for client memory management supporting both cuGraph-DGL and cuGraph-PyG for even greater scalability
6-
* [cugraph_dgl](https://github.com/rapidsai/cugraph-gnn/blob/main/readme_pages/cugraph_dgl.md) enables the ability to use cugraph Property Graphs with Deep Graph Library (DGL)
76
* [cugraph_pyg](https://github.com/rapidsai/cugraph-gnn/blob/main/readme_pages/cugraph_pyg.md) enables the ability to use cugraph Property Graphs with PyTorch Geometric (PyG).
87

98
[RAPIDS nx-cugraph](https://rapids.ai/nx-cugraph/) is now located in the [nx-cugraph repository](https://github.com/rapidsai/nx-cugraph) containing a backend to NetworkX for running supported algorithms with GPU acceleration.

‎benchmarks/cugraph/standalone/main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2021-2023, NVIDIA CORPORATION.
1+
# Copyright (c) 2021-2025, NVIDIA CORPORATION.
22
# Licensed under the Apache License, Version 2.0 (the "License");
33
# you may not use this file except in compliance with the License.
44
# You may obtain a copy of the License at
@@ -113,7 +113,7 @@ def run(
113113
# If the number of GPUs is None, This is a MNMG run
114114
# Extract the number of gpus from the client
115115
if n_gpus is None:
116-
n_gpus = len(setup_objs[0].scheduler_info()["workers"])
116+
n_gpus = setup_objs[0].scheduler_info()["n_workers"]
117117
log("done.")
118118

119119
try:

‎benchmarks/shared/build_cugraph_ucx/test_client_bandwidth.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022-2023, NVIDIA CORPORATION.
1+
# Copyright (c) 2022-2025, NVIDIA CORPORATION.
22
# Licensed under the Apache License, Version 2.0 (the "License");
33
# you may not use this file except in compliance with the License.
44
# You may obtain a copy of the License at
@@ -46,7 +46,7 @@ def create_dataframe(client):
4646
}
4747
)
4848
ddf = dask_cudf.from_cudf(
49-
df, npartitions=len(client.scheduler_info()["workers"])
49+
df, npartitions=client.scheduler_info()["n_workers"]
5050
).persist()
5151
client.rebalance(ddf)
5252
del df

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ dependencies:
5555
- pytest-cov
5656
- pytest-xdist
5757
- python-louvain
58-
- pytorch>=2.3,<2.5a0
58+
- pytorch>=2.3
5959
- raft-dask==25.8.*,>=0.0.0a0
6060
- rapids-build-backend>=0.3.1,<0.4.0.dev0
6161
- rapids-dask-dependency==25.8.*,>=0.0.0a0

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ dependencies:
5555
- pytest-cov
5656
- pytest-xdist
5757
- python-louvain
58-
- pytorch>=2.3,<2.5a0
58+
- pytorch>=2.3
5959
- raft-dask==25.8.*,>=0.0.0a0
6060
- rapids-build-backend>=0.3.1,<0.4.0.dev0
6161
- rapids-dask-dependency==25.8.*,>=0.0.0a0

‎conda/recipes/cugraph/conda_build_config.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
c_compiler_version:
2-
- 13 # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
3-
- 11 # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
2+
- 13
43

54
cxx_compiler_version:
6-
- 13 # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
7-
- 11 # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
5+
- 13
86

97
cuda_compiler:
10-
- cuda-nvcc # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
11-
- nvcc # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
8+
- cuda-nvcc
129

1310
cmake_version:
1411
- ">=3.30.4"

‎conda/recipes/cugraph/recipe.yaml

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,7 @@ requirements:
6767
- rmm =${{ minor_version }}
6868
- rapids-build-backend >=0.3.0,<0.4.0.dev0
6969
- scikit-build-core >=0.10.0
70-
- if: cuda_major == "11"
71-
then:
72-
- cudatoolkit
73-
else:
74-
- cuda-cudart-dev
70+
- cuda-cudart-dev
7571
run:
7672
- ${{ pin_compatible("cuda-version", upper_bound="x", lower_bound="x") }}
7773
- aiohttp
@@ -89,22 +85,13 @@ requirements:
8985
- rapids-dask-dependency =${{ minor_version }}
9086
- requests
9187
- ucx-py ${{ ucx_py_version }}
92-
- if: cuda_major == "11"
93-
then:
94-
- cudatoolkit
95-
- cuda-python >=11.8.5,<12.0a0
96-
else:
97-
- cuda-cudart
98-
- cuda-python >=12.6.2,<13.0a0
88+
- cuda-cudart
89+
- cuda-python >=12.6.2,<13.0a0
9990
ignore_run_exports:
10091
from_package:
101-
- if: cuda_major != "11"
102-
then:
103-
- cuda-cudart-dev
92+
- cuda-cudart-dev
10493
by_name:
10594
- cuda-version
106-
- if: cuda_major == "11"
107-
then: cudatoolkit
10895

10996
tests:
11097
- python:

‎conda/recipes/libcugraph/conda_build_config.yaml

Lines changed: 3 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
c_compiler_version:
2-
- 13 # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
3-
- 11 # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
2+
- 13
43

54
cxx_compiler_version:
6-
- 13 # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
7-
- 11 # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
5+
- 13
86

97
cuda_compiler:
10-
- cuda-nvcc # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
11-
- nvcc # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
8+
- cuda-nvcc
129

1310
cmake_version:
1411
- ">=3.30.4"
@@ -25,43 +22,5 @@ c_stdlib:
2522
c_stdlib_version:
2623
- "2.28"
2724

28-
# The CTK libraries below are missing from the conda-forge::cudatoolkit
29-
# package. The "*_host_*" version specifiers correspond to `11.8` packages
30-
# and the "*_run_*" version specifiers correspond to `11.x` packages.
31-
32-
cuda11_libcublas_host_version:
33-
- "=11.11.3.6"
34-
35-
cuda11_libcublas_run_version:
36-
- ">=11.5.2.43,<12.0.0"
37-
38-
cuda11_libcurand_host_version:
39-
- "=10.3.0.86"
40-
41-
cuda11_libcurand_run_version:
42-
- ">=10.2.5.43,<10.3.1"
43-
44-
cuda11_libcusolver_host_version:
45-
- "=11.4.1.48"
46-
47-
cuda11_libcusolver_run_version:
48-
- ">=11.2.0.43,<11.4.2"
49-
50-
cuda11_libcusparse_host_version:
51-
- "=11.7.5.86"
52-
53-
cuda11_libcusparse_run_version:
54-
- ">=11.6.0.43,<12.0.0"
55-
56-
# `cuda-profiler-api` only has `11.8.0` and `12.0.0` packages for all
57-
# architectures. The "*_host_*" version specifiers correspond to `11.8` packages and the
58-
# "*_run_*" version specifiers correspond to `11.x` packages.
59-
60-
cuda11_cuda_profiler_api_host_version:
61-
- "=11.8.86"
62-
63-
cuda11_cuda_profiler_api_run_version:
64-
- ">=11.4.240,<12"
65-
6625
libucxx_version:
6726
- "0.45.*"

‎conda/recipes/libcugraph/recipe.yaml

Lines changed: 22 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -63,27 +63,13 @@ cache:
6363
- nccl ${{ nccl_version }}
6464
- openmpi <5.0.3 # Required for building cpp-mgtests (multi-GPU tests)
6565
- rapids-build-backend >=0.3.1,<0.4.0.dev0
66-
- if: cuda_major == "11"
67-
then:
68-
- cudatoolkit
69-
- cuda-nvtx =${{ cuda_version }}
70-
- cuda-profiler-api ${{ cuda11_cuda_profiler_api_host_version }}
71-
- libcublas ${{ cuda11_libcublas_host_version }}
72-
- libcublas-dev ${{ cuda11_libcublas_host_version }}
73-
- libcurand ${{ cuda11_libcurand_host_version }}
74-
- libcurand-dev ${{ cuda11_libcurand_host_version }}
75-
- libcusolver ${{ cuda11_libcusolver_host_version }}
76-
- libcusolver-dev ${{ cuda11_libcusolver_host_version }}
77-
- libcusparse ${{ cuda11_libcusparse_host_version }}
78-
- libcusparse-dev ${{ cuda11_libcusparse_host_version }}
79-
else:
80-
- cuda-nvtx-dev
81-
- cuda-profiler-api
82-
- cuda-cudart-dev
83-
- libcublas-dev
84-
- libcurand-dev
85-
- libcusolver-dev
86-
- libcusparse-dev
66+
- cuda-nvtx-dev
67+
- cuda-profiler-api
68+
- cuda-cudart-dev
69+
- libcublas-dev
70+
- libcurand-dev
71+
- libcusolver-dev
72+
- libcusparse-dev
8773

8874
outputs:
8975
- package:
@@ -109,39 +95,22 @@ outputs:
10995
- cuda-version =${{ cuda_version }}
11096
- librmm =${{ minor_version }}
11197
- rapids-logger =0.1
112-
- if: cuda_major == "11"
113-
then:
114-
- cudatoolkit
115-
- libcublas-dev ${{ cuda11_libcublas_host_version }}
116-
- libcurand-dev ${{ cuda11_libcurand_host_version }}
117-
- libcusolver-dev ${{ cuda11_libcusolver_host_version }}
118-
- libcusparse-dev ${{ cuda11_libcusparse_host_version }}
119-
else:
120-
- cuda-cudart-dev
121-
- libcublas-dev
122-
- libcurand-dev
123-
- libcusolver-dev
124-
- libcusparse-dev
98+
- cuda-cudart-dev
99+
- libcublas-dev
100+
- libcurand-dev
101+
- libcusolver-dev
102+
- libcusparse-dev
125103
run:
126104
- ${{ pin_compatible("cuda-version", upper_bound="x", lower_bound="x") }}
127105
- libraft =${{ minor_version }}
128106
- librmm =${{ minor_version }}
129107
- nccl ${{ nccl_version }}
130-
- if: cuda_major == "11"
131-
then:
132-
- cudatoolkit
133-
- cuda-profiler-api ${{ cuda11_cuda_profiler_api_run_version }}
134-
- libcublas ${{ cuda11_libcublas_run_version }}
135-
- libcurand ${{ cuda11_libcurand_run_version }}
136-
- libcusolver ${{ cuda11_libcusolver_run_version }}
137-
- libcusparse ${{ cuda11_libcusparse_run_version }}
138-
else:
139-
- cuda-profiler-api
140-
- cuda-cudart
141-
- libcublas
142-
- libcurand
143-
- libcusolver
144-
- libcusparse
108+
- cuda-profiler-api
109+
- cuda-cudart
110+
- libcublas
111+
- libcurand
112+
- libcusolver
113+
- libcusparse
145114
ignore_run_exports:
146115
by_name:
147116
- cuda-cudart
@@ -156,8 +125,6 @@ outputs:
156125
- libucxx
157126
- nccl
158127
- openmpi
159-
- if: cuda_major == "11"
160-
then: cudatoolkit
161128
about:
162129
homepage: ${{ load_from_file("python/libcugraph/pyproject.toml").project.urls.Homepage }}
163130
license: ${{ load_from_file("python/libcugraph/pyproject.toml").project.license.text }}
@@ -185,17 +152,13 @@ outputs:
185152
- cuda-version =${{ cuda_version }}
186153
- libcudf =${{ minor_version }}
187154
- librmm =${{ minor_version }}
188-
- if: cuda_major == "11"
189-
then: cudatoolkit
190-
else: cuda-cudart-dev
155+
- cuda-cudart-dev
191156
run:
192157
- ${{ pin_compatible("cuda-version", upper_bound="x", lower_bound="x") }}
193158
- ${{ pin_subpackage("libcugraph", exact=True) }}
194159
- libcudf =${{ minor_version }}
195160
- librmm =${{ minor_version }}
196-
- if: cuda_major == "11"
197-
then: cudatoolkit
198-
else: cuda-cudart
161+
- cuda-cudart
199162
ignore_run_exports:
200163
by_name:
201164
- cuda-cudart
@@ -210,8 +173,6 @@ outputs:
210173
- libucxx
211174
- nccl
212175
- openmpi
213-
- if: cuda_major == "11"
214-
then: cudatoolkit
215176
about:
216177
homepage: ${{ load_from_file("python/libcugraph/pyproject.toml").project.urls.Homepage }}
217178
license: ${{ load_from_file("python/libcugraph/pyproject.toml").project.license.text }}
@@ -240,16 +201,12 @@ outputs:
240201
- nccl ${{ nccl_version }}
241202
- openmpi <5.0.3 # Required for building cpp-mgtests (multi-GPU tests)
242203
- rapids-logger =0.1
243-
- if: cuda_major == "11"
244-
then: cudatoolkit
245-
else: cuda-cudart-dev
204+
- cuda-cudart-dev
246205
run:
247206
- ${{ pin_compatible("cuda-version", upper_bound="x", lower_bound="x") }}
248207
- ${{ pin_subpackage("libcugraph", exact=True) }}
249208
- ${{ pin_subpackage("libcugraph_etl", exact=True) }}
250-
- if: cuda_major == "11"
251-
then: cudatoolkit
252-
else: cuda-cudart
209+
- cuda-cudart
253210
ignore_run_exports:
254211
by_name:
255212
- cuda-cudart
@@ -264,8 +221,6 @@ outputs:
264221
- libucxx
265222
- nccl
266223
- openmpi
267-
- if: cuda_major == "11"
268-
then: cudatoolkit
269224
about:
270225
homepage: ${{ load_from_file("python/libcugraph/pyproject.toml").project.urls.Homepage }}
271226
license: ${{ load_from_file("python/libcugraph/pyproject.toml").project.license.text }}

0 commit comments

Comments
 (0)