Merge pull request #1 from netsyslab/master

Updating the main repository
netsyslab · Aug 30, 2014 · a011e9f · a011e9f
2 parents 4b10dc9 + ccf91f8
commit a011e9f
Show file tree

Hide file tree

Showing 13 changed files with 1,384 additions and 1,046 deletions.
diff --git a/src/alg/totem_alg.h b/src/alg/totem_alg.h
@@ -108,6 +108,7 @@ error_t bfs_gpu(graph_t* graph, vid_t src_id, cost_t* cost);
 error_t bfs_bu_gpu(graph_t* graph, vid_t src_id, cost_t* cost);
 error_t bfs_vwarp_gpu(graph_t* graph, vid_t src_id, cost_t* cost);
 error_t bfs_hybrid(vid_t src_id, cost_t* cost);
+error_t bfs_stepwise_hybrid(vid_t src_id, cost_t* cost);
 
 /**
  * Given an undirected, unweighted graph and a source vertex, compute the 

diff --git a/src/alg/totem_betweenness_hybrid.cu b/src/alg/totem_betweenness_hybrid.cu