Switch over to using streaming repository

CMakeLists.txt

@@ -43,19 +43,19 @@ else()
   message (STATUS "GraphZeppelin building executables")
 endif()
 
-# Get xxHash
+# Get GutterTree Project
 FetchContent_Declare(
-  xxhash
+  GutterTree
 
-  GIT_REPOSITORY https://github.com/Cyan4973/xxHash.git
-  GIT_TAG        v0.8.0
+  GIT_REPOSITORY  https://github.com/GraphStreamingProject/GutterTree.git
+  GIT_TAG         main
 )
 
-# Get GutterTree Project
+# Get StreamingUtilities
 FetchContent_Declare(
-  GutterTree
+  StreamingUtilities
 
-  GIT_REPOSITORY  https://github.com/GraphStreamingProject/GutterTree.git
+  GIT_REPOSITORY  https://github.com/GraphStreamingProject/StreamingUtilities.git
   GIT_TAG         main
 )
 
@@ -72,21 +72,7 @@ if (BUILD_BENCH)
   FetchContent_MakeAvailable(benchmark)
 endif()
 
-FetchContent_MakeAvailable(xxHash GutterTree)
-#####
-# Some additional steps for xxHash as it is unofficial
-#####
-#xxHash messes with BUILD_SHARED_LIBS if it is empty
-set(SAVED_BUILD_SHARED_LIBS "${BUILD_SHARED_LIBS}")
-
-add_subdirectory(
-  "${xxhash_SOURCE_DIR}/cmake_unofficial"
-  "${xxhash_BINARY_DIR}"
-  EXCLUDE_FROM_ALL
-)
-#Restore BUILD_SHARED_LIBS
-set(BUILD_SHARED_LIBS "${SAVED_BUILD_SHARED_LIBS}" CACHE BOOL "" FORCE)
-
+FetchContent_MakeAvailable(GutterTree StreamingUtilities)
 
 # AVAILABLE COMPILATION DEFINITIONS:
 # VERIFY_SAMPLES_F   Use a deterministic connected-components
@@ -107,8 +93,8 @@ add_library(GraphZeppelin
   src/cc_alg_configuration.cpp
   src/sketch.cpp
   src/util.cpp)
-add_dependencies(GraphZeppelin GutterTree)
-target_link_libraries(GraphZeppelin PUBLIC xxhash GutterTree)
+add_dependencies(GraphZeppelin GutterTree StreamingUtilities)
+target_link_libraries(GraphZeppelin PUBLIC xxhash GutterTree StreamingUtilities)
 target_include_directories(GraphZeppelin PUBLIC include/)
 target_compile_options(GraphZeppelin PUBLIC -fopenmp)
 target_link_options(GraphZeppelin PUBLIC -fopenmp)
@@ -123,8 +109,8 @@ add_library(GraphZeppelinVerifyCC
   src/util.cpp
   test/util/file_graph_verifier.cpp
   test/util/mat_graph_verifier.cpp)
-add_dependencies(GraphZeppelinVerifyCC GutterTree)
-target_link_libraries(GraphZeppelinVerifyCC PUBLIC xxhash GutterTree)
+add_dependencies(GraphZeppelinVerifyCC GutterTree StreamingUtilities)
+target_link_libraries(GraphZeppelinVerifyCC PUBLIC xxhash GutterTree StreamingUtilities)
 target_include_directories(GraphZeppelinVerifyCC PUBLIC include/ include/test/)
 target_compile_options(GraphZeppelinVerifyCC PUBLIC -fopenmp)
 target_link_options(GraphZeppelinVerifyCC PUBLIC -fopenmp)
@@ -138,31 +124,10 @@ if (BUILD_EXE)
     test/dsu_test.cpp
     test/util_test.cpp
     test/util/file_graph_verifier.cpp
-    test/util/graph_gen.cpp
-    test/util/graph_gen_test.cpp
     test/util/graph_verifier_test.cpp)
   add_dependencies(tests GraphZeppelinVerifyCC)
   target_link_libraries(tests PRIVATE GraphZeppelinVerifyCC)
 
-  add_executable(statistical_test
-    tools/statistical_testing/graph_testing.cpp
-    test/util/file_graph_verifier.cpp
-    test/util/graph_gen.cpp)
-  add_dependencies(statistical_test GraphZeppelinVerifyCC)
-  target_link_libraries(statistical_test PRIVATE GraphZeppelinVerifyCC)
-
-  # executables for experiment/benchmarking
-  add_executable(efficient_gen
-    src/util.cpp
-    test/util/efficient_gen/edge_gen.cpp
-    test/util/efficient_gen/efficient_gen.cpp)
-  target_link_libraries(efficient_gen PRIVATE xxhash GraphZeppelinCommon)
-
-  # executable for converting to stream format
-  add_executable(to_binary_format
-    tools/to_binary_format.cpp)
-  target_link_libraries(to_binary_format PRIVATE GraphZeppelinCommon)
-
   # executable for processing a binary graph stream
   add_executable(process_stream
     tools/process_stream.cpp)
@@ -172,12 +137,6 @@ if (BUILD_EXE)
   add_executable(test_correctness
     tools/test_correctness.cpp)
   target_link_libraries(test_correctness PRIVATE GraphZeppelinVerifyCC)
-
-  # tool for validating that a binary stream appears correct  
-  add_executable(validate_binary_stream
-    tools/validate_binary_stream.cpp
-  )
-  target_link_libraries(validate_binary_stream PRIVATE GraphZeppelin)
 endif()
 
 if (BUILD_BENCH)

include/graph_sketch_driver.h

@@ -58,8 +58,8 @@ class GraphSketchDriver {
   FRIEND_TEST(GraphTest, TestSupernodeRestoreAfterCCFailure);
  public:
   GraphSketchDriver(Alg *sketching_alg, GraphStream *stream, DriverConfiguration config,
-                    size_t num_inserters = 1)
-      : sketching_alg(sketching_alg), stream(stream), num_stream_threads(num_inserters) {
+                    size_t num_stream_threads = 1)
+      : sketching_alg(sketching_alg), stream(stream), num_stream_threads(num_stream_threads) {
     sketching_alg->allocate_worker_memory(config.get_worker_threads());
     // set the leaf size of the guttering system appropriately
     if (config.gutter_conf().get_gutter_bytes() == GutteringConfiguration::uninit_param) {