Skip to content

Replace thrust::identity with cuda::std::identity #4925

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
merged 2 commits into from
Feb 7, 2025
Merged

Replace thrust::identity with cuda::std::identity #4925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a28d7a5
Replace `thrust::identity` with `cuda::std::identity`
miscco Feb 6, 2025
423588e
Add missing copyright
miscco Feb 6, 2025
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
6 changes: 3 additions & 3 deletions cpp/src/mtmg/vertex_result.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023-2024, NVIDIA CORPORATION.
* Copyright (c) 2023-2025, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -24,7 +24,7 @@
#include <cugraph/utilities/device_functors.cuh>
#include <cugraph/vertex_partition_device_view.cuh>

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

namespace cugraph {
Expand Down Expand Up @@ -129,7 +129,7 @@ rmm::device_uvector<result_t> vertex_result_view_t<result_t>::gather(
vertex_gpu_ids.begin(),
vertex_gpu_ids.end(),
thrust::make_zip_iterator(local_vertices.begin(), vertex_pos.begin(), result.begin()),
thrust::identity{},
cuda::std::identity{},
stream);

//
Expand Down
7 changes: 3 additions & 4 deletions cpp/src/prims/detail/per_v_transform_reduce_e.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
#include <thrust/execution_policy.h>
#include <thrust/fill.h>
#include <thrust/for_each.h>
#include <thrust/functional.h>
#include <thrust/iterator/counting_iterator.h>
#include <thrust/iterator/transform_iterator.h>
#include <thrust/scatter.h>
Expand Down Expand Up @@ -4004,7 +4003,7 @@ void per_v_transform_reduce_e(raft::handle_t const& handle,
return (bitmap[packed_bool_offset(i)] &
packed_bool_mask(i)) == packed_bool_mask(i);
})),
thrust::identity<bool>{})),
cuda::std::identity{})),
handle.get_stream());
// skip shrink_to_fit() to cut execution time
std::exclusive_scan((*rx_value_sizes).begin(),
Expand Down Expand Up @@ -4064,7 +4063,7 @@ void per_v_transform_reduce_e(raft::handle_t const& handle,
return (bitmap[packed_bool_offset(i)] &
packed_bool_mask(i)) == packed_bool_mask(i);
})),
thrust::identity<bool>{})),
cuda::std::identity{})),
handle.get_stream());
// skip shrink_to_fit() to cut execution time
} else {
Expand All @@ -4083,7 +4082,7 @@ void per_v_transform_reduce_e(raft::handle_t const& handle,
return (bitmap[packed_bool_offset(i)] &
packed_bool_mask(i)) == packed_bool_mask(i);
})),
thrust::identity<bool>{})),
cuda::std::identity{})),
handle.get_stream());
// skip shrink_to_fit() to cut execution time
}
Expand Down
3 changes: 2 additions & 1 deletion cpp/src/prims/fill_edge_property.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

#include <rmm/exec_policy.hpp>

#include <cuda/std/functional>
#include <cuda/std/optional>
#include <thrust/fill.h>
#include <thrust/iterator/constant_iterator.h>
Expand Down Expand Up @@ -106,7 +107,7 @@ void fill_edge_property(raft::handle_t const& handle,
thrust::make_constant_iterator(input) + edge_counts[i],
thrust::make_counting_iterator(edge_t{0}),
value_firsts[i],
thrust::identity<T>{},
cuda::std::identity{},
[edge_partition_e_mask = *edge_partition_e_mask] __device__(edge_t i) {
return edge_partition_e_mask.get(i);
});
Expand Down
3 changes: 2 additions & 1 deletion cpp/src/sampling/negative_sampling_impl.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@

#include <rmm/device_scalar.hpp>

#include <cuda/std/functional>
#include <thrust/adjacent_difference.h>
#include <thrust/binary_search.h>
#include <thrust/copy.h>
Expand Down Expand Up @@ -359,7 +360,7 @@ std::tuple<rmm::device_uvector<vertex_t>, rmm::device_uvector<vertex_t>> negativ
begin_iter,
begin_iter + batch_srcs.size(),
has_edge_flags.begin(),
thrust::identity<bool>());
cuda::std::identity());

batch_srcs.resize(thrust::distance(begin_iter, new_end), handle.get_stream());
batch_dsts.resize(thrust::distance(begin_iter, new_end), handle.get_stream());
Expand Down
12 changes: 6 additions & 6 deletions cpp/src/traversal/od_shortest_distances_impl.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
#include <raft/util/cudart_utils.hpp>
#include <raft/util/integer_utils.hpp>

#include <cuda/std/functional>
#include <cuda/std/optional>
#include <thrust/fill.h>
#include <thrust/functional.h>
#include <thrust/iterator/counting_iterator.h>
#include <thrust/iterator/discard_iterator.h>
#include <thrust/iterator/zip_iterator.h>
Expand Down Expand Up @@ -385,7 +385,7 @@ kv_store_t<key_t, weight_t, false /* use_binary_search */> filter_key_to_dist_ma
detail::key_cuco_store_contains_device_view_t(key_set.view())});

keep_count = thrust::count_if(
handle.get_thrust_policy(), keep_flags.begin(), keep_flags.end(), thrust::identity<bool>{});
handle.get_thrust_policy(), keep_flags.begin(), keep_flags.end(), cuda::std::identity{});
}

size_t new_kv_store_capacity = compute_kv_store_capacity(
Expand All @@ -398,7 +398,7 @@ kv_store_t<key_t, weight_t, false /* use_binary_search */> filter_key_to_dist_ma
old_key_buffer.end(),
old_value_buffer.begin(),
keep_flags.begin(),
thrust::identity<bool>{},
cuda::std::identity{},
handle.get_stream());

return std::move(key_to_dist_map);
Expand Down Expand Up @@ -606,7 +606,7 @@ rmm::device_uvector<weight_t> od_shortest_distances(
v_to_destination_indices.size()),
static_cast<od_idx_t>(origins.size()),
static_cast<od_idx_t>(destinations.size())})),
thrust::identity<weight_t>{},
cuda::std::identity{},
check_destination_index_t<vertex_t, od_idx_t, key_t>{
raft::device_span<od_idx_t const>(v_to_destination_indices.data(),
v_to_destination_indices.size()),
Expand Down Expand Up @@ -725,7 +725,7 @@ rmm::device_uvector<weight_t> od_shortest_distances(
v_to_destination_indices.size()),
static_cast<od_idx_t>(origins.size()),
static_cast<od_idx_t>(destinations.size())})),
thrust::identity<weight_t>{},
cuda::std::identity{},
check_destination_index_t<vertex_t, od_idx_t, key_t>{
raft::device_span<od_idx_t const>(v_to_destination_indices.data(),
v_to_destination_indices.size()),
Expand Down Expand Up @@ -947,7 +947,7 @@ rmm::device_uvector<weight_t> od_shortest_distances(
split_thresholds.end(),
dist)));
},
thrust::identity<key_t>{},
cuda::std::identity{},
raft::device_span<size_t>(d_counters.data(), d_counters.size()));
}
std::vector<size_t> h_counters(d_counters.size());
Expand Down