use pw specializations in rbc

cjnolet · Feb 14, 2023 · 8eaba84 · 8eaba84
1 parent d905266
commit 8eaba84
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 189 deletions.
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -455,7 +455,7 @@ if(RAFT_COMPILE_NN_LIBRARY)
 
   target_link_libraries(
     raft_nn_lib
-    PUBLIC raft::raft
+    PUBLIC raft::raft raft::raft_distance_lib
     PRIVATE nvidia::cutlass::cutlass
   )
   target_compile_options(

diff --git a/cpp/src/nn/specializations/ball_cover_all_knn_query.cu b/cpp/src/nn/specializations/ball_cover_all_knn_query.cu
@@ -18,10 +18,8 @@
 #include <raft/neighbors/ball_cover_types.hpp>
 
 // Ignore upstream specializations to avoid unnecessary recompiling
-#ifdef RAFT_DISTANCE_COMPILED
+static_assert(RAFT_DISTANCE_COMPILED, "Requires distance specializations");
 #include <raft/distance/specializations.cuh>
-#endif
-
 #include <raft/neighbors/specializations/detail/ball_cover_lowdim.hpp>
 #include <raft/neighbors/specializations/fused_l2_knn.cuh>
 #include <raft/neighbors/specializations/knn.cuh>

diff --git a/cpp/src/nn/specializations/ball_cover_build_index.cu b/cpp/src/nn/specializations/ball_cover_build_index.cu
@@ -18,10 +18,8 @@
 #include <raft/neighbors/ball_cover_types.hpp>
 
 // Ignore upstream specializations to avoid unnecessary recompiling
-#ifdef RAFT_DISTANCE_COMPILED
+static_assert(RAFT_DISTANCE_COMPILED, "Requires distance specializations");
 #include <raft/distance/specializations.cuh>
-#endif
-
 #include <raft/neighbors/specializations/detail/ball_cover_lowdim.hpp>
 #include <raft/neighbors/specializations/fused_l2_knn.cuh>
 #include <raft/neighbors/specializations/knn.cuh>

diff --git a/cpp/src/nn/specializations/ball_cover_knn_query.cu b/cpp/src/nn/specializations/ball_cover_knn_query.cu
@@ -18,10 +18,8 @@
 #include <raft/neighbors/ball_cover_types.hpp>
 
 // Ignore upstream specializations to avoid unnecessary recompiling
-#ifdef RAFT_DISTANCE_COMPILED
+static_assert(RAFT_DISTANCE_COMPILED, "Requires distance specializations");
 #include <raft/distance/specializations.cuh>
-#endif
-
 #include <raft/neighbors/specializations/detail/ball_cover_lowdim.hpp>
 #include <raft/neighbors/specializations/fused_l2_knn.cuh>
 #include <raft/neighbors/specializations/knn.cuh>

diff --git a/cpp/src/nn/specializations/knn_long_float_int.cu b/cpp/src/nn/specializations/knn_long_float_int.cu
diff --git a/cpp/src/nn/specializations/knn_long_float_uint.cu b/cpp/src/nn/specializations/knn_long_float_uint.cu
diff --git a/cpp/src/nn/specializations/knn_uint_float_int.cu b/cpp/src/nn/specializations/knn_uint_float_int.cu
diff --git a/cpp/src/nn/specializations/knn_uint_float_uint.cu b/cpp/src/nn/specializations/knn_uint_float_uint.cu