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

Forward-merge branch-24.08 into branch-24.10 #4546

Merged
merged 12 commits into from
Jul 30, 2024
Merged

Forward-merge branch-24.08 into branch-24.10 #4546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c9d2843
remove thriftpy2 ceiling (#4521)
jameslamb Jul 19, 2024
522055b
Add `-cuXX` suffixed versions of cugraph-service-client dependency to…
trxcllnt Jul 23, 2024
0900a06
Fix triangle count test bug (#4549)
jnke2016 Jul 24, 2024
f628718
Temporarily Disable Feature Store Tests with WholeGraph (#4559)
alexbarghi-nv Jul 29, 2024
4fb6470
split up CUDA-suffixed dependencies in dependencies.yaml (#4552)
jameslamb Jul 30, 2024
a1f8a65
Optimize K-Truss (#4375)
jnke2016 Jul 30, 2024
4a9218c
Fix build error with NO_CUGRAPH_OPS (#4563)
seunghwak Jul 30, 2024
f9c587a
nx-cugraph: add `from_dict_of_lists` and `to_dict_of_lists` (#4537)
eriknw Jul 30, 2024
f20ccdd
nx-cugraph: fix `from_pandas_edgekey` given edgekey but not edgeattr …
eriknw Jul 30, 2024
0e69733
nx-cugraph: add dijkstra sssp functions (#4538)
eriknw Jul 30, 2024
4ff7acb
Further optimize `from_pandas_edgelist` with cudf (#4528)
eriknw Jul 30, 2024
94e60f0
Fix MG `katz_centrality`: Check if DataFrame Arg is Not None (#4555)
nv-rliu Jul 30, 2024
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 conda/environments/all_cuda-118_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ dependencies:
- sphinx-markdown-tables
- sphinx<6
- sphinxcontrib-websupport
- thriftpy2<=0.5.0
- thriftpy2!=0.5.0,!=0.5.1
- ucx-proc=*=gpu
- ucx-py==0.39.*,>=0.0.0a0
- wget
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-125_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ dependencies:
- sphinx-markdown-tables
- sphinx<6
- sphinxcontrib-websupport
- thriftpy2<=0.5.0
- thriftpy2!=0.5.0,!=0.5.1
- ucx-proc=*=gpu
- ucx-py==0.39.*,>=0.0.0a0
- wget
Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/cugraph-service/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ outputs:
- rapids-build-backend>=0.3.1,<0.4.0.dev0
run:
- python
- thriftpy2 >=0.4.15
- thriftpy2 >=0.4.15,!=0.5.0,!=0.5.1

- name: cugraph-service-server
version: {{ version }}
Expand Down Expand Up @@ -65,7 +65,7 @@ outputs:
- numpy >=1.23,<2.0a0
- python
- rapids-dask-dependency ={{ minor_version }}
- thriftpy2 >=0.4.15
- thriftpy2 >=0.4.15,!=0.5.0,!=0.5.1
- ucx-py {{ ucx_py_version }}

tests:
Expand Down
3 changes: 3 additions & 0 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,9 @@ set(CUGRAPH_SOURCES
src/community/k_truss_sg_v64_e64.cu
src/community/k_truss_sg_v32_e32.cu
src/community/k_truss_sg_v32_e64.cu
src/community/k_truss_mg_v64_e64.cu
src/community/k_truss_mg_v32_e32.cu
src/community/k_truss_mg_v32_e64.cu
src/lookup/lookup_src_dst_mg_v32_e32.cu
src/lookup/lookup_src_dst_mg_v32_e64.cu
src/lookup/lookup_src_dst_mg_v64_e64.cu
Expand Down
8 changes: 5 additions & 3 deletions cpp/include/cugraph/detail/shuffle_wrappers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ std::tuple<rmm::device_uvector<vertex_t>,
rmm::device_uvector<vertex_t>,
std::optional<rmm::device_uvector<weight_t>>,
std::optional<rmm::device_uvector<edge_t>>,
std::optional<rmm::device_uvector<edge_type_id_t>>>
std::optional<rmm::device_uvector<edge_type_id_t>>,
std::vector<size_t>>
shuffle_ext_vertex_pairs_with_values_to_local_gpu_by_edge_partitioning(
raft::handle_t const& handle,
rmm::device_uvector<vertex_t>&& majors,
Expand Down Expand Up @@ -86,14 +87,15 @@ shuffle_ext_vertex_pairs_with_values_to_local_gpu_by_edge_partitioning(
* (exclusive) vertex ID.
*
* @return Tuple of vectors storing shuffled major vertices, minor vertices and optional weights,
* edge ids and edge types
* edge ids and edge types and rx counts
*/
template <typename vertex_t, typename edge_t, typename weight_t, typename edge_type_id_t>
std::tuple<rmm::device_uvector<vertex_t>,
rmm::device_uvector<vertex_t>,
std::optional<rmm::device_uvector<weight_t>>,
std::optional<rmm::device_uvector<edge_t>>,
std::optional<rmm::device_uvector<edge_type_id_t>>>
std::optional<rmm::device_uvector<edge_type_id_t>>,
std::vector<size_t>>
shuffle_int_vertex_pairs_with_values_to_local_gpu_by_edge_partitioning(
raft::handle_t const& handle,
rmm::device_uvector<vertex_t>&& majors,
Expand Down
3 changes: 2 additions & 1 deletion cpp/include/cugraph/mtmg/detail/per_device_edgelist.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,8 @@ class per_device_edgelist_t {
store_transposed ? src_[0] : dst_[0],
tmp_wgt,
tmp_edge_id,
tmp_edge_type) =
tmp_edge_type,
std::ignore) =
cugraph::detail::shuffle_ext_vertex_pairs_with_values_to_local_gpu_by_edge_partitioning(
handle.raft_handle(),
store_transposed ? std::move(dst_[0]) : std::move(src_[0]),
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/c_api/graph_functions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ struct create_vertex_pairs_functor : public cugraph::c_api::abstract_functor {
second_copy.data(), second_->as_type<vertex_t>(), second_->size_, handle_.get_stream());

if constexpr (multi_gpu) {
std::tie(first_copy, second_copy, std::ignore, std::ignore, std::ignore) =
std::tie(first_copy, second_copy, std::ignore, std::ignore, std::ignore, std::ignore) =
cugraph::detail::shuffle_ext_vertex_pairs_with_values_to_local_gpu_by_edge_partitioning<
vertex_t,
edge_t,
Expand Down
3 changes: 2 additions & 1 deletion cpp/src/c_api/graph_mg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,8 @@ struct create_graph_functor : public cugraph::c_api::abstract_functor {
store_transposed ? edgelist_srcs : edgelist_dsts,
edgelist_weights,
edgelist_edge_ids,
edgelist_edge_types) =
edgelist_edge_types,
std::ignore) =
cugraph::detail::shuffle_ext_vertex_pairs_with_values_to_local_gpu_by_edge_partitioning(
handle_,
std::move(store_transposed ? edgelist_dsts : edgelist_srcs),
Expand Down
3 changes: 0 additions & 3 deletions cpp/src/c_api/k_truss.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,7 @@ struct k_truss_functor : public cugraph::c_api::abstract_functor {
{
if constexpr (!cugraph::is_candidate<vertex_t, edge_t, weight_t>::value) {
unsupported();
} else if constexpr (multi_gpu) {
unsupported();
} else {
// k_truss expects store_transposed == false
if constexpr (store_transposed) {
error_code_ = cugraph::c_api::
transpose_storage<vertex_t, edge_t, weight_t, store_transposed, multi_gpu>(
Expand Down
1 change: 1 addition & 0 deletions cpp/src/community/detail/refine_impl.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,6 +627,7 @@ refine_clustering(
store_transposed ? d_srcs : d_dsts,
d_weights,
std::ignore,
std::ignore,
std::ignore) =
cugraph::detail::shuffle_ext_vertex_pairs_with_values_to_local_gpu_by_edge_partitioning<
vertex_t,
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/community/edge_triangle_count_impl.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ edge_property_t<graph_view_t<vertex_t, edge_t, false, multi_gpu>, edge_t> edge_t
handle.get_stream());

// There are still multiple copies here but is it worth sorting and reducing again?
std::tie(pair_srcs, pair_dsts, std::ignore, pair_count, std::ignore) =
std::tie(pair_srcs, pair_dsts, std::ignore, pair_count, std::ignore, std::ignore) =
shuffle_int_vertex_pairs_with_values_to_local_gpu_by_edge_partitioning<vertex_t,
edge_t,
weight_t,
Expand Down
Loading
Loading