support c++11/c++14 compile

NVIDIA-Merlin · Sep 22, 2023 · 433eff8 · 433eff8
1 parent 8354680
commit 433eff8
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/include/merlin/core_kernels.cuh b/include/merlin/core_kernels.cuh
@@ -16,17 +16,17 @@
 
 #pragma once
 
-#include "merlin/allocator.cuh"
-#include "merlin/core_kernels/accum_or_assign.cuh"
-#include "merlin/core_kernels/find_or_insert.cuh"
-#include "merlin/core_kernels/find_ptr_or_insert.cuh"
-#include "merlin/core_kernels/kernel_utils.cuh"
-#include "merlin/core_kernels/lookup.cuh"
-#include "merlin/core_kernels/lookup_ptr.cuh"
-#include "merlin/core_kernels/update.cuh"
-#include "merlin/core_kernels/update_score.cuh"
-#include "merlin/core_kernels/upsert.cuh"
-#include "merlin/core_kernels/upsert_and_evict.cuh"
+#include "allocator.cuh"
+#include "core_kernels/accum_or_assign.cuh"
+#include "core_kernels/find_or_insert.cuh"
+#include "core_kernels/find_ptr_or_insert.cuh"
+#include "core_kernels/kernel_utils.cuh"
+#include "core_kernels/lookup.cuh"
+#include "core_kernels/lookup_ptr.cuh"
+#include "core_kernels/update.cuh"
+#include "core_kernels/update_score.cuh"
+#include "core_kernels/upsert.cuh"
+#include "core_kernels/upsert_and_evict.cuh"
 
 namespace nv {
 namespace merlin {
@@ -754,7 +754,7 @@ inline std::tuple<size_t, size_t> dump_kernel_shared_memory_size(
       block_size > 0,
       "[HierarchicalKV] block_size <= 0, the K-V-S size may be too large!");
 
-  return {block_size * sizeof(KVM<K, V, S>), block_size};
+  return std::make_tuple(block_size * sizeof(KVM<K, V, S>), block_size);
 }
 
 template <class K, class V, class S>

diff --git a/include/merlin/core_kernels/kernel_utils.cuh b/include/merlin/core_kernels/kernel_utils.cuh
@@ -23,8 +23,8 @@
 #include <mutex>
 #include <thread>
 #include <vector>
-#include "merlin/types.cuh"
-#include "merlin/utils.cuh"
+#include "../types.cuh"
+#include "../utils.cuh"
 
 using namespace cooperative_groups;
 namespace cg = cooperative_groups;

diff --git a/include/merlin/group_lock.cuh b/include/merlin/group_lock.cuh
@@ -20,8 +20,8 @@
 #include <mutex>
 #include <system_error>
 #include <thread>
-#include "merlin/core_kernels/group_lock_kernels.cuh"
-#include "merlin/utils.cuh"
+#include "core_kernels/group_lock_kernels.cuh"
+#include "utils.cuh"
 
 namespace nv {
 namespace merlin {

diff --git a/include/merlin/memory_pool.cuh b/include/merlin/memory_pool.cuh
@@ -303,7 +303,7 @@ class MemoryPool final {
     inline StaticWorkspace(pool_type* pool, size_t requested_buffer_size,
                            cudaStream_t stream)
         : base_type(pool, stream) {
-      auto& buffers{this->buffers_};
+      auto& buffers = this->buffers_;
       this->buffer_size_ = pool->get_raw(buffers.begin(), buffers.end(),
                                          requested_buffer_size, stream);
     }
@@ -333,7 +333,7 @@ class MemoryPool final {
     inline DynamicWorkspace(pool_type* pool, size_t n,
                             size_t requested_buffer_size, cudaStream_t stream)
         : base_type(pool, stream) {
-      auto& buffers{this->buffers_};
+      auto& buffers = this->buffers_;
       buffers.resize(n);
       this->buffer_size_ = pool->get_raw(buffers.begin(), buffers.end(),
                                          requested_buffer_size, stream);