Skip to content
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

Fix Thrust 1.12 compile errors #231

Merged
merged 1 commit into from
May 18, 2021
Merged

Fix Thrust 1.12 compile errors #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cpp/include/raft/sparse/hierarchy/detail/agglomerative.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ void extract_flattened_clusters(const raft::handle_t &handle, value_idx *labels,
size_t n_leaves) {
auto d_alloc = handle.get_device_allocator();
auto stream = handle.get_stream();
auto thrust_policy = rmm::exec_policy(stream);
auto thrust_policy = rmm::exec_policy(rmm::cuda_stream_view{stream});

// Handle special case where n_clusters == 1
if (n_clusters == 1) {
Expand Down
4 changes: 2 additions & 2 deletions cpp/include/raft/sparse/hierarchy/detail/connectivities.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ struct distance_graph_impl<raft::hierarchy::LinkageDistance::KNN_GRAPH,
rmm::device_uvector<value_t> &data, int c) {
auto d_alloc = handle.get_device_allocator();
auto stream = handle.get_stream();
auto exec_policy = rmm::exec_policy(stream);
auto exec_policy = rmm::exec_policy(rmm::cuda_stream_view{stream});

// Need to symmetrize knn into undirected graph
raft::sparse::COO<value_t, value_idx> knn_graph_coo(d_alloc, stream);
Expand Down Expand Up @@ -133,4 +133,4 @@ void get_distance_graph(const raft::handle_t &handle, const value_t *X,

}; // namespace detail
}; // namespace hierarchy
}; // namespace raft
}; // namespace raft
10 changes: 5 additions & 5 deletions cpp/include/raft/sparse/mst/detail/mst_solver_inl.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ MST_solver<vertex_t, edge_t, weight_t>::MST_solver(
sm_count = handle_.get_device_properties().multiProcessorCount;

//Initially, color holds the vertex id as color
auto policy = rmm::exec_policy(stream);
auto policy = rmm::exec_policy(rmm::cuda_stream_view{stream});
if (initialize_colors_) {
thrust::sequence(policy, color.begin(), color.end(), 0);
thrust::sequence(policy, color_index, color_index + v, 0);
Expand Down Expand Up @@ -212,7 +212,7 @@ struct alteration_functor {
// Compute the uper bound for the alteration
template <typename vertex_t, typename edge_t, typename weight_t>
weight_t MST_solver<vertex_t, edge_t, weight_t>::alteration_max() {
auto policy = rmm::exec_policy(stream);
auto policy = rmm::exec_policy(rmm::cuda_stream_view{stream});
rmm::device_vector<weight_t> tmp(e);
thrust::device_ptr<const weight_t> weights_ptr(weights);
thrust::copy(policy, weights_ptr, weights_ptr + e, tmp.begin());
Expand Down Expand Up @@ -308,7 +308,7 @@ void MST_solver<vertex_t, edge_t, weight_t>::label_prop(vertex_t* mst_src,
// Finds the minimum edge from each vertex to the lowest color
template <typename vertex_t, typename edge_t, typename weight_t>
void MST_solver<vertex_t, edge_t, weight_t>::min_edge_per_vertex() {
auto policy = rmm::exec_policy(stream);
auto policy = rmm::exec_policy(rmm::cuda_stream_view{stream});
thrust::fill(policy, min_edge_color.begin(), min_edge_color.end(),
std::numeric_limits<weight_t>::max());
thrust::fill(policy, new_mst_edge.begin(), new_mst_edge.end(),
Expand All @@ -333,7 +333,7 @@ void MST_solver<vertex_t, edge_t, weight_t>::min_edge_per_supervertex() {
auto nthreads = std::min(v, max_threads);
auto nblocks = std::min((v + nthreads - 1) / nthreads, max_blocks);

auto policy = rmm::exec_policy(stream);
auto policy = rmm::exec_policy(rmm::cuda_stream_view{stream});
thrust::fill(policy, temp_src.begin(), temp_src.end(),
std::numeric_limits<vertex_t>::max());

Expand Down Expand Up @@ -388,7 +388,7 @@ struct new_edges_functor {
template <typename vertex_t, typename edge_t, typename weight_t>
void MST_solver<vertex_t, edge_t, weight_t>::append_src_dst_pair(
vertex_t* mst_src, vertex_t* mst_dst, weight_t* mst_weights) {
auto policy = rmm::exec_policy(stream);
auto policy = rmm::exec_policy(rmm::cuda_stream_view{stream});

auto curr_mst_edge_count = prev_mst_edge_count[0];

Expand Down
2 changes: 1 addition & 1 deletion cpp/include/raft/sparse/op/reduce.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ void max_duplicates(const raft::handle_t &handle,
auto d_alloc = handle.get_device_allocator();
auto stream = handle.get_stream();

auto exec_policy = rmm::exec_policy(stream);
auto exec_policy = rmm::exec_policy(rmm::cuda_stream_view{stream});

// compute diffs & take exclusive scan
rmm::device_uvector<value_idx> diff(nnz + 1, stream);
Expand Down