From ea5f152aae84fa2d9f9ed93a16f5539bb1f478bc Mon Sep 17 00:00:00 2001 From: kstppd Date: Tue, 9 Apr 2024 14:16:17 +0300 Subject: [PATCH] Move hashmap and unoredered_set one dir up --- include/hashinator/{hashmap => }/hashmap.h | 18 +++++++++--------- .../{unordered_set => }/unordered_set.h | 18 +++++++++--------- unit_tests/benchmark/loadFactor.cu | 2 +- unit_tests/benchmark/main.cu | 2 +- unit_tests/benchmark/realistic.cu | 2 +- unit_tests/benchmark/tbPerf.cu | 2 +- unit_tests/delete_by_compaction/main.cu | 2 +- unit_tests/hashmap_unit_test/main.cu | 2 +- unit_tests/hybrid/main.cu | 2 +- unit_tests/insertion_mechanism/main.cu | 2 +- unit_tests/unordered_set_unit_test/main.cpp | 2 +- unit_tests/unordered_set_unit_test/main.cu | 2 +- 12 files changed, 28 insertions(+), 28 deletions(-) rename include/hashinator/{hashmap => }/hashmap.h (99%) rename include/hashinator/{unordered_set => }/unordered_set.h (99%) diff --git a/include/hashinator/hashmap/hashmap.h b/include/hashinator/hashmap.h similarity index 99% rename from include/hashinator/hashmap/hashmap.h rename to include/hashinator/hashmap.h index 079fc3b..3d94ba2 100644 --- a/include/hashinator/hashmap/hashmap.h +++ b/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 #include #include #include #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/include/hashinator/unordered_set/unordered_set.h b/include/hashinator/unordered_set.h similarity index 99% rename from include/hashinator/unordered_set/unordered_set.h rename to include/hashinator/unordered_set.h index 8e97b62..fd99828 100644 --- a/include/hashinator/unordered_set/unordered_set.h +++ b/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 #include #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 index 675f696..ec365f8 100644 --- a/unit_tests/benchmark/loadFactor.cu +++ b/unit_tests/benchmark/loadFactor.cu @@ -2,7 +2,7 @@ #include #include #include -#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 index 0d34479..0238148 100644 --- a/unit_tests/benchmark/main.cu +++ b/unit_tests/benchmark/main.cu @@ -3,7 +3,7 @@ #include #include #include -#include "../../include/hashinator/hashmap/hashmap.h" +#include "../../include/hashinator/hashmap.h" #include #define PROFILE_START(msg) nvtxRangePushA((msg)) #define PROFILE_END() nvtxRangePop() diff --git a/unit_tests/benchmark/realistic.cu b/unit_tests/benchmark/realistic.cu index 64f257f..5f1b8c6 100644 --- a/unit_tests/benchmark/realistic.cu +++ b/unit_tests/benchmark/realistic.cu @@ -3,7 +3,7 @@ #include #include #include -#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 index f8c204c..8f76f9a 100644 --- a/unit_tests/benchmark/tbPerf.cu +++ b/unit_tests/benchmark/tbPerf.cu @@ -3,7 +3,7 @@ #include #include #include -#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 index fb063e7..a48abc5 100644 --- a/unit_tests/delete_by_compaction/main.cu +++ b/unit_tests/delete_by_compaction/main.cu @@ -2,7 +2,7 @@ #include #include #include -#include "../../include/hashinator/hashmap/hashmap.h" +#include "../../include/hashinator/hashmap.h" #include #define BLOCKSIZE 32 diff --git a/unit_tests/hashmap_unit_test/main.cu b/unit_tests/hashmap_unit_test/main.cu index cecd608..c54eeae 100644 --- a/unit_tests/hashmap_unit_test/main.cu +++ b/unit_tests/hashmap_unit_test/main.cu @@ -2,7 +2,7 @@ #include #include #include -#include "../../include/hashinator/hashmap/hashmap.h" +#include "../../include/hashinator/hashmap.h" #include #include #include diff --git a/unit_tests/hybrid/main.cu b/unit_tests/hybrid/main.cu index 732d284..077e369 100644 --- a/unit_tests/hybrid/main.cu +++ b/unit_tests/hybrid/main.cu @@ -2,7 +2,7 @@ #include #include #include -#include "../../include/hashinator/hashmap/hashmap.h" +#include "../../include/hashinator/hashmap.h" #include diff --git a/unit_tests/insertion_mechanism/main.cu b/unit_tests/insertion_mechanism/main.cu index d186481..09f4eac 100644 --- a/unit_tests/insertion_mechanism/main.cu +++ b/unit_tests/insertion_mechanism/main.cu @@ -4,7 +4,7 @@ #include #include #include -#include "../../include/hashinator/hashmap/hashmap.h" +#include "../../include/hashinator/hashmap.h" #include #define BLOCKSIZE 1024 diff --git a/unit_tests/unordered_set_unit_test/main.cpp b/unit_tests/unordered_set_unit_test/main.cpp index 7325c07..c318ec9 100644 --- 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 #include diff --git a/unit_tests/unordered_set_unit_test/main.cu b/unit_tests/unordered_set_unit_test/main.cu index 5f551d9..8e28411 100644 --- a/unit_tests/unordered_set_unit_test/main.cu +++ b/unit_tests/unordered_set_unit_test/main.cu @@ -1,5 +1,5 @@ #include -#include "../../include/hashinator/unordered_set/unordered_set.h" +#include "../../include/hashinator/unordered_set.h" #include #include