Merge branch 'branch-23.12' into enh-ann-bench-faiss-cpu

rapidsai · Oct 6, 2023 · 36d4dd3 · 36d4dd3
2 parents 1e7b5c8 + d9fde97
commit 36d4dd3
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 9 deletions.
diff --git a/cpp/cmake/patches/ggnn.patch b/cpp/cmake/patches/ggnn.patch
@@ -1,3 +1,26 @@
+diff --git a/include/ggnn/cache/cuda_simple_knn_sym_cache.cuh b/include/ggnn/cache/cuda_simple_knn_sym_cache.cuh
+index 890420e..d792903 100644
+--- a/include/ggnn/cache/cuda_simple_knn_sym_cache.cuh
++++ b/include/ggnn/cache/cuda_simple_knn_sym_cache.cuh
+@@ -62,7 +62,7 @@ struct SimpleKNNSymCache {
+                                                 const ValueT dist_half)
+         : dist_query(dist_query), dist_half(dist_half) {}
+
+-    __device__ __forceinline__ DistQueryAndHalf() {}
++    DistQueryAndHalf() = default;
+   };
+
+   struct DistanceAndNorm {
+@@ -98,8 +98,7 @@ struct SimpleKNNSymCache {
+     KeyT cache;
+     DistQueryAndHalf dist;
+     bool flag;
+-
+-    __device__ __forceinline__ SyncTempStorage() {}
++    SyncTempStorage() = default;
+   };
+
+  public:
 diff --git a/include/ggnn/cuda_knn_ggnn_gpu_instance.cuh b/include/ggnn/cuda_knn_ggnn_gpu_instance.cuh
 index 8cbaf0d..6eb72ac 100644
 --- a/include/ggnn/cuda_knn_ggnn_gpu_instance.cuh

diff --git a/cpp/include/raft/core/kvp.hpp b/cpp/include/raft/core/kvp.hpp
@@ -36,7 +36,7 @@ struct KeyValuePair {
   Value value;  ///< Item value
 
   /// Constructor
-  RAFT_INLINE_FUNCTION KeyValuePair() {}
+  KeyValuePair() = default;
 
 #ifdef _RAFT_HAS_CUDA
   /// Conversion Constructor to allow integration w/ cub

diff --git a/cpp/include/raft/neighbors/detail/nn_descent.cuh b/cpp/include/raft/neighbors/detail/nn_descent.cuh
@@ -980,9 +980,9 @@ GnndGraph<Index_t>::GnndGraph(const size_t nrow,
     num_samples(num_samples),
     bloom_filter(nrow, internal_node_degree / segment_size, 3),
     h_dists{raft::make_host_matrix<DistData_t, size_t, raft::row_major>(nrow, node_degree)},
-    h_graph_new{nrow * num_samples},
-    h_list_sizes_new{nrow},
-    h_graph_old{nrow * num_samples},
+    h_graph_new(nrow * num_samples),
+    h_list_sizes_new(nrow),
+    h_graph_old(nrow * num_samples),
     h_list_sizes_old{nrow}
 {
   // node_degree must be a multiple of segment_size;
@@ -1150,12 +1150,12 @@ GNND<Data_t, Index_t>::GNND(raft::resources const& res, const BuildConfig& build
       raft::make_device_matrix<ID_t, Index_t, raft::row_major>(res, nrow_, DEGREE_ON_DEVICE)},
     dists_buffer_{
       raft::make_device_matrix<DistData_t, Index_t, raft::row_major>(res, nrow_, DEGREE_ON_DEVICE)},
-    graph_host_buffer_{static_cast<size_t>(nrow_ * DEGREE_ON_DEVICE)},
-    dists_host_buffer_{static_cast<size_t>(nrow_ * DEGREE_ON_DEVICE)},
+    graph_host_buffer_(nrow_ * DEGREE_ON_DEVICE),
+    dists_host_buffer_(nrow_ * DEGREE_ON_DEVICE),
     d_locks_{raft::make_device_vector<int, Index_t>(res, nrow_)},
-    h_rev_graph_new_{static_cast<size_t>(nrow_ * NUM_SAMPLES)},
-    h_graph_old_{static_cast<size_t>(nrow_ * NUM_SAMPLES)},
-    h_rev_graph_old_{static_cast<size_t>(nrow_ * NUM_SAMPLES)},
+    h_rev_graph_new_(nrow_ * NUM_SAMPLES),
+    h_graph_old_(nrow_ * NUM_SAMPLES),
+    h_rev_graph_old_(nrow_ * NUM_SAMPLES),
     d_list_sizes_new_{raft::make_device_vector<int2, Index_t>(res, nrow_)},
     d_list_sizes_old_{raft::make_device_vector<int2, Index_t>(res, nrow_)}
 {