Merge branch 'master' of github.com:IntelligentSoftwareSystems/Galois

insertinterestingnamehere · insertinterestingnamehere · commit 47db406d8ac5 · 2020-08-20T08:15:23.000-05:00
diff --git a/libpangolin/include/pangolin/BfsMining/engine.h b/libpangolin/include/pangolin/BfsMining/engine.h
@@ -12,7 +12,7 @@ int main(int argc, char** argv) {
   AppMiner miner(k, numThreads);
   galois::StatTimer Tinitial("GraphReadingTime");
   Tinitial.start();
-  miner.read_graph(filetype, filename);
+  miner.read_graph(filetype, inputFile);
   Tinitial.stop();
   ResourceManager rm;
   for (unsigned nt = 0; nt < num_trials; nt++) {
diff --git a/lonestar/analytics/distributed/CMakeLists.txt b/lonestar/analytics/distributed/CMakeLists.txt
@@ -1,5 +1,4 @@
 include_directories("${PROJECT_SOURCE_DIR}/libgluon/include")
-include_directories("${PROJECT_SOURCE_DIR}/lonestardist/include")
 
 add_subdirectory(betweennesscentrality)
 add_subdirectory(bfs)
diff --git a/lonestar/analytics/distributed/triangle-counting/tc.cpp b/lonestar/analytics/distributed/triangle-counting/tc.cpp
@@ -134,7 +134,7 @@ int main(int argc, char** argv) {
   galois::DistMemSys G;
   DistBenchStart(argc, argv, name, desc, url);
 
-  if (!inputFileSymmetric) {
+  if (!symmetricGraph) {
     GALOIS_DIE("This application requires a symmetric graph input;"
                " please use the -symmetricGraph flag "
                " to indicate the input is a symmetric graph.");
diff --git a/lonestar/libdistbench/include/DistBench/Input.h b/lonestar/libdistbench/include/DistBench/Input.h
@@ -96,7 +96,7 @@ extern cll::opt<std::string> inputFile;
 //! input graph file, but transposed
 extern cll::opt<std::string> inputFileTranspose;
 //! symmetric input graph file
-extern cll::opt<bool> inputFileSymmetric;
+extern cll::opt<bool> symmetricGraph;
 //! partitioning scheme to use
 extern cll::opt<PARTITIONING_SCHEME> partitionScheme;
 ////! path to vertex id map for custom edge cut
@@ -133,7 +133,7 @@ using DistGraphPtr =
 template <typename NodeData, typename EdgeData>
 DistGraphPtr<NodeData, EdgeData>
 constructSymmetricGraph(std::vector<unsigned>& GALOIS_UNUSED(scaleFactor)) {
-  if (!inputFileSymmetric) {
+  if (!symmetricGraph) {
     GALOIS_DIE("application requires a symmetric graph input;"
                " please use the -symmetricGraph flag "
                " to indicate the input is a symmetric graph");
diff --git a/lonestar/libdistbench/include/DistBench/Start.h b/lonestar/libdistbench/include/DistBench/Start.h
@@ -181,7 +181,7 @@ loadSymmetricDistGraph(std::vector<unsigned>& scaleFactor) {
   DistGraphPtr<NodeData, EdgeData> loadedGraph = nullptr;
 
   // make sure that the symmetric graph flag was passed in
-  if (inputFileSymmetric) {
+  if (symmetricGraph) {
     loadedGraph = constructSymmetricGraph<NodeData, EdgeData>(scaleFactor);
   } else {
     GALOIS_DIE("This application requires a symmetric graph input;"
diff --git a/lonestar/libdistbench/src/Input.cpp b/lonestar/libdistbench/src/Input.cpp
@@ -36,7 +36,7 @@ cll::opt<std::string> inputFileTranspose("graphTranspose",
                                          cll::desc("<input file, transposed>"),
                                          cll::init(""));
 cll::opt<bool>
-    inputFileSymmetric("symmetricGraph",
+    symmetricGraph("symmetricGraph",
                        cll::desc("Specify that the input graph is symmetric"),
                        cll::init(false));
 
diff --git a/lonestar/mining/CMakeLists.txt b/lonestar/mining/CMakeLists.txt
@@ -1,6 +1,7 @@
-include_directories(include)
 include_directories(${CMAKE_SOURCE_DIR}/libgalois/include)
 
+add_subdirectory(libminingbench)
+
 add_subdirectory(cpu)
 
 if(GALOIS_ENABLE_GPU)
diff --git a/lonestar/mining/cpu/frequent-subgraph-mining/CMakeLists.txt b/lonestar/mining/cpu/frequent-subgraph-mining/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_executable(frequent-subgraph-mining-cpu fsm.cpp)
 add_dependencies(apps frequent-subgraph-mining-cpu)
-target_link_libraries(frequent-subgraph-mining-cpu PRIVATE Galois::pangolin LLVMSupport)
+target_link_libraries(frequent-subgraph-mining-cpu PRIVATE Galois::pangolin miningbench)
 install(TARGETS frequent-subgraph-mining-cpu DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT apps EXCLUDE_FROM_ALL)
 
 add_test_mine(small1 frequent-subgraph-mining-cpu -symmetricGraph -simpleGraph "${BASEINPUT}/Mining/citeseer.sadj" "-ft=adj" NOT_QUICK)
diff --git a/lonestar/mining/cpu/frequent-subgraph-mining/fsm.cpp b/lonestar/mining/cpu/frequent-subgraph-mining/fsm.cpp
@@ -1,4 +1,4 @@
-#include "lonestarmine.h"
+#include "MiningBench/Start.h"
 #include "pangolin/BfsMining/edge_miner.h"
 
 const char* name = "FSM";
diff --git a/lonestar/mining/cpu/k-clique-listing/CMakeLists.txt b/lonestar/mining/cpu/k-clique-listing/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_executable(k-clique-listing-cpu kcl.cpp)
 add_dependencies(apps k-clique-listing-cpu)
-target_link_libraries(k-clique-listing-cpu PRIVATE Galois::pangolin LLVMSupport)
+target_link_libraries(k-clique-listing-cpu PRIVATE Galois::pangolin miningbench)
 install(TARGETS k-clique-listing-cpu DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT apps EXCLUDE_FROM_ALL)
 
 add_test_mine(small1 k-clique-listing-cpu -symmetricGraph -simpleGraph "${BASEINPUT}/Mining/citeseer.csgr" NOT_QUICK)
diff --git a/lonestar/mining/cpu/k-clique-listing/kcl.cpp b/lonestar/mining/cpu/k-clique-listing/kcl.cpp
@@ -1,4 +1,4 @@
-#include "lonestarmine.h"
+#include "MiningBench/Start.h"
 #include "pangolin/BfsMining/vertex_miner.h"
 
 const char* name = "Kcl";
diff --git a/lonestar/mining/cpu/motif-counting/CMakeLists.txt b/lonestar/mining/cpu/motif-counting/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_executable(motif-counting-cpu motif.cpp)
 add_dependencies(apps motif-counting-cpu)
-target_link_libraries(motif-counting-cpu PRIVATE Galois::pangolin LLVMSupport)
+target_link_libraries(motif-counting-cpu PRIVATE Galois::pangolin miningbench)
 install(TARGETS motif-counting-cpu DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT apps EXCLUDE_FROM_ALL)
 
 add_test_mine(small1 motif-counting-cpu -symmetricGraph -simpleGraph "${BASEINPUT}/Mining/citeseer.csgr" NOT_QUICK)
diff --git a/lonestar/mining/cpu/motif-counting/motif.cpp b/lonestar/mining/cpu/motif-counting/motif.cpp
@@ -1,4 +1,4 @@
-#include "lonestarmine.h"
+#include "MiningBench/Start.h"
 #include "pangolin/BfsMining/vertex_miner.h"
 
 const char* name = "Motif Counting";
diff --git a/lonestar/mining/cpu/subgraph-listing/CMakeLists.txt b/lonestar/mining/cpu/subgraph-listing/CMakeLists.txt
@@ -2,7 +2,7 @@ add_executable(sgl_cycle sgl_cycle.cpp)
 add_executable(sgl_diamond sgl_diamond.cpp)
 add_dependencies(apps sgl_cycle)
 add_dependencies(apps sgl_diamond)
-target_link_libraries(sgl_cycle PRIVATE Galois::pangolin LLVMSupport)
-target_link_libraries(sgl_diamond PRIVATE Galois::pangolin LLVMSupport)
+target_link_libraries(sgl_cycle PRIVATE Galois::pangolin miningbench)
+target_link_libraries(sgl_diamond PRIVATE Galois::pangolin miningbench)
 install(TARGETS sgl_cycle DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT apps EXCLUDE_FROM_ALL)
 install(TARGETS sgl_diamond DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT apps EXCLUDE_FROM_ALL)
diff --git a/lonestar/mining/cpu/subgraph-listing/sgl_cycle.cpp b/lonestar/mining/cpu/subgraph-listing/sgl_cycle.cpp
@@ -1,4 +1,4 @@
-#include "lonestarmine.h"
+#include "MiningBench/Start.h"
 #include "pangolin/BfsMining/vertex_miner.h"
 
 const char* name = "sgl";
diff --git a/lonestar/mining/cpu/subgraph-listing/sgl_diamond.cpp b/lonestar/mining/cpu/subgraph-listing/sgl_diamond.cpp
@@ -1,4 +1,4 @@
-#include "lonestarmine.h"
+#include "MiningBench/Start.h"
 #include "pangolin/BfsMining/vertex_miner.h"
 
 const char* name = "sgl";
diff --git a/lonestar/mining/cpu/triangle-counting/CMakeLists.txt b/lonestar/mining/cpu/triangle-counting/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_executable(triangle-counting-mining-cpu tc_mine.cpp)
 add_dependencies(apps triangle-counting-mining-cpu)
-target_link_libraries(triangle-counting-mining-cpu PRIVATE Galois::pangolin LLVMSupport)
+target_link_libraries(triangle-counting-mining-cpu PRIVATE Galois::pangolin miningbench)
 install(TARGETS triangle-counting-mining-cpu DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT apps EXCLUDE_FROM_ALL)
 
 add_test_mine(small1 triangle-counting-mining-cpu -symmetricGraph -simpleGraph "${BASEINPUT}/Mining/citeseer.csgr" NOT_QUICK)
diff --git a/lonestar/mining/cpu/triangle-counting/tc_mine.cpp b/lonestar/mining/cpu/triangle-counting/tc_mine.cpp
@@ -1,4 +1,4 @@
-#include "lonestarmine.h"
+#include "MiningBench/Start.h"
 #include "pangolin/BfsMining/vertex_miner.h"
 #define TRIANGLE
 
diff --git a/lonestar/mining/gpu/frequent-subgraph-mining/CMakeLists.txt b/lonestar/mining/gpu/frequent-subgraph-mining/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_executable(frequent-subgraph-mining-gpu fsm_gpu.cpp fsm.cu)
 add_dependencies(apps frequent-subgraph-mining-gpu)
-target_link_libraries(frequent-subgraph-mining-gpu PRIVATE Galois::pangolin_gpu LLVMSupport)
+target_link_libraries(frequent-subgraph-mining-gpu PRIVATE Galois::pangolin_gpu miningbench_gpu)
 target_compile_definitions(frequent-subgraph-mining-gpu PRIVATE GALOIS_ENABLE_GPU=1)
 set_property(TARGET frequent-subgraph-mining-gpu PROPERTY CUDA_STANDARD 14)
 install(TARGETS frequent-subgraph-mining-gpu DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT apps EXCLUDE_FROM_ALL)
diff --git a/lonestar/mining/gpu/frequent-subgraph-mining/fsm_gpu.cpp b/lonestar/mining/gpu/frequent-subgraph-mining/fsm_gpu.cpp
@@ -3,7 +3,7 @@
 #define EDGE_INDUCED
 #include "galois/Galois.h"
 #include "fsm.h"
-#include "lonestarmine.h"
+#include "MiningBench/Start.h"
 #include "llvm/Support/CommandLine.h"
 
 const char* name = "FSM";
@@ -26,7 +26,7 @@ int main(int argc, char** argv) {
     exit(1);
   }
   AccType total = 0;
-  fsm_gpu_solver(filename, k, minsup, total);
+  fsm_gpu_solver(inputFile, k, minsup, total);
   std::cout << "\n\ttotal_num_frequent_patterns = " << total << "\n\n";
   return 0;
 }
diff --git a/lonestar/mining/gpu/k-clique-listing/CMakeLists.txt b/lonestar/mining/gpu/k-clique-listing/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_executable(k-clique-listing-gpu kcl_gpu.cpp kcl.cu)
 add_dependencies(apps k-clique-listing-gpu)
-target_link_libraries(k-clique-listing-gpu PRIVATE Galois::pangolin_gpu LLVMSupport)
+target_link_libraries(k-clique-listing-gpu PRIVATE Galois::pangolin_gpu miningbench_gpu)
 target_compile_definitions(k-clique-listing-gpu PRIVATE GALOIS_ENABLE_GPU=1)
 set_property(TARGET k-clique-listing-gpu PROPERTY CUDA_STANDARD 14)
 install(TARGETS k-clique-listing-gpu DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT apps EXCLUDE_FROM_ALL)
diff --git a/lonestar/mining/gpu/k-clique-listing/kcl_gpu.cpp b/lonestar/mining/gpu/k-clique-listing/kcl_gpu.cpp
@@ -2,7 +2,7 @@
 // Authors: Xuhao Chen <cxh@utexas.edu>
 #include "galois/Galois.h"
 #include "kcl.h"
-#include "lonestarmine.h"
+#include "MiningBench/Start.h"
 #include "llvm/Support/CommandLine.h"
 
 const char* name = "k-cliques";
@@ -26,7 +26,7 @@ int main(int argc, char** argv) {
   }
 
   AccType total = 0;
-  kcl_gpu_solver(filename, k, total);
+  kcl_gpu_solver(inputFile, k, total);
   std::cout << "\n\ttotal_num_cliques = " << total << "\n\n";
   return 0;
 }
diff --git a/lonestar/mining/gpu/motif-counting/CMakeLists.txt b/lonestar/mining/gpu/motif-counting/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_executable(motif-counting-gpu motif_gpu.cpp motif.cu)
 add_dependencies(apps motif-counting-gpu)
-target_link_libraries(motif-counting-gpu PRIVATE Galois::pangolin_gpu LLVMSupport)
+target_link_libraries(motif-counting-gpu PRIVATE Galois::pangolin_gpu miningbench_gpu)
 target_compile_definitions(motif-counting-gpu PRIVATE GALOIS_ENABLE_GPU=1)
 set_property(TARGET motif-counting-gpu PROPERTY CUDA_STANDARD 14)
 install(TARGETS motif-counting-gpu DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT apps EXCLUDE_FROM_ALL)
diff --git a/lonestar/mining/gpu/motif-counting/motif_gpu.cpp b/lonestar/mining/gpu/motif-counting/motif_gpu.cpp
@@ -2,7 +2,7 @@
 // Authors: Xuhao Chen <cxh@utexas.edu>
 #include "galois/Galois.h"
 #include "motif.h"
-#include "lonestarmine.h"
+#include "MiningBench/Start.h"
 #include "llvm/Support/CommandLine.h"
 
 const char* name           = "k-cliques";
@@ -31,6 +31,6 @@ int main(int argc, char** argv) {
   for (int i = 0; i < npatterns; i++)
     accumulators[i] = 0;
 
-  motif_gpu_solver(filename, k, accumulators);
+  motif_gpu_solver(inputFile, k, accumulators);
   return 0;
 }
diff --git a/lonestar/mining/gpu/triangle-counting/CMakeLists.txt b/lonestar/mining/gpu/triangle-counting/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_executable(triangle-counting-mining-gpu tc_mine_gpu.cpp tc_mine.cu)
 add_dependencies(apps triangle-counting-mining-gpu)
-target_link_libraries(triangle-counting-mining-gpu PRIVATE Galois::pangolin_gpu LLVMSupport)
+target_link_libraries(triangle-counting-mining-gpu PRIVATE Galois::pangolin_gpu miningbench_gpu)
 target_compile_definitions(triangle-counting-mining-gpu PRIVATE GALOIS_ENABLE_GPU=1)
 set_property(TARGET triangle-counting-mining-gpu PROPERTY CUDA_STANDARD 14)
 install(TARGETS triangle-counting-mining-gpu DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT apps EXCLUDE_FROM_ALL)
diff --git a/lonestar/mining/gpu/triangle-counting/tc_mine_gpu.cpp b/lonestar/mining/gpu/triangle-counting/tc_mine_gpu.cpp
@@ -2,7 +2,7 @@
 // Authors: Xuhao Chen <cxh@utexas.edu>
 #include "galois/Galois.h"
 #include "tc.h"
-#include "lonestarmine.h"
+#include "MiningBench/Start.h"
 #include "llvm/Support/CommandLine.h"
 
 const char* name = "Triangle counting";
@@ -25,7 +25,7 @@ int main(int argc, char** argv) {
     exit(1);
   }
   AccType total = 0;
-  tc_gpu_solver(filename, total);
+  tc_gpu_solver(inputFile, total);
   std::cout << "\n\ttotal_num_triangles = " << total << "\n\n";
   return 0;
 }
diff --git a/lonestar/mining/libminingbench/CMakeLists.txt b/lonestar/mining/libminingbench/CMakeLists.txt
@@ -0,0 +1,24 @@
+add_library(miningbench STATIC src/Start.cpp src/Input.cpp)
+target_include_directories(miningbench PUBLIC
+  "${CMAKE_CURRENT_SOURCE_DIR}/include"
+)
+
+target_link_libraries(miningbench Galois::shmem LLVMSupport lonestar)
+
+if(GALOIS_ENABLE_DIST)
+  add_library(miningbench_dist STATIC src/Start.cpp)
+  target_include_directories(miningbench_dist PUBLIC
+    "${CMAKE_CURRENT_SOURCE_DIR}/include"
+  )
+  target_compile_definitions(miningbench_dist PRIVATE GALOIS_ENABLE_DIST=1) 
+  target_link_libraries(miningbench_dist Galois::shmem LLVMSupport distbench)
+endif()
+
+if(GALOIS_ENABLE_GPU)
+  add_library(miningbench_gpu STATIC src/Start.cpp src/Input.cpp)
+  target_include_directories(miningbench_gpu PUBLIC
+    "${CMAKE_CURRENT_SOURCE_DIR}/include"
+  )
+  target_compile_definitions(miningbench_gpu PRIVATE GALOIS_ENABLE_GPU=1) 
+  target_link_libraries(miningbench_gpu Galois::shmem LLVMSupport)
+endif()
diff --git a/lonestar/mining/libminingbench/include/MiningBench/Start.h b/lonestar/mining/libminingbench/include/MiningBench/Start.h
@@ -0,0 +1,29 @@
+#pragma once
+#include "llvm/Support/CommandLine.h"
+
+namespace cll = llvm::cl;
+extern cll::opt<std::string> inputFile;
+extern cll::opt<std::string> filetype;
+extern cll::opt<unsigned> num_trials;
+extern cll::opt<unsigned> nblocks;
+extern cll::opt<std::string> pattern_filename;
+extern cll::opt<std::string> morder_filename;
+extern cll::opt<unsigned> fv;
+extern cll::opt<unsigned> k;
+extern cll::opt<unsigned> show;
+extern cll::opt<unsigned> debug;
+extern cll::opt<unsigned> minsup;
+extern cll::opt<std::string> preset_filename;
+
+extern cll::opt<bool> simpleGraph;
+
+// note these may come from uplevel liblonestar or libdistbench
+extern cll::opt<int> numThreads; // locally defined for gpu apps (necessary?)
+extern cll::opt<bool> verify;    // TODO use skipVerify from liblonestar
+#ifndef GALOIS_ENABLE_GPU
+extern cll::opt<std::string> statFile;
+#endif
+extern cll::opt<bool> symmetricGraph; // locally defined for gpu apps
+
+void LonestarMineStart(int argc, char** argv, const char* app, const char* desc,
+                       const char* url);
diff --git a/lonestar/mining/libminingbench/src/Input.cpp b/lonestar/mining/libminingbench/src/Input.cpp
@@ -0,0 +1,5 @@
+#include "MiningBench/Start.h"
+
+cll::opt<std::string> inputFile(cll::Positional,
+                                cll::desc("<filename: symmetrized graph>"),
+                                cll::Required);
diff --git a/lonestar/mining/libminingbench/src/Start.cpp b/lonestar/mining/libminingbench/src/Start.cpp

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`include_directories("${PROJECT_SOURCE_DIR}/libgluon/include")`
`2`		`-include_directories("${PROJECT_SOURCE_DIR}/lonestardist/include")`
`3`	`2`
`4`	`3`	`add_subdirectory(betweennesscentrality)`
`5`	`4`	`add_subdirectory(bfs)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "lonestarmine.h"`
	`1`	`+#include "MiningBench/Start.h"`
`2`	`2`	`#include "pangolin/BfsMining/edge_miner.h"`
`3`	`3`
`4`	`4`	`const char* name = "FSM";`