Refactor the python function symmetrizing the edgelist #4649
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -43,6 +43,7 @@ struct create_graph_functor : public cugraph::c_api::abstract_functor { | |
| bool_t renumber_; | ||
| bool_t drop_self_loops_; | ||
| bool_t drop_multi_edges_; | ||
| bool_t symmetrize_; | ||
| bool_t do_expensive_check_; | ||
| cugraph_data_type_id_t edge_type_; | ||
| cugraph::c_api::cugraph_graph_t* result_{}; | ||
|
|
@@ -58,6 +59,7 @@ struct create_graph_functor : public cugraph::c_api::abstract_functor { | |
| bool_t renumber, | ||
| bool_t drop_self_loops, | ||
| bool_t drop_multi_edges, | ||
| bool_t symmetrize, | ||
| bool_t do_expensive_check, | ||
| cugraph_data_type_id_t edge_type) | ||
| : abstract_functor(), | ||
|
|
@@ -72,6 +74,7 @@ struct create_graph_functor : public cugraph::c_api::abstract_functor { | |
| renumber_(renumber), | ||
| drop_self_loops_(drop_self_loops), | ||
| drop_multi_edges_(drop_multi_edges), | ||
| symmetrize_(symmetrize), | ||
| do_expensive_check_(do_expensive_check), | ||
| edge_type_(edge_type) | ||
| { | ||
|
|
@@ -207,6 +210,22 @@ struct create_graph_functor : public cugraph::c_api::abstract_functor { | |
| : false); | ||
| } | ||
|
|
||
| if (symmetrize_) { | ||
| if (edgelist_edge_ids || edgelist_edge_types) { | ||
| // Currently doesn't support the symmetrization with edge_ids and edge_types | ||
| unsupported(); | ||
| } | ||
|
|
||
| // Symmetrize the edgelist | ||
| std::tie(edgelist_srcs, edgelist_dsts, edgelist_weights) = | ||
| cugraph::symmetrize_edgelist<vertex_t, weight_t, store_transposed, multi_gpu>( | ||
| handle_, | ||
| std::move(edgelist_srcs), | ||
| std::move(edgelist_dsts), | ||
| std::move(edgelist_weights), | ||
| false); | ||
| } | ||
|
|
||
| std::tie(*graph, new_edge_weights, new_edge_ids, new_edge_types, new_number_map) = | ||
| cugraph::create_graph_from_edgelist<vertex_t, | ||
| edge_t, | ||
|
|
@@ -268,6 +287,7 @@ struct create_graph_csr_functor : public cugraph::c_api::abstract_functor { | |
| cugraph::c_api::cugraph_type_erased_device_array_view_t const* edge_ids_; | ||
| cugraph::c_api::cugraph_type_erased_device_array_view_t const* edge_type_ids_; | ||
| bool_t renumber_; | ||
| bool_t symmetrize_; | ||
| bool_t do_expensive_check_; | ||
| cugraph::c_api::cugraph_graph_t* result_{}; | ||
|
|
||
|
|
@@ -280,6 +300,7 @@ struct create_graph_csr_functor : public cugraph::c_api::abstract_functor { | |
| cugraph::c_api::cugraph_type_erased_device_array_view_t const* edge_ids, | ||
| cugraph::c_api::cugraph_type_erased_device_array_view_t const* edge_type_ids, | ||
| bool_t renumber, | ||
| bool_t symmetrize, | ||
| bool_t do_expensive_check) | ||
| : abstract_functor(), | ||
| properties_(properties), | ||
|
|
@@ -290,6 +311,7 @@ struct create_graph_csr_functor : public cugraph::c_api::abstract_functor { | |
| edge_ids_(edge_ids), | ||
| edge_type_ids_(edge_type_ids), | ||
| renumber_(renumber), | ||
| symmetrize_(symmetrize), | ||
| do_expensive_check_(do_expensive_check) | ||
| { | ||
| } | ||
|
|
@@ -398,6 +420,22 @@ struct create_graph_csr_functor : public cugraph::c_api::abstract_functor { | |
| cugraph::graph_view_t<vertex_t, edge_t, store_transposed, multi_gpu>, | ||
| edge_type_id_t>(handle_); | ||
|
|
||
| if (symmetrize_) { | ||
|
There was a problem hiding this comment. Same comment as above regarding |
||
| if (edgelist_edge_ids || edgelist_edge_types) { | ||
|
There was a problem hiding this comment. We should add an issue to discuss what symmetrization means with respect to edge properties. There was a problem hiding this comment. I tracked this in an issue |
||
| // Currently doesn't support the symmetrization with edge_ids and edge_types | ||
| unsupported(); | ||
| } | ||
|
|
||
| // Symmetrize the edgelist | ||
| std::tie(edgelist_srcs, edgelist_dsts, edgelist_weights) = | ||
| cugraph::symmetrize_edgelist<vertex_t, weight_t, store_transposed, multi_gpu>( | ||
| handle_, | ||
| std::move(edgelist_srcs), | ||
| std::move(edgelist_dsts), | ||
| std::move(edgelist_weights), | ||
| false); | ||
| } | ||
|
|
||
| std::tie(*graph, new_edge_weights, new_edge_ids, new_edge_types, new_number_map) = | ||
| cugraph::create_graph_from_edgelist<vertex_t, | ||
| edge_t, | ||
|
|
@@ -518,6 +556,7 @@ extern "C" cugraph_error_code_t cugraph_graph_create_sg( | |
| bool_t renumber, | ||
| bool_t drop_self_loops, | ||
| bool_t drop_multi_edges, | ||
| bool_t symmetrize, | ||
| bool_t do_expensive_check, | ||
| cugraph_graph_t** graph, | ||
| cugraph_error_t** error) | ||
|
|
@@ -542,6 +581,14 @@ extern "C" cugraph_error_code_t cugraph_graph_create_sg( | |
| auto p_edge_type_ids = | ||
| reinterpret_cast<cugraph::c_api::cugraph_type_erased_device_array_view_t const*>(edge_type_ids); | ||
|
|
||
| if (symmetrize == TRUE) { | ||
| CAPI_EXPECTS((properties->is_symmetric == TRUE), | ||
| CUGRAPH_INVALID_INPUT, | ||
| "Invalid input arguments: The graph property must be symmetric if 'symmetrize' is " | ||
| "set to True.", | ||
| *error); | ||
| } | ||
|
|
||
| CAPI_EXPECTS(p_src->size_ == p_dst->size_, | ||
| CUGRAPH_INVALID_INPUT, | ||
| "Invalid input arguments: src size != dst size.", | ||
|
|
@@ -606,6 +653,7 @@ extern "C" cugraph_error_code_t cugraph_graph_create_sg( | |
| renumber, | ||
| drop_self_loops, | ||
| drop_multi_edges, | ||
| symmetrize, | ||
| do_expensive_check, | ||
| edge_type); | ||
|
|
||
|
|
@@ -658,6 +706,7 @@ extern "C" cugraph_error_code_t cugraph_sg_graph_create( | |
| renumber, | ||
| FALSE, | ||
| FALSE, | ||
| FALSE, | ||
| do_expensive_check, | ||
| graph, | ||
| error); | ||
|
|
@@ -673,6 +722,7 @@ cugraph_error_code_t cugraph_graph_create_sg_from_csr( | |
| const cugraph_type_erased_device_array_view_t* edge_type_ids, | ||
| bool_t store_transposed, | ||
| bool_t renumber, | ||
| bool_t symmetrize, | ||
| bool_t do_expensive_check, | ||
| cugraph_graph_t** graph, | ||
| cugraph_error_t** error) | ||
|
|
@@ -707,6 +757,14 @@ cugraph_error_code_t cugraph_graph_create_sg_from_csr( | |
| weight_type = cugraph_data_type_id_t::FLOAT32; | ||
| } | ||
|
|
||
| if (symmetrize == TRUE) { | ||
| CAPI_EXPECTS((properties->is_symmetric == TRUE), | ||
| CUGRAPH_INVALID_INPUT, | ||
| "Invalid input arguments: The graph property must be symmetric if 'symmetrize' is " | ||
| "set to True.", | ||
| *error); | ||
| } | ||
|
|
||
| CAPI_EXPECTS( | ||
| (edge_type_ids == nullptr && edge_ids == nullptr) || | ||
| (edge_type_ids != nullptr && edge_ids != nullptr), | ||
|
|
@@ -735,6 +793,7 @@ cugraph_error_code_t cugraph_graph_create_sg_from_csr( | |
| p_edge_ids, | ||
| p_edge_type_ids, | ||
| renumber, | ||
| FALSE, // symmetrize | ||
| do_expensive_check); | ||
|
|
||
| try { | ||
|
|
@@ -770,6 +829,7 @@ cugraph_error_code_t cugraph_sg_graph_create_from_csr( | |
| const cugraph_type_erased_device_array_view_t* edge_type_ids, | ||
| bool_t store_transposed, | ||
| bool_t renumber, | ||
| bool_t symmetrize, | ||
| bool_t do_expensive_check, | ||
| cugraph_graph_t** graph, | ||
| cugraph_error_t** error) | ||
|
|
@@ -783,6 +843,7 @@ cugraph_error_code_t cugraph_sg_graph_create_from_csr( | |
| edge_type_ids, | ||
| store_transposed, | ||
| renumber, | ||
| symmetrize, | ||
| do_expensive_check, | ||
| graph, | ||
| error); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In addition to this logic, if
symmetrize_is true then we should override the graph properties to setis_symmetricto true.