From e04ca188ae14001de26b7902bd73cba6e18ad62b Mon Sep 17 00:00:00 2001 From: brandon-b-miller Date: Thu, 2 Nov 2023 16:41:47 -0700 Subject: [PATCH 1/3] fixes --- python/cugraph/cugraph/structure/graph_classes.py | 3 +-- .../cugraph/structure/graph_implementation/simpleGraph.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/python/cugraph/cugraph/structure/graph_classes.py b/python/cugraph/cugraph/structure/graph_classes.py index 6f6c7e5a26c..03efcba0307 100644 --- a/python/cugraph/cugraph/structure/graph_classes.py +++ b/python/cugraph/cugraph/structure/graph_classes.py @@ -469,8 +469,7 @@ def from_numpy_array(self, np_array, nodes=None): nodes: array-like or None, optional (default=None) A list of column names, acting as labels for nodes """ - if not isinstance(np_array, np.ndarray): - raise TypeError("np_array input is not a Numpy array") + np_array = np.asarray(np_array) if len(np_array.shape) != 2: raise ValueError("np_array is not a 2D matrix") diff --git a/python/cugraph/cugraph/structure/graph_implementation/simpleGraph.py b/python/cugraph/cugraph/structure/graph_implementation/simpleGraph.py index 2b23d3a26b7..f962b8da119 100644 --- a/python/cugraph/cugraph/structure/graph_implementation/simpleGraph.py +++ b/python/cugraph/cugraph/structure/graph_implementation/simpleGraph.py @@ -1288,7 +1288,7 @@ def nodes(self): else: return cudf.concat( [df[simpleGraphImpl.srcCol], df[simpleGraphImpl.dstCol]] - ).unique() + ).drop_duplicates() if self.adjlist is not None: return cudf.Series(np.arange(0, self.number_of_nodes())) From 610f1117d560d7841e28d618107fbcc4a016d172 Mon Sep 17 00:00:00 2001 From: brandon-b-miller Date: Tue, 7 Nov 2023 08:33:22 -0800 Subject: [PATCH 2/3] reset index --- .../cugraph/structure/graph_implementation/simpleGraph.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/cugraph/cugraph/structure/graph_implementation/simpleGraph.py b/python/cugraph/cugraph/structure/graph_implementation/simpleGraph.py index f962b8da119..b4e9e4fb32f 100644 --- a/python/cugraph/cugraph/structure/graph_implementation/simpleGraph.py +++ b/python/cugraph/cugraph/structure/graph_implementation/simpleGraph.py @@ -1288,7 +1288,7 @@ def nodes(self): else: return cudf.concat( [df[simpleGraphImpl.srcCol], df[simpleGraphImpl.dstCol]] - ).drop_duplicates() + ).drop_duplicates().reset_index(drop=True) if self.adjlist is not None: return cudf.Series(np.arange(0, self.number_of_nodes())) From 4ea6806e036db36af9c2db1ce07f2e68a3fb554c Mon Sep 17 00:00:00 2001 From: brandon-b-miller Date: Tue, 7 Nov 2023 08:51:17 -0800 Subject: [PATCH 3/3] style fix --- .../structure/graph_implementation/simpleGraph.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/python/cugraph/cugraph/structure/graph_implementation/simpleGraph.py b/python/cugraph/cugraph/structure/graph_implementation/simpleGraph.py index b4e9e4fb32f..22d82eb1796 100644 --- a/python/cugraph/cugraph/structure/graph_implementation/simpleGraph.py +++ b/python/cugraph/cugraph/structure/graph_implementation/simpleGraph.py @@ -1286,9 +1286,13 @@ def nodes(self): else: return df[df.columns[0]] else: - return cudf.concat( - [df[simpleGraphImpl.srcCol], df[simpleGraphImpl.dstCol]] - ).drop_duplicates().reset_index(drop=True) + return ( + cudf.concat( + [df[simpleGraphImpl.srcCol], df[simpleGraphImpl.dstCol]] + ) + .drop_duplicates() + .reset_index(drop=True) + ) if self.adjlist is not None: return cudf.Series(np.arange(0, self.number_of_nodes()))