Skip to content

Commit 48542cd

Browse files
committed
Merge branch 'main' of https://github.com/rapidsai/cugraph into enh_fix_mg_test_failures
2 parents d6f262f + 68062cd commit 48542cd

File tree

8 files changed

+41
-9
lines changed

8 files changed

+41
-9
lines changed

.github/workflows/test.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ jobs:
5050
date: ${{ inputs.date }}
5151
script: ci/test_python.sh
5252
sha: ${{ inputs.sha }}
53+
# Skip failing tests on RTX PRO 6000 (Blackwell). xref: https://github.com/rapidsai/cugraph/issues/5421
54+
matrix_filter: map(select(.GPU != "rtxpro6000"))
5355
wheel-tests-pylibcugraph:
5456
secrets: inherit
5557
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@main
@@ -68,3 +70,5 @@ jobs:
6870
date: ${{ inputs.date }}
6971
sha: ${{ inputs.sha }}
7072
script: ci/test_wheel_cugraph.sh
73+
# Skip failing tests on RTX PRO 6000 (Blackwell). xref: https://github.com/rapidsai/cugraph/issues/5421
74+
matrix_filter: map(select(.GPU != "rtxpro6000"))
File renamed without changes.

benchmarks/shared/build_cugraph_ucx/cugraph_ucx.dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-FileCopyrightText: Copyright (c) 2022-2025, NVIDIA CORPORATION.
1+
# SPDX-FileCopyrightText: Copyright (c) 2022-2026, NVIDIA CORPORATION.
22
# SPDX-License-Identifier: Apache-2.0
33

44
# rdma build instructions from here:
@@ -47,7 +47,7 @@ RUN conda config --set ssl_verify false
4747
RUN conda install -c gpuci gpuci-tools
4848
RUN gpuci_conda_retry install -c conda-forge mamba
4949

50-
RUN gpuci_mamba_retry install -y -c pytorch -c rapidsai-nightly -c rapidsai -c conda-forge -c nvidia \
50+
RUN gpuci_mamba_retry install -y -c rapidsai-nightly -c rapidsai -c conda-forge \
5151
cugraph=$RAPIDS_VER \
5252
pytorch=$PYTORCH_VER \
5353
python=$PYTHON_VER \
@@ -59,8 +59,6 @@ RUN chmod 744 /root/build-ucx.sh & bash /root/build-ucx.sh
5959

6060
ADD test_client_bandwidth.py /root/test_client_bandwidth.py
6161
RUN chmod 777 /root/test_client_bandwidth.py
62-
ADD test_cugraph_sampling.py /root/test_cugraph_sampling.py
63-
RUN chmod 777 /root/test_cugraph_sampling.py
6462

6563
ENV PATH /opt/conda/env/bin:$PATH
6664
WORKDIR /root/

conda/environments/all_cuda-131_arch-aarch64.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ dependencies:
3232
- libcusolver-dev
3333
- libcusparse-dev
3434
- libcuvs==26.4.*,>=0.0.0a0
35+
- libnvjitlink-dev
3536
- libraft==26.4.*,>=0.0.0a0
3637
- librmm==26.4.*,>=0.0.0a0
3738
- nbsphinx

conda/environments/all_cuda-131_arch-x86_64.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ dependencies:
3232
- libcusolver-dev
3333
- libcusparse-dev
3434
- libcuvs==26.4.*,>=0.0.0a0
35+
- libnvjitlink-dev
3536
- libraft==26.4.*,>=0.0.0a0
3637
- librmm==26.4.*,>=0.0.0a0
3738
- nbsphinx

conda/recipes/libcugraph/recipe.yaml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-FileCopyrightText: Copyright (c) 2018-2025, NVIDIA CORPORATION.
1+
# SPDX-FileCopyrightText: Copyright (c) 2018-2026, NVIDIA CORPORATION.
22
# SPDX-License-Identifier: Apache-2.0
33
schema_version: 1
44

@@ -85,6 +85,9 @@ cache:
8585
- libcurand-dev
8686
- libcusolver-dev
8787
- libcusparse-dev
88+
- if: cuda_major == "13"
89+
then:
90+
- libnvjitlink-dev
8891

8992
outputs:
9093
- package:
@@ -114,6 +117,9 @@ outputs:
114117
- libcurand-dev
115118
- libcusolver-dev
116119
- libcusparse-dev
120+
- if: cuda_major == "13"
121+
then:
122+
- libnvjitlink-dev
117123
run:
118124
- ${{ pin_compatible("cuda-version", upper_bound="x", lower_bound="x") }}
119125
- libraft =${{ minor_version }}
@@ -124,6 +130,9 @@ outputs:
124130
- libcurand
125131
- libcusolver
126132
- libcusparse
133+
- if: cuda_major == "13"
134+
then:
135+
- libnvjitlink
127136
ignore_run_exports:
128137
by_name:
129138
- cuda-nvtx
@@ -137,6 +146,9 @@ outputs:
137146
- libucxx
138147
- nccl
139148
- openmpi
149+
- if: cuda_major == "13"
150+
then:
151+
- libnvjitlink
140152
about:
141153
homepage: ${{ load_from_file("python/libcugraph/pyproject.toml").project.urls.Homepage }}
142154
license: ${{ load_from_file("python/libcugraph/pyproject.toml").project.license }}
@@ -183,6 +195,9 @@ outputs:
183195
- libucxx
184196
- nccl
185197
- openmpi
198+
- if: cuda_major == "13"
199+
then:
200+
- libnvjitlink
186201
about:
187202
homepage: ${{ load_from_file("python/libcugraph/pyproject.toml").project.urls.Homepage }}
188203
license: ${{ load_from_file("python/libcugraph/pyproject.toml").project.license }}
@@ -228,6 +243,9 @@ outputs:
228243
- libucxx
229244
- nccl
230245
- openmpi
246+
- if: cuda_major == "13"
247+
then:
248+
- libnvjitlink
231249
about:
232250
homepage: ${{ load_from_file("python/libcugraph/pyproject.toml").project.urls.Homepage }}
233251
license: ${{ load_from_file("python/libcugraph/pyproject.toml").project.license }}

cpp/src/sampling/negative_sampling_impl.cuh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: Copyright (c) 2024-2025, NVIDIA CORPORATION.
2+
* SPDX-FileCopyrightText: Copyright (c) 2024-2026, NVIDIA CORPORATION.
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

@@ -88,10 +88,10 @@ normalize_biases(raft::handle_t const& handle,
8888
// be part of the upper-most range. We'll compute the last non-zero value in the
8989
// gpu_biases array here and below we will fill it with a value larger than 1.0
9090
size_t trailing_zeros = cuda::std::distance(
91-
thrust::make_reverse_iterator(gpu_biases->end()),
91+
cuda::std::make_reverse_iterator(gpu_biases->end()),
9292
thrust::find_if(handle.get_thrust_policy(),
93-
thrust::make_reverse_iterator(gpu_biases->end()),
94-
thrust::make_reverse_iterator(gpu_biases->begin()),
93+
cuda::std::make_reverse_iterator(gpu_biases->end()),
94+
cuda::std::make_reverse_iterator(gpu_biases->begin()),
9595
cuda::proclaim_return_type<bool>(
9696
[] __device__(weight_t bias) { return bias > weight_t{0}; })));
9797

dependencies.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,16 @@ dependencies:
252252
- libcurand-dev
253253
- libcusolver-dev
254254
- libcusparse-dev
255+
specific:
256+
- output_types: [conda]
257+
matrices:
258+
- matrix:
259+
cuda: "13.*"
260+
packages:
261+
- libnvjitlink-dev
262+
- matrix:
263+
cuda: "12.*"
264+
packages:
255265
common_build:
256266
common:
257267
- output_types: [conda, requirements, pyproject]

0 commit comments

Comments
 (0)