Merge branch 'branch-23.12' into fea-2312-bench-ann-conf

rapidsai · Nov 1, 2023 · c2b7656 · c2b7656
2 parents e21bc0b + d504795
commit c2b7656
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/cpp/include/raft/neighbors/ball_cover-inl.cuh b/cpp/include/raft/neighbors/ball_cover-inl.cuh
@@ -44,7 +44,7 @@ namespace raft::neighbors::ball_cover {
  *  #include <raft/distance/distance_types.hpp>
  *  using namespace raft::neighbors;
  *
- *  raft::raft::resources handle;
+ *  raft::resources handle;
  *  ...
  *  auto metric = raft::distance::DistanceType::L2Expanded;
  *  BallCoverIndex index(handle, X, metric);
@@ -168,7 +168,7 @@ void all_knn_query(raft::resources const& handle,
  *  #include <raft/distance/distance_types.hpp>
  *  using namespace raft::neighbors;
  *
- *  raft::raft::resources handle;
+ *  raft::resources handle;
  *  ...
  *  auto metric = raft::distance::DistanceType::L2Expanded;
  *
@@ -316,7 +316,7 @@ void knn_query(raft::resources const& handle,
  *  #include <raft/distance/distance_types.hpp>
  *  using namespace raft::neighbors;
  *
- *  raft::raft::resources handle;
+ *  raft::resources handle;
  *  ...
  *  auto metric = raft::distance::DistanceType::L2Expanded;
  *

diff --git a/cpp/include/raft/neighbors/brute_force-inl.cuh b/cpp/include/raft/neighbors/brute_force-inl.cuh
@@ -34,13 +34,13 @@ namespace raft::neighbors::brute_force {
  * @brief Performs a k-select across several (contiguous) row-partitioned index/distance
  * matrices formatted like the following:
  *
- * part1row1: k0, k1, k2, k3
- * part1row2: k0, k1, k2, k3
- * part1row3: k0, k1, k2, k3
- * part2row1: k0, k1, k2, k3
- * part2row2: k0, k1, k2, k3
- * part2row3: k0, k1, k2, k3
- * etc...
+ *     part1row1: k0, k1, k2, k3
+ *     part1row2: k0, k1, k2, k3
+ *     part1row3: k0, k1, k2, k3
+ *     part2row1: k0, k1, k2, k3
+ *     part2row2: k0, k1, k2, k3
+ *     part2row3: k0, k1, k2, k3
+ *     etc...
  *
  * The example above shows what an aggregated index/distance matrix
  * would look like with two partitions when n_samples=3 and k=4.
@@ -59,7 +59,7 @@ namespace raft::neighbors::brute_force {
  *  #include <raft/neighbors/brute_force.cuh>
  *  using namespace raft::neighbors;
  *
- *  raft::raft::resources handle;
+ *  raft::resources handle;
  *  ...
  *  compute multiple knn graphs and aggregate row-wise
  *  (see detailed description above)
@@ -126,7 +126,7 @@ inline void knn_merge_parts(
  *  #include <raft/distance/distance_types.hpp>
  *  using namespace raft::neighbors;
  *
- *  raft::raft::resources handle;
+ *  raft::resources handle;
  *  ...
  *  auto metric = raft::distance::DistanceType::L2SqrtExpanded;
  *  brute_force::knn(handle, index, search, indices, distances, metric);
@@ -219,7 +219,7 @@ void knn(raft::resources const& handle,
  *  #include <raft/distance/distance_types.hpp>
  *  using namespace raft::neighbors;
  *
- *  raft::raft::resources handle;
+ *  raft::resources handle;
  *  ...
  *  auto metric = raft::distance::DistanceType::L2SqrtExpanded;
  *  brute_force::fused_l2_knn(handle, index, search, indices, distances, metric);

diff --git a/cpp/include/raft/neighbors/brute_force_types.hpp b/cpp/include/raft/neighbors/brute_force_types.hpp
@@ -30,7 +30,7 @@
 
 namespace raft::neighbors::brute_force {
 /**
- * @addtogroup brute_force
+ * @addtogroup brute_force_knn
  * @{
  */
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,7 @@ @@
     namespace raft::neighbors::brute_force {
     /**
-     * @addtogroup brute_force
+     * @addtogroup brute_force_knn
      * @{
      */
@@ Expand Down @@