fix style

rapidsai · Oct 1, 2024 · efbdb38 · efbdb38
1 parent fec091f
commit efbdb38
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 74 deletions.
diff --git a/cpp/src/c_api/graph_mg.cpp b/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,

diff --git a/cpp/src/c_api/graph_sg.cpp b/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(

diff --git a/python/cugraph/cugraph/components/connectivity.py b/python/cugraph/cugraph/components/connectivity.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2023, NVIDIA CORPORATION.
+# Copyright (c) 2019-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
@@ -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)

diff --git a/python/cugraph/cugraph/structure/graph_implementation/simpleDistributedGraph.py b/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

diff --git a/python/cugraph/cugraph/structure/graph_implementation/simpleGraph.py b/python/cugraph/cugraph/structure/graph_implementation/simpleGraph.py
@@ -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
@@ -299,7 +299,7 @@ def __from_edgelist(
         # be returned. If set to False, the API will assume that the edges are already
         # symmetric. Duplicated edges will be dropped unless the graph is a
         # MultiGraph(Not Implemented yet)
-        
+
         if edge_attr is not None:
             value_col = {
                 self.edgeWeightCol: elist[weight] if weight in edge_attr else None,
@@ -1359,9 +1359,8 @@ def has_edge(self, u, v):
                 df, simpleGraphImpl.srcCol, simpleGraphImpl.dstCol
             )
             value_col = None
-
-        self.edgelist = simpleGraphImpl.EdgeList(source_col, dest_col, value_col)
 
+        self.edgelist = simpleGraphImpl.EdgeList(source_col, dest_col, value_col)
 
         return (
             (df[simpleGraphImpl.srcCol] == u) & (df[simpleGraphImpl.dstCol] == v)

diff --git a/python/cugraph/cugraph/structure/hypergraph.py b/python/cugraph/cugraph/structure/hypergraph.py
@@ -288,21 +288,20 @@ def hypergraph(
             "src",
             "dst",
             "weights",
-            symmetrize=not graph.is_directed())
-
+            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())
-
+        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 {

diff --git a/python/cugraph/cugraph/structure/property_graph.py b/python/cugraph/cugraph/structure/property_graph.py
@@ -2005,7 +2005,7 @@ 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.
@@ -2018,15 +2018,13 @@ def edge_props_to_graph(
                 "src",
                 "dst",
                 "weights",
-                symmetrize=not G.is_directed())
+                symmetrize=not G.is_directed(),
+            )
         else:
             source_col, dest_col = symmetrize(
-                G.edgelist.edgelist_df,
-                    "src",
-                    "dst",
-                    symmetrize=not G.is_directed())
+                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

diff --git a/python/cugraph/cugraph/tests/sampling/test_uniform_neighbor_sample.py b/python/cugraph/cugraph/tests/sampling/test_uniform_neighbor_sample.py
@@ -151,10 +151,8 @@ def test_uniform_neighbor_sample_simple(input_combo):
 
     # FIXME: Uses the deprecated implementation of symmetrize.
     source_col, dest_col = symmetrize(
-        input_df,
-        "src",
-        "dst",
-        symmetrize=not G.is_directed())
+        input_df, "src", "dst", symmetrize=not G.is_directed()
+    )
 
     input_df = cudf.DataFrame()
     input_df["src"] = source_col

diff --git a/python/cugraph/cugraph/tests/structure/test_graph.py b/python/cugraph/cugraph/tests/structure/test_graph.py
@@ -538,10 +538,8 @@ def test_to_directed(graph_file):
 
     # FIXME: Uses the deprecated implementation of symmetrize.
     source_col, dest_col = symmetrize(
-        G.edgelist.edgelist_df,
-        "src",
-        "dst",
-        symmetrize=not G.is_directed())
+        G.edgelist.edgelist_df, "src", "dst", symmetrize=not G.is_directed()
+    )
 
     input_df = cudf.DataFrame()
     input_df["src"] = source_col

diff --git a/python/cugraph/cugraph/tests/structure/test_multigraph.py b/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

diff --git a/python/cugraph/cugraph/utilities/nx_factory.py b/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