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.

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

Update edge triangle count to call a non detail primitive #4630

6 changes: 5 additions & 1 deletion cpp/include/cugraph/algorithms.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1873,12 +1873,16 @@ void triangle_count(raft::handle_t const& handle,
* @param handle RAFT handle object to encapsulate resources (e.g. CUDA stream, communicator, and
* handles to various CUDA libraries) to run graph algorithms.
* @param graph_view Graph view object.
* * @param do_expensive_check A flag to run expensive checks for input arguments (if set to
* `true`).
*
* @return edge_property_t containing the edge triangle count
*/
template <typename vertex_t, typename edge_t, bool multi_gpu>
edge_property_t<graph_view_t<vertex_t, edge_t, false, multi_gpu>, edge_t> edge_triangle_count(
raft::handle_t const& handle, graph_view_t<vertex_t, edge_t, false, multi_gpu> const& graph_view);
raft::handle_t const& handle,
graph_view_t<vertex_t, edge_t, false, multi_gpu> const& graph_view,
bool do_expensive_check = false);

/*
* @brief Compute K-Truss.
Expand Down
24 changes: 12 additions & 12 deletions cpp/src/community/edge_triangle_count_impl.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

#include "detail/graph_partition_utils.cuh"
#include "prims/edge_bucket.cuh"
#include "prims/per_v_pair_dst_nbr_intersection.cuh"
#include "prims/transform_e.cuh"
#include "prims/transform_reduce_dst_nbr_intersection_of_e_endpoints_by_v.cuh"

#include <cugraph/detail/shuffle_wrappers.hpp>
#include <cugraph/graph_functions.hpp>
Expand Down Expand Up @@ -124,7 +124,8 @@ struct extract_q_r {
template <typename vertex_t, typename edge_t, bool store_transposed, bool multi_gpu>
edge_property_t<graph_view_t<vertex_t, edge_t, false, multi_gpu>, edge_t> edge_triangle_count_impl(
raft::handle_t const& handle,
graph_view_t<vertex_t, edge_t, store_transposed, multi_gpu> const& graph_view)
graph_view_t<vertex_t, edge_t, store_transposed, multi_gpu> const& graph_view,
bool do_expensive_check)
{
using weight_t = float;
rmm::device_uvector<vertex_t> edgelist_srcs(0, handle.get_stream());
Expand Down Expand Up @@ -158,14 +159,11 @@ edge_property_t<graph_view_t<vertex_t, edge_t, false, multi_gpu>, edge_t> edge_t
num_remaining_edges -= chunk_size;
// Perform 'nbr_intersection' in chunks to reduce peak memory.
auto [intersection_offsets, intersection_indices] =
detail::nbr_intersection(handle,
graph_view,
cugraph::edge_dummy_property_t{}.view(),
edge_first + prev_chunk_size,
edge_first + prev_chunk_size + chunk_size,
std::array<bool, 2>{true, true},
false /*FIXME: pass 'do_expensive_check' as argument*/);

per_v_pair_dst_nbr_intersection(handle,
graph_view,
edge_first + prev_chunk_size,
edge_first + prev_chunk_size + chunk_size,
do_expensive_check);
// Update the number of triangles of each (p, q) edges by looking at their intersection
// size
thrust::for_each(
Expand Down Expand Up @@ -365,9 +363,11 @@ edge_property_t<graph_view_t<vertex_t, edge_t, false, multi_gpu>, edge_t> edge_t

template <typename vertex_t, typename edge_t, bool multi_gpu>
edge_property_t<graph_view_t<vertex_t, edge_t, false, multi_gpu>, edge_t> edge_triangle_count(
raft::handle_t const& handle, graph_view_t<vertex_t, edge_t, false, multi_gpu> const& graph_view)
raft::handle_t const& handle,
graph_view_t<vertex_t, edge_t, false, multi_gpu> const& graph_view,
bool do_expensive_check)
{
return detail::edge_triangle_count_impl(handle, graph_view);
return detail::edge_triangle_count_impl(handle, graph_view, do_expensive_check);
}

} // namespace cugraph
3 changes: 2 additions & 1 deletion cpp/src/community/edge_triangle_count_mg_v32_e32.cu
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ namespace cugraph {
// SG instantiation
template edge_property_t<graph_view_t<int32_t, int32_t, false, true>, int32_t> edge_triangle_count(
raft::handle_t const& handle,
cugraph::graph_view_t<int32_t, int32_t, false, true> const& graph_view);
cugraph::graph_view_t<int32_t, int32_t, false, true> const& graph_view,
bool do_expensive_check);

} // namespace cugraph
3 changes: 2 additions & 1 deletion cpp/src/community/edge_triangle_count_mg_v32_e64.cu
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ namespace cugraph {
// SG instantiation
template edge_property_t<graph_view_t<int32_t, int64_t, false, true>, int64_t> edge_triangle_count(
raft::handle_t const& handle,
cugraph::graph_view_t<int32_t, int64_t, false, true> const& graph_view);
cugraph::graph_view_t<int32_t, int64_t, false, true> const& graph_view,
bool do_expensive_check);

} // namespace cugraph
3 changes: 2 additions & 1 deletion cpp/src/community/edge_triangle_count_mg_v64_e64.cu
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ namespace cugraph {
// SG instantiation
template edge_property_t<graph_view_t<int64_t, int64_t, false, true>, int64_t> edge_triangle_count(
raft::handle_t const& handle,
cugraph::graph_view_t<int64_t, int64_t, false, true> const& graph_view);
cugraph::graph_view_t<int64_t, int64_t, false, true> const& graph_view,
bool do_expensive_check);

} // namespace cugraph
3 changes: 2 additions & 1 deletion cpp/src/community/edge_triangle_count_sg_v32_e32.cu
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ namespace cugraph {
// SG instantiation
template edge_property_t<graph_view_t<int32_t, int32_t, false, false>, int32_t> edge_triangle_count(
raft::handle_t const& handle,
cugraph::graph_view_t<int32_t, int32_t, false, false> const& graph_view);
cugraph::graph_view_t<int32_t, int32_t, false, false> const& graph_view,
bool do_expensive_check);

} // namespace cugraph
3 changes: 2 additions & 1 deletion cpp/src/community/edge_triangle_count_sg_v32_e64.cu
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ namespace cugraph {
// SG instantiation
template edge_property_t<graph_view_t<int32_t, int64_t, false, false>, int64_t> edge_triangle_count(
raft::handle_t const& handle,
cugraph::graph_view_t<int32_t, int64_t, false, false> const& graph_view);
cugraph::graph_view_t<int32_t, int64_t, false, false> const& graph_view,
bool do_expensive_check);

} // namespace cugraph
3 changes: 2 additions & 1 deletion cpp/src/community/edge_triangle_count_sg_v64_e64.cu
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ namespace cugraph {
// SG instantiation
template edge_property_t<graph_view_t<int64_t, int64_t, false, false>, int64_t> edge_triangle_count(
raft::handle_t const& handle,
cugraph::graph_view_t<int64_t, int64_t, false, false> const& graph_view);
cugraph::graph_view_t<int64_t, int64_t, false, false> const& graph_view,
bool do_expensive_check);

} // namespace cugraph
64 changes: 64 additions & 0 deletions cpp/src/prims/per_v_pair_dst_nbr_intersection.cuh
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
/*
* Copyright (c) 2024, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#pragma once

#include "prims/detail/nbr_intersection.cuh"

jnke2016 marked this conversation as resolved.
Show resolved Hide resolved
#include <raft/core/handle.hpp>

#include <rmm/device_uvector.hpp>

#include <tuple>

namespace cugraph {

/**
* @brief Iterate over each input vertex pair and returns the common destination neighbor list
* pair in a CSR-like format
*
* Iterate over every vertex pair; intersect destination neighbor lists of the two vertices in the
* pair and store the result in a CSR-like format
*
* @tparam GraphViewType Type of the passed non-owning graph object.
* @tparam VertexPairIterator Type of the iterator for input vertex pairs.
* @param handle RAFT handle object to encapsulate resources (e.g. CUDA stream, communicator, and
* handles to various CUDA libraries) to run graph algorithms.
* @param graph_view Non-owning graph object.
* @param vertex_pair_first Iterator pointing to the first (inclusive) input vertex pair.
* @param vertex_pair_last Iterator pointing to the last (exclusive) input vertex pair.
* @param do_expensive_check A flag to run expensive checks for input arguments (if set to `true`).
* @return std::tuple Tuple of intersection offsets and indices.
*/
template <typename GraphViewType, typename VertexPairIterator>
std::tuple<rmm::device_uvector<size_t>, rmm::device_uvector<typename GraphViewType::vertex_type>>
per_v_pair_dst_nbr_intersection(raft::handle_t const& handle,
GraphViewType const& graph_view,
VertexPairIterator vertex_pair_first,
VertexPairIterator vertex_pair_last,
bool do_expensive_check = false)
{
static_assert(!GraphViewType::is_storage_transposed);

return detail::nbr_intersection(handle,
graph_view,
cugraph::edge_dummy_property_t{}.view(),
vertex_pair_first,
vertex_pair_last,
std::array<bool, 2>{true, true},
do_expensive_check);
}

} // namespace cugraph
Loading