Skip to content

Commit 285e5ed

Browse files
committed
consolidate aliases and get rid of naming inconsistencies
1 parent 8d99fa7 commit 285e5ed

5 files changed

Lines changed: 156 additions & 184 deletions

File tree

cpp/include/cuvs/neighbors/cagra.hpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
#pragma once
77

8-
#include "common.hpp"
98
#include <cuda_fp16.h>
109
#include <cuvs/distance/distance.hpp>
1110
#include <cuvs/neighbors/common.hpp>
@@ -558,7 +557,7 @@ struct index : cuvs::neighbors::index {
558557
* `detail::clone_any_dataset_view_for_cagra_index` stores a shallow copy of the view variant.
559558
* Supported:
560559
* `empty_dataset_view`, `indirect_dataset_view`, `device_padded_dataset_view`,
561-
* `dataset_view<strided_dataset_container,...>`. The index stores only a **non-owning** view; the
560+
* `strided_dataset_view<T, int64_t>`. The index stores only a **non-owning** view; the
562561
* caller must keep all underlying device storage (and any `indirect_dataset_view` target) alive
563562
* for the index lifetime.
564563
*
@@ -693,8 +692,7 @@ struct index : cuvs::neighbors::index {
693692
static_cast<unsigned>(required_stride),
694693
static_cast<unsigned>(src_stride));
695694

696-
::cuvs::neighbors::dataset_view<strided_dataset_container, T, dataset_index_type, true, false>
697-
wrap(dataset_view);
695+
::cuvs::neighbors::strided_dataset_view<T, dataset_index_type> wrap(dataset_view);
698696
update_dataset(res, cuvs::neighbors::any_dataset_view<T, dataset_index_type>(wrap));
699697
}
700698

@@ -1420,7 +1418,7 @@ auto build_ace(raft::resources const& res,
14201418
* is used, returns `build_result` with `.vpq` that the caller must keep alive.
14211419
* See `build(res, params, device_matrix_view)` for full documentation.
14221420
*
1423-
* Strided device rows (`dataset_view<strided_dataset_container, T, int64_t, true, false>`) are
1421+
* Strided device rows (`strided_dataset_view<T, int64_t>`) are
14241422
* carried as the strided alternative inside `any_dataset_view` and convert implicitly from that
14251423
* view type (`any_dataset_view<T, int64_t>(strided_view)` is optional).
14261424
*/

0 commit comments

Comments
 (0)