diff --git a/cpp/include/cuvs/neighbors/cagra.hpp b/cpp/include/cuvs/neighbors/cagra.hpp index d1937cba27..98f3a96e87 100644 --- a/cpp/include/cuvs/neighbors/cagra.hpp +++ b/cpp/include/cuvs/neighbors/cagra.hpp @@ -3101,17 +3101,17 @@ auto distribute(const raft::resources& clique, const std::string& filename) * Usage example: * @code{.cpp} * using namespace cuvs::neighbors; - * // use default index parameters based on shape of the dataset - * ivf_pq::index_params build_params = ivf_pq::index_params::from_dataset(dataset); - * ivf_pq::search_params search_params; - * auto knn_graph = raft::make_host_matrix(dataset.extent(0), 128); + * // raft::host_matrix_view dataset; + * auto metric = cuvs::distance::DistanceType::L2Expanded; + * auto build_params = cagra::graph_build_params::ivf_pq_params(dataset.extents(), metric); + * auto knn_graph = raft::make_host_matrix(dataset.extent(0), 128); * // create knn graph - * cagra::build_knn_graph(res, dataset, knn_graph.view(), 2, build_params, search_params); - * auto optimized_gaph = raft::make_host_matrix(dataset.extent(0), 64); - * cagra::optimize(res, dataset, knn_graph.view(), optimized_graph.view()); + * cagra::build_knn_graph(res, dataset, knn_graph.view(), build_params); + * auto optimized_graph = raft::make_host_matrix(dataset.extent(0), 64); + * cagra::helpers::optimize(res, knn_graph.view(), optimized_graph.view()); * // Construct an index from dataset and optimized knn_graph - * auto index = cagra::index(res, build_params.metric(), dataset, - * optimized_graph.view()); + * auto index = cagra::index( + * res, metric, dataset, raft::make_const_mdspan(optimized_graph.view())); * @endcode * * @param[in] res raft resources @@ -3141,17 +3141,17 @@ void build_knn_graph(raft::resources const& res, * Usage example: * @code{.cpp} * using namespace cuvs::neighbors; - * // use default index parameters based on shape of the dataset - * ivf_pq::index_params build_params = ivf_pq::index_params::from_dataset(dataset); - * ivf_pq::search_params search_params; - * auto knn_graph = raft::make_host_matrix(dataset.extent(0), 128); + * // raft::host_matrix_view dataset; + * auto metric = cuvs::distance::DistanceType::L2Expanded; + * auto build_params = cagra::graph_build_params::ivf_pq_params(dataset.extents(), metric); + * auto knn_graph = raft::make_host_matrix(dataset.extent(0), 128); * // create knn graph - * cagra::build_knn_graph(res, dataset, knn_graph.view(), 2, build_params, search_params); - * auto optimized_gaph = raft::make_host_matrix(dataset.extent(0), 64); - * cagra::optimize(res, dataset, knn_graph.view(), optimized_graph.view()); + * cagra::build_knn_graph(res, dataset, knn_graph.view(), build_params); + * auto optimized_graph = raft::make_host_matrix(dataset.extent(0), 64); + * cagra::helpers::optimize(res, knn_graph.view(), optimized_graph.view()); * // Construct an index from dataset and optimized knn_graph - * auto index = cagra::index(res, build_params.metric(), dataset, - * optimized_graph.view()); + * auto index = cagra::index( + * res, metric, dataset, raft::make_const_mdspan(optimized_graph.view())); * @endcode * * @param[in] res raft resources @@ -3181,17 +3181,17 @@ void build_knn_graph(raft::resources const& res, * Usage example: * @code{.cpp} * using namespace cuvs::neighbors; - * // use default index parameters based on shape of the dataset - * ivf_pq::index_params build_params = ivf_pq::index_params::from_dataset(dataset); - * ivf_pq::search_params search_params; - * auto knn_graph = raft::make_host_matrix(dataset.extent(0), 128); + * // raft::host_matrix_view dataset; + * auto metric = cuvs::distance::DistanceType::L2Expanded; + * auto build_params = cagra::graph_build_params::ivf_pq_params(dataset.extents(), metric); + * auto knn_graph = raft::make_host_matrix(dataset.extent(0), 128); * // create knn graph - * cagra::build_knn_graph(res, dataset, knn_graph.view(), 2, build_params, search_params); - * auto optimized_gaph = raft::make_host_matrix(dataset.extent(0), 64); - * cagra::optimize(res, dataset, knn_graph.view(), optimized_graph.view()); + * cagra::build_knn_graph(res, dataset, knn_graph.view(), build_params); + * auto optimized_graph = raft::make_host_matrix(dataset.extent(0), 64); + * cagra::helpers::optimize(res, knn_graph.view(), optimized_graph.view()); * // Construct an index from dataset and optimized knn_graph - * auto index = cagra::index(res, build_params.metric(), dataset, - * optimized_graph.view()); + * auto index = cagra::index( + * res, metric, dataset, raft::make_const_mdspan(optimized_graph.view())); * @endcode * * @param[in] res raft resources @@ -3221,17 +3221,17 @@ void build_knn_graph(raft::resources const& res, * Usage example: * @code{.cpp} * using namespace cuvs::neighbors; - * // use default index parameters based on shape of the dataset - * ivf_pq::index_params build_params = ivf_pq::index_params::from_dataset(dataset); - * ivf_pq::search_params search_params; - * auto knn_graph = raft::make_host_matrix(dataset.extent(0), 128); + * // raft::host_matrix_view dataset; + * auto metric = cuvs::distance::DistanceType::L2Expanded; + * auto build_params = cagra::graph_build_params::ivf_pq_params(dataset.extents(), metric); + * auto knn_graph = raft::make_host_matrix(dataset.extent(0), 128); * // create knn graph - * cagra::build_knn_graph(res, dataset, knn_graph.view(), 2, build_params, search_params); - * auto optimized_gaph = raft::make_host_matrix(dataset.extent(0), 64); - * cagra::optimize(res, dataset, knn_graph.view(), optimized_graph.view()); + * cagra::build_knn_graph(res, dataset, knn_graph.view(), build_params); + * auto optimized_graph = raft::make_host_matrix(dataset.extent(0), 64); + * cagra::helpers::optimize(res, knn_graph.view(), optimized_graph.view()); * // Construct an index from dataset and optimized knn_graph - * auto index = cagra::index(res, build_params.metric(), dataset, - * optimized_graph.view()); + * auto index = cagra::index( + * res, metric, dataset, raft::make_const_mdspan(optimized_graph.view())); * @endcode * * @param[in] res raft resources