Skip to content

Commit

Permalink
Deprecating
Browse files Browse the repository at this point in the history
  • Loading branch information
cjnolet committed Sep 24, 2024
1 parent cefd678 commit 4b10bf6
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 16 deletions.
1 change: 1 addition & 0 deletions cpp/include/raft/neighbors/ball_cover.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#pragma once
#ifndef RAFT_EXPLICIT_INSTANTIATE_ONLY
#include "ball_cover-inl.cuh"
Expand Down
8 changes: 4 additions & 4 deletions cpp/include/raft/neighbors/ball_cover_types.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ namespace raft::neighbors::ball_cover {
* @tparam value_t
* @tparam value_int
*/
template <typename value_idx,
typename value_t,
typename value_int = std::int64_t,
typename matrix_idx = std::int64_t>
[[deprecated("Use cuVS instead")]] template <typename value_idx,
typename value_t,
typename value_int = std::int64_t,
typename matrix_idx = std::int64_t>
class BallCoverIndex {
public:
explicit BallCoverIndex(raft::resources const& handle_,
Expand Down
2 changes: 1 addition & 1 deletion cpp/include/raft/neighbors/brute_force_types.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ using ann::search_params;
*
* @tparam T data element type
*/
template <typename T>
[[deprecated("Use cuVS instead")]] template <typename T>
struct index : ann::index {
public:
/** Distance metric used for retrieval */
Expand Down
2 changes: 1 addition & 1 deletion cpp/include/raft/neighbors/cagra_types.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ static_assert(std::is_aggregate_v<search_params>);
* @tparam IdxT type of the vector indices (represent dataset.extent(0))
*
*/
template <typename T, typename IdxT>
[[deprecated("Use cuVS instead")]] template <typename T, typename IdxT>
struct index : ann::index {
static_assert(!raft::is_narrowing_v<uint32_t, IdxT>,
"IdxT must be able to represent all values of uint32_t");
Expand Down
7 changes: 4 additions & 3 deletions cpp/include/raft/neighbors/epsilon_neighborhood.cuh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020-2023, NVIDIA CORPORATION.
* Copyright (c) 2020-2024, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -45,7 +45,7 @@ namespace raft::neighbors::epsilon_neighborhood {
* squared as we compute L2-squared distance in this method)
* @param[in] stream cuda stream
*/
template <typename value_t, typename idx_t>
[[deprecated("Use cuVS instead")]] template <typename value_t, typename idx_t>
void epsUnexpL2SqNeighborhood(bool* adj,
idx_t* vd,
const value_t* x,
Expand Down Expand Up @@ -97,7 +97,8 @@ void epsUnexpL2SqNeighborhood(bool* adj,
* @param[in] eps defines epsilon neighborhood radius (should be passed as
* squared as we compute L2-squared distance in this method)
*/
template <typename value_t, typename idx_t, typename matrix_idx_t>
[[deprecated(
"Use cuVS instead")]] template <typename value_t, typename idx_t, typename matrix_idx_t>
void eps_neighbors_l2sq(raft::resources const& handle,
raft::device_matrix_view<const value_t, matrix_idx_t, row_major> x,
raft::device_matrix_view<const value_t, matrix_idx_t, row_major> y,
Expand Down
3 changes: 1 addition & 2 deletions cpp/include/raft/neighbors/hnsw_types.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ struct search_params : ann::search_params {
int num_threads = 0; // number of host threads to use for concurrent searches. Value of 0
// automatically maximizes parallelism
};

template <typename T>
[[deprecated("Use cuVS instead")]] template <typename T>
struct index : ann::index {
public:
/**
Expand Down
2 changes: 1 addition & 1 deletion cpp/include/raft/neighbors/ivf_flat_types.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ using list_data = ivf::list<list_spec, SizeT, ValueT, IdxT>;
* @tparam IdxT type of the indices in the source dataset
*
*/
template <typename T, typename IdxT>
[[deprecated("Use cuVS instead")]] template <typename T, typename IdxT>
struct index : ann::index {
static_assert(!raft::is_narrowing_v<uint32_t, IdxT>,
"IdxT must be able to represent all values of uint32_t");
Expand Down
2 changes: 1 addition & 1 deletion cpp/include/raft/neighbors/ivf_pq_types.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ using list_data = ivf::list<list_spec, SizeT, IdxT>;
* @tparam IdxT type of the indices in the source dataset
*
*/
template <typename IdxT>
[[deprecated("Use cuVS instead")]] template <typename IdxT>
struct index : ann::index {
static_assert(!raft::is_narrowing_v<uint32_t, IdxT>,
"IdxT must be able to represent all values of uint32_t");
Expand Down
2 changes: 1 addition & 1 deletion cpp/include/raft/neighbors/nn_descent_types.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ struct index_params : ann::index_params {
*
* @tparam IdxT dtype to be used for constructing knn-graph
*/
template <typename IdxT>
[[deprecated("Use cuVS instead")]] template <typename IdxT>
struct index : ann::index {
public:
/**
Expand Down
10 changes: 8 additions & 2 deletions cpp/include/raft/neighbors/refine-ext.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@

namespace raft::neighbors {

template <typename idx_t, typename data_t, typename distance_t, typename matrix_idx>
[[deprecated("Use cuVS instead")]] template <typename idx_t,
typename data_t,
typename distance_t,
typename matrix_idx>
void refine(raft::resources const& handle,
raft::device_matrix_view<const data_t, matrix_idx, row_major> dataset,
raft::device_matrix_view<const data_t, matrix_idx, row_major> queries,
Expand All @@ -38,7 +41,10 @@ void refine(raft::resources const& handle,
raft::distance::DistanceType metric = distance::DistanceType::L2Unexpanded)
RAFT_EXPLICIT;

template <typename idx_t, typename data_t, typename distance_t, typename matrix_idx>
[[deprecated("Use cuVS instead")]] template <typename idx_t,
typename data_t,
typename distance_t,
typename matrix_idx>
void refine(raft::resources const& handle,
raft::host_matrix_view<const data_t, matrix_idx, row_major> dataset,
raft::host_matrix_view<const data_t, matrix_idx, row_major> queries,
Expand Down

0 comments on commit 4b10bf6

Please sign in to comment.