wrap namespaces

ParAlg · Jun 21, 2020 · ba238af · ba238af
1 parent 822adc5
commit ba238af
Show file tree

Hide file tree

Showing 295 changed files with 1,236 additions and 701 deletions.
diff --git a/benchmarks/Biconnectivity/TarjanVishkin/BUILD b/benchmarks/Biconnectivity/TarjanVishkin/BUILD
@@ -5,7 +5,6 @@ cc_library(
   "//benchmarks/Connectivity/WorkEfficientSDB14:Connectivity",
   "//gbbs:gbbs",
   "//gbbs/pbbslib:dyn_arr",
-  "//gbbs/pbbslib:sparse_table",
   "//pbbslib:random",
   "//pbbslib:sample_sort",
   "//pbbslib/strings:string_basics",

diff --git a/benchmarks/Biconnectivity/TarjanVishkin/Biconnectivity.cc b/benchmarks/Biconnectivity/TarjanVishkin/Biconnectivity.cc
@@ -78,7 +78,7 @@ void BiconnectivityStats(symmetric_graph<vertex, W>& GA, char* s,
 
   size_t mask = (1 << 12) - 1;
   auto empty = std::make_tuple(UINT_E_MAX, UINT_E_MAX);
-  auto ST = sparse_additive_map<uintE, uintE>(n, empty);
+  auto ST = pbbslib::sparse_additive_map<uintE, uintE>(n, empty);
 
   auto map_bc_label = [&](const uintE& src, const uintE& ngh, const W& wgh) {
     auto label = bicc_label(src, ngh);

diff --git a/benchmarks/Biconnectivity/TarjanVishkin/Biconnectivity.h b/benchmarks/Biconnectivity/TarjanVishkin/Biconnectivity.h
@@ -27,7 +27,6 @@
 
 #include "gbbs/gbbs.h"
 #include "gbbs/pbbslib/dyn_arr.h"
-#include "gbbs/pbbslib/sparse_table.h"
 #include "pbbslib/random.h"
 #include "pbbslib/sample_sort.h"
 #include "pbbslib/strings/string_basics.h"

diff --git a/benchmarks/CliqueCounting/BUILD b/benchmarks/CliqueCounting/BUILD
@@ -6,7 +6,6 @@ cc_library(
   "//gbbs:edge_map_reduce",
   "//gbbs:gbbs",
   "//gbbs/pbbslib:dyn_arr",
-  "//gbbs/pbbslib:sparse_table",
   ]
 )
 

diff --git a/benchmarks/CliqueCounting/Clique.h b/benchmarks/CliqueCounting/Clique.h
@@ -30,7 +30,6 @@
 #include "gbbs/edge_map_reduce.h"
 #include "gbbs/gbbs.h"
 #include "gbbs/pbbslib/dyn_arr.h"
-#include "gbbs/pbbslib/sparse_table.h"
 #include "pbbslib/assert.h"
 #include "pbbslib/list_allocator.h"
 #include "pbbslib/integer_sort.h"

diff --git a/benchmarks/CliqueCounting/intersect.h b/benchmarks/CliqueCounting/intersect.h
@@ -8,7 +8,6 @@
 #include "gbbs/edge_map_reduce.h"
 #include "gbbs/gbbs.h"
 #include "gbbs/pbbslib/dyn_arr.h"
-#include "gbbs/pbbslib/sparse_table.h"
 
 #define INDUCED_STACK_THR 5000
 

diff --git a/benchmarks/CliqueCounting/peel.h b/benchmarks/CliqueCounting/peel.h
@@ -127,7 +127,7 @@ inline size_t triUpdate(Graph& G, Graph2& DG, F get_active, size_t active_size,
 
   // Hash table to contain triangle count updates
   size_t edge_table_size = (size_t) (active_deg < n ? active_deg : n);
-  auto edge_table = sparse_table<uintE, bool, hashtup>(edge_table_size, std::make_tuple(UINT_E_MAX, false), hashtup());
+  auto edge_table = pbbslib::sparse_table<uintE, bool, hashtup>(edge_table_size, std::make_tuple(UINT_E_MAX, false), hashtup());
 
   // Function that dictates which edges to consider in first level of recursion
   auto ignore_f = [&](const uintE& u, const uintE& v) {
@@ -204,7 +204,7 @@ inline size_t cliqueUpdate(Graph& G, Graph2& DG, size_t k, size_t max_deg, bool
 
   // Hash table to contain clique count updates
   size_t edge_table_size = (size_t) (active_deg < n ? active_deg : n);
-  auto edge_table = sparse_table<uintE, bool, hashtup>(edge_table_size, std::make_tuple(UINT_E_MAX, false), hashtup());
+  auto edge_table = pbbslib::sparse_table<uintE, bool, hashtup>(edge_table_size, std::make_tuple(UINT_E_MAX, false), hashtup());
 
   // Function that dictates which edges to consider in first level of recursion
   auto ignore_f = [&](const uintE& u, const uintE& v) {

diff --git a/benchmarks/CoSimRank/BUILD b/benchmarks/CoSimRank/BUILD
@@ -3,7 +3,6 @@ cc_library(
   hdrs = ["CoSimRank.h"],
   deps = [
   "//gbbs:gbbs",
-  "//gbbs:edge_map_reduce",
   ]
 )
 

diff --git a/benchmarks/CoSimRank/CoSimRank.cc b/benchmarks/CoSimRank/CoSimRank.cc
@@ -33,6 +33,7 @@
 
 #include "CoSimRank.h"
 
+namespace gbbs {
 template <class Graph>
 double CoSimRank_runner(Graph& G, commandLine P) {
   std::cout << "### Application: CoSimRank" << std::endl;
@@ -56,5 +57,6 @@ double CoSimRank_runner(Graph& G, commandLine P) {
   std::cout << "### Running Time: " << tt << std::endl;
   return tt;
 }
+}  // namespace gbbs
 
-generate_main(CoSimRank_runner, false);
+generate_main(gbbs::CoSimRank_runner, false);
diff --git a/benchmarks/CoSimRank/CoSimRank.h b/benchmarks/CoSimRank/CoSimRank.h
@@ -5,6 +5,7 @@
 
 #include "gbbs/gbbs.h"
 
+namespace gbbs {
 template <class Graph>
 struct PR_F {
   using W = typename Graph::weight_type;
@@ -202,3 +203,4 @@ void CoSimRank(Graph& G, uintE v, uintE u, double eps = 0.000001, double c = 0.8
   cout << "max_pr = " << max_pr_v << ", " << max_pr_u << endl;
   cout << "sim = " << sim << endl;
 }
+}  // namespace gbbs
diff --git a/benchmarks/Connectivity/BFSCC/Connectivity.cc b/benchmarks/Connectivity/BFSCC/Connectivity.cc
@@ -34,6 +34,8 @@
 
 #include "Connectivity.h"
 
+namespace gbbs {
+
 template <class Graph>
 double CC_runner(Graph& G, commandLine P) {
   std::cout << "### Application: CC (Connectivity)" << std::endl;
@@ -52,4 +54,6 @@ double CC_runner(Graph& G, commandLine P) {
   return tt;
 }
 
-generate_main(CC_runner, false);
+}  // namespace gbbs
+
+generate_main(gbbs::CC_runner, false);
diff --git a/benchmarks/Connectivity/BFSCC/Connectivity.h b/benchmarks/Connectivity/BFSCC/Connectivity.h
@@ -26,6 +26,7 @@
 #include "gbbs/gbbs.h"
 #include "benchmarks/Connectivity/common.h"
 
+namespace gbbs {
 namespace bfs_cc {
 
 template <class W>
@@ -85,3 +86,4 @@ inline sequence<parent> CC(Graph& G) {
 }
 
 }  // namespace bfs_cc
+}  // namespace gbbs
diff --git a/benchmarks/Connectivity/Framework/benchmark_edge_gather.cc b/benchmarks/Connectivity/Framework/benchmark_edge_gather.cc
@@ -5,6 +5,7 @@
 
 #include "utils/benchmark.h"
 
+namespace gbbs {
 template <class CpuStats>
 void print_result(commandLine& P, std::string method, size_t rounds, double time, CpuStats& stats) {
   std::cout << "{" << std::endl;
@@ -114,5 +115,6 @@ double Sampler(Graph& G, commandLine& P) {
 
   std::cout << "]" << std::endl;
 }
+}  // namespace gbbs
 
-generate_symmetric_once_main(Sampler, false);
+generate_symmetric_once_main(gbbs::Sampler, false);
diff --git a/benchmarks/Connectivity/Framework/benchmark_sampling.cc b/benchmarks/Connectivity/Framework/benchmark_sampling.cc
@@ -5,6 +5,7 @@
 
 #include "utils/benchmark.h"
 
+namespace gbbs {
 void print_result(commandLine& P, std::string sampling_method, size_t rounds, double sampling_time, double pct_covered, double pct_ic_edges, size_t k=0) {
   std::cout << "{" << std::endl;
   std::cout << "  \"test_type\": \"sampling_result\"," << std::endl;
@@ -329,5 +330,6 @@ double Sampler(Graph& G, commandLine& P) {
 
   std::cout << "]" << std::endl;
 }
+}  // namespace gbbs
 
-generate_symmetric_once_main(Sampler, false);
+generate_symmetric_once_main(gbbs::Sampler, false);
diff --git a/benchmarks/Connectivity/Framework/framework.h b/benchmarks/Connectivity/Framework/framework.h
@@ -8,6 +8,7 @@
 
 #include "sampling.h"
 
+namespace gbbs {
 namespace connectit {
 
   /* Union-Find Strategies */
@@ -263,4 +264,5 @@ namespace connectit {
   }
 
 
-} // namesapce connectit
+}  // namesapce connectit
+}  // namespace gbbs
diff --git a/benchmarks/Connectivity/Framework/mains/bench_utils.h b/benchmarks/Connectivity/Framework/mains/bench_utils.h
@@ -6,6 +6,7 @@
 
 /* ************************* Benchmark Utils *************************** */
 
+namespace gbbs {
 static timer bt;
 using uchar = unsigned char;
 
@@ -121,3 +122,4 @@ double t_gbbs_cc(Graph& G, commandLine P, pbbs::sequence<parent>& correct) {
   }
   return t;
 }
+}  // namespace gbbs
diff --git a/benchmarks/Connectivity/Framework/mains/bfscc.cc b/benchmarks/Connectivity/Framework/mains/bfscc.cc
@@ -29,6 +29,7 @@
 
 #include "bench_utils.h"
 
+namespace gbbs {
 namespace connectit {
 
 template <class Graph>
@@ -63,5 +64,6 @@ double Benchmark_runner(Graph& G, commandLine P) {
     });
   return 1.0;
 }
+}  // namespace gbbs
 
-generate_symmetric_once_main(Benchmark_runner, false);
+generate_symmetric_once_main(gbbs::Benchmark_runner, false);
diff --git a/benchmarks/Connectivity/Framework/mains/check.h b/benchmarks/Connectivity/Framework/mains/check.h
@@ -2,6 +2,7 @@
 
 /* ************************* Utils *************************** */
 
+namespace gbbs {
 template <class Seq>
 inline size_t num_cc(Seq& labels) {
   size_t n = labels.size();
@@ -72,3 +73,4 @@ inline void cc_check(S1& correct, S2& check) {
   cout << "# correctness check: " << is_correct << endl;
   cout << "# max_cor = " << max_cor << " max_chk = " << max_chk << endl;
 }
+}  // namespace gbbs
diff --git a/benchmarks/Connectivity/Framework/mains/gbbscc.cc b/benchmarks/Connectivity/Framework/mains/gbbscc.cc
@@ -29,6 +29,7 @@
 
 #include "bench_utils.h"
 
+namespace gbbs {
 namespace connectit {
 
 template <class Graph>
@@ -65,5 +66,6 @@ double Benchmark_runner(Graph& G, commandLine P) {
     });
   return 1.0;
 }
+}  // namespace gbbs
 
-generate_symmetric_once_main(Benchmark_runner, false);
+generate_symmetric_once_main(gbbs::Benchmark_runner, false);
diff --git a/benchmarks/Connectivity/Framework/mains/jayanti_bfs.cc b/benchmarks/Connectivity/Framework/mains/jayanti_bfs.cc
@@ -29,6 +29,7 @@
 #include "bench_utils.h"
 #include "uf_utils.h"
 
+namespace gbbs {
 namespace connectit {
 template <class Graph>
 void jayanti_find_twotrysplit(Graph& G, int rounds, commandLine& P, pbbs::sequence<parent>& correct) {
@@ -59,5 +60,6 @@ double Benchmark_runner(Graph& G, commandLine P) {
     });
   return 1.0;
 }
+}  // namespace gbbs
 
-generate_symmetric_once_main(Benchmark_runner, false);
+generate_symmetric_once_main(gbbs::Benchmark_runner, false);
diff --git a/benchmarks/Connectivity/Framework/mains/jayanti_kout.cc b/benchmarks/Connectivity/Framework/mains/jayanti_kout.cc
@@ -29,6 +29,7 @@
 #include "bench_utils.h"
 #include "uf_utils.h"
 
+namespace gbbs {
 namespace connectit {
 template <class Graph>
 void jayanti_find_twotrysplit(Graph& G, int rounds, commandLine& P, pbbs::sequence<parent>& correct) {
@@ -59,5 +60,6 @@ double Benchmark_runner(Graph& G, commandLine P) {
     });
   return 1.0;
 }
+}  // namespace gbbs
 
-generate_symmetric_once_main(Benchmark_runner, false);
+generate_symmetric_once_main(gbbs::Benchmark_runner, false);
diff --git a/benchmarks/Connectivity/Framework/mains/jayanti_ldd.cc b/benchmarks/Connectivity/Framework/mains/jayanti_ldd.cc
@@ -29,6 +29,7 @@
 #include "bench_utils.h"
 #include "uf_utils.h"
 
+namespace gbbs {
 namespace connectit {
 template <class Graph>
 void jayanti_find_twotrysplit(Graph& G, int rounds, commandLine& P, pbbs::sequence<parent>& correct) {
@@ -59,5 +60,6 @@ double Benchmark_runner(Graph& G, commandLine P) {
     });
   return 1.0;
 }
+}  // namespace gbbs
 
-generate_symmetric_once_main(Benchmark_runner, false);
+generate_symmetric_once_main(gbbs::Benchmark_runner, false);
diff --git a/benchmarks/Connectivity/Framework/mains/jayanti_nosample.cc b/benchmarks/Connectivity/Framework/mains/jayanti_nosample.cc
@@ -29,6 +29,7 @@
 #include "bench_utils.h"
 #include "uf_utils.h"
 
+namespace gbbs {
 namespace connectit {
 template <class Graph>
 void jayanti_find_twotrysplit(Graph& G, int rounds, commandLine& P, pbbs::sequence<parent>& correct) {
@@ -58,5 +59,6 @@ double Benchmark_runner(Graph& G, commandLine P) {
     });
   return 1.0;
 }
+}  // namespace gbbs
 
-generate_symmetric_once_main(Benchmark_runner, false);
+generate_symmetric_once_main(gbbs::Benchmark_runner, false);
diff --git a/benchmarks/Connectivity/Framework/mains/label_propagation.cc b/benchmarks/Connectivity/Framework/mains/label_propagation.cc
@@ -29,6 +29,7 @@
 
 #include "bench_utils.h"
 
+namespace gbbs {
 namespace connectit {
 template<
   class Graph,
@@ -95,5 +96,6 @@ double Benchmark_runner(Graph& G, commandLine P) {
     });
   return 1.0;
 }
+}  // namespace gbbs
 
-generate_symmetric_once_main(Benchmark_runner, false);
+generate_symmetric_once_main(gbbs::Benchmark_runner, false);
diff --git a/benchmarks/Connectivity/Framework/mains/liutarjan_bfs.cc b/benchmarks/Connectivity/Framework/mains/liutarjan_bfs.cc
@@ -29,6 +29,7 @@
 #include "bench_utils.h"
 #include "uf_utils.h"
 
+namespace gbbs {
 namespace connectit {
 
   template<
@@ -211,5 +212,6 @@ double Benchmark_runner(Graph& G, commandLine P) {
     });
   return 1.0;
 }
+}  // namespace gbbs
 
-generate_symmetric_once_main(Benchmark_runner, false);
+generate_symmetric_once_main(gbbs::Benchmark_runner, false);
diff --git a/benchmarks/Connectivity/Framework/mains/liutarjan_kout.cc b/benchmarks/Connectivity/Framework/mains/liutarjan_kout.cc
@@ -29,6 +29,7 @@
 #include "bench_utils.h"
 #include "uf_utils.h"
 
+namespace gbbs {
 namespace connectit {
 
   template<
@@ -211,5 +212,6 @@ double Benchmark_runner(Graph& G, commandLine P) {
     });
   return 1.0;
 }
+}  // namespace gbbs
 
-generate_symmetric_once_main(Benchmark_runner, false);
+generate_symmetric_once_main(gbbs::Benchmark_runner, false);
diff --git a/benchmarks/Connectivity/Framework/mains/liutarjan_ldd.cc b/benchmarks/Connectivity/Framework/mains/liutarjan_ldd.cc
@@ -29,6 +29,7 @@
 #include "bench_utils.h"
 #include "uf_utils.h"
 
+namespace gbbs {
 namespace connectit {
 
   template<
@@ -211,5 +212,6 @@ double Benchmark_runner(Graph& G, commandLine P) {
     });
   return 1.0;
 }
+}  // namespace gbbs
 
-generate_symmetric_once_main(Benchmark_runner, false);
+generate_symmetric_once_main(gbbs::Benchmark_runner, false);
diff --git a/benchmarks/Connectivity/Framework/mains/liutarjan_nosample.cc b/benchmarks/Connectivity/Framework/mains/liutarjan_nosample.cc
@@ -29,6 +29,7 @@
 #include "bench_utils.h"
 #include "uf_utils.h"
 
+namespace gbbs {
 namespace connectit {
 
   template<
@@ -211,5 +212,6 @@ double Benchmark_runner(Graph& G, commandLine P) {
     });
   return 1.0;
 }
+}  // namespace gbbs
 
-generate_symmetric_once_main(Benchmark_runner, false);
+generate_symmetric_once_main(gbbs::Benchmark_runner, false);
diff --git a/benchmarks/Connectivity/Framework/mains/shiloach_vishkin.cc b/benchmarks/Connectivity/Framework/mains/shiloach_vishkin.cc
@@ -28,6 +28,7 @@
 
 #include "bench_utils.h"
 
+namespace gbbs {
 namespace connectit {
 template<
   class Graph,
@@ -93,5 +94,6 @@ double Benchmark_runner(Graph& G, commandLine P) {
     });
   return 1.0;
 }
+}  // namespace gbbs
 
-generate_symmetric_once_main(Benchmark_runner, false);
+generate_symmetric_once_main(gbbs::Benchmark_runner, false);