fix build; remove some unnecessary templates

ParAlg · Dec 25, 2020 · 7060711 · 7060711
1 parent 1e0eff2
commit 7060711
Show file tree

Hide file tree

Showing 55 changed files with 143 additions and 171 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,9 +6,11 @@
 *.o
 *.dSYM
 *.DS_Store
+*.gdb_history
 
 experimental
 cplib.sh
+gbbs.pyc
 
 /bazel-*
 .pytype

diff --git a/benchmarks/CliqueCounting/induced_split.h b/benchmarks/CliqueCounting/induced_split.h
@@ -19,7 +19,7 @@ namespace induced_split {
     };
     par_for(0, DG.n, [&] (size_t i) {
       auto monoid = pbbslib::addm<size_t>();
-      parallel_work[i] = DG.get_vertex(i).template reduceOutNgh<size_t>(i, map_f, monoid);
+      parallel_work[i] = DG.get_vertex(i).reduceOutNgh(i, map_f, monoid);
     });
     }
     size_t total_work = pbbslib::scan_add_inplace(parallel_work.slice());

diff --git a/benchmarks/Connectivity/ConnectIt/benchmark_edge_gather.cc b/benchmarks/Connectivity/ConnectIt/benchmark_edge_gather.cc
@@ -45,7 +45,7 @@ double TestEdgeGather(Graph& G, commandLine& P) {
         return arr[v];
       };
       auto reduce_m = pbbs::addm<size_t>();
-      u_vtx.template reduceOutNgh<size_t>(u, map_f, reduce_m);
+      u_vtx.reduceOutNgh(u, map_f, reduce_m);
     }, 512);
     double edge_gather_time = t.stop();
 
@@ -83,7 +83,7 @@ double TestEdgeMap(Graph& G, commandLine& P) {
         return static_cast<size_t>(1);
       };
       auto reduce_m = pbbs::addm<size_t>();
-      out[u] = u_vtx.template reduceOutNgh<size_t>(u, map_f, reduce_m);
+      out[u] = u_vtx.reduceOutNgh(u, map_f, reduce_m);
     }, 512);
     double edge_gather_time = t.stop();
 

diff --git a/benchmarks/Connectivity/ConnectIt/benchmark_sampling.cc b/benchmarks/Connectivity/ConnectIt/benchmark_sampling.cc
@@ -47,7 +47,7 @@ size_t intercomponent_edges(Graph& G, pbbs::sequence<parent>& parents) {
       return static_cast<size_t>(0);
     };
     auto red_m = pbbs::addm<size_t>();
-    ic_edges[u] = G.get_vertex(u).template reduceOutNgh<size_t>(u, map_f, red_m);
+    ic_edges[u] = G.get_vertex(u).reduceOutNgh(u, map_f, red_m);
   });
   return pbbslib::reduce_add(ic_edges.slice());
 }

diff --git a/benchmarks/Connectivity/ConnectIt/mains/bfscc.cc b/benchmarks/Connectivity/ConnectIt/mains/bfscc.cc
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "benchmarks/Connectivity/Framework/framework.h"
+#include "benchmarks/Connectivity/ConnectIt/framework.h"
 #include "benchmarks/Connectivity/WorkEfficientSDB14/Connectivity.h"
 #include "benchmarks/Connectivity/BFSCC/Connectivity.h"
 #include "benchmarks/Connectivity/common.h"

diff --git a/benchmarks/Connectivity/ConnectIt/mains/gbbscc.cc b/benchmarks/Connectivity/ConnectIt/mains/gbbscc.cc
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "benchmarks/Connectivity/Framework/framework.h"
+#include "benchmarks/Connectivity/ConnectIt/framework.h"
 #include "benchmarks/Connectivity/WorkEfficientSDB14/Connectivity.h"
 #include "benchmarks/Connectivity/BFSCC/Connectivity.h"
 #include "benchmarks/Connectivity/common.h"

diff --git a/benchmarks/Connectivity/ConnectIt/mains/jayanti_bfs.cc b/benchmarks/Connectivity/ConnectIt/mains/jayanti_bfs.cc
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "benchmarks/Connectivity/Framework/framework.h"
+#include "benchmarks/Connectivity/ConnectIt/framework.h"
 #include "benchmarks/Connectivity/WorkEfficientSDB14/Connectivity.h"
 #include "benchmarks/Connectivity/BFSCC/Connectivity.h"
 #include "benchmarks/Connectivity/common.h"

diff --git a/benchmarks/Connectivity/ConnectIt/mains/jayanti_kout.cc b/benchmarks/Connectivity/ConnectIt/mains/jayanti_kout.cc
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "benchmarks/Connectivity/Framework/framework.h"
+#include "benchmarks/Connectivity/ConnectIt/framework.h"
 #include "benchmarks/Connectivity/WorkEfficientSDB14/Connectivity.h"
 #include "benchmarks/Connectivity/BFSCC/Connectivity.h"
 #include "benchmarks/Connectivity/common.h"

diff --git a/benchmarks/Connectivity/ConnectIt/mains/jayanti_ldd.cc b/benchmarks/Connectivity/ConnectIt/mains/jayanti_ldd.cc
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "benchmarks/Connectivity/Framework/framework.h"
+#include "benchmarks/Connectivity/ConnectIt/framework.h"
 #include "benchmarks/Connectivity/WorkEfficientSDB14/Connectivity.h"
 #include "benchmarks/Connectivity/BFSCC/Connectivity.h"
 #include "benchmarks/Connectivity/common.h"

diff --git a/benchmarks/Connectivity/ConnectIt/mains/jayanti_nosample.cc b/benchmarks/Connectivity/ConnectIt/mains/jayanti_nosample.cc
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "benchmarks/Connectivity/Framework/framework.h"
+#include "benchmarks/Connectivity/ConnectIt/framework.h"
 #include "benchmarks/Connectivity/WorkEfficientSDB14/Connectivity.h"
 #include "benchmarks/Connectivity/BFSCC/Connectivity.h"
 #include "benchmarks/Connectivity/common.h"

diff --git a/benchmarks/Connectivity/ConnectIt/mains/label_propagation.cc b/benchmarks/Connectivity/ConnectIt/mains/label_propagation.cc
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "benchmarks/Connectivity/Framework/framework.h"
+#include "benchmarks/Connectivity/ConnectIt/framework.h"
 #include "benchmarks/Connectivity/WorkEfficientSDB14/Connectivity.h"
 #include "benchmarks/Connectivity/BFSCC/Connectivity.h"
 #include "benchmarks/Connectivity/common.h"

diff --git a/benchmarks/Connectivity/ConnectIt/mains/liutarjan_bfs.cc b/benchmarks/Connectivity/ConnectIt/mains/liutarjan_bfs.cc
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "benchmarks/Connectivity/Framework/framework.h"
+#include "benchmarks/Connectivity/ConnectIt/framework.h"
 #include "benchmarks/Connectivity/WorkEfficientSDB14/Connectivity.h"
 #include "benchmarks/Connectivity/BFSCC/Connectivity.h"
 #include "benchmarks/Connectivity/common.h"

diff --git a/benchmarks/Connectivity/ConnectIt/mains/liutarjan_kout.cc b/benchmarks/Connectivity/ConnectIt/mains/liutarjan_kout.cc
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "benchmarks/Connectivity/Framework/framework.h"
+#include "benchmarks/Connectivity/ConnectIt/framework.h"
 #include "benchmarks/Connectivity/WorkEfficientSDB14/Connectivity.h"
 #include "benchmarks/Connectivity/BFSCC/Connectivity.h"
 #include "benchmarks/Connectivity/common.h"

diff --git a/benchmarks/Connectivity/ConnectIt/mains/liutarjan_ldd.cc b/benchmarks/Connectivity/ConnectIt/mains/liutarjan_ldd.cc
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "benchmarks/Connectivity/Framework/framework.h"
+#include "benchmarks/Connectivity/ConnectIt/framework.h"
 #include "benchmarks/Connectivity/WorkEfficientSDB14/Connectivity.h"
 #include "benchmarks/Connectivity/BFSCC/Connectivity.h"
 #include "benchmarks/Connectivity/common.h"

diff --git a/benchmarks/Connectivity/ConnectIt/mains/liutarjan_nosample.cc b/benchmarks/Connectivity/ConnectIt/mains/liutarjan_nosample.cc
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "benchmarks/Connectivity/Framework/framework.h"
+#include "benchmarks/Connectivity/ConnectIt/framework.h"
 #include "benchmarks/Connectivity/WorkEfficientSDB14/Connectivity.h"
 #include "benchmarks/Connectivity/BFSCC/Connectivity.h"
 #include "benchmarks/Connectivity/common.h"

diff --git a/benchmarks/Connectivity/ConnectIt/mains/shiloach_vishkin.cc b/benchmarks/Connectivity/ConnectIt/mains/shiloach_vishkin.cc
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "benchmarks/Connectivity/Framework/framework.h"
+#include "benchmarks/Connectivity/ConnectIt/framework.h"
 #include "benchmarks/Connectivity/WorkEfficientSDB14/Connectivity.h"
 #include "benchmarks/Connectivity/BFSCC/Connectivity.h"
 #include "benchmarks/Connectivity/common.h"

diff --git a/benchmarks/Connectivity/ConnectIt/mains/unite_bfs.cc b/benchmarks/Connectivity/ConnectIt/mains/unite_bfs.cc
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "benchmarks/Connectivity/Framework/framework.h"
+#include "benchmarks/Connectivity/ConnectIt/framework.h"
 #include "benchmarks/Connectivity/WorkEfficientSDB14/Connectivity.h"
 #include "benchmarks/Connectivity/BFSCC/Connectivity.h"
 #include "benchmarks/Connectivity/common.h"

diff --git a/benchmarks/Connectivity/ConnectIt/mains/unite_early_bfs.cc b/benchmarks/Connectivity/ConnectIt/mains/unite_early_bfs.cc
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "benchmarks/Connectivity/Framework/framework.h"
+#include "benchmarks/Connectivity/ConnectIt/framework.h"
 #include "benchmarks/Connectivity/WorkEfficientSDB14/Connectivity.h"
 #include "benchmarks/Connectivity/BFSCC/Connectivity.h"
 #include "benchmarks/Connectivity/common.h"

diff --git a/benchmarks/Connectivity/ConnectIt/mains/unite_early_kout.cc b/benchmarks/Connectivity/ConnectIt/mains/unite_early_kout.cc
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "benchmarks/Connectivity/Framework/framework.h"
+#include "benchmarks/Connectivity/ConnectIt/framework.h"
 #include "benchmarks/Connectivity/WorkEfficientSDB14/Connectivity.h"
 #include "benchmarks/Connectivity/BFSCC/Connectivity.h"
 #include "benchmarks/Connectivity/common.h"

diff --git a/benchmarks/Connectivity/ConnectIt/mains/unite_early_ldd.cc b/benchmarks/Connectivity/ConnectIt/mains/unite_early_ldd.cc
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "benchmarks/Connectivity/Framework/framework.h"
+#include "benchmarks/Connectivity/ConnectIt/framework.h"
 #include "benchmarks/Connectivity/WorkEfficientSDB14/Connectivity.h"
 #include "benchmarks/Connectivity/BFSCC/Connectivity.h"
 #include "benchmarks/Connectivity/common.h"

diff --git a/benchmarks/Connectivity/ConnectIt/mains/unite_early_nosample.cc b/benchmarks/Connectivity/ConnectIt/mains/unite_early_nosample.cc
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "benchmarks/Connectivity/Framework/framework.h"
+#include "benchmarks/Connectivity/ConnectIt/framework.h"
 #include "benchmarks/Connectivity/WorkEfficientSDB14/Connectivity.h"
 #include "benchmarks/Connectivity/BFSCC/Connectivity.h"
 #include "benchmarks/Connectivity/common.h"

diff --git a/benchmarks/Connectivity/ConnectIt/mains/unite_kout.cc b/benchmarks/Connectivity/ConnectIt/mains/unite_kout.cc
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "benchmarks/Connectivity/Framework/framework.h"
+#include "benchmarks/Connectivity/ConnectIt/framework.h"
 #include "benchmarks/Connectivity/WorkEfficientSDB14/Connectivity.h"
 #include "benchmarks/Connectivity/BFSCC/Connectivity.h"
 #include "benchmarks/Connectivity/common.h"

diff --git a/benchmarks/Connectivity/ConnectIt/mains/unite_ldd.cc b/benchmarks/Connectivity/ConnectIt/mains/unite_ldd.cc
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "benchmarks/Connectivity/Framework/framework.h"
+#include "benchmarks/Connectivity/ConnectIt/framework.h"
 #include "benchmarks/Connectivity/WorkEfficientSDB14/Connectivity.h"
 #include "benchmarks/Connectivity/BFSCC/Connectivity.h"
 #include "benchmarks/Connectivity/common.h"

diff --git a/benchmarks/Connectivity/ConnectIt/mains/unite_nd_bfs.cc b/benchmarks/Connectivity/ConnectIt/mains/unite_nd_bfs.cc
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "benchmarks/Connectivity/Framework/framework.h"
+#include "benchmarks/Connectivity/ConnectIt/framework.h"
 #include "benchmarks/Connectivity/WorkEfficientSDB14/Connectivity.h"
 #include "benchmarks/Connectivity/BFSCC/Connectivity.h"
 #include "benchmarks/Connectivity/common.h"

diff --git a/benchmarks/Connectivity/ConnectIt/mains/unite_nd_kout.cc b/benchmarks/Connectivity/ConnectIt/mains/unite_nd_kout.cc
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "benchmarks/Connectivity/Framework/framework.h"
+#include "benchmarks/Connectivity/ConnectIt/framework.h"
 #include "benchmarks/Connectivity/WorkEfficientSDB14/Connectivity.h"
 #include "benchmarks/Connectivity/BFSCC/Connectivity.h"
 #include "benchmarks/Connectivity/common.h"

diff --git a/benchmarks/Connectivity/ConnectIt/mains/unite_nd_ldd.cc b/benchmarks/Connectivity/ConnectIt/mains/unite_nd_ldd.cc
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "benchmarks/Connectivity/Framework/framework.h"
+#include "benchmarks/Connectivity/ConnectIt/framework.h"
 #include "benchmarks/Connectivity/WorkEfficientSDB14/Connectivity.h"
 #include "benchmarks/Connectivity/BFSCC/Connectivity.h"
 #include "benchmarks/Connectivity/common.h"

diff --git a/benchmarks/Connectivity/ConnectIt/mains/unite_nd_nosample.cc b/benchmarks/Connectivity/ConnectIt/mains/unite_nd_nosample.cc
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "benchmarks/Connectivity/Framework/framework.h"
+#include "benchmarks/Connectivity/ConnectIt/framework.h"
 #include "benchmarks/Connectivity/WorkEfficientSDB14/Connectivity.h"
 #include "benchmarks/Connectivity/BFSCC/Connectivity.h"
 #include "benchmarks/Connectivity/common.h"

diff --git a/benchmarks/Connectivity/ConnectIt/mains/unite_nosample.cc b/benchmarks/Connectivity/ConnectIt/mains/unite_nosample.cc
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "benchmarks/Connectivity/Framework/framework.h"
+#include "benchmarks/Connectivity/ConnectIt/framework.h"
 #include "benchmarks/Connectivity/WorkEfficientSDB14/Connectivity.h"
 #include "benchmarks/Connectivity/BFSCC/Connectivity.h"
 #include "benchmarks/Connectivity/common.h"

diff --git a/benchmarks/Connectivity/ConnectIt/mains/unite_rem_cas_bfs.cc b/benchmarks/Connectivity/ConnectIt/mains/unite_rem_cas_bfs.cc
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "benchmarks/Connectivity/Framework/framework.h"
+#include "benchmarks/Connectivity/ConnectIt/framework.h"
 #include "benchmarks/Connectivity/WorkEfficientSDB14/Connectivity.h"
 #include "benchmarks/Connectivity/BFSCC/Connectivity.h"
 #include "benchmarks/Connectivity/common.h"

diff --git a/benchmarks/Connectivity/ConnectIt/mains/unite_rem_cas_kout.cc b/benchmarks/Connectivity/ConnectIt/mains/unite_rem_cas_kout.cc
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "benchmarks/Connectivity/Framework/framework.h"
+#include "benchmarks/Connectivity/ConnectIt/framework.h"
 #include "benchmarks/Connectivity/WorkEfficientSDB14/Connectivity.h"
 #include "benchmarks/Connectivity/BFSCC/Connectivity.h"
 #include "benchmarks/Connectivity/common.h"

diff --git a/benchmarks/Connectivity/ConnectIt/mains/unite_rem_cas_ldd.cc b/benchmarks/Connectivity/ConnectIt/mains/unite_rem_cas_ldd.cc
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "benchmarks/Connectivity/Framework/framework.h"
+#include "benchmarks/Connectivity/ConnectIt/framework.h"
 #include "benchmarks/Connectivity/WorkEfficientSDB14/Connectivity.h"
 #include "benchmarks/Connectivity/BFSCC/Connectivity.h"
 #include "benchmarks/Connectivity/common.h"

diff --git a/benchmarks/Connectivity/ConnectIt/mains/unite_rem_cas_nosample.cc b/benchmarks/Connectivity/ConnectIt/mains/unite_rem_cas_nosample.cc
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "benchmarks/Connectivity/Framework/framework.h"
+#include "benchmarks/Connectivity/ConnectIt/framework.h"
 #include "benchmarks/Connectivity/WorkEfficientSDB14/Connectivity.h"
 #include "benchmarks/Connectivity/BFSCC/Connectivity.h"
 #include "benchmarks/Connectivity/common.h"

diff --git a/benchmarks/Connectivity/ConnectIt/mains/unite_rem_lock_bfs.cc b/benchmarks/Connectivity/ConnectIt/mains/unite_rem_lock_bfs.cc
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "benchmarks/Connectivity/Framework/framework.h"
+#include "benchmarks/Connectivity/ConnectIt/framework.h"
 #include "benchmarks/Connectivity/WorkEfficientSDB14/Connectivity.h"
 #include "benchmarks/Connectivity/BFSCC/Connectivity.h"
 #include "benchmarks/Connectivity/common.h"

diff --git a/benchmarks/Connectivity/ConnectIt/mains/unite_rem_lock_kout.cc b/benchmarks/Connectivity/ConnectIt/mains/unite_rem_lock_kout.cc
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "benchmarks/Connectivity/Framework/framework.h"
+#include "benchmarks/Connectivity/ConnectIt/framework.h"
 #include "benchmarks/Connectivity/WorkEfficientSDB14/Connectivity.h"
 #include "benchmarks/Connectivity/BFSCC/Connectivity.h"
 #include "benchmarks/Connectivity/common.h"

diff --git a/benchmarks/Connectivity/ConnectIt/mains/unite_rem_lock_ldd.cc b/benchmarks/Connectivity/ConnectIt/mains/unite_rem_lock_ldd.cc
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "benchmarks/Connectivity/Framework/framework.h"
+#include "benchmarks/Connectivity/ConnectIt/framework.h"
 #include "benchmarks/Connectivity/WorkEfficientSDB14/Connectivity.h"
 #include "benchmarks/Connectivity/BFSCC/Connectivity.h"
 #include "benchmarks/Connectivity/common.h"

diff --git a/benchmarks/Connectivity/ConnectIt/mains/unite_rem_lock_nosample.cc b/benchmarks/Connectivity/ConnectIt/mains/unite_rem_lock_nosample.cc
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "benchmarks/Connectivity/Framework/framework.h"
+#include "benchmarks/Connectivity/ConnectIt/framework.h"
 #include "benchmarks/Connectivity/WorkEfficientSDB14/Connectivity.h"
 #include "benchmarks/Connectivity/BFSCC/Connectivity.h"
 #include "benchmarks/Connectivity/common.h"

diff --git a/benchmarks/Connectivity/ConnectIt/sampling.h b/benchmarks/Connectivity/ConnectIt/sampling.h
@@ -203,7 +203,7 @@ struct KOutSamplingTemplate {
               }
             };
             auto reduce_m = pbbs::make_monoid(reduce_f, std::make_pair(0, 0));
-            auto [ngh, degree] = u_vtx.template reduceOutNgh<int_pair>(u, map_f, reduce_m);
+            auto [ngh, degree] = u_vtx.reduceOutNgh(u, map_f, reduce_m);
             (void)degree;
             link(u, ngh, parents);
           }

diff --git a/benchmarks/Connectivity/Incremental/mains/bench_utils.h b/benchmarks/Connectivity/Incremental/mains/bench_utils.h
@@ -2,8 +2,8 @@
 
 #include <iomanip>
 
-#include "benchmarks/Connectivity/Framework/framework.h"
-#include "benchmarks/Connectivity/Framework/mains/check.h"
+#include "benchmarks/Connectivity/ConnectIt/framework.h"
+#include "benchmarks/Connectivity/ConnectIt/mains/check.h"
 #include "gbbs/gbbs.h"
 
 /* ************************* Benchmark Utils *************************** */