Skip to content

Drop uses of thrust/functional.h #1835

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rapids-bot merged 4 commits into from
Feb 24, 2026
Merged

Drop uses of thrust/functional.h #1835

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8920f2c
Drop uses of `thrust/functional.h`
miscco Feb 23, 2026
298bb68
Merge branch 'main' into drop_thrust_functional
aamijar Feb 23, 2026
511c55e
Fix merge conflict
aamijar Feb 23, 2026
08aafee
Fix style
aamijar Feb 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cpp/src/cluster/detail/agglomerative.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@

#include <rmm/device_uvector.hpp>

#include <cuda/std/functional>
#include <cuda/std/tuple>
#include <thrust/device_ptr.h>
#include <thrust/execution_policy.h>
#include <thrust/extrema.h>
#include <thrust/fill.h>
#include <thrust/for_each.h>
#include <thrust/functional.h>
#include <thrust/iterator/counting_iterator.h>
#include <thrust/iterator/zip_iterator.h>
#include <thrust/sort.h>
Expand Down Expand Up @@ -282,7 +282,7 @@ void extract_flattened_clusters(raft::resources const& handle,
thrust::sort(thrust_policy,
label_roots.data(),
label_roots.data() + (child_size),
thrust::greater<value_idx>());
cuda::std::greater<value_idx>());

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

Expand Down
1 change: 0 additions & 1 deletion cpp/src/neighbors/ball_cover/ball_cover.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

#include <cuda/std/tuple>
#include <thrust/fill.h>
#include <thrust/functional.h>
#include <thrust/iterator/zip_iterator.h>
#include <thrust/reduce.h>
#include <thrust/sort.h>
Expand Down
1 change: 0 additions & 1 deletion cpp/src/neighbors/ball_cover/common.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#pragma once

#include <cuda/std/tuple>
#include <thrust/functional.h>

#include <cstdint>

Expand Down
5 changes: 3 additions & 2 deletions cpp/src/neighbors/ball_cover/registers.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: Copyright (c) 2025, NVIDIA CORPORATION.
* SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION.
* SPDX-License-Identifier: Apache-2.0
*/

Expand All @@ -17,6 +17,7 @@
#include <raft/linalg/unary_op.cuh>
#include <raft/util/cuda_utils.cuh>

#include <cuda/functional>
#include <thrust/count.h>
#include <thrust/fill.h>
#include <thrust/scan.h>
Expand Down Expand Up @@ -1444,7 +1445,7 @@ void rbc_eps_pass(raft::resources const& handle,
vd_ptr,
vd_ptr + n_query_rows,
(value_idx)0,
thrust::maximum<value_idx>());
cuda::maximum<value_idx>());

if (actual_max > max_k_in) {
// ceil vd to max_k
Expand Down