From 71c489ef8c02a6f11fa826bbd181eb6e18d5b60f Mon Sep 17 00:00:00 2001
From: "Frank J. T. Wojcik" <fwojcik@uw.edu>
Date: Sun, 12 Dec 2021 19:37:01 -0800
Subject: [PATCH] Move hashmap code to util/, and remove unneeded -I flags

---
 CMakeLists.txt                                    | 7 +++----
 {tests => util}/parallel_hashmap/LICENSE          | 0
 {tests => util}/parallel_hashmap/README.md        | 0
 {tests => util}/parallel_hashmap/btree.h          | 0
 {tests => util}/parallel_hashmap/meminfo.h        | 0
 {tests => util}/parallel_hashmap/phmap.h          | 0
 {tests => util}/parallel_hashmap/phmap.natvis     | 0
 {tests => util}/parallel_hashmap/phmap_base.h     | 0
 {tests => util}/parallel_hashmap/phmap_bits.h     | 0
 {tests => util}/parallel_hashmap/phmap_config.h   | 0
 {tests => util}/parallel_hashmap/phmap_dump.h     | 0
 {tests => util}/parallel_hashmap/phmap_fwd_decl.h | 0
 {tests => util}/parallel_hashmap/phmap_utils.h    | 0
 13 files changed, 3 insertions(+), 4 deletions(-)
 rename {tests => util}/parallel_hashmap/LICENSE (100%)
 rename {tests => util}/parallel_hashmap/README.md (100%)
 rename {tests => util}/parallel_hashmap/btree.h (100%)
 rename {tests => util}/parallel_hashmap/meminfo.h (100%)
 rename {tests => util}/parallel_hashmap/phmap.h (100%)
 rename {tests => util}/parallel_hashmap/phmap.natvis (100%)
 rename {tests => util}/parallel_hashmap/phmap_base.h (100%)
 rename {tests => util}/parallel_hashmap/phmap_bits.h (100%)
 rename {tests => util}/parallel_hashmap/phmap_config.h (100%)
 rename {tests => util}/parallel_hashmap/phmap_dump.h (100%)
 rename {tests => util}/parallel_hashmap/phmap_fwd_decl.h (100%)
 rename {tests => util}/parallel_hashmap/phmap_utils.h (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d3ae8988..fde3c248 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -499,17 +499,16 @@ endif()
 
 if(NOT MSVC)
   set(NOTMSVC_SRC hashes/seahash.c)
-  set_source_files_properties(tests/HashMapTest.cpp PROPERTIES COMPILE_FLAGS "-std=c++11 -I${CMAKE_SOURCE_DIR}/tests")
+  set_source_files_properties(tests/HashMapTest.cpp PROPERTIES COMPILE_FLAGS "-std=c++11")
   set_source_files_properties(tests/SpeedTest.cpp PROPERTIES COMPILE_FLAGS "-std=c++0x")
   set_source_files_properties(main.cpp PROPERTIES COMPILE_FLAGS "-std=c++0x -I${CMAKE_SOURCE_DIR}/hashes -I${CMAKE_SOURCE_DIR}/tests")
-  set_source_files_properties(hashes/Hashes.cpp PROPERTIES COMPILE_FLAGS "-std=c++1y -I${CMAKE_SOURCE_DIR} -flax-vector-conversions -Wno-ignored-attributes")
+  set_source_files_properties(hashes/Hashes.cpp PROPERTIES COMPILE_FLAGS "-std=c++1y -flax-vector-conversions -Wno-ignored-attributes")
   # https://github.com/dgryski/trifles/tree/master/tsip
   set(TSIP_SRC hashes/tsip.c)
 else(NOT MSVC)
-  set_source_files_properties(tests/SpeedTest.cpp PROPERTIES COMPILE_FLAGS "-I${CMAKE_SOURCE_DIR}/tests")
   set_source_files_properties(main.cpp PROPERTIES COMPILE_FLAGS "-I${CMAKE_SOURCE_DIR}/hashes -I${CMAKE_SOURCE_DIR}/tests")
   # nmhash32 wants "/std:c++latest"
-  set_source_files_properties(hashes/Hashes.cpp PROPERTIES COMPILE_FLAGS "/std:c++latest -I${CMAKE_SOURCE_DIR}")
+  set_source_files_properties(hashes/Hashes.cpp PROPERTIES COMPILE_FLAGS "/std:c++latest")
 endif(NOT MSVC)
 
 find_library(HIGHWAY highwayhash)
diff --git a/tests/parallel_hashmap/LICENSE b/util/parallel_hashmap/LICENSE
similarity index 100%
rename from tests/parallel_hashmap/LICENSE
rename to util/parallel_hashmap/LICENSE
diff --git a/tests/parallel_hashmap/README.md b/util/parallel_hashmap/README.md
similarity index 100%
rename from tests/parallel_hashmap/README.md
rename to util/parallel_hashmap/README.md
diff --git a/tests/parallel_hashmap/btree.h b/util/parallel_hashmap/btree.h
similarity index 100%
rename from tests/parallel_hashmap/btree.h
rename to util/parallel_hashmap/btree.h
diff --git a/tests/parallel_hashmap/meminfo.h b/util/parallel_hashmap/meminfo.h
similarity index 100%
rename from tests/parallel_hashmap/meminfo.h
rename to util/parallel_hashmap/meminfo.h
diff --git a/tests/parallel_hashmap/phmap.h b/util/parallel_hashmap/phmap.h
similarity index 100%
rename from tests/parallel_hashmap/phmap.h
rename to util/parallel_hashmap/phmap.h
diff --git a/tests/parallel_hashmap/phmap.natvis b/util/parallel_hashmap/phmap.natvis
similarity index 100%
rename from tests/parallel_hashmap/phmap.natvis
rename to util/parallel_hashmap/phmap.natvis
diff --git a/tests/parallel_hashmap/phmap_base.h b/util/parallel_hashmap/phmap_base.h
similarity index 100%
rename from tests/parallel_hashmap/phmap_base.h
rename to util/parallel_hashmap/phmap_base.h
diff --git a/tests/parallel_hashmap/phmap_bits.h b/util/parallel_hashmap/phmap_bits.h
similarity index 100%
rename from tests/parallel_hashmap/phmap_bits.h
rename to util/parallel_hashmap/phmap_bits.h
diff --git a/tests/parallel_hashmap/phmap_config.h b/util/parallel_hashmap/phmap_config.h
similarity index 100%
rename from tests/parallel_hashmap/phmap_config.h
rename to util/parallel_hashmap/phmap_config.h
diff --git a/tests/parallel_hashmap/phmap_dump.h b/util/parallel_hashmap/phmap_dump.h
similarity index 100%
rename from tests/parallel_hashmap/phmap_dump.h
rename to util/parallel_hashmap/phmap_dump.h
diff --git a/tests/parallel_hashmap/phmap_fwd_decl.h b/util/parallel_hashmap/phmap_fwd_decl.h
similarity index 100%
rename from tests/parallel_hashmap/phmap_fwd_decl.h
rename to util/parallel_hashmap/phmap_fwd_decl.h
diff --git a/tests/parallel_hashmap/phmap_utils.h b/util/parallel_hashmap/phmap_utils.h
similarity index 100%
rename from tests/parallel_hashmap/phmap_utils.h
rename to util/parallel_hashmap/phmap_utils.h