stuff

Author: Gillgamesh

CMakeLists.txt

@@ -70,7 +70,7 @@ FetchContent_Declare(
 )
 
 FetchContent_Declare(
-  highway
+  hwy
 
   GIT_REPOSITORY https://github.com/google/highway.git
   GIT_TAG        1.2.0
@@ -80,10 +80,10 @@ set(HWY_ENABLE_EXAMPLES OFF CACHE INTERNAL "Disable highway examples")
 set(HWY_ENABLE_TESTS OFF CACHE INTERNAL "Disable highway tests")
 
 # Get google highway
-FetchContent_MakeAvailable(highway)
+FetchContent_MakeAvailable(hwy)
 
 # Ensure highway target is explicitly added
-add_library(highway INTERFACE IMPORTED)
+#add_library(highway INTERFACE IMPORTED)
 
 if (BUILD_BENCH)
   # Get Google Benchmark
@@ -121,8 +121,8 @@ add_library(GraphZeppelin
   src/sketch.cpp
   src/recovery.cpp
   src/util.cpp)
-add_dependencies(GraphZeppelin GutterTree StreamingUtilities highway)
-target_link_libraries(GraphZeppelin PUBLIC xxhash GutterTree StreamingUtilities highway)
+add_dependencies(GraphZeppelin GutterTree StreamingUtilities hwy)
+target_link_libraries(GraphZeppelin PUBLIC xxhash GutterTree StreamingUtilities hwy)
 target_include_directories(GraphZeppelin PUBLIC include/)
 target_compile_options(GraphZeppelin PUBLIC -fopenmp)
 target_link_options(GraphZeppelin PUBLIC -fopenmp)
@@ -137,8 +137,8 @@ add_library(GraphZeppelinVerifyCC
   src/recovery.cpp
   src/util.cpp
   test/util/graph_verifier.cpp)
-add_dependencies(GraphZeppelinVerifyCC GutterTree StreamingUtilities highway)
-target_link_libraries(GraphZeppelinVerifyCC PUBLIC xxhash GutterTree StreamingUtilities highway )
+add_dependencies(GraphZeppelinVerifyCC GutterTree StreamingUtilities hwy)
+target_link_libraries(GraphZeppelinVerifyCC PUBLIC xxhash GutterTree StreamingUtilities hwy )
 target_include_directories(GraphZeppelinVerifyCC PUBLIC include/ include/test/)
 target_compile_options(GraphZeppelinVerifyCC PUBLIC -fopenmp)
 target_link_options(GraphZeppelinVerifyCC PUBLIC -fopenmp)

src/sketch.cpp

@@ -444,11 +444,11 @@ void Sketch::merge(const Sketch &other) {
     uint32_t *our_starting_bucket = (uint32_t*) (buckets + our_starting_bucket_idx);
     uint32_t *other_starting_bucket = (uint32_t*) (other.buckets + other_starting_bucket_idx);
 
-    hwy::HWY_NAMESPACE::simd_xor(our_starting_bucket, other_starting_bucket,
-                                 num_words);
-    // for (size_t word=0; word < num_words; ++word) {
-    //   our_starting_bucket[word] ^= other_starting_bucket[word];
-    // }
+    // hwy::HWY_NAMESPACE::simd_xor(our_starting_bucket, other_starting_bucket,
+    //                              num_words);
+    for (size_t word=0; word < num_words; ++word) {
+      our_starting_bucket[word] ^= other_starting_bucket[word];
+    }
     // NO SIMD but more stable
     // for (size_t bucket_id=0; bucket_id < other_effective_size; bucket_id++) {
     //   get_bucket(i, bucket_id) ^= other.get_bucket(i, bucket_id);