Merge remote-tracking branch 'origin/master' into mgpu-dev

Conflicts: gunrock/app/bc/bc_enactor.cuh gunrock/app/bc/bc_functor.cuh gunrock/app/pr/pr_enactor.cuh gunrock/app/sssp/sssp_enactor.cuh gunrock/app/sssp/sssp_functor.cuh gunrock/app/sssp/sssp_problem.cuh gunrock/csr.cuh gunrock/oprtr/edge_map_partitioned/kernel.cuh gunrock/util/test_utils.h tests/bc/test_bc.cu tests/sssp/test_sssp.cu
gunrock · Jun 29, 2015 · a95cd42 · a95cd42
2 parents 18824a7 + 57842ba
commit a95cd42
Show file tree

Hide file tree

Showing 58 changed files with 4,541 additions and 3,129 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -193,7 +193,7 @@ add_test(NAME TestSSSP COMMAND test_sssp)
 set_tests_properties(TestSSSP
   PROPERTIES PASS_REGULAR_EXPRESSION "Node ID.*1.*: Label.*39.*: Predecessor.*0")
 
-add_test(NAME TestPR COMMAND test_pr --undirected)
+add_test(NAME TestPR COMMAND test_pr)
 set_tests_properties(TestPR
   PROPERTIES PASS_REGULAR_EXPRESSION "Node ID.*2.*: Page Rank.*0.357069.")
 

diff --git a/FAQ.markdown b/FAQ.markdown
diff --git a/dataset/small/test_mst.mtx b/dataset/small/test_mst.mtx
@@ -0,0 +1,18 @@
+9 9 17
+1 2 2
+2 3 2
+2 4 17
+3 1 2
+3 4 38
+3 5 10
+4 5 2
+5 1 82
+5 2 11
+6 3 100
+6 4 100
+6 5 210
+6 7 2
+6 8 21
+7 3 120
+7 5 110
+8 9 2
diff --git a/gunrock/CMakeLists.txt b/gunrock/CMakeLists.txt
@@ -26,6 +26,7 @@ set(CUFILES
   app/cc/cc_app.cu
   app/sssp/sssp_app.cu
   app/pr/pr_app.cu
+  app/mst/mst_app.cu
   util/test_utils.cu
   util/error_utils.cu
   ${mgpu_SOURCE_FILES})