Change perfect hash to grape perfect hash.

Signed-off-by: vegetableysm <[email protected]>
v6d-io · Mar 29, 2024 · a2e4e39 · a2e4e39
1 parent 76e9175
commit a2e4e39
Show file tree

Hide file tree

Showing 16 changed files with 240 additions and 746 deletions.
diff --git a/modules/basic/CMakeLists.txt b/modules/basic/CMakeLists.txt
@@ -5,7 +5,8 @@ file(GLOB_RECURSE VINEYARD_MOD_SRCS "${CMAKE_CURRENT_SOURCE_DIR}"
 
 file(GLOB_RECURSE VINEYARD_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}"
                                    "ds/*.h"
-                                   "stream/*.h")
+                                   "stream/*.h"
+                                   "ds/grape_perfect_hash/*.h")
 
 if(VINEYARD_MOD_SRCS)
     vineyard_generate(

diff --git a/thirdparty/grape_perfect_hash/config.h → modules/basic/ds/grape_perfect_hash/config.h b/thirdparty/grape_perfect_hash/config.h → modules/basic/ds/grape_perfect_hash/config.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#ifndef GRAPE_CONFIG_H_
-#define GRAPE_CONFIG_H_
+#ifndef MODULES_BASIC_DS_GRAPE_PERFECT_HASH_CONFIG_H_
+#define MODULES_BASIC_DS_GRAPE_PERFECT_HASH_CONFIG_H_
 
 #ifdef USE_JEMALLOC
 #include <jemalloc/jemalloc.h>
@@ -24,8 +24,8 @@ limitations under the License.
 #include <thrust/host_vector.h>
 #endif
 
-#include "default_allocator.h"
-#include "hp_allocator.h"
+#include "basic/ds/grape_perfect_hash/default_allocator.h"
+#include "basic/ds/grape_perfect_hash/hp_allocator.h"
 
 namespace google {}
 namespace grape {
@@ -67,4 +67,4 @@ const char kSerializationVertexMapFilename[] = "vertex_map.s";
 const char kSerializationFilenameFormat[] = "%s/frag_%d.s";
 
 }  // namespace grape
-#endif  // GRAPE_CONFIG_H_
+#endif  // MODULES_BASIC_DS_GRAPE_PERFECT_HASH_CONFIG_H_
diff --git a/...ty/grape_perfect_hash/default_allocator.h → ...ds/grape_perfect_hash/default_allocator.h b/...ty/grape_perfect_hash/default_allocator.h → ...ds/grape_perfect_hash/default_allocator.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#ifndef GRAPE_UTILS_DEFAULT_ALLOCATOR_H_
-#define GRAPE_UTILS_DEFAULT_ALLOCATOR_H_
+#ifndef MODULES_BASIC_DS_GRAPE_PERFECT_HASH_DEFAULT_ALLOCATOR_H_
+#define MODULES_BASIC_DS_GRAPE_PERFECT_HASH_DEFAULT_ALLOCATOR_H_
 
 #include <stdlib.h>
 #define ALLOC_ALIGNMENT 64
@@ -71,4 +71,4 @@ inline bool operator==(const DefaultAllocator<_Tp1>&,
 
 }  // namespace grape
 
-#endif  // GRAPE_UTILS_DEFAULT_ALLOCATOR_H_
+#endif  // MODULES_BASIC_DS_GRAPE_PERFECT_HASH_DEFAULT_ALLOCATOR_H_
diff --git a/...rty/grape_perfect_hash/ef_sequence_view.h → .../ds/grape_perfect_hash/ef_sequence_view.h b/...rty/grape_perfect_hash/ef_sequence_view.h → .../ds/grape_perfect_hash/ef_sequence_view.h
@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-#ifndef GRAPHSCOPE_PTHASH_UTILS_EF_SEQUENCE_VIEW_VIEW_H_
-#define GRAPHSCOPE_PTHASH_UTILS_EF_SEQUENCE_VIEW_VIEW_H_
+#ifndef MODULES_BASIC_DS_GRAPE_PERFECT_HASH_EF_SEQUENCE_VIEW_H_
+#define MODULES_BASIC_DS_GRAPE_PERFECT_HASH_EF_SEQUENCE_VIEW_H_
 
 #include <assert.h>
 #include <stddef.h>
 #include <stdint.h>
 
 #include <type_traits>
 
-#include "ref_vector.h"
+#include "basic/ds/grape_perfect_hash/ref_vector.h"
 #include "pthash/encoders/util.hpp"
 
 namespace grape {
@@ -146,4 +146,4 @@ struct ef_sequence_view {
 
 }  // namespace grape
 
-#endif  // GRAPHSCOPE_PTHASH_UTILS_EF_SEQUENCE_VIEW_VIEW_H_
+#endif  // MODULES_BASIC_DS_GRAPE_PERFECT_HASH_EF_SEQUENCE_VIEW_H_
diff --git a/...dparty/grape_perfect_hash/encoders_view.h → ...sic/ds/grape_perfect_hash/encoders_view.h b/...dparty/grape_perfect_hash/encoders_view.h → ...sic/ds/grape_perfect_hash/encoders_view.h
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-#ifndef GRAPHSCOPE_PTHASH_UTILS_ENCODERS_VIEW_VIEW_H_
-#define GRAPHSCOPE_PTHASH_UTILS_ENCODERS_VIEW_VIEW_H_
+#ifndef MODULES_BASIC_DS_GRAPE_PERFECT_HASH_ENCODERS_VIEW_H_
+#define MODULES_BASIC_DS_GRAPE_PERFECT_HASH_ENCODERS_VIEW_H_
 
-#include "ef_sequence_view.h"
+#include "basic/ds/grape_perfect_hash/ef_sequence_view.h"
 
 namespace grape {
 
@@ -59,4 +59,4 @@ struct dual_dictionary_view {
 
 }  // namespace grape
 
-#endif  // GRAPHSCOPE_PTHASH_UTILS_ENCODERS_VIEW_VIEW_H_
+#endif  // MODULES_BASIC_DS_GRAPE_PERFECT_HASH_ENCODERS_VIEW_H_
diff --git a/...grape_perfect_hash/hashmap_indexer_impl.h → ...grape_perfect_hash/hashmap_indexer_impl.h b/...grape_perfect_hash/hashmap_indexer_impl.h → ...grape_perfect_hash/hashmap_indexer_impl.h
@@ -13,14 +13,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#ifndef GRAPE_GRAPH_HASHMAP_INDEXER_IMPL_H_
-#define GRAPE_GRAPH_HASHMAP_INDEXER_IMPL_H_
+#ifndef MODULES_BASIC_DS_GRAPE_PERFECT_HASH_HASHMAP_INDEXER_IMPL_H_
+#define MODULES_BASIC_DS_GRAPE_PERFECT_HASH_HASHMAP_INDEXER_IMPL_H_
 
+#include <memory>
+#include <utility>
 #include <vector>
 
-#include "config.h"
-#include "ref_vector.h"
-#include "string_view_vector.h"
+#include "basic/ds/grape_perfect_hash/config.h"
+#include "basic/ds/grape_perfect_hash/ref_vector.h"
+#include "basic/ds/grape_perfect_hash/string_view_vector.h"
 
 namespace grape {
 
@@ -173,38 +175,6 @@ struct KeyBufferView {
 
 }  // namespace hashmap_indexer_impl
 
-namespace sync_comm {
-
-// template <typename T>
-// struct CommImpl<hashmap_indexer_impl::KeyBuffer<T>> {
-//   static void send(const hashmap_indexer_impl::KeyBuffer<T>& buf,
-//                    int dst_worker_id, int tag, MPI_Comm comm) {
-//     Send(buf.buffer(), dst_worker_id, tag, comm);
-//   }
-
-//   static void recv(hashmap_indexer_impl::KeyBuffer<T>& buf, int
-//   src_worker_id,
-//                    int tag, MPI_Comm comm) {
-//     Recv(buf.buffer(), src_worker_id, tag, comm);
-//   }
-// };
-
-// template <>
-// struct CommImpl<hashmap_indexer_impl::KeyBuffer<nonstd::string_view>> {
-//   static void send(
-//       const hashmap_indexer_impl::KeyBuffer<nonstd::string_view>& buf,
-//       int dst_worker_id, int tag, MPI_Comm comm) {
-//     Send(buf.buffer(), dst_worker_id, tag, comm);
-//   }
-
-//   static void recv(hashmap_indexer_impl::KeyBuffer<nonstd::string_view>& buf,
-//                    int src_worker_id, int tag, MPI_Comm comm) {
-//     Recv(buf.buffer(), src_worker_id, tag, comm);
-//   }
-// };
-
-}  // namespace sync_comm
-
 }  // namespace grape
 
-#endif  // GRAPE_GRAPH_HASHMAP_INDEXER_IMPL_H_
+#endif  // MODULES_BASIC_DS_GRAPE_PERFECT_HASH_HASHMAP_INDEXER_IMPL_H_
diff --git a/thirdparty/grape_perfect_hash/hp_allocator.h → ...asic/ds/grape_perfect_hash/hp_allocator.h b/thirdparty/grape_perfect_hash/hp_allocator.h → ...asic/ds/grape_perfect_hash/hp_allocator.h
@@ -13,13 +13,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#ifndef GRAPE_UTILS_HP_ALLOCATOR_H_
-#define GRAPE_UTILS_HP_ALLOCATOR_H_
+#ifndef MODULES_BASIC_DS_GRAPE_PERFECT_HASH_HP_ALLOCATOR_H_
+#define MODULES_BASIC_DS_GRAPE_PERFECT_HASH_HP_ALLOCATOR_H_
 
+#include <glog/logging.h>
 #include <stdlib.h>
 #include <sys/mman.h>
 
-#include <glog/logging.h>
+#include <limits>
 
 #ifdef USE_HUGEPAGES
 
@@ -124,4 +125,4 @@ inline bool operator==(const HpAllocator<_Tp1>&, const HpAllocator<_Tp2>&) {
 
 #endif
 
-#endif  // GRAPE_UTILS_HP_ALLOCATOR_H_
+#endif  // MODULES_BASIC_DS_GRAPE_PERFECT_HASH_HP_ALLOCATOR_H_
diff --git a/thirdparty/grape_perfect_hash/ref_vector.h → .../basic/ds/grape_perfect_hash/ref_vector.h b/thirdparty/grape_perfect_hash/ref_vector.h → .../basic/ds/grape_perfect_hash/ref_vector.h
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef GRAPE_UTILS_REF_VECTOR_H_
-#define GRAPE_UTILS_REF_VECTOR_H_
+#ifndef MODULES_BASIC_DS_GRAPE_PERFECT_HASH_REF_VECTOR_H_
+#define MODULES_BASIC_DS_GRAPE_PERFECT_HASH_REF_VECTOR_H_
 
 #include <vector>
 
@@ -79,4 +79,4 @@ const char* decode_val(T& val, const char* buf) {
 
 }  // namespace grape
 
-#endif  // GRAPE_UTILS_REF_VECTOR_H_
+#endif  // MODULES_BASIC_DS_GRAPE_PERFECT_HASH_REF_VECTOR_H_
diff --git a/...arty/grape_perfect_hash/single_phf_view.h → ...c/ds/grape_perfect_hash/single_phf_view.h b/...arty/grape_perfect_hash/single_phf_view.h → ...c/ds/grape_perfect_hash/single_phf_view.h
@@ -13,16 +13,18 @@
  * limitations under the License.
  */
 
-#ifndef GRAPHSCOPE_PTHASH_UTILS_SINGLE_PHF_VIEW_H_
-#define GRAPHSCOPE_PTHASH_UTILS_SINGLE_PHF_VIEW_H_
+#ifndef MODULES_BASIC_DS_GRAPE_PERFECT_HASH_SINGLE_PHF_VIEW_H_
+#define MODULES_BASIC_DS_GRAPE_PERFECT_HASH_SINGLE_PHF_VIEW_H_
 
 #include <cstdlib>
+#include <set>
 #include <vector>
-#include "encoders_view.h"
-#include "ref_vector.h"
+
+#include "basic/ds/grape_perfect_hash/encoders_view.h"
+#include "basic/ds/grape_perfect_hash/ref_vector.h"
+#include "basic/ds/grape_perfect_hash/types.h"
 #include "pthash/pthash.hpp"
 #include "pthash/single_phf.hpp"
-#include "types.h"
 
 #define nssv_CONFIG_SELECT_STRING_VIEW nssv_STRING_VIEW_NONSTD
 #include "string_view/string_view.hpp"
@@ -163,4 +165,4 @@ struct SinglePHFView {
 
 }  // namespace grape
 
-#endif  // GRAPHSCOPE_PTHASH_UTILS_SINGLE_PHF_VIEW_H_
+#endif  // MODULES_BASIC_DS_GRAPE_PERFECT_HASH_SINGLE_PHF_VIEW_H_
diff --git a/...y/grape_perfect_hash/string_view_vector.h → ...s/grape_perfect_hash/string_view_vector.h b/...y/grape_perfect_hash/string_view_vector.h → ...s/grape_perfect_hash/string_view_vector.h
@@ -13,16 +13,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#ifndef GRAPE_UTILS_STRING_VIEW_VECTOR_H_
-#define GRAPE_UTILS_STRING_VIEW_VECTOR_H_
+#ifndef MODULES_BASIC_DS_GRAPE_PERFECT_HASH_STRING_VIEW_VECTOR_H_
+#define MODULES_BASIC_DS_GRAPE_PERFECT_HASH_STRING_VIEW_VECTOR_H_
 
 #include <stdlib.h>
 #include <string.h>
 #include <cassert>
 #include <memory>
+#include <utility>
 #include <vector>
 
-#include "ref_vector.h"
+#include "basic/ds/grape_perfect_hash/ref_vector.h"
 #define nssv_CONFIG_SELECT_STRING_VIEW nssv_STRING_VIEW_NONSTD
 #include "string_view/string_view.hpp"
 
@@ -165,4 +166,4 @@ struct ref_vector<nonstd::string_view> {
 
 }  // namespace grape
 
-#endif  // GRAPE_UTILS_STRING_VIEW_VECTOR_H_
+#endif  // MODULES_BASIC_DS_GRAPE_PERFECT_HASH_STRING_VIEW_VECTOR_H_
diff --git a/thirdparty/grape_perfect_hash/types.h → modules/basic/ds/grape_perfect_hash/types.h b/thirdparty/grape_perfect_hash/types.h → modules/basic/ds/grape_perfect_hash/types.h
@@ -13,11 +13,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#ifndef GRAPE_TYPES_H_
-#define GRAPE_TYPES_H_
+#ifndef MODULES_BASIC_DS_GRAPE_PERFECT_HASH_TYPES_H_
+#define MODULES_BASIC_DS_GRAPE_PERFECT_HASH_TYPES_H_
 
 #include <istream>
 #include <ostream>
+#include <string>
 #include <type_traits>
 #include "pthash/utils/hasher.hpp"
 
@@ -160,4 +161,4 @@ struct murmurhasher {
 
 }  // namespace grape
 
-#endif  // GRAPE_TYPES_H_
+#endif  // MODULES_BASIC_DS_GRAPE_PERFECT_HASH_TYPES_H_