Refactor the python function symmetrizing the edgelist

cpp/src/c_api/graph_mg.cpp

@@ -378,12 +378,12 @@ extern "C" cugraph_error_code_t cugraph_graph_create_mg(
       if (weight_type == cugraph_data_type_id_t::NTYPES) weight_type = p_weights[i]->type_;
     }
 
-    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);
+    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[i]->type_ == vertex_type,

cpp/src/c_api/graph_sg.cpp

@@ -581,12 +581,12 @@ 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);
+  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_,
@@ -757,12 +757,12 @@ 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);
+  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(

python/cugraph/cugraph/components/connectivity.py

@@ -287,8 +287,6 @@ def strongly_connected_components(
         "strongly_connected_components", G, directed, connection, return_labels
     )
 
-    print("G = ", G)
-
     # FIXME: allow nx_weight_attr to be specified
     (G, input_type) = ensure_cugraph_obj(
         G, nx_weight_attr="weight", matrix_graph_type=Graph(directed=directed)

python/cugraph/cugraph/structure/graph_implementation/simpleDistributedGraph.py

@@ -210,7 +210,7 @@ def __from_edgelist(
                         "If the edges are already symmetric, set the 'symmetrize' "
                         "flag to False"
                     )
-        
+
         if symmetrize is None:
             # default behavior
             symmetrize = not self.properties.directed

python/cugraph/cugraph/structure/graph_implementation/simpleGraph.py

@@ -13,7 +13,7 @@
 
 from cugraph.structure import graph_primtypes_wrapper
 from cugraph.structure.replicate_edgelist import replicate_cudf_dataframe
-from cugraph.structure.symmetrize import symmetrize as symmetrize
+from cugraph.structure.symmetrize import symmetrize as symmetrize_df
 from cugraph.structure.number_map import NumberMap
 import cugraph.dask.common.mg_utils as mg_utils
 import cudf
@@ -148,7 +148,7 @@ def __from_edgelist(
             raise ValueError(
                 "The edgelist can only be symmetrized for undirected graphs."
             )
-        
+
         if self.properties.directed:
             if symmetrize:
                 raise ValueError(
@@ -168,7 +168,7 @@ def __from_edgelist(
                         "If the edges are already symmetric, set the 'symmetrize' "
                         "flag to False"
                     )
-        
+
         if symmetrize is None:
             # default behavior
             symmetrize = not self.properties.directed
@@ -1171,6 +1171,7 @@ def _make_plc_graph(
         drop_multi_edges: bool = False,
         symmetrize: bool = False,
     ):
+        print("in PLC symmetrize = ", symmetrize)
         """
         Parameters
         ----------
@@ -1301,14 +1302,14 @@ def to_undirected(self, G, store_transposed=False):
         else:
             df = self.edgelist.edgelist_df
             if self.edgelist.weights:
-                source_col, dest_col, value_col = symmetrize(
+                source_col, dest_col, value_col = symmetrize_df(
                     df,
                     simpleGraphImpl.srcCol,
                     simpleGraphImpl.dstCol,
                     simpleGraphImpl.edgeWeightCol,
                 )
             else:
-                source_col, dest_col = symmetrize(
+                source_col, dest_col = symmetrize_df(
                     df, simpleGraphImpl.srcCol, simpleGraphImpl.dstCol
                 )
                 value_col = None
@@ -1343,6 +1344,24 @@ def has_edge(self, u, v):
             v = tmp["id"][1]
 
         df = self.edgelist.edgelist_df
+
+        if self.edgelist.weights:
+            # FIXME: Update this function to not call the deprecated
+            # symmetrize function.
+            source_col, dest_col, value_col = symmetrize_df(
+                df,
+                simpleGraphImpl.srcCol,
+                simpleGraphImpl.dstCol,
+                simpleGraphImpl.edgeWeightCol,
+            )
+        else:
+            source_col, dest_col = symmetrize_df(
+                df, simpleGraphImpl.srcCol, simpleGraphImpl.dstCol
+            )
+            value_col = None
+
+        self.edgelist = simpleGraphImpl.EdgeList(source_col, dest_col, value_col)
+
         return (
             (df[simpleGraphImpl.srcCol] == u) & (df[simpleGraphImpl.dstCol] == v)
         ).any()

python/cugraph/cugraph/structure/hypergraph.py

@@ -37,6 +37,7 @@
 import cudf
 import numpy as np
 from cugraph.structure.graph_classes import Graph
+from cugraph.structure.symmetrize import symmetrize
 
 
 def hypergraph(
@@ -277,6 +278,32 @@ def hypergraph(
         renumber=True,
     )
 
+    df = cudf.DataFrame()
+
+    # Need to refactor this code as it uses the
+    # deprecated symmetrize call.
+    if "weights" in graph.edgelist.edgelist_df:
+        source_col, dest_col, value_col = symmetrize(
+            graph.edgelist.edgelist_df,
+            "src",
+            "dst",
+            "weights",
+            symmetrize=not graph.is_directed(),
+        )
+
+        df["src"] = source_col
+        df["dst"] = dest_col
+        df["weights"] = value_col
+    else:
+        source_col, dest_col = symmetrize(
+            graph.edgelist.edgelist_df, "src", "dst", symmetrize=not graph.is_directed()
+        )
+
+        df["src"] = source_col
+        df["dst"] = dest_col
+
+    graph.edgelist.edgelist_df = df
+
     return {
         "nodes": nodes,
         "edges": edges,

python/cugraph/cugraph/structure/property_graph.py

@@ -2005,23 +2005,31 @@ def edge_props_to_graph(
             G.from_cudf_edgelist(edge_prop_df.reset_index(), **create_args)
         else:
             G.from_pandas_edgelist(edge_prop_df.reset_index(), **create_args)
-        
+
         # FIXME: Property_graph does not fully leverage the PLC API yet.
         # It still relies on the edges being symmetrized by the deprecated
         # symmetrize function.
 
         # Symmetrize the internal representation of the edgelists
-        source_col, dest_col, value_col = symmetrize(
-            G.edgelist.edgelist_df,
-            "src",
-            "dst",
-            "weights",
-            symmetrize=not G.is_directed())
-
+
+        if edge_attr is not None:
+            source_col, dest_col, value_col = symmetrize(
+                G.edgelist.edgelist_df,
+                "src",
+                "dst",
+                "weights",
+                symmetrize=not G.is_directed(),
+            )
+        else:
+            source_col, dest_col = symmetrize(
+                G.edgelist.edgelist_df, "src", "dst", symmetrize=not G.is_directed()
+            )
+
         renumbered_edge_prop_df = cudf.DataFrame()
         renumbered_edge_prop_df["src"] = source_col
         renumbered_edge_prop_df["dst"] = dest_col
-        renumbered_edge_prop_df["weights"] = value_col
+        if edge_attr:
+            renumbered_edge_prop_df["weights"] = value_col
 
         G.edgelist.edgelist_df = renumbered_edge_prop_df
 

python/cugraph/cugraph/structure/symmetrize.py

@@ -257,7 +257,6 @@ def symmetrize(
     >>> df['values'] = cudf.Series(M['2'])
     >>> src, dst, val = symmetrize(df, 'sources', 'destinations', 'values', multi=True)
     """
-
     warnings.warn(
         "This method is deprecated and will no longer be supported. The symmetrization "
         "of the edges are only supported by setting the 'symmetrize' flag to 'True'",

python/cugraph/cugraph/tests/sampling/test_uniform_neighbor_sample.py

@@ -21,6 +21,7 @@
 from cugraph import uniform_neighbor_sample
 from cugraph.testing import UNDIRECTED_DATASETS
 from cugraph.datasets import email_Eu_core, small_tree
+from cugraph.structure.symmetrize import symmetrize
 from pylibcugraph.testing.utils import gen_fixture_params_product
 
 
@@ -148,6 +149,15 @@ def test_uniform_neighbor_sample_simple(input_combo):
     # should be 'None' if the datasets was never renumbered
     input_df = G.edgelist.edgelist_df
 
+    # FIXME: Uses the deprecated implementation of symmetrize.
+    source_col, dest_col = symmetrize(
+        input_df, "src", "dst", symmetrize=not G.is_directed()
+    )
+
+    input_df = cudf.DataFrame()
+    input_df["src"] = source_col
+    input_df["dst"] = dest_col
+
     result_nbr = uniform_neighbor_sample(
         G,
         input_combo["start_list"],

python/cugraph/cugraph/tests/structure/test_graph.py

@@ -25,6 +25,7 @@
 from cugraph.testing import utils
 from cudf.testing import assert_series_equal
 from cudf.testing.testing import assert_frame_equal
+from cugraph.structure.symmetrize import symmetrize
 
 # MG
 import dask_cudf
@@ -534,6 +535,18 @@ def test_to_directed(graph_file):
     # cugraph add_edge_list
     G = cugraph.Graph()
     G.from_cudf_edgelist(cu_M, source="0", destination="1")
+
+    # FIXME: Uses the deprecated implementation of symmetrize.
+    source_col, dest_col = symmetrize(
+        G.edgelist.edgelist_df, "src", "dst", symmetrize=not G.is_directed()
+    )
+
+    input_df = cudf.DataFrame()
+    input_df["src"] = source_col
+    input_df["dst"] = dest_col
+
+    G.edgelist.edgelist_df = input_df
+
     Gnx = nx.from_pandas_edgelist(M, source="0", target="1", create_using=nx.Graph())
 
     DiG = G.to_directed()

python/cugraph/cugraph/tests/structure/test_multigraph.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2023, NVIDIA CORPORATION.
+# Copyright (c) 2020-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
@@ -76,7 +76,7 @@ def test_Graph_from_MultiGraph(graph_file):
 
     G = cugraph.Graph(GM)
     Gnx = nx.Graph(GnxM)
-    assert Gnx.number_of_edges() == G.number_of_edges()
+    assert Gnx.number_of_edges() == G.number_of_edges(True)
     GdM = graph_file.get_graph(create_using=cugraph.MultiGraph(directed=True))
     GnxdM = nx.from_pandas_edgelist(
         nxM,

python/cugraph/cugraph/utilities/nx_factory.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2023, NVIDIA CORPORATION.
+# Copyright (c) 2020-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
@@ -119,10 +119,8 @@ def convert_from_nx(
     """
 
     if isinstance(nxG, nx.classes.digraph.DiGraph):
-        print("creating a directed graph")
         G = cugraph.Graph(directed=True)
     elif isinstance(nxG, nx.classes.graph.Graph):
-        print("creating an undirected graph")
         G = cugraph.Graph()
     else:
         raise TypeError(
@@ -137,11 +135,9 @@ def convert_from_nx(
         # hence, the symmetrization cannot be performed at the graph
         # creation. Use the deprecated 'symmetrize' function for now.
         source_col, dest_col = symmetrize(
-            _gdf,
-            "src",
-            "dst",
-            symmetrize=not G.is_directed())
-
+            _gdf, "src", "dst", symmetrize=not G.is_directed()
+        )
+
         _gdf = cudf.DataFrame()
 
         _gdf["src"] = source_col
@@ -153,20 +149,17 @@ def convert_from_nx(
             edge_attr=None,
             renumber=do_renumber,
             store_transposed=store_transposed,
-        )       
+        )
     else:
         if weight is None:
             _gdf = convert_weighted_unnamed_to_gdf(nxG, vertex_type)
             # FIXME: The legacy algorithms do not support the PLC graph
             # hence, the symmetrization cannot be performed at the graph
             # creation. Use the deprecated 'symmetrize' function for now.
             source_col, dest_col, value_col = symmetrize(
-                _gdf,
-                "src",
-                "target",
-                "weight",
-                symmetrize=not G.is_directed())
-
+                _gdf, "src", "target", "weight", symmetrize=not G.is_directed()
+            )
+
             _gdf = cudf.DataFrame()
 
             _gdf["src"] = source_col
@@ -187,12 +180,9 @@ def convert_from_nx(
             # hence, the symmetrization cannot be performed at the graph
             # creation. Use the deprecated 'symmetrize' function for now.
             source_col, dest_col, value_col = symmetrize(
-                _gdf,
-                "src",
-                "dst",
-                "weight",
-                symmetrize=not G.is_directed())
-
+                _gdf, "src", "dst", "weight", symmetrize=not G.is_directed()
+            )
+
             _gdf = cudf.DataFrame()
 
             _gdf["src"] = source_col
@@ -207,7 +197,6 @@ def convert_from_nx(
                 renumber=do_renumber,
                 store_transposed=store_transposed,
             )
-
 
     return G
 

python/pylibcugraph/pylibcugraph/graphs.pyx

@@ -243,8 +243,8 @@ cdef class SGGraph(_GPUGraph):
                 self.edge_id_view_ptr,
                 edge_type_view_ptr,
                 store_transposed,
-                symmetrize,
                 renumber,
+                symmetrize,
                 # drop_self_loops, #FIXME: Not supported yet
                 # drop_multi_edges, #FIXME: Not supported yet
                 do_expensive_check,