Fix build and pre-filtering bug

rapidsai · Sep 26, 2023 · 02eebe5 · 02eebe5
1 parent 4ab04c2
commit 02eebe5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 18 deletions.
diff --git a/cpp/include/raft/neighbors/detail/cagra/cagra_search.cuh b/cpp/include/raft/neighbors/detail/cagra/cagra_search.cuh
@@ -36,6 +36,24 @@
 
 namespace raft::neighbors::cagra::detail {
 
+// A helper function to set a query id offset
+template <class CagraSampleFilterT>
+inline typename raft::neighbors::filtering::CagraSampleFilterT_Selector<CagraSampleFilterT>::type
+set_offset(CagraSampleFilterT filter, const uint32_t offset)
+{
+  typename raft::neighbors::filtering::CagraSampleFilterT_Selector<CagraSampleFilterT>::type
+    new_filter(offset, filter);
+  return new_filter;
+}
+template <>
+inline typename raft::neighbors::filtering::CagraSampleFilterT_Selector<
+  raft::neighbors::filtering::none_cagra_sample_filter>::type
+set_offset<raft::neighbors::filtering::none_cagra_sample_filter>(
+  raft::neighbors::filtering::none_cagra_sample_filter filter, const uint32_t)
+{
+  return filter;
+}
+
 /**
  * @brief Search ANN using the constructed index.
  *

diff --git a/cpp/include/raft/neighbors/sample_filter_types.hpp b/cpp/include/raft/neighbors/sample_filter_types.hpp
@@ -89,7 +89,7 @@ struct CagraSampleFilterWithQueryIdOffset {
   }
 };
 
-/** Utility to add an offset to the query ud */
+/** Utility to add an offset to the query id */
 template <class CagraSampleFilterT>
 struct CagraSampleFilterT_Selector {
   using type = CagraSampleFilterWithQueryIdOffset<CagraSampleFilterT>;
@@ -99,23 +99,6 @@ struct CagraSampleFilterT_Selector<raft::neighbors::filtering::none_cagra_sample
   using type = raft::neighbors::filtering::none_cagra_sample_filter;
 };
 
-// A helper function to set a query id offset
-template <class CagraSampleFilterT>
-inline typename CagraSampleFilterT_Selector<CagraSampleFilterT>::type set_offset(
-  CagraSampleFilterT filter, const uint32_t offset)
-{
-  typename CagraSampleFilterT_Selector<CagraSampleFilterT>::type new_filter(offset, filter);
-  return new_filter;
-}
-template <>
-inline
-  typename CagraSampleFilterT_Selector<raft::neighbors::filtering::none_cagra_sample_filter>::type
-  set_offset<raft::neighbors::filtering::none_cagra_sample_filter>(
-    raft::neighbors::filtering::none_cagra_sample_filter filter, const uint32_t)
-{
-  return filter;
-}
-
 using removed_cagra_filter_with_offset_u32 =
   CagraSampleFilterWithQueryIdOffset<removed_cagra_filter<uint32_t>>;
 using removed_cagra_filter_with_offset_u64 =