Merge pull request rapidsai#682 from rapidsai/branch-0.12

[gpuCI] Auto-merge branch-0.12 to branch-0.13 [skip ci]
rlratzel · Jan 22, 2020 · 044218d · 044218d
2 parents fa1a251 + 685017c
commit 044218d
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -30,6 +30,7 @@
 - PR #651 fix cudf error in katz wrapper and test nstart
 - PR #663 Replaced use of cudf._lib.gdf_dtype_from_value based on cudf refactoring
 - PR #672 fix snmg pagerank based on cudf Buffer changes
+- PR #681 fix column length mismatch cudf issue
 
 # cuGraph 0.11.0 (11 Dec 2019)
 

diff --git a/python/cugraph/link_prediction/jaccard_wrapper.pyx b/python/cugraph/link_prediction/jaccard_wrapper.pyx
@@ -110,8 +110,8 @@ def jaccard(input_graph, vertex_pair=None):
         df['destination'] = cudf.Series(dest_data)
 
         if input_graph.renumbered:
-            df['source'] = input_graph.edgelist.renumber_map[df['source']]
-            df['destination'] = input_graph.edgelist.renumber_map[df['destination']]
+            df['source'] = input_graph.edgelist.renumber_map[df['source']].reset_index().drop('index')
+            df['destination'] = input_graph.edgelist.renumber_map[df['destination']].reset_index().drop('index')
 
         df['jaccard_coeff'] = result
 

diff --git a/python/cugraph/link_prediction/overlap_wrapper.pyx b/python/cugraph/link_prediction/overlap_wrapper.pyx
@@ -112,8 +112,8 @@ def overlap(input_graph, vertex_pair=None):
         df['destination'] = cudf.Series(dest_data)
 
         if input_graph.renumbered:
-            df['source'] = input_graph.edgelist.renumber_map[df['source']]
-            df['destination'] = input_graph.edgelist.renumber_map[df['destination']]
+            df['source'] = input_graph.edgelist.renumber_map[df['source']].reset_index().drop('index')
+            df['destination'] = input_graph.edgelist.renumber_map[df['destination']].reset_index().drop('index')
 
         df['overlap_coeff'] = result
 

diff --git a/python/cugraph/link_prediction/wjaccard_wrapper.pyx b/python/cugraph/link_prediction/wjaccard_wrapper.pyx
@@ -115,8 +115,8 @@ def jaccard_w(input_graph, weights_arr, vertex_pair=None):
         df['destination'] = cudf.Series(dest_data)
 
         if input_graph.renumbered:
-            df['source'] = input_graph.edgelist.renumber_map[df['source']]
-            df['destination'] = input_graph.edgelist.renumber_map[df['destination']]
+            df['source'] = input_graph.edgelist.renumber_map[df['source']].reset_index().drop('index')
+            df['destination'] = input_graph.edgelist.renumber_map[df['destination']].reset_index().drop('index')
 
         df['jaccard_coeff'] = result
 

diff --git a/python/cugraph/link_prediction/woverlap_wrapper.pyx b/python/cugraph/link_prediction/woverlap_wrapper.pyx
@@ -115,8 +115,8 @@ def overlap_w(input_graph, weights_arr, vertex_pair=None):
         df['destination'] = cudf.Series(dest_data)
 
         if input_graph.renumbered:
-            df['source'] = input_graph.edgelist.renumber_map[df['source']]
-            df['destination'] = input_graph.edgelist.renumber_map[df['destination']]
+            df['source'] = input_graph.edgelist.renumber_map[df['source']].reset_index().drop('index')
+            df['destination'] = input_graph.edgelist.renumber_map[df['destination']].reset_index().drop('index')
 
         df['overlap_coeff'] = result
 

diff --git a/python/cugraph/structure/graph.py b/python/cugraph/structure/graph.py
@@ -208,8 +208,10 @@ def view_edge_list(self):
         edgelist_df = self.edgelist.edgelist_df
         if self.renumbered:
             df = cudf.DataFrame()
-            df['src'] = self.edgelist.renumber_map[edgelist_df['src']]
-            df['dst'] = self.edgelist.renumber_map[edgelist_df['dst']]
+            df['src'] = self.edgelist.renumber_map[edgelist_df['src']].\
+                reset_index().drop('index')
+            df['dst'] = self.edgelist.renumber_map[edgelist_df['dst']].\
+                reset_index().drop('index')
             return df
         else:
             return edgelist_df
@@ -324,8 +326,10 @@ def get_two_hop_neighbors(self):
         """
         df = graph_wrapper.get_two_hop_neighbors(self)
         if self.renumbered is True:
-            df['first'] = self.edgelist.renumber_map[df['first']]
-            df['second'] = self.edgelist.renumber_map[df['second']]
+            df['first'] = self.edgelist.renumber_map[df['first']].\
+                reset_index().drop('index')
+            df['second'] = self.edgelist.renumber_map[df['second']].\
+                reset_index().drop('index')
         return df
 
     def number_of_vertices(self):

diff --git a/python/cugraph/tests/test_wjaccard.py b/python/cugraph/tests/test_wjaccard.py
@@ -42,7 +42,7 @@ def cugraph_call(cu_M):
                               cu_M['1'].max())+1, dtype=np.float32))
 
     G = cugraph.DiGraph()
-    G.from_cudf_edgelist(cu_M, source='0', destination='1', renumber=False)
+    G.from_cudf_edgelist(cu_M, source='0', destination='1')
 
     # cugraph Jaccard Call
     t1 = time.time()