Skip to content

Commit 3b3dcc4

Browse files
authored
Drop uses of thrust/functional.h (#1835)
Authors: - Michael Schellenberger Costa (https://github.com/miscco) - Anupam (https://github.com/aamijar) Approvers: - Micka (https://github.com/lowener) - Anupam (https://github.com/aamijar) URL: #1835
1 parent 27119f4 commit 3b3dcc4

4 files changed

Lines changed: 5 additions & 6 deletions

File tree

cpp/src/cluster/detail/agglomerative.cuh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
#include <rmm/device_uvector.hpp>
1515

1616
#include <cuda/iterator>
17+
#include <cuda/std/functional>
1718
#include <cuda/std/tuple>
1819
#include <thrust/device_ptr.h>
1920
#include <thrust/execution_policy.h>
2021
#include <thrust/extrema.h>
2122
#include <thrust/fill.h>
2223
#include <thrust/for_each.h>
23-
#include <thrust/functional.h>
2424
#include <thrust/iterator/zip_iterator.h>
2525
#include <thrust/sort.h>
2626

@@ -282,7 +282,7 @@ void extract_flattened_clusters(raft::resources const& handle,
282282
thrust::sort(thrust_policy,
283283
label_roots.data(),
284284
label_roots.data() + (child_size),
285-
thrust::greater<value_idx>());
285+
cuda::std::greater<value_idx>());
286286

287287
rmm::device_uvector<value_idx> tmp_labels(n_vertices, stream);
288288

cpp/src/neighbors/ball_cover/ball_cover.cuh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
#include <cuda/std/tuple>
2727
#include <thrust/fill.h>
28-
#include <thrust/functional.h>
2928
#include <thrust/iterator/zip_iterator.h>
3029
#include <thrust/reduce.h>
3130
#include <thrust/sort.h>

cpp/src/neighbors/ball_cover/common.cuh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#pragma once
77

88
#include <cuda/std/tuple>
9-
#include <thrust/functional.h>
109

1110
#include <cstdint>
1211

cpp/src/neighbors/ball_cover/registers.cuh

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

@@ -17,6 +17,7 @@
1717
#include <raft/linalg/unary_op.cuh>
1818
#include <raft/util/cuda_utils.cuh>
1919

20+
#include <cuda/functional>
2021
#include <thrust/count.h>
2122
#include <thrust/fill.h>
2223
#include <thrust/scan.h>
@@ -1444,7 +1445,7 @@ void rbc_eps_pass(raft::resources const& handle,
14441445
vd_ptr,
14451446
vd_ptr + n_query_rows,
14461447
(value_idx)0,
1447-
thrust::maximum<value_idx>());
1448+
cuda::maximum<value_idx>());
14481449
14491450
if (actual_max > max_k_in) {
14501451
// ceil vd to max_k

0 commit comments

Comments
 (0)