Merge remote-tracking branch 'origin/branch-0.6' into bug_ext_python_…

…test
rapidsai · Mar 6, 2019 · aa60d2b · aa60d2b
2 parents 35d6f22 + faa0172
commit aa60d2b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,7 +29,7 @@
 - PR #48 ABI Fixes
 - PR #72 Bug fix for segfault issue getting transpose from adjacency list
 - PR #105 Bug fix for memory leaks and python test failures
-
+- PR #110 Bug fix for segfault calling Louvain with only edge list
 
 # cuGraph 0.5.0 (28 Jan 2019)
 
diff --git a/python/cugraph/louvain/louvain_wrapper.pyx b/python/cugraph/louvain/louvain_wrapper.pyx
@@ -84,6 +84,9 @@ cpdef nvLouvain(input_graph):
     """
     cdef uintptr_t graph = input_graph.graph_ptr
     cdef gdf_graph* g = <gdf_graph*>graph
+
+    err = gdf_add_adj_list(g)
+    cudf.bindings.cudf_cpp.check_gdf_error(err)
 
     cdef uintptr_t offsets_ptr = <uintptr_t>g.adjList.offsets.data
     cdef uintptr_t indices_ptr = <uintptr_t>g.adjList.indices.data
@@ -98,6 +101,7 @@ cpdef nvLouvain(input_graph):
     df['vertex'] = cudf.Series(np.zeros(n, dtype=np.int32))
     cdef uintptr_t identifier_ptr = create_column(df['vertex'])
     err = g.adjList.get_vertex_identifiers(<gdf_column*>identifier_ptr)
+    cudf.bindings.cudf_cpp.check_gdf_error(err)
 
     df['partition'] = cudf.Series(np.zeros(n,dtype=np.int32))
     cdef uintptr_t louvain_parts_ptr = _get_column_data_ptr(df['partition'])