Merge branch 'branch-23.04' into bfknn

cjnolet · Feb 14, 2023 · d905266 · d905266
2 parents 5905b2d + 2347e06
commit d905266
Show file tree

Hide file tree

Showing 200 changed files with 560 additions and 3,630 deletions.
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -308,6 +308,8 @@ if(RAFT_COMPILE_DIST_LIBRARY)
     src/distance/distance/specializations/detail/hamming_unexpanded_float_float_float_int.cu
     src/distance/distance/specializations/detail/hellinger_expanded_float_float_float_int.cu
     src/distance/distance/specializations/detail/hellinger_expanded_double_double_double_int.cu
+    src/distance/distance/specializations/detail/inner_product_float_float_float_int.cu
+    src/distance/distance/specializations/detail/inner_product_double_double_double_int.cu
     src/distance/distance/specializations/detail/jensen_shannon_float_float_float_int.cu
     src/distance/distance/specializations/detail/jensen_shannon_double_double_double_int.cu
     src/distance/distance/specializations/detail/kernels/gram_matrix_base_double.cu

diff --git a/cpp/bench/cluster/kmeans.cu b/cpp/bench/cluster/kmeans.cu
@@ -16,7 +16,7 @@
 
 #include <common/benchmark.hpp>
 #include <raft/cluster/kmeans.cuh>
-#include <raft/cluster/kmeans_params.hpp>
+#include <raft/cluster/kmeans_types.hpp>
 
 #if defined RAFT_DISTANCE_COMPILED
 #include <raft/distance/specializations.cuh>

diff --git a/cpp/bench/common/benchmark.hpp b/cpp/bench/common/benchmark.hpp
@@ -21,9 +21,9 @@
 #include <raft/core/detail/macros.hpp>
 #include <raft/core/device_mdarray.hpp>
 #include <raft/core/device_resources.hpp>
-#include <raft/cudart_utils.h>
-#include <raft/interruptible.hpp>
+#include <raft/core/interruptible.hpp>
 #include <raft/random/make_blobs.cuh>
+#include <raft/util/cudart_utils.hpp>
 
 #include <benchmark/benchmark.h>
 

diff --git a/cpp/bench/distance/distance_common.cuh b/cpp/bench/distance/distance_common.cuh
@@ -49,15 +49,15 @@ struct distance : public fixture {
   void run_benchmark(::benchmark::State& state) override
   {
     loop_on_state(state, [this]() {
-      raft::distance::distance<DType, T, T, T>(x.data(),
+      raft::distance::distance<DType, T, T, T>(handle,
+                                               x.data(),
                                                y.data(),
                                                out.data(),
                                                params.m,
                                                params.n,
                                                params.k,
                                                (void*)workspace.data(),
                                                worksize,
-                                               stream,
                                                params.isRowMajor);
     });
   }

diff --git a/cpp/bench/distance/masked_nn.cu b/cpp/bench/distance/masked_nn.cu
@@ -24,8 +24,8 @@
 #include <limits>
 #include <raft/core/device_mdarray.hpp>
 #include <raft/core/device_mdspan.hpp>
+#include <raft/core/handle.hpp>
 #include <raft/distance/masked_nn.cuh>
-#include <raft/handle.hpp>
 #include <raft/linalg/norm.cuh>
 #include <raft/random/rng.cuh>
 #include <raft/util/cudart_utils.hpp>

diff --git a/cpp/bench/random/permute.cu b/cpp/bench/random/permute.cu
@@ -15,9 +15,9 @@
  */
 
 #include <common/benchmark.hpp>
-#include <raft/cudart_utils.h>
 #include <raft/random/permute.cuh>
 #include <raft/random/rng.cuh>
+#include <raft/util/cudart_utils.hpp>
 
 #include <rmm/device_uvector.hpp>
 

diff --git a/cpp/bench/random/rng.cu b/cpp/bench/random/rng.cu
@@ -15,8 +15,8 @@
  */
 
 #include <common/benchmark.hpp>
-#include <raft/cudart_utils.h>
 #include <raft/random/rng.cuh>
+#include <raft/util/cudart_utils.hpp>
 
 #include <rmm/device_uvector.hpp>
 

diff --git a/cpp/doxygen/Doxyfile.in b/cpp/doxygen/Doxyfile.in
@@ -887,18 +887,18 @@ EXCLUDE                = @CMAKE_CURRENT_SOURCE_DIR@/include/raft/sparse/linalg/s
                          @CMAKE_CURRENT_SOURCE_DIR@/include/raft/sparse/csr.hpp \
                          @CMAKE_CURRENT_SOURCE_DIR@/include/raft/linalg/lanczos.cuh \
                          @CMAKE_CURRENT_SOURCE_DIR@/include/raft/linalg/lanczos.hpp \
-                         @CMAKE_CURRENT_SOURCE_DIR@/include/raft/cuda_utils.cuh \
-                         @CMAKE_CURRENT_SOURCE_DIR@/include/raft/cudart_utils.h \
+                         @CMAKE_CURRENT_SOURCE_DIR@/include/raft/util/cuda_utils.cuh \
+                         @CMAKE_CURRENT_SOURCE_DIR@/include/raft/util/cudart_utils.hpp \
                          @CMAKE_CURRENT_SOURCE_DIR@/include/raft/util/device_atomics.cuh \
-                         @CMAKE_CURRENT_SOURCE_DIR@/include/raft/device_utils.cuh \
-                         @CMAKE_CURRENT_SOURCE_DIR@/include/raft/error.hpp \
-                         @CMAKE_CURRENT_SOURCE_DIR@/include/raft/handle.hpp \
-                         @CMAKE_CURRENT_SOURCE_DIR@/include/raft/integer_utils.h \
-                         @CMAKE_CURRENT_SOURCE_DIR@/include/raft/interruptible.hpp \
-                         @CMAKE_CURRENT_SOURCE_DIR@/include/raft/mdarray.hpp \
-                         @CMAKE_CURRENT_SOURCE_DIR@/include/raft/pow2_utils.cuh \
-                         @CMAKE_CURRENT_SOURCE_DIR@/include/raft/span.hpp \
-                         @CMAKE_CURRENT_SOURCE_DIR@/include/raft/vectorized.cuh \
+                         @CMAKE_CURRENT_SOURCE_DIR@/include/raft/util/device_utils.cuh \
+                         @CMAKE_CURRENT_SOURCE_DIR@/include/raft/core/error.hpp \
+                         @CMAKE_CURRENT_SOURCE_DIR@/include/raft/core/handle.hpp \
+                         @CMAKE_CURRENT_SOURCE_DIR@/include/raft/util/integer_utils.hpp \
+                         @CMAKE_CURRENT_SOURCE_DIR@/include/raft/core/interruptible.hpp \
+                         @CMAKE_CURRENT_SOURCE_DIR@/include/raft/core/mdarray.hpp \
+                         @CMAKE_CURRENT_SOURCE_DIR@/include/raft/util/pow2_utils.cuh \
+                         @CMAKE_CURRENT_SOURCE_DIR@/include/raft/core/span.hpp \
+                         @CMAKE_CURRENT_SOURCE_DIR@/include/raft/util/vectorized.cuh \
                          @CMAKE_CURRENT_SOURCE_DIR@/include/raft/raft.hpp \
                          @CMAKE_CURRENT_SOURCE_DIR@/include/raft/core/cudart_utils.hpp \
                          @CMAKE_CURRENT_SOURCE_DIR@/include/raft/matrix/math.cuh \

diff --git a/cpp/include/raft/cluster/kmeans_params.hpp b/cpp/include/raft/cluster/kmeans_params.hpp
diff --git a/cpp/include/raft/comms/detail/util.hpp b/cpp/include/raft/comms/detail/util.hpp
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <raft/interruptible.hpp>
+#include <raft/core/interruptible.hpp>
 
 #include <nccl.h>
 #include <raft/core/error.hpp>

diff --git a/cpp/include/raft/cuda_utils.cuh b/cpp/include/raft/cuda_utils.cuh
diff --git a/cpp/include/raft/cudart_utils.h b/cpp/include/raft/cudart_utils.h
diff --git a/cpp/include/raft/device_utils.cuh b/cpp/include/raft/device_utils.cuh