Merge branch 'master' of /org/centers/cdgc/repos/GaloisCpp

Author: insertinterestingnamehere

lonestar/analytics/cpu/CMakeLists.txt

@@ -15,3 +15,5 @@ add_subdirectory(pointstoanalysis)
 add_subdirectory(preflowpush)
 add_subdirectory(sssp)
 add_subdirectory(triangle-counting)
+
+add_subdirectory(louvain-partitioning)

lonestar/analytics/cpu/bipart/bipart.cpp

@@ -40,10 +40,10 @@
 
 namespace cll = llvm::cl;
 
-static const char* name = "HYPAR";
+static const char* name = "BIPART";
 static const char* desc =
     "Partitions a hypergraph into K parts and minimizing the graph cut";
-static const char* url = "HyPar";
+static const char* url = "BiPart";
 
 static cll::opt<std::string>
     inputFile(cll::Positional, cll::desc("<input file>"), cll::Required);
@@ -98,29 +98,6 @@ static cll::opt<bool>
     output("output", cll::desc("Specify if partitions need to be written"),
            cll::init(false));
 
-// const double COARSEN_FRACTION = 0.9;
-
-/*int cutsize(GGraph& g) {
-  unsigned size = std::distance(g.cellList().begin(), g.cellList().end());
-  unsigned sizen = std::distance(g.getNets().begin(), g.getNets().end());
-  int cutsize = 0;
-  std::vector<int> cells;
-  for (auto n : g.getNets()) {
-    bool cut_status = false;
-    for (auto e : g.edges(n)) {
-      auto cell1 = g.getEdgeDst(e);
-    for (auto c : g.edges(n)) {
-        auto cell2 = g.getEdgeDst(c);
-        if(g.getData(cell1).getPart() != g.getData(cell2).getPart() && cell1 !=
-cell2) { cutsize++; cut_status = true; break;
-        }
-      }
-      if (cut_status == true)
-        break;
-    }
-  }
-  return cutsize;
-}*/
 /**
  * Partitioning
  */
@@ -391,7 +368,7 @@ int main(int argc, char** argv) {
             galois::iterate(uint32_t{0}, totalnodes),
             [&](uint32_t c) {
               pre_edges[c] = edges_ids[c].size();
-              num_edges_acc += prefix_edges[c];
+              num_edges_acc += pre_edges[c];
             },
             galois::steal());
         edges = num_edges_acc.reduce();
@@ -410,7 +387,7 @@ int main(int argc, char** argv) {
           gr.getData(n).netval  = INT_MAX;
           gr.getData(n).nodeid  = n + 1;
         });
-        Partition(&metisG, 25, kValue[i]);
+        Partition(&metisG, csize, kValue[i]);
         MetisGraph* mcg = &metisG;
 
         while (mcg->getCoarserGraph() != NULL) {
@@ -445,8 +422,8 @@ int main(int argc, char** argv) {
     toProcessNew.clear();
   }
   // std::cout<<"Total Edge Cut: "<<computingCut(graph)<<"\n";
-  galois::runtime::reportStat_Single("HyPar", "Edge Cut", computingCut(graph));
-  galois::runtime::reportStat_Single("HyParzo", "zero-one",
+  galois::runtime::reportStat_Single("BiPart", "Edge Cut", computingCut(graph));
+  galois::runtime::reportStat_Single("BiPart", "zero-one",
                                      computingBalance(graph));
   // galois::reportPageAlloc("MeminfoPost");
 

lonestar/analytics/cpu/louvain-partitioning/CMakeLists.txt

@@ -0,0 +1,5 @@
+add_executable(louvain-partitioning-cpu louvain-partitioning.cpp serial-partitioning.cpp)
+add_dependencies(apps louvain-partitioning-cpu)
+target_link_libraries(louvain-partitioning-cpu PRIVATE Galois::shmem lonestar)
+install(TARGETS louvain-partitioning-cpu DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT apps EXCLUDE_FROM_ALL)
+add_test_scale(small1 louvain-partitioning-cpu -symmetricGraph "${BASEINPUT}/scalefree/symmetric/rmat10.sgr")

lonestar/analytics/cpu/louvain-partitioning/README.md

@@ -0,0 +1,28 @@
+Partitioning using Louvain
+================================================================================
+
+DESCRIPTION 
+--------------------------------------------------------------------------------
+
+This directory contains a graph partitioning algorithm that uses a hierarchical community detection algorithm for coarsening. The algorithm uses the well-known multi-level partitioning approach, similar to GMetis.
+
+INPUT
+--------------------------------------------------------------------------------
+
+This application takes in symmetric Galois .gr graphs.
+You must specify the -symmetricGraph flag when running this benchmark.
+
+BUILD
+--------------------------------------------------------------------------------
+
+1. Run cmake at BUILD directory (refer to top-level README for cmake instructions).
+
+2. Run `cd <BUILD>/lonestar/analytics/cpu/louvain_partitioning; make -j`
+
+RUN
+--------------------------------------------------------------------------------
+
+The following is an example command line.
+
+-`$  ./louvain-partitioning-cpu -input <path-to-graph> -t 4 -tolerance=15 -threshold=0.000001 -max_iter 1000  -symmetricGraph`
+