resolve additional merge conflicts

rapidsai · Mar 5, 2019 · 35d6f22 · 35d6f22
2 parents 9da6b38 + cb4a20e
commit 35d6f22
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/cpp/src/cugraph.cu b/cpp/src/cugraph.cu
@@ -360,7 +360,10 @@ gdf_error gdf_pagerank(gdf_graph *graph, gdf_column *pagerank, float alpha, floa
 }
 
 gdf_error gdf_bfs(gdf_graph *graph, gdf_column *distances, gdf_column *predecessors, int start_node, bool directed) {
-  GDF_REQUIRE(graph->adjList != nullptr, GDF_VALIDITY_UNSUPPORTED);
+  GDF_REQUIRE(graph->adjList != nullptr || graph->edgeList != nullptr, GDF_INVALID_API_CALL);
+  gdf_error err = gdf_add_adj_list(graph);
+  if (err != GDF_SUCCESS)
+    return err;
   GDF_REQUIRE(graph->adjList->offsets->dtype == GDF_INT32, GDF_UNSUPPORTED_DTYPE);
   GDF_REQUIRE(graph->adjList->indices->dtype == GDF_INT32, GDF_UNSUPPORTED_DTYPE);
   GDF_REQUIRE(distances->dtype == GDF_INT32, GDF_UNSUPPORTED_DTYPE);

diff --git a/python/cugraph/bfs/bfs_wrapper.pyx b/python/cugraph/bfs/bfs_wrapper.pyx
@@ -55,7 +55,7 @@ cpdef bfs(G, start, directed=True):
 
     cdef uintptr_t graph = G.graph_ptr
     cdef gdf_graph* g = <gdf_graph*>graph
-    num_verts = g.adjList.offsets.size - 1
+    num_verts = G.num_vertices()
 
     df = cudf.DataFrame()
     df['vertex'] = cudf.Series(np.zeros(num_verts, dtype=np.int32))