Skip to content

Commit 1a50445

Browse files
authored
Merge pull request #5407 from rapidsai/release/26.02
Forward-merge release/26.02 into main
2 parents 1857c99 + a31a8bd commit 1a50445

36 files changed

+90
-50
lines changed

cpp/examples/developers/vertex_and_edge_partition/vertex_and_edge_partition.cu

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include <raft/core/handle.hpp>
1515
#include <raft/random/rng_state.hpp>
1616

17+
#include <cuda/std/tuple>
1718
#include <thrust/for_each.h>
1819

1920
#include <iostream>
@@ -227,15 +228,15 @@ void look_into_vertex_and_edge_partitions(
227228

228229
if (renumber_map) {
229230
thrust::for_each(thrust::host,
230-
thrust::make_zip_iterator(thrust::make_tuple(
231+
thrust::make_zip_iterator(cuda::std::make_tuple(
231232
h_vertices_in_this_proces.begin(),
232233
thrust::make_counting_iterator(renumbered_vertex_id_of_local_first))),
233-
thrust::make_zip_iterator(thrust::make_tuple(
234+
thrust::make_zip_iterator(cuda::std::make_tuple(
234235
h_vertices_in_this_proces.end(),
235236
thrust::make_counting_iterator(renumbered_vertex_id_of_local_last))),
236237
[comm_rank](auto old_and_new_id_pair) {
237-
auto old_id = thrust::get<0>(old_and_new_id_pair);
238-
auto new_id = thrust::get<1>(old_and_new_id_pair);
238+
auto old_id = cuda::std::get<0>(old_and_new_id_pair);
239+
auto new_id = cuda::std::get<1>(old_and_new_id_pair);
239240
printf("owner rank = %d, original vertex id %d is renumbered to %d\n",
240241
comm_rank,
241242
static_cast<int>(old_id),

cpp/include/cugraph/edge_partition_edge_property_device_view.cuh

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

@@ -13,6 +13,7 @@
1313
#include <raft/core/device_span.hpp>
1414

1515
#include <cuda/std/optional>
16+
#include <cuda/std/tuple>
1617
#include <thrust/binary_search.h>
1718
#include <thrust/iterator/iterator_traits.h>
1819

cpp/include/cugraph/edge_partition_endpoint_property_device_view.cuh

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

@@ -14,6 +14,7 @@
1414

1515
#include <cuda/std/iterator>
1616
#include <cuda/std/optional>
17+
#include <cuda/std/tuple>
1718
#include <thrust/binary_search.h>
1819
#include <thrust/execution_policy.h>
1920
#include <thrust/fill.h>

cpp/include/cugraph/utilities/device_comm.hpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: Copyright (c) 2020-2025, NVIDIA CORPORATION.
2+
* SPDX-FileCopyrightText: Copyright (c) 2020-2026, NVIDIA CORPORATION.
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55
#pragma once
@@ -79,8 +79,8 @@ struct device_isend_tuple_iterator_element_impl {
7979
int base_tag,
8080
raft::comms::request_t* requests) const
8181
{
82-
using output_value_t = typename thrust::
83-
tuple_element<I, typename std::iterator_traits<OutputIterator>::value_type>::type;
82+
using output_value_t =
83+
cuda::std::tuple_element_t<I, typename std::iterator_traits<OutputIterator>::value_type>;
8484
auto tuple_element_input_first = cuda::std::get<I>(input_first.get_iterator_tuple());
8585
device_isend_impl<decltype(tuple_element_input_first), output_value_t>(
8686
comm, tuple_element_input_first, count, dst, static_cast<int>(base_tag + I), requests + I);
@@ -139,8 +139,8 @@ struct device_irecv_tuple_iterator_element_impl {
139139
int base_tag,
140140
raft::comms::request_t* requests) const
141141
{
142-
using input_value_t = typename thrust::
143-
tuple_element<I, typename std::iterator_traits<InputIterator>::value_type>::type;
142+
using input_value_t =
143+
cuda::std::tuple_element_t<I, typename std::iterator_traits<InputIterator>::value_type>;
144144
auto tuple_element_output_first = cuda::std::get<I>(output_first.get_iterator_tuple());
145145
device_irecv_impl<input_value_t, decltype(tuple_element_output_first)>(
146146
comm, tuple_element_output_first, count, src, static_cast<int>(base_tag + I), requests + I);
@@ -211,8 +211,8 @@ struct device_sendrecv_tuple_iterator_element_impl {
211211
int src,
212212
rmm::cuda_stream_view stream_view) const
213213
{
214-
using output_value_t = typename thrust::
215-
tuple_element<I, typename std::iterator_traits<OutputIterator>::value_type>::type;
214+
using output_value_t =
215+
cuda::std::tuple_element_t<I, typename std::iterator_traits<OutputIterator>::value_type>;
216216
auto tuple_element_input_first = cuda::std::get<I>(input_first.get_iterator_tuple());
217217
auto tuple_element_output_first = cuda::std::get<I>(output_first.get_iterator_tuple());
218218
device_sendrecv_impl<decltype(tuple_element_input_first), decltype(tuple_element_output_first)>(
@@ -301,8 +301,8 @@ struct device_multicast_sendrecv_tuple_iterator_element_impl {
301301
raft::host_span<int const> rx_src_ranks,
302302
rmm::cuda_stream_view stream_view) const
303303
{
304-
using output_value_t = typename thrust::
305-
tuple_element<I, typename std::iterator_traits<OutputIterator>::value_type>::type;
304+
using output_value_t =
305+
cuda::std::tuple_element_t<I, typename std::iterator_traits<OutputIterator>::value_type>;
306306
auto tuple_element_input_first = cuda::std::get<I>(input_first.get_iterator_tuple());
307307
auto tuple_element_output_first = cuda::std::get<I>(output_first.get_iterator_tuple());
308308
device_multicast_sendrecv_impl<decltype(tuple_element_input_first),

cpp/src/centrality/betweenness_centrality_impl.cuh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include <cuda/atomic>
3131
#include <cuda/std/iterator>
3232
#include <cuda/std/optional>
33+
#include <cuda/std/tuple>
3334
#include <thrust/copy.h>
3435
#include <thrust/execution_policy.h>
3536
#include <thrust/functional.h>

cpp/src/centrality/katz_centrality_impl.cuh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: Copyright (c) 2020-2025, NVIDIA CORPORATION.
2+
* SPDX-FileCopyrightText: Copyright (c) 2020-2026, NVIDIA CORPORATION.
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55
#pragma once
@@ -19,6 +19,7 @@
1919

2020
#include <rmm/exec_policy.hpp>
2121

22+
#include <cuda/std/tuple>
2223
#include <thrust/copy.h>
2324
#include <thrust/fill.h>
2425
#include <thrust/iterator/constant_iterator.h>

cpp/src/community/approx_weighted_matching_impl.cuh

Lines changed: 2 additions & 1 deletion
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
#pragma once
@@ -19,6 +19,7 @@
1919
#include <raft/core/handle.hpp>
2020

2121
#include <cuda/std/iterator>
22+
#include <cuda/std/tuple>
2223
#include <thrust/fill.h>
2324

2425
namespace cugraph {

cpp/src/cores/k_core_impl.cuh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: Copyright (c) 2022-2025, NVIDIA CORPORATION.
2+
* SPDX-FileCopyrightText: Copyright (c) 2022-2026, NVIDIA CORPORATION.
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55
#pragma once
@@ -10,6 +10,7 @@
1010
#include <cugraph/utilities/error.hpp>
1111

1212
#include <cuda/std/iterator>
13+
#include <cuda/std/tuple>
1314
#include <thrust/copy.h>
1415
#include <thrust/iterator/discard_iterator.h>
1516

cpp/src/detail/graph_partition_utils.cuh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: Copyright (c) 2020-2025, NVIDIA CORPORATION.
2+
* SPDX-FileCopyrightText: Copyright (c) 2020-2026, NVIDIA CORPORATION.
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55
#pragma once
@@ -9,6 +9,7 @@
99
#include <raft/core/device_span.hpp>
1010

1111
#include <cuda/std/iterator>
12+
#include <cuda/std/tuple>
1213
#include <thrust/binary_search.h>
1314
#include <thrust/execution_policy.h>
1415
#include <thrust/sort.h>

cpp/src/lookup/lookup_src_dst_impl.cuh

Lines changed: 2 additions & 1 deletion
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
#include "detail/graph_partition_utils.cuh"
@@ -22,6 +22,7 @@
2222

2323
#include <cuda/std/iterator>
2424
#include <cuda/std/optional>
25+
#include <cuda/std/tuple>
2526

2627
#include <vector>
2728

0 commit comments

Comments
 (0)