Move hashmap and unoredered_set one dir up

kstppd · Apr 9, 2024 · ea5f152 · ea5f152
1 parent 45dff96
commit ea5f152
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 28 deletions.
diff --git a/include/hashinator/hashmap/hashmap.h → include/hashinator/hashmap.h b/include/hashinator/hashmap/hashmap.h → include/hashinator/hashmap.h
@@ -24,20 +24,20 @@
 #ifdef HASHINATOR_CPU_ONLY_MODE
 #define SPLIT_CPU_ONLY_MODE
 #endif
-#include "../../common.h"
-#include "../../splitvector/gpu_wrappers.h"
-#include "../../splitvector/split_allocators.h"
-#include "../../splitvector/splitvec.h"
-#include "../defaults.h"
-#include "../hash_pair.h"
-#include "../hashfunctions.h"
+#include "../common.h"
+#include "../splitvector/gpu_wrappers.h"
+#include "../splitvector/split_allocators.h"
+#include "../splitvector/splitvec.h"
+#include "defaults.h"
+#include "hash_pair.h"
+#include "hashfunctions.h"
 #include <algorithm>
 #include <cassert>
 #include <limits>
 #include <stdexcept>
 #ifndef HASHINATOR_CPU_ONLY_MODE
-#include "../../splitvector/split_tools.h"
-#include "../hashers.h"
+#include "../splitvector/split_tools.h"
+#include "hashers.h"
 #endif
 
 namespace Hashinator {

diff --git a/.../hashinator/unordered_set/unordered_set.h → include/hashinator/unordered_set.h b/.../hashinator/unordered_set/unordered_set.h → include/hashinator/unordered_set.h
@@ -23,18 +23,18 @@
 #ifdef HASHINATOR_CPU_ONLY_MODE
 #define SPLIT_CPU_ONLY_MODE
 #endif
-#include "../../common.h"
-#include "../../splitvector/gpu_wrappers.h"
-#include "../../splitvector/split_allocators.h"
-#include "../../splitvector/splitvec.h"
-#include "../defaults.h"
-#include "../hash_pair.h"
-#include "../hashfunctions.h"
+#include "../common.h"
+#include "../splitvector/gpu_wrappers.h"
+#include "../splitvector/split_allocators.h"
+#include "../splitvector/splitvec.h"
+#include "defaults.h"
+#include "hash_pair.h"
+#include "hashfunctions.h"
 #include <algorithm>
 #include <stdexcept>
 #ifndef HASHINATOR_CPU_ONLY_MODE
-#include "../../splitvector/split_tools.h"
-#include "../hashers.h"
+#include "../splitvector/split_tools.h"
+#include "hashers.h"
 #endif
 #define UNUSED(x) (void)(x)
 namespace Hashinator {

diff --git a/unit_tests/benchmark/loadFactor.cu b/unit_tests/benchmark/loadFactor.cu
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <chrono>
 #include <unordered_set>
-#include "../../include/hashinator/hashmap/hashmap.h"
+#include "../../include/hashinator/hashmap.h"
 
 constexpr int R = 2;
 using namespace std::chrono;

diff --git a/unit_tests/benchmark/main.cu b/unit_tests/benchmark/main.cu
@@ -3,7 +3,7 @@
 #include <chrono>
 #include <unordered_set>
 #include <random>
-#include "../../include/hashinator/hashmap/hashmap.h"
+#include "../../include/hashinator/hashmap.h"
 #include <nvToolsExt.h>
 #define PROFILE_START(msg) nvtxRangePushA((msg))
 #define PROFILE_END() nvtxRangePop()

diff --git a/unit_tests/benchmark/realistic.cu b/unit_tests/benchmark/realistic.cu
@@ -3,7 +3,7 @@
 #include <chrono>
 #include <unordered_set>
 #include <random>
-#include "../../include/hashinator/hashmap/hashmap.h"
+#include "../../include/hashinator/hashmap.h"
 constexpr int R = 10;
 
 using namespace std::chrono;

diff --git a/unit_tests/benchmark/tbPerf.cu b/unit_tests/benchmark/tbPerf.cu
@@ -3,7 +3,7 @@
 #include <chrono>
 #include <unordered_set>
 #include <random>
-#include "../../include/hashinator/hashmap/hashmap.h"
+#include "../../include/hashinator/hashmap.h"
 static constexpr int R = 10;
 
 using namespace std::chrono;

diff --git a/unit_tests/delete_by_compaction/main.cu b/unit_tests/delete_by_compaction/main.cu
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <chrono>
 #include <random>
-#include "../../include/hashinator/hashmap/hashmap.h"
+#include "../../include/hashinator/hashmap.h"
 #include <gtest/gtest.h>
 
 #define BLOCKSIZE 32

diff --git a/unit_tests/hashmap_unit_test/main.cu b/unit_tests/hashmap_unit_test/main.cu
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <chrono>
 #include <random>
-#include "../../include/hashinator/hashmap/hashmap.h"
+#include "../../include/hashinator/hashmap.h"
 #include <gtest/gtest.h>
 #include <random>
 #include <algorithm>

diff --git a/unit_tests/hybrid/main.cu b/unit_tests/hybrid/main.cu
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <chrono>
 #include <random>
-#include "../../include/hashinator/hashmap/hashmap.h"
+#include "../../include/hashinator/hashmap.h"
 #include <gtest/gtest.h>
 
 

diff --git a/unit_tests/insertion_mechanism/main.cu b/unit_tests/insertion_mechanism/main.cu
@@ -4,7 +4,7 @@
 #include <algorithm>
 #include <vector>
 #include <random>
-#include "../../include/hashinator/hashmap/hashmap.h"
+#include "../../include/hashinator/hashmap.h"
 #include <gtest/gtest.h>
 
 #define BLOCKSIZE 1024

diff --git a/unit_tests/unordered_set_unit_test/main.cpp b/unit_tests/unordered_set_unit_test/main.cpp
@@ -3,7 +3,7 @@
 #define SPLIT_CPU_ONLY_MODE
 #define HASHINATOR_CPU_ONLY_MODE
 
-#include "../../include/hashinator/unordered_set/unordered_set.h"
+#include "../../include/hashinator/unordered_set.h"
 #include <gtest/gtest.h>
 #include <unordered_set>
 

diff --git a/unit_tests/unordered_set_unit_test/main.cu b/unit_tests/unordered_set_unit_test/main.cu
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "../../include/hashinator/unordered_set/unordered_set.h"
+#include "../../include/hashinator/unordered_set.h"
 #include <gtest/gtest.h>
 #include <unordered_set>