From ab32581c9b78c8b6dda9d36e0c787331e6bac06a Mon Sep 17 00:00:00 2001 From: Charles Hastings Date: Mon, 23 Oct 2023 13:18:07 -0700 Subject: [PATCH 1/2] fix a few things found compiling for dlfw (CUDA 12.3) --- cpp/src/community/detail/refine_impl.cuh | 2 +- cpp/src/prims/detail/nbr_intersection.cuh | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cpp/src/community/detail/refine_impl.cuh b/cpp/src/community/detail/refine_impl.cuh index e811aafc776..6b6470991bb 100644 --- a/cpp/src/community/detail/refine_impl.cuh +++ b/cpp/src/community/detail/refine_impl.cuh @@ -64,7 +64,7 @@ struct leiden_key_aggregated_edge_op_t { weight_t total_edge_weight{}; weight_t resolution{}; // resolution parameter weight_t theta{}; // scaling factor - raft::random::DeviceState device_state{}; + raft::random::DeviceState& device_state; __device__ auto operator()( vertex_t src, vertex_t neighboring_leiden_cluster, diff --git a/cpp/src/prims/detail/nbr_intersection.cuh b/cpp/src/prims/detail/nbr_intersection.cuh index 2f30faebb3e..51c1d57a782 100644 --- a/cpp/src/prims/detail/nbr_intersection.cuh +++ b/cpp/src/prims/detail/nbr_intersection.cuh @@ -135,7 +135,7 @@ struct update_rx_major_local_degree_t { size_t local_edge_partition_idx{}; raft::device_span rx_reordered_group_lasts{}; - raft::device_span rx_group_firsts{nullptr}; + raft::device_span rx_group_firsts{}; raft::device_span rx_majors{}; raft::device_span local_degrees_for_rx_majors{}; @@ -186,7 +186,7 @@ struct update_rx_major_local_nbrs_t { size_t local_edge_partition_idx{}; raft::device_span rx_reordered_group_lasts{}; - raft::device_span rx_group_firsts{nullptr}; + raft::device_span rx_group_firsts{}; raft::device_span rx_majors{}; raft::device_span local_nbr_offsets_for_rx_majors{}; raft::device_span local_nbrs_for_rx_majors{}; @@ -204,7 +204,7 @@ struct update_rx_major_local_nbrs_t { auto major = rx_majors[rx_group_firsts[major_comm_rank * minor_comm_size + local_edge_partition_idx] + offset_in_local_edge_partition]; - vertex_t const* indices{nullptr}; + vertex_t const* indices{}; [[maybe_unused]] edge_t edge_offset{0}; edge_t local_degree{0}; if (multi_gpu && (edge_partition.major_hypersparse_first() && @@ -259,10 +259,10 @@ template struct pick_min_degree_t { FirstElementToIdxMap first_element_to_idx_map{}; - raft::device_span first_element_offsets{nullptr}; + raft::device_span first_element_offsets{}; SecondElementToIdxMap second_element_to_idx_map{}; - raft::device_span second_element_offsets{nullptr}; + raft::device_span second_element_offsets{}; edge_partition_device_view_t edge_partition{}; @@ -339,20 +339,20 @@ template first_element_offsets{}; - raft::device_span first_element_indices{nullptr}; + raft::device_span first_element_indices{}; optional_property_buffer_view_t first_element_properties{}; SecondElementToIdxMap second_element_to_idx_map{}; raft::device_span second_element_offsets{}; - raft::device_span second_element_indices{nullptr}; + raft::device_span second_element_indices{}; optional_property_buffer_view_t second_element_properties{}; edge_partition_device_view_t edge_partition{}; edge_partition_e_input_device_view_t edge_partition_e_value_input{}; VertexPairIterator vertex_pair_first; - raft::device_span nbr_intersection_offsets{nullptr}; - raft::device_span nbr_intersection_indices{nullptr}; + raft::device_span nbr_intersection_offsets{}; + raft::device_span nbr_intersection_indices{}; optional_property_buffer_view_t nbr_intersection_properties0{}; optional_property_buffer_view_t nbr_intersection_properties1{}; @@ -366,7 +366,7 @@ struct copy_intersecting_nbrs_and_update_intersection_size_t { std::byte /* dummy */>; auto pair = *(vertex_pair_first + i); - vertex_t const* indices0{nullptr}; + vertex_t const* indices0{}; optional_const_property_buffer_view_t properties0{}; edge_t local_edge_offset0{0}; @@ -409,7 +409,7 @@ struct copy_intersecting_nbrs_and_update_intersection_size_t { } } - vertex_t const* indices1{nullptr}; + vertex_t const* indices1{}; optional_const_property_buffer_view_t properties1{}; [[maybe_unused]] edge_t local_edge_offset1{0}; From 337d3a514f54b335e379ab7b99939f978dc6d064 Mon Sep 17 00:00:00 2001 From: Charles Hastings Date: Mon, 30 Oct 2023 11:33:53 -0700 Subject: [PATCH 2/2] missed some things in the conflict resolution --- cpp/src/prims/detail/nbr_intersection.cuh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cpp/src/prims/detail/nbr_intersection.cuh b/cpp/src/prims/detail/nbr_intersection.cuh index 504b82d110c..cefc1836fa6 100644 --- a/cpp/src/prims/detail/nbr_intersection.cuh +++ b/cpp/src/prims/detail/nbr_intersection.cuh @@ -311,10 +311,10 @@ template struct pick_min_degree_t { FirstElementToIdxMap first_element_to_idx_map{}; - raft::device_span first_element_offsets{}; + raft::device_span first_element_offsets{}; SecondElementToIdxMap second_element_to_idx_map{}; - raft::device_span second_element_offsets{}; + raft::device_span second_element_offsets{}; edge_partition_device_view_t edge_partition{}; thrust::optional> @@ -472,14 +472,14 @@ template struct copy_intersecting_nbrs_and_update_intersection_size_t { FirstElementToIdxMap first_element_to_idx_map{}; - raft::device_span first_element_offsets{}; + raft::device_span first_element_offsets{}; raft::device_span first_element_indices{}; - optional_property_buffer_view_t first_element_properties{}; + optional_property_buffer_view_t first_element_edge_property_values{}; SecondElementToIdxMap second_element_to_idx_map{}; - raft::device_span second_element_offsets{}; + raft::device_span second_element_offsets{}; raft::device_span second_element_indices{}; - optional_property_buffer_view_t second_element_properties{}; + optional_property_buffer_view_t second_element_edge_property_values{}; edge_partition_device_view_t edge_partition{}; edge_partition_e_input_device_view_t edge_partition_e_value_input{};