Skip to content

Commit

Permalink
Deprecating distance APIs
Browse files Browse the repository at this point in the history
  • Loading branch information
cjnolet committed Sep 24, 2024
1 parent 8ddcd3e commit a8b44f8
Showing 1 changed file with 68 additions and 65 deletions.
133 changes: 68 additions & 65 deletions cpp/include/raft/distance/distance-ext.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -35,42 +35,43 @@ template <raft::distance::DistanceType DistT,
typename OutT,
typename FinalLambda,
typename IdxT = int>
void distance(raft::resources const& handle,
const DataT* x,
const DataT* y,
OutT* dist,
IdxT m,
IdxT n,
IdxT k,
void* workspace,
size_t worksize,
FinalLambda fin_op,
bool isRowMajor = true,
DataT metric_arg = 2.0f) RAFT_EXPLICIT;
[[deprecated("Use cuVS instead")]] void distance(raft::resources const& handle,
const DataT* x,
const DataT* y,
OutT* dist,
IdxT m,
IdxT n,
IdxT k,
void* workspace,
size_t worksize,
FinalLambda fin_op,
bool isRowMajor = true,
DataT metric_arg = 2.0f) RAFT_EXPLICIT;

template <raft::distance::DistanceType DistT,
typename DataT,
typename AccT,
typename OutT,
typename IdxT = int>
void distance(raft::resources const& handle,
const DataT* x,
const DataT* y,
OutT* dist,
IdxT m,
IdxT n,
IdxT k,
void* workspace,
size_t worksize,
bool isRowMajor = true,
DataT metric_arg = 2.0f) RAFT_EXPLICIT;
[[deprecated("Use cuVS instead")]] void distance(raft::resources const& handle,
const DataT* x,
const DataT* y,
OutT* dist,
IdxT m,
IdxT n,
IdxT k,
void* workspace,
size_t worksize,
bool isRowMajor = true,
DataT metric_arg = 2.0f) RAFT_EXPLICIT;

template <raft::distance::DistanceType DistT,
typename DataT,
typename AccT,
typename OutT,
typename IdxT = int>
size_t getWorkspaceSize(const DataT* x, const DataT* y, IdxT m, IdxT n, IdxT k) RAFT_EXPLICIT;
[[deprecated("Use cuVS instead")]] size_t getWorkspaceSize(
const DataT* x, const DataT* y, IdxT m, IdxT n, IdxT k) RAFT_EXPLICIT;

template <raft::distance::DistanceType DistT,
typename DataT,
Expand All @@ -86,60 +87,62 @@ template <raft::distance::DistanceType DistT,
typename AccT,
typename OutT,
typename IdxT = int>
void distance(raft::resources const& handle,
const DataT* x,
const DataT* y,
OutT* dist,
IdxT m,
IdxT n,
IdxT k,
bool isRowMajor = true,
DataT metric_arg = 2.0f) RAFT_EXPLICIT;
[[deprecated("Use cuVS instead")]] void distance(raft::resources const& handle,
const DataT* x,
const DataT* y,
OutT* dist,
IdxT m,
IdxT n,
IdxT k,
bool isRowMajor = true,
DataT metric_arg = 2.0f) RAFT_EXPLICIT;

template <typename Type, typename IdxT = int>
void pairwise_distance(raft::resources const& handle,
const Type* x,
const Type* y,
Type* dist,
IdxT m,
IdxT n,
IdxT k,
rmm::device_uvector<char>& workspace,
raft::distance::DistanceType metric,
bool isRowMajor = true,
Type metric_arg = 2.0f) RAFT_EXPLICIT;
[[deprecated("Use cuVS instead")]] void pairwise_distance(raft::resources const& handle,
const Type* x,
const Type* y,
Type* dist,
IdxT m,
IdxT n,
IdxT k,
rmm::device_uvector<char>& workspace,
raft::distance::DistanceType metric,
bool isRowMajor = true,
Type metric_arg = 2.0f) RAFT_EXPLICIT;

template <typename Type, typename IdxT = int>
void pairwise_distance(raft::resources const& handle,
const Type* x,
const Type* y,
Type* dist,
IdxT m,
IdxT n,
IdxT k,
raft::distance::DistanceType metric,
bool isRowMajor = true,
Type metric_arg = 2.0f) RAFT_EXPLICIT;
[[deprecated("Use cuVS instead")]] void pairwise_distance(raft::resources const& handle,
const Type* x,
const Type* y,
Type* dist,
IdxT m,
IdxT n,
IdxT k,
raft::distance::DistanceType metric,
bool isRowMajor = true,
Type metric_arg = 2.0f) RAFT_EXPLICIT;

template <raft::distance::DistanceType DistT,
typename DataT,
typename AccT,
typename OutT,
typename layout = raft::layout_c_contiguous,
typename IdxT = int>
void distance(raft::resources const& handle,
raft::device_matrix_view<DataT, IdxT, layout> const x,
raft::device_matrix_view<DataT, IdxT, layout> const y,
raft::device_matrix_view<OutT, IdxT, layout> dist,
DataT metric_arg = 2.0f) RAFT_EXPLICIT;
[[deprecated("Use cuVS instead")]] void distance(
raft::resources const& handle,
raft::device_matrix_view<DataT, IdxT, layout> const x,
raft::device_matrix_view<DataT, IdxT, layout> const y,
raft::device_matrix_view<OutT, IdxT, layout> dist,
DataT metric_arg = 2.0f) RAFT_EXPLICIT;

template <typename Type, typename layout = layout_c_contiguous, typename IdxT = int>
void pairwise_distance(raft::resources const& handle,
device_matrix_view<Type, IdxT, layout> const x,
device_matrix_view<Type, IdxT, layout> const y,
device_matrix_view<Type, IdxT, layout> dist,
raft::distance::DistanceType metric,
Type metric_arg = 2.0f) RAFT_EXPLICIT;
[[deprecated("Use cuVS instead")]] void pairwise_distance(
raft::resources const& handle,
device_matrix_view<Type, IdxT, layout> const x,
device_matrix_view<Type, IdxT, layout> const y,
device_matrix_view<Type, IdxT, layout> dist,
raft::distance::DistanceType metric,
Type metric_arg = 2.0f) RAFT_EXPLICIT;

}; // namespace distance
}; // namespace raft
Expand Down

0 comments on commit a8b44f8

Please sign in to comment.