Remove experimental namespace from vamana

rapidsai · Jan 7, 2025 · e8f9c25 · e8f9c25
1 parent b782389
commit e8f9c25
Show file tree

Hide file tree

Showing 21 changed files with 78 additions and 77 deletions.
diff --git a/cpp/include/cuvs/neighbors/vamana.hpp b/cpp/include/cuvs/neighbors/vamana.hpp
@@ -31,7 +31,7 @@
 #include <optional>
 #include <variant>
 
-namespace cuvs::neighbors::experimental::vamana {
+namespace cuvs::neighbors::vamana {
 /**
  * @defgroup vamana_cpp_index_params Vamana index build parameters
  * @{
@@ -219,34 +219,34 @@ struct index : cuvs::neighbors::index {
  *
  */
 auto build(raft::resources const& handle,
-           const cuvs::neighbors::experimental::vamana::index_params& params,
+           const cuvs::neighbors::vamana::index_params& params,
            raft::device_matrix_view<const float, int64_t, raft::row_major> dataset)
-  -> cuvs::neighbors::experimental::vamana::index<float, uint32_t>;
+  -> cuvs::neighbors::vamana::index<float, uint32_t>;
 
 auto build(raft::resources const& handle,
-           const cuvs::neighbors::experimental::vamana::index_params& params,
+           const cuvs::neighbors::vamana::index_params& params,
            raft::host_matrix_view<const float, int64_t, raft::row_major> dataset)
-  -> cuvs::neighbors::experimental::vamana::index<float, uint32_t>;
+  -> cuvs::neighbors::vamana::index<float, uint32_t>;
 
 auto build(raft::resources const& handle,
-           const cuvs::neighbors::experimental::vamana::index_params& params,
+           const cuvs::neighbors::vamana::index_params& params,
            raft::device_matrix_view<const int8_t, int64_t, raft::row_major> dataset)
-  -> cuvs::neighbors::experimental::vamana::index<int8_t, uint32_t>;
+  -> cuvs::neighbors::vamana::index<int8_t, uint32_t>;
 
 auto build(raft::resources const& handle,
-           const cuvs::neighbors::experimental::vamana::index_params& params,
+           const cuvs::neighbors::vamana::index_params& params,
            raft::host_matrix_view<const int8_t, int64_t, raft::row_major> dataset)
-  -> cuvs::neighbors::experimental::vamana::index<int8_t, uint32_t>;
+  -> cuvs::neighbors::vamana::index<int8_t, uint32_t>;
 
 auto build(raft::resources const& handle,
-           const cuvs::neighbors::experimental::vamana::index_params& params,
+           const cuvs::neighbors::vamana::index_params& params,
            raft::device_matrix_view<const uint8_t, int64_t, raft::row_major> dataset)
-  -> cuvs::neighbors::experimental::vamana::index<uint8_t, uint32_t>;
+  -> cuvs::neighbors::vamana::index<uint8_t, uint32_t>;
 
 auto build(raft::resources const& handle,
-           const cuvs::neighbors::experimental::vamana::index_params& params,
+           const cuvs::neighbors::vamana::index_params& params,
            raft::host_matrix_view<const uint8_t, int64_t, raft::row_major> dataset)
-  -> cuvs::neighbors::experimental::vamana::index<uint8_t, uint32_t>;
+  -> cuvs::neighbors::vamana::index<uint8_t, uint32_t>;
 
 /**
  * @defgroup vamana_cpp_serialize Vamana serialize functions
@@ -258,18 +258,18 @@ auto build(raft::resources const& handle,
 
 void serialize(raft::resources const& handle,
                const std::string& file_prefix,
-               const cuvs::neighbors::experimental::vamana::index<float, uint32_t>& index);
+               const cuvs::neighbors::vamana::index<float, uint32_t>& index);
 
 void serialize(raft::resources const& handle,
                const std::string& file_prefix,
-               const cuvs::neighbors::experimental::vamana::index<int8_t, uint32_t>& index);
+               const cuvs::neighbors::vamana::index<int8_t, uint32_t>& index);
 
 void serialize(raft::resources const& handle,
                const std::string& file_prefix,
-               const cuvs::neighbors::experimental::vamana::index<uint8_t, uint32_t>& index);
+               const cuvs::neighbors::vamana::index<uint8_t, uint32_t>& index);
 
 /**
  * @}
  */
 
-}  // namespace cuvs::neighbors::experimental::vamana
+}  // namespace cuvs::neighbors::vamana
diff --git a/cpp/src/neighbors/detail/vamana/greedy_search.cuh b/cpp/src/neighbors/detail/vamana/greedy_search.cuh
@@ -30,7 +30,7 @@
 #include <cstdio>
 #include <vector>
 
-namespace cuvs::neighbors::experimental::vamana::detail {
+namespace cuvs::neighbors::vamana::detail {
 
 /* @defgroup greedy_search_detail greedy search
  * @{
@@ -286,4 +286,4 @@ __global__ void GreedySearchKernel(
  * @}
  */
 
-}  // namespace cuvs::neighbors::experimental::vamana::detail
+}  // namespace cuvs::neighbors::vamana::detail
diff --git a/cpp/src/neighbors/detail/vamana/macros.cuh b/cpp/src/neighbors/detail/vamana/macros.cuh
@@ -16,7 +16,7 @@
 
 #pragma once
 
-namespace cuvs::neighbors::experimental::vamana::detail {
+namespace cuvs::neighbors::vamana::detail {
 
 /* Macros to compute the shared memory requirements for CUB primitives used by search and prune */
 #define COMPUTE_SMEM_SIZES(degree, visited_size, DEG, CANDS)                                     \
@@ -79,4 +79,4 @@ namespace cuvs::neighbors::experimental::vamana::detail {
   SEARCH_CALL_SORT(topk, 512);   \
   SEARCH_CALL_SORT(topk, 1024);
 
-}  // namespace cuvs::neighbors::experimental::vamana::detail
+}  // namespace cuvs::neighbors::vamana::detail
diff --git a/cpp/src/neighbors/detail/vamana/priority_queue.cuh b/cpp/src/neighbors/detail/vamana/priority_queue.cuh
@@ -20,7 +20,7 @@
 #include <raft/util/warp_primitives.cuh>
 #include <stdio.h>
 
-namespace cuvs::neighbors::experimental::vamana::detail {
+namespace cuvs::neighbors::vamana::detail {
 
 /***************************************************************************************
 ***************************************************************************************/
@@ -326,4 +326,4 @@ __forceinline__ __device__ void enqueue_all_neighbors(int num_neighbors,
   }
 }
 
-}  // namespace cuvs::neighbors::experimental::vamana::detail
+}  // namespace cuvs::neighbors::vamana::detail
diff --git a/cpp/src/neighbors/detail/vamana/robust_prune.cuh b/cpp/src/neighbors/detail/vamana/robust_prune.cuh
@@ -22,7 +22,7 @@
 #include "macros.cuh"
 #include "vamana_structs.cuh"
 
-namespace cuvs::neighbors::experimental::vamana::detail {
+namespace cuvs::neighbors::vamana::detail {
 
 // Load candidates (from query) and previous edges (from nbh_list) into registers (tmp) spanning
 // warp
@@ -247,4 +247,4 @@ __global__ void RobustPruneKernel(
 
 }  // namespace
 
-}  // namespace cuvs::neighbors::experimental::vamana::detail
+}  // namespace cuvs::neighbors::vamana::detail
diff --git a/cpp/src/neighbors/detail/vamana/vamana_build.cuh b/cpp/src/neighbors/detail/vamana/vamana_build.cuh
@@ -46,7 +46,7 @@
 #include <cstdio>
 #include <vector>
 
-namespace cuvs::neighbors::experimental::vamana::detail {
+namespace cuvs::neighbors::vamana::detail {
 
 /* @defgroup vamana_build_detail vamana build
  * @{
@@ -406,4 +406,4 @@ index<T, IdxT> build(
  * @}
  */
 
-}  // namespace cuvs::neighbors::experimental::vamana::detail
+}  // namespace cuvs::neighbors::vamana::detail
diff --git a/cpp/src/neighbors/detail/vamana/vamana_serialize.cuh b/cpp/src/neighbors/detail/vamana/vamana_serialize.cuh
@@ -34,7 +34,7 @@
 #include <fstream>
 #include <type_traits>
 
-namespace cuvs::neighbors::experimental::vamana::detail {
+namespace cuvs::neighbors::vamana::detail {
 
 /**
  * Save the index to file.
@@ -117,4 +117,4 @@ void serialize(raft::resources const& res,
   if (!index_of) { RAFT_FAIL("Error writing output %s", file_name.c_str()); }
 }
 
-}  // namespace cuvs::neighbors::experimental::vamana::detail
+}  // namespace cuvs::neighbors::vamana::detail
diff --git a/cpp/src/neighbors/detail/vamana/vamana_structs.cuh b/cpp/src/neighbors/detail/vamana/vamana_structs.cuh
@@ -34,7 +34,7 @@
 
 #include <cuvs/distance/distance.hpp>
 
-namespace cuvs::neighbors::experimental::vamana::detail {
+namespace cuvs::neighbors::vamana::detail {
 
 /* @defgroup vamana_structures vamana structures
  * @{
@@ -476,4 +476,4 @@ __global__ void recompute_reverse_dists(
  * @}
  */
 
-}  // namespace cuvs::neighbors::experimental::vamana::detail
+}  // namespace cuvs::neighbors::vamana::detail
diff --git a/cpp/src/neighbors/vamana.cuh b/cpp/src/neighbors/vamana.cuh
@@ -31,7 +31,7 @@
 
 #include <rmm/cuda_stream_view.hpp>
 
-namespace cuvs::neighbors::experimental::vamana {
+namespace cuvs::neighbors::vamana {
 
 /**
  * @defgroup VAMANA ANN Graph-based nearest neighbor search
@@ -85,7 +85,7 @@ index<T, IdxT> build(
   const index_params& params,
   raft::mdspan<const T, raft::matrix_extent<int64_t>, raft::row_major, Accessor> dataset)
 {
-  return cuvs::neighbors::experimental::vamana::detail::build<T, IdxT, Accessor>(
+  return cuvs::neighbors::vamana::detail::build<T, IdxT, Accessor>(
     res, params, dataset);
 }
 
@@ -94,9 +94,9 @@ void serialize(raft::resources const& res,
                const std::string& file_prefix,
                const index<T, IdxT>& index_)
 {
-  cuvs::neighbors::experimental::vamana::detail::build<T, IdxT>(res, file_prefix, index_);
+  cuvs::neighbors::vamana::detail::build<T, IdxT>(res, file_prefix, index_);
 }
 
 /** @} */  // end group vamana
 
-}  // namespace cuvs::neighbors::experimental::vamana
+}  // namespace cuvs::neighbors::vamana
diff --git a/cpp/src/neighbors/vamana_build_float.cu b/cpp/src/neighbors/vamana_build_float.cu
@@ -17,27 +17,27 @@
 #include "vamana.cuh"
 #include <cuvs/neighbors/vamana.hpp>
 
-namespace cuvs::neighbors::experimental::vamana {
+namespace cuvs::neighbors::vamana {
 
 #define RAFT_INST_VAMANA_BUILD(T, IdxT)                                                    \
   auto build(raft::resources const& handle,                                                \
-             const cuvs::neighbors::experimental::vamana::index_params& params,            \
+             const cuvs::neighbors::vamana::index_params& params,            \
              raft::device_matrix_view<const T, int64_t, raft::row_major> dataset)          \
-    ->cuvs::neighbors::experimental::vamana::index<T, IdxT>                                \
+    ->cuvs::neighbors::vamana::index<T, IdxT>                                \
   {                                                                                        \
-    return cuvs::neighbors::experimental::vamana::build<T, IdxT>(handle, params, dataset); \
+    return cuvs::neighbors::vamana::build<T, IdxT>(handle, params, dataset); \
   }                                                                                        \
                                                                                            \
   auto build(raft::resources const& handle,                                                \
-             const cuvs::neighbors::experimental::vamana::index_params& params,            \
+             const cuvs::neighbors::vamana::index_params& params,            \
              raft::host_matrix_view<const T, int64_t, raft::row_major> dataset)            \
-    ->cuvs::neighbors::experimental::vamana::index<T, IdxT>                                \
+    ->cuvs::neighbors::vamana::index<T, IdxT>                                \
   {                                                                                        \
-    return cuvs::neighbors::experimental::vamana::build<T, IdxT>(handle, params, dataset); \
+    return cuvs::neighbors::vamana::build<T, IdxT>(handle, params, dataset); \
   }
 
 RAFT_INST_VAMANA_BUILD(float, uint32_t);
 
 #undef RAFT_INST_VAMANA_BUILD
 
-}  // namespace cuvs::neighbors::experimental::vamana
+}  // namespace cuvs::neighbors::vamana
diff --git a/cpp/src/neighbors/vamana_build_int8.cu b/cpp/src/neighbors/vamana_build_int8.cu
@@ -17,27 +17,27 @@
 #include "vamana.cuh"
 #include <cuvs/neighbors/vamana.hpp>
 
-namespace cuvs::neighbors::experimental::vamana {
+namespace cuvs::neighbors::vamana {
 
 #define RAFT_INST_VAMANA_BUILD(T, IdxT)                                                    \
   auto build(raft::resources const& handle,                                                \
-             const cuvs::neighbors::experimental::vamana::index_params& params,            \
+             const cuvs::neighbors::vamana::index_params& params,            \
              raft::device_matrix_view<const T, int64_t, raft::row_major> dataset)          \
-    ->cuvs::neighbors::experimental::vamana::index<T, IdxT>                                \
+    ->cuvs::neighbors::vamana::index<T, IdxT>                                \
   {                                                                                        \
-    return cuvs::neighbors::experimental::vamana::build<T, IdxT>(handle, params, dataset); \
+    return cuvs::neighbors::vamana::build<T, IdxT>(handle, params, dataset); \
   }                                                                                        \
                                                                                            \
   auto build(raft::resources const& handle,                                                \
-             const cuvs::neighbors::experimental::vamana::index_params& params,            \
+             const cuvs::neighbors::vamana::index_params& params,            \
              raft::host_matrix_view<const T, int64_t, raft::row_major> dataset)            \
-    ->cuvs::neighbors::experimental::vamana::index<T, IdxT>                                \
+    ->cuvs::neighbors::vamana::index<T, IdxT>                                \
   {                                                                                        \
-    return cuvs::neighbors::experimental::vamana::build<T, IdxT>(handle, params, dataset); \
+    return cuvs::neighbors::vamana::build<T, IdxT>(handle, params, dataset); \
   }
 
 RAFT_INST_VAMANA_BUILD(int8_t, uint32_t);
 
 #undef RAFT_INST_VAMANA_BUILD
 
-}  // namespace cuvs::neighbors::experimental::vamana
+}  // namespace cuvs::neighbors::vamana
diff --git a/cpp/src/neighbors/vamana_build_uint8.cu b/cpp/src/neighbors/vamana_build_uint8.cu
@@ -17,27 +17,27 @@
 #include "vamana.cuh"
 #include <cuvs/neighbors/vamana.hpp>
 
-namespace cuvs::neighbors::experimental::vamana {
+namespace cuvs::neighbors::vamana {
 
 #define RAFT_INST_VAMANA_BUILD(T, IdxT)                                                    \
   auto build(raft::resources const& handle,                                                \
-             const cuvs::neighbors::experimental::vamana::index_params& params,            \
+             const cuvs::neighbors::vamana::index_params& params,            \
              raft::device_matrix_view<const T, int64_t, raft::row_major> dataset)          \
-    ->cuvs::neighbors::experimental::vamana::index<T, IdxT>                                \
+    ->cuvs::neighbors::vamana::index<T, IdxT>                                \
   {                                                                                        \
-    return cuvs::neighbors::experimental::vamana::build<T, IdxT>(handle, params, dataset); \
+    return cuvs::neighbors::vamana::build<T, IdxT>(handle, params, dataset); \
   }                                                                                        \
                                                                                            \
   auto build(raft::resources const& handle,                                                \
-             const cuvs::neighbors::experimental::vamana::index_params& params,            \
+             const cuvs::neighbors::vamana::index_params& params,            \
              raft::host_matrix_view<const T, int64_t, raft::row_major> dataset)            \
-    ->cuvs::neighbors::experimental::vamana::index<T, IdxT>                                \
+    ->cuvs::neighbors::vamana::index<T, IdxT>                                \
   {                                                                                        \
-    return cuvs::neighbors::experimental::vamana::build<T, IdxT>(handle, params, dataset); \
+    return cuvs::neighbors::vamana::build<T, IdxT>(handle, params, dataset); \
   }
 
 RAFT_INST_VAMANA_BUILD(uint8_t, uint32_t);
 
 #undef RAFT_INST_VAMANA_BUILD
 
-}  // namespace cuvs::neighbors::experimental::vamana
+}  // namespace cuvs::neighbors::vamana
diff --git a/cpp/src/neighbors/vamana_serialize.cuh b/cpp/src/neighbors/vamana_serialize.cuh
@@ -18,7 +18,7 @@
 
 #include "detail/vamana/vamana_serialize.cuh"
 
-namespace cuvs::neighbors::experimental::vamana {
+namespace cuvs::neighbors::vamana {
 
 /**
  * @defgroup VAMANA graph serialize/derserialize
@@ -28,12 +28,12 @@ namespace cuvs::neighbors::experimental::vamana {
 #define CUVS_INST_VAMANA_SERIALIZE(DTYPE)                                                     \
   void serialize(raft::resources const& handle,                                               \
                  const std::string& file_prefix,                                              \
-                 const cuvs::neighbors::experimental::vamana::index<DTYPE, uint32_t>& index_) \
+                 const cuvs::neighbors::vamana::index<DTYPE, uint32_t>& index_) \
   {                                                                                           \
-    cuvs::neighbors::experimental::vamana::detail::serialize<DTYPE, uint32_t>(                \
+    cuvs::neighbors::vamana::detail::serialize<DTYPE, uint32_t>(                \
       handle, file_prefix, index_);                                                           \
   };
 
 /** @} */  // end group vamana
 
-}  // namespace cuvs::neighbors::experimental::vamana
+}  // namespace cuvs::neighbors::vamana
diff --git a/cpp/src/neighbors/vamana_serialize_float.cu b/cpp/src/neighbors/vamana_serialize_float.cu
@@ -16,8 +16,8 @@
 
 #include "vamana_serialize.cuh"
 
-namespace cuvs::neighbors::experimental::vamana {
+namespace cuvs::neighbors::vamana {
 
 CUVS_INST_VAMANA_SERIALIZE(float);
 
-}  // namespace cuvs::neighbors::experimental::vamana
+}  // namespace cuvs::neighbors::vamana
diff --git a/cpp/src/neighbors/vamana_serialize_int8.cu b/cpp/src/neighbors/vamana_serialize_int8.cu
@@ -16,8 +16,8 @@
 
 #include "vamana_serialize.cuh"
 
-namespace cuvs::neighbors::experimental::vamana {
+namespace cuvs::neighbors::vamana {
 
 CUVS_INST_VAMANA_SERIALIZE(int8_t);
 
-}  // namespace cuvs::neighbors::experimental::vamana
+}  // namespace cuvs::neighbors::vamana
diff --git a/cpp/src/neighbors/vamana_serialize_uint8.cu b/cpp/src/neighbors/vamana_serialize_uint8.cu
@@ -16,8 +16,8 @@
 
 #include "vamana_serialize.cuh"
 
-namespace cuvs::neighbors::experimental::vamana {
+namespace cuvs::neighbors::vamana {
 
 CUVS_INST_VAMANA_SERIALIZE(uint8_t);
 
-}  // namespace cuvs::neighbors::experimental::vamana
+}  // namespace cuvs::neighbors::vamana
diff --git a/cpp/test/neighbors/ann_vamana.cuh b/cpp/test/neighbors/ann_vamana.cuh
@@ -46,7 +46,7 @@
 #include <string>
 #include <vector>
 
-namespace cuvs::neighbors::experimental::vamana {
+namespace cuvs::neighbors::vamana {
 
 struct edge_op {
   template <typename Type, typename... UnusedArgs>
@@ -335,4 +335,4 @@ inline std::vector<AnnVamanaInputs> generate_inputs()
 
 const std::vector<AnnVamanaInputs> inputs = generate_inputs();
 
-}  // namespace cuvs::neighbors::experimental::vamana
+}  // namespace cuvs::neighbors::vamana