From a850726af2a7688c2f303b30a68becc459928781 Mon Sep 17 00:00:00 2001 From: "Corey J. Nolet" Date: Fri, 3 Feb 2023 15:14:01 -0500 Subject: [PATCH] Remove uint32 distance idx specializations (#1235) In addition to removing uint32_t idx specializations from pairwise distances, this splits a few of the remaining distance specializations into separate files so they can be compiled concurrently. Verified cuml is not using any of the uint32_t specializations. Authors: - Corey J. Nolet (https://github.com/cjnolet) Approvers: - Ben Frederickson (https://github.com/benfred) URL: https://github.com/rapidsai/raft/pull/1235 --- cpp/CMakeLists.txt | 28 ++++---- .../specializations/detail/canberra.cuh | 16 +---- .../specializations/detail/chebyshev.cuh | 16 +---- .../specializations/detail/correlation.cuh | 16 +---- .../specializations/detail/cosine.cuh | 16 +---- .../detail/hamming_unexpanded.cuh | 16 +---- .../detail/hellinger_expanded.cuh | 16 +---- .../specializations/detail/jensen_shannon.cuh | 15 +---- .../specializations/detail/kl_divergence.cuh | 16 +---- .../distance/specializations/detail/l1.cuh | 15 +---- .../specializations/detail/l2_expanded.cuh | 16 +---- .../detail/l2_sqrt_expanded.cuh | 16 +---- .../detail/l2_sqrt_unexpanded.cuh | 16 +---- .../specializations/detail/l2_unexpanded.cuh | 16 +---- .../specializations/detail/lp_unexpanded.cuh | 16 +---- .../specializations/detail/russel_rao.cuh | 16 +---- ...u => canberra_double_double_double_int.cu} | 15 +---- .../detail/canberra_float_float_float_int.cu | 37 +++++++++++ .../specializations/detail/chebyshev.cu | 63 ------------------ .../chebyshev_double_double_double_int.cu | 38 +++++++++++ ....cu => chebyshev_float_float_float_int.cu} | 11 ++-- .../specializations/detail/correlation.cu | 65 ------------------- ...> correlation_double_double_double_int.cu} | 18 ++--- ...u => correlation_float_float_float_int.cu} | 11 ++-- .../distance/specializations/detail/cosine.cu | 64 ------------------ .../detail/cosine_double_double_double_int.cu | 38 +++++++++++ ...t32.cu => cosine_float_float_float_int.cu} | 12 ++-- .../detail/hamming_unexpanded.cu | 65 ------------------- ...ing_unexpanded_double_double_double_int.cu | 39 +++++++++++ ...mming_unexpanded_float_float_float_int.cu} | 12 ++-- .../detail/hellinger_expanded.cu | 64 ------------------ ...inger_expanded_double_double_double_int.cu | 39 +++++++++++ ...ellinger_expanded_float_float_float_int.cu | 37 +++++++++++ ...jensen_shannon_float_float_float_uint32.cu | 39 ----------- ..._sqrt_expanded_float_float_float_uint32.cu | 39 ----------- ...qrt_unexpanded_float_float_float_uint32.cu | 39 ----------- .../russel_rao_float_float_float_uint32.cu | 39 ----------- 37 files changed, 285 insertions(+), 765 deletions(-) rename cpp/src/distance/distance/specializations/detail/{canberra.cu => canberra_double_double_double_int.cu} (78%) create mode 100644 cpp/src/distance/distance/specializations/detail/canberra_float_float_float_int.cu delete mode 100644 cpp/src/distance/distance/specializations/detail/chebyshev.cu create mode 100644 cpp/src/distance/distance/specializations/detail/chebyshev_double_double_double_int.cu rename cpp/src/distance/distance/specializations/detail/{l1_float_float_float_uint32.cu => chebyshev_float_float_float_int.cu} (81%) delete mode 100644 cpp/src/distance/distance/specializations/detail/correlation.cu rename cpp/src/distance/distance/specializations/detail/{lp_unexpanded_float_float_float_uint32.cu => correlation_double_double_double_int.cu} (75%) rename cpp/src/distance/distance/specializations/detail/{l2_expanded_float_float_float_uint32.cu => correlation_float_float_float_int.cu} (81%) delete mode 100644 cpp/src/distance/distance/specializations/detail/cosine.cu create mode 100644 cpp/src/distance/distance/specializations/detail/cosine_double_double_double_int.cu rename cpp/src/distance/distance/specializations/detail/{kl_divergence_float_float_float_uint32.cu => cosine_float_float_float_int.cu} (81%) delete mode 100644 cpp/src/distance/distance/specializations/detail/hamming_unexpanded.cu create mode 100644 cpp/src/distance/distance/specializations/detail/hamming_unexpanded_double_double_double_int.cu rename cpp/src/distance/distance/specializations/detail/{l2_unexpanded_float_float_float_uint32.cu => hamming_unexpanded_float_float_float_int.cu} (81%) delete mode 100644 cpp/src/distance/distance/specializations/detail/hellinger_expanded.cu create mode 100644 cpp/src/distance/distance/specializations/detail/hellinger_expanded_double_double_double_int.cu create mode 100644 cpp/src/distance/distance/specializations/detail/hellinger_expanded_float_float_float_int.cu delete mode 100644 cpp/src/distance/distance/specializations/detail/jensen_shannon_float_float_float_uint32.cu delete mode 100644 cpp/src/distance/distance/specializations/detail/l2_sqrt_expanded_float_float_float_uint32.cu delete mode 100644 cpp/src/distance/distance/specializations/detail/l2_sqrt_unexpanded_float_float_float_uint32.cu delete mode 100644 cpp/src/distance/distance/specializations/detail/russel_rao_float_float_float_uint32.cu diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 925dc4faff..cf938a5d33 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -307,15 +307,19 @@ if(RAFT_COMPILE_DIST_LIBRARY) src/distance/neighbors/specializations/refine_h_uint64_t_uint8_t.cu src/distance/cluster/kmeans_fit_float.cu src/distance/cluster/kmeans_fit_double.cu - src/distance/distance/specializations/detail/canberra.cu - src/distance/distance/specializations/detail/chebyshev.cu - src/distance/distance/specializations/detail/correlation.cu - src/distance/distance/specializations/detail/cosine.cu - src/distance/distance/specializations/detail/cosine.cu - src/distance/distance/specializations/detail/hamming_unexpanded.cu - src/distance/distance/specializations/detail/hellinger_expanded.cu + src/distance/distance/specializations/detail/canberra_double_double_double_int.cu + src/distance/distance/specializations/detail/canberra_float_float_float_int.cu + src/distance/distance/specializations/detail/chebyshev_double_double_double_int.cu + src/distance/distance/specializations/detail/chebyshev_float_float_float_int.cu + src/distance/distance/specializations/detail/correlation_double_double_double_int.cu + src/distance/distance/specializations/detail/correlation_float_float_float_int.cu + src/distance/distance/specializations/detail/cosine_double_double_double_int.cu + src/distance/distance/specializations/detail/cosine_float_float_float_int.cu + src/distance/distance/specializations/detail/hamming_unexpanded_double_double_double_int.cu + src/distance/distance/specializations/detail/hamming_unexpanded_float_float_float_int.cu + src/distance/distance/specializations/detail/hellinger_expanded_float_float_float_int.cu + src/distance/distance/specializations/detail/hellinger_expanded_double_double_double_int.cu src/distance/distance/specializations/detail/jensen_shannon_float_float_float_int.cu - src/distance/distance/specializations/detail/jensen_shannon_float_float_float_uint32.cu src/distance/distance/specializations/detail/jensen_shannon_double_double_double_int.cu src/distance/distance/specializations/detail/kernels/gram_matrix_base_double.cu src/distance/distance/specializations/detail/kernels/gram_matrix_base_float.cu @@ -327,28 +331,20 @@ if(RAFT_COMPILE_DIST_LIBRARY) src/distance/distance/specializations/detail/kernels/tanh_kernel_double.cu src/distance/distance/specializations/detail/kernels/tanh_kernel_float.cu src/distance/distance/specializations/detail/kl_divergence_float_float_float_int.cu - src/distance/distance/specializations/detail/kl_divergence_float_float_float_uint32.cu src/distance/distance/specializations/detail/kl_divergence_double_double_double_int.cu src/distance/distance/specializations/detail/l1_float_float_float_int.cu - src/distance/distance/specializations/detail/l1_float_float_float_uint32.cu src/distance/distance/specializations/detail/l1_double_double_double_int.cu src/distance/distance/specializations/detail/l2_expanded_float_float_float_int.cu - src/distance/distance/specializations/detail/l2_expanded_float_float_float_uint32.cu src/distance/distance/specializations/detail/l2_expanded_double_double_double_int.cu src/distance/distance/specializations/detail/l2_sqrt_expanded_float_float_float_int.cu - src/distance/distance/specializations/detail/l2_sqrt_expanded_float_float_float_uint32.cu src/distance/distance/specializations/detail/l2_sqrt_expanded_double_double_double_int.cu src/distance/distance/specializations/detail/l2_sqrt_unexpanded_float_float_float_int.cu - src/distance/distance/specializations/detail/l2_sqrt_unexpanded_float_float_float_uint32.cu src/distance/distance/specializations/detail/l2_sqrt_unexpanded_double_double_double_int.cu src/distance/distance/specializations/detail/l2_unexpanded_double_double_double_int.cu - src/distance/distance/specializations/detail/l2_unexpanded_float_float_float_uint32.cu src/distance/distance/specializations/detail/l2_unexpanded_float_float_float_int.cu src/distance/distance/specializations/detail/lp_unexpanded_double_double_double_int.cu - src/distance/distance/specializations/detail/lp_unexpanded_float_float_float_uint32.cu src/distance/distance/specializations/detail/lp_unexpanded_float_float_float_int.cu src/distance/distance/specializations/detail/russel_rao_double_double_double_int.cu - src/distance/distance/specializations/detail/russel_rao_float_float_float_uint32.cu src/distance/distance/specializations/detail/russel_rao_float_float_float_int.cu src/distance/distance/specializations/fused_l2_nn_double_int.cu src/distance/distance/specializations/fused_l2_nn_double_int64.cu diff --git a/cpp/include/raft/distance/specializations/detail/canberra.cuh b/cpp/include/raft/distance/specializations/detail/canberra.cuh index 22bdf41fd1..6b6364fb58 100644 --- a/cpp/include/raft/distance/specializations/detail/canberra.cuh +++ b/cpp/include/raft/distance/specializations/detail/canberra.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2023, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -48,20 +48,6 @@ extern template void distance( - const float* x, - const float* y, - float* dist, - std::uint32_t m, - std::uint32_t n, - std::uint32_t k, - void* workspace, - size_t worksize, - cudaStream_t stream, - bool isRowMajor, - float metric_arg); - } // namespace detail } // namespace distance } // namespace raft diff --git a/cpp/include/raft/distance/specializations/detail/chebyshev.cuh b/cpp/include/raft/distance/specializations/detail/chebyshev.cuh index 7502409082..bbf5635ceb 100644 --- a/cpp/include/raft/distance/specializations/detail/chebyshev.cuh +++ b/cpp/include/raft/distance/specializations/detail/chebyshev.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2023, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -47,20 +47,6 @@ extern template void distance( - const float* x, - const float* y, - float* dist, - std::uint32_t m, - std::uint32_t n, - std::uint32_t k, - void* workspace, - size_t worksize, - cudaStream_t stream, - bool isRowMajor, - float metric_arg); - } // namespace detail } // namespace distance } // namespace raft diff --git a/cpp/include/raft/distance/specializations/detail/correlation.cuh b/cpp/include/raft/distance/specializations/detail/correlation.cuh index a2cddea179..3826fb1030 100644 --- a/cpp/include/raft/distance/specializations/detail/correlation.cuh +++ b/cpp/include/raft/distance/specializations/detail/correlation.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2023, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -49,20 +49,6 @@ distance( - const float* x, - const float* y, - float* dist, - std::uint32_t m, - std::uint32_t n, - std::uint32_t k, - void* workspace, - size_t worksize, - cudaStream_t stream, - bool isRowMajor, - float metric_arg); - } // namespace detail } // namespace distance } // namespace raft diff --git a/cpp/include/raft/distance/specializations/detail/cosine.cuh b/cpp/include/raft/distance/specializations/detail/cosine.cuh index c98703e135..40e4a55aae 100644 --- a/cpp/include/raft/distance/specializations/detail/cosine.cuh +++ b/cpp/include/raft/distance/specializations/detail/cosine.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2023, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -49,20 +49,6 @@ distance( - const float* x, - const float* y, - float* dist, - std::uint32_t m, - std::uint32_t n, - std::uint32_t k, - void* workspace, - size_t worksize, - cudaStream_t stream, - bool isRowMajor, - float metric_arg); - } // namespace detail } // namespace distance } // namespace raft diff --git a/cpp/include/raft/distance/specializations/detail/hamming_unexpanded.cuh b/cpp/include/raft/distance/specializations/detail/hamming_unexpanded.cuh index 9cf7b9b343..08868eb7ea 100644 --- a/cpp/include/raft/distance/specializations/detail/hamming_unexpanded.cuh +++ b/cpp/include/raft/distance/specializations/detail/hamming_unexpanded.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2023, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -49,20 +49,6 @@ distance( - const float* x, - const float* y, - float* dist, - std::uint32_t m, - std::uint32_t n, - std::uint32_t k, - void* workspace, - size_t worksize, - cudaStream_t stream, - bool isRowMajor, - float metric_arg); - } // namespace detail } // namespace distance } // namespace raft diff --git a/cpp/include/raft/distance/specializations/detail/hellinger_expanded.cuh b/cpp/include/raft/distance/specializations/detail/hellinger_expanded.cuh index 28ecaa1b65..9fe5c3d6f9 100644 --- a/cpp/include/raft/distance/specializations/detail/hellinger_expanded.cuh +++ b/cpp/include/raft/distance/specializations/detail/hellinger_expanded.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2023, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -49,20 +49,6 @@ distance( - const float* x, - const float* y, - float* dist, - std::uint32_t m, - std::uint32_t n, - std::uint32_t k, - void* workspace, - size_t worksize, - cudaStream_t stream, - bool isRowMajor, - float metric_arg); - } // namespace detail } // namespace distance } // namespace raft diff --git a/cpp/include/raft/distance/specializations/detail/jensen_shannon.cuh b/cpp/include/raft/distance/specializations/detail/jensen_shannon.cuh index ac0190562b..4e86417840 100644 --- a/cpp/include/raft/distance/specializations/detail/jensen_shannon.cuh +++ b/cpp/include/raft/distance/specializations/detail/jensen_shannon.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2023, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -47,19 +47,6 @@ distance( - const float* x, - const float* y, - float* dist, - std::uint32_t m, - std::uint32_t n, - std::uint32_t k, - void* workspace, - size_t worksize, - cudaStream_t stream, - bool isRowMajor, - float metric_arg); } // namespace detail } // namespace distance diff --git a/cpp/include/raft/distance/specializations/detail/kl_divergence.cuh b/cpp/include/raft/distance/specializations/detail/kl_divergence.cuh index b338cebdc2..828b5b09e3 100644 --- a/cpp/include/raft/distance/specializations/detail/kl_divergence.cuh +++ b/cpp/include/raft/distance/specializations/detail/kl_divergence.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2023, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -48,20 +48,6 @@ distance( - const float* x, - const float* y, - float* dist, - std::uint32_t m, - std::uint32_t n, - std::uint32_t k, - void* workspace, - size_t worksize, - cudaStream_t stream, - bool isRowMajor, - float metric_arg); - } // namespace detail } // namespace distance } // namespace raft diff --git a/cpp/include/raft/distance/specializations/detail/l1.cuh b/cpp/include/raft/distance/specializations/detail/l1.cuh index 65979ce414..b4d9d4343b 100644 --- a/cpp/include/raft/distance/specializations/detail/l1.cuh +++ b/cpp/include/raft/distance/specializations/detail/l1.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2023, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -47,19 +47,6 @@ extern template void distance( - const float* x, - const float* y, - float* dist, - std::uint32_t m, - std::uint32_t n, - std::uint32_t k, - void* workspace, - size_t worksize, - cudaStream_t stream, - bool isRowMajor, - float metric_arg); - } // namespace detail } // namespace distance } // namespace raft diff --git a/cpp/include/raft/distance/specializations/detail/l2_expanded.cuh b/cpp/include/raft/distance/specializations/detail/l2_expanded.cuh index 1dac34ad7a..8eadd6e233 100644 --- a/cpp/include/raft/distance/specializations/detail/l2_expanded.cuh +++ b/cpp/include/raft/distance/specializations/detail/l2_expanded.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2023, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -47,20 +47,6 @@ distance( bool isRowMajor, double metric_arg); -extern template void -distance( - const float* x, - const float* y, - float* dist, - std::uint32_t m, - std::uint32_t n, - std::uint32_t k, - void* workspace, - size_t worksize, - cudaStream_t stream, - bool isRowMajor, - float metric_arg); - } // namespace detail } // namespace distance } // namespace raft diff --git a/cpp/include/raft/distance/specializations/detail/l2_sqrt_expanded.cuh b/cpp/include/raft/distance/specializations/detail/l2_sqrt_expanded.cuh index 8b752d8235..65e48e8401 100644 --- a/cpp/include/raft/distance/specializations/detail/l2_sqrt_expanded.cuh +++ b/cpp/include/raft/distance/specializations/detail/l2_sqrt_expanded.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2023, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -49,20 +49,6 @@ distance( - const float* x, - const float* y, - float* dist, - std::uint32_t m, - std::uint32_t n, - std::uint32_t k, - void* workspace, - size_t worksize, - cudaStream_t stream, - bool isRowMajor, - float metric_arg); - } // namespace detail } // namespace distance } // namespace raft diff --git a/cpp/include/raft/distance/specializations/detail/l2_sqrt_unexpanded.cuh b/cpp/include/raft/distance/specializations/detail/l2_sqrt_unexpanded.cuh index 8632fda769..8d0de7711f 100644 --- a/cpp/include/raft/distance/specializations/detail/l2_sqrt_unexpanded.cuh +++ b/cpp/include/raft/distance/specializations/detail/l2_sqrt_unexpanded.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2023, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -49,20 +49,6 @@ distance( - const float* x, - const float* y, - float* dist, - std::uint32_t m, - std::uint32_t n, - std::uint32_t k, - void* workspace, - size_t worksize, - cudaStream_t stream, - bool isRowMajor, - float metric_arg); - } // namespace detail } // namespace distance } // namespace raft diff --git a/cpp/include/raft/distance/specializations/detail/l2_unexpanded.cuh b/cpp/include/raft/distance/specializations/detail/l2_unexpanded.cuh index 3962cfd1ae..23c9849917 100644 --- a/cpp/include/raft/distance/specializations/detail/l2_unexpanded.cuh +++ b/cpp/include/raft/distance/specializations/detail/l2_unexpanded.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2023, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -48,20 +48,6 @@ distance( - const float* x, - const float* y, - float* dist, - std::uint32_t m, - std::uint32_t n, - std::uint32_t k, - void* workspace, - size_t worksize, - cudaStream_t stream, - bool isRowMajor, - float metric_arg); - } // namespace detail } // namespace distance } // namespace raft diff --git a/cpp/include/raft/distance/specializations/detail/lp_unexpanded.cuh b/cpp/include/raft/distance/specializations/detail/lp_unexpanded.cuh index 1f7e504ba8..593ac84ebb 100644 --- a/cpp/include/raft/distance/specializations/detail/lp_unexpanded.cuh +++ b/cpp/include/raft/distance/specializations/detail/lp_unexpanded.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2023, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -48,20 +48,6 @@ distance( - const float* x, - const float* y, - float* dist, - std::uint32_t m, - std::uint32_t n, - std::uint32_t k, - void* workspace, - size_t worksize, - cudaStream_t stream, - bool isRowMajor, - float metric_arg); - } // namespace detail } // namespace distance } // namespace raft diff --git a/cpp/include/raft/distance/specializations/detail/russel_rao.cuh b/cpp/include/raft/distance/specializations/detail/russel_rao.cuh index f0aa1c27ee..0147559429 100644 --- a/cpp/include/raft/distance/specializations/detail/russel_rao.cuh +++ b/cpp/include/raft/distance/specializations/detail/russel_rao.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2023, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -49,20 +49,6 @@ distance( - const float* x, - const float* y, - float* dist, - std::uint32_t m, - std::uint32_t n, - std::uint32_t k, - void* workspace, - size_t worksize, - cudaStream_t stream, - bool isRowMajor, - float metric_arg); - } // namespace detail } // namespace distance } // namespace raft diff --git a/cpp/src/distance/distance/specializations/detail/canberra.cu b/cpp/src/distance/distance/specializations/detail/canberra_double_double_double_int.cu similarity index 78% rename from cpp/src/distance/distance/specializations/detail/canberra.cu rename to cpp/src/distance/distance/specializations/detail/canberra_double_double_double_int.cu index 3a81b35a46..a00861f421 100644 --- a/cpp/src/distance/distance/specializations/detail/canberra.cu +++ b/cpp/src/distance/distance/specializations/detail/canberra_double_double_double_int.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2023, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -45,19 +45,6 @@ template void distance( - const float* x, - const float* y, - float* dist, - std::uint32_t m, - std::uint32_t n, - std::uint32_t k, - void* workspace, - size_t worksize, - cudaStream_t stream, - bool isRowMajor, - float metric_arg); - } // namespace detail } // namespace distance } // namespace raft diff --git a/cpp/src/distance/distance/specializations/detail/canberra_float_float_float_int.cu b/cpp/src/distance/distance/specializations/detail/canberra_float_float_float_int.cu new file mode 100644 index 0000000000..b5ed1dd629 --- /dev/null +++ b/cpp/src/distance/distance/specializations/detail/canberra_float_float_float_int.cu @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include + +namespace raft { +namespace distance { +namespace detail { +template void distance( + const float* x, + const float* y, + float* dist, + int m, + int n, + int k, + void* workspace, + size_t worksize, + cudaStream_t stream, + bool isRowMajor, + float metric_arg); + +} // namespace detail +} // namespace distance +} // namespace raft diff --git a/cpp/src/distance/distance/specializations/detail/chebyshev.cu b/cpp/src/distance/distance/specializations/detail/chebyshev.cu deleted file mode 100644 index 7406265e97..0000000000 --- a/cpp/src/distance/distance/specializations/detail/chebyshev.cu +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include - -namespace raft { -namespace distance { -namespace detail { -template void distance( - const float* x, - const float* y, - float* dist, - int m, - int n, - int k, - void* workspace, - std::size_t worksize, - cudaStream_t stream, - bool isRowMajor, - float metric_arg); - -template void distance( - const double* x, - const double* y, - double* dist, - int m, - int n, - int k, - void* workspace, - std::size_t worksize, - cudaStream_t stream, - bool isRowMajor, - double metric_arg); - -template void distance( - const float* x, - const float* y, - float* dist, - std::uint32_t m, - std::uint32_t n, - std::uint32_t k, - void* workspace, - std::size_t worksize, - cudaStream_t stream, - bool isRowMajor, - float metric_arg); - -} // namespace detail -} // namespace distance -} // namespace raft diff --git a/cpp/src/distance/distance/specializations/detail/chebyshev_double_double_double_int.cu b/cpp/src/distance/distance/specializations/detail/chebyshev_double_double_double_int.cu new file mode 100644 index 0000000000..14938769c3 --- /dev/null +++ b/cpp/src/distance/distance/specializations/detail/chebyshev_double_double_double_int.cu @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include + +namespace raft { +namespace distance { +namespace detail { + +template void distance( + const double* x, + const double* y, + double* dist, + int m, + int n, + int k, + void* workspace, + std::size_t worksize, + cudaStream_t stream, + bool isRowMajor, + double metric_arg); + +} // namespace detail +} // namespace distance +} // namespace raft diff --git a/cpp/src/distance/distance/specializations/detail/l1_float_float_float_uint32.cu b/cpp/src/distance/distance/specializations/detail/chebyshev_float_float_float_int.cu similarity index 81% rename from cpp/src/distance/distance/specializations/detail/l1_float_float_float_uint32.cu rename to cpp/src/distance/distance/specializations/detail/chebyshev_float_float_float_int.cu index f906d711d3..3a4e5a92fd 100644 --- a/cpp/src/distance/distance/specializations/detail/l1_float_float_float_uint32.cu +++ b/cpp/src/distance/distance/specializations/detail/chebyshev_float_float_float_int.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2023, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,14 +19,13 @@ namespace raft { namespace distance { namespace detail { - -template void distance( +template void distance( const float* x, const float* y, float* dist, - std::uint32_t m, - std::uint32_t n, - std::uint32_t k, + int m, + int n, + int k, void* workspace, std::size_t worksize, cudaStream_t stream, diff --git a/cpp/src/distance/distance/specializations/detail/correlation.cu b/cpp/src/distance/distance/specializations/detail/correlation.cu deleted file mode 100644 index 0e2e55ecfb..0000000000 --- a/cpp/src/distance/distance/specializations/detail/correlation.cu +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include - -namespace raft { -namespace distance { -namespace detail { -template void distance( - const float* x, - const float* y, - float* dist, - int m, - int n, - int k, - void* workspace, - std::size_t worksize, - cudaStream_t stream, - bool isRowMajor, - float metric_arg); - -template void -distance( - const double* x, - const double* y, - double* dist, - int m, - int n, - int k, - void* workspace, - std::size_t worksize, - cudaStream_t stream, - bool isRowMajor, - double metric_arg); - -template void -distance( - const float* x, - const float* y, - float* dist, - std::uint32_t m, - std::uint32_t n, - std::uint32_t k, - void* workspace, - std::size_t worksize, - cudaStream_t stream, - bool isRowMajor, - float metric_arg); - -} // namespace detail -} // namespace distance -} // namespace raft diff --git a/cpp/src/distance/distance/specializations/detail/lp_unexpanded_float_float_float_uint32.cu b/cpp/src/distance/distance/specializations/detail/correlation_double_double_double_int.cu similarity index 75% rename from cpp/src/distance/distance/specializations/detail/lp_unexpanded_float_float_float_uint32.cu rename to cpp/src/distance/distance/specializations/detail/correlation_double_double_double_int.cu index 79a560dde7..7f80786b7e 100644 --- a/cpp/src/distance/distance/specializations/detail/lp_unexpanded_float_float_float_uint32.cu +++ b/cpp/src/distance/distance/specializations/detail/correlation_double_double_double_int.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2023, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,18 +21,18 @@ namespace distance { namespace detail { template void -distance( - const float* x, - const float* y, - float* dist, - std::uint32_t m, - std::uint32_t n, - std::uint32_t k, +distance( + const double* x, + const double* y, + double* dist, + int m, + int n, + int k, void* workspace, std::size_t worksize, cudaStream_t stream, bool isRowMajor, - float metric_arg); + double metric_arg); } // namespace detail } // namespace distance diff --git a/cpp/src/distance/distance/specializations/detail/l2_expanded_float_float_float_uint32.cu b/cpp/src/distance/distance/specializations/detail/correlation_float_float_float_int.cu similarity index 81% rename from cpp/src/distance/distance/specializations/detail/l2_expanded_float_float_float_uint32.cu rename to cpp/src/distance/distance/specializations/detail/correlation_float_float_float_int.cu index 43494eabd1..f1c83fecc1 100644 --- a/cpp/src/distance/distance/specializations/detail/l2_expanded_float_float_float_uint32.cu +++ b/cpp/src/distance/distance/specializations/detail/correlation_float_float_float_int.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2023, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,14 +19,13 @@ namespace raft { namespace distance { namespace detail { -template void -distance( +template void distance( const float* x, const float* y, float* dist, - std::uint32_t m, - std::uint32_t n, - std::uint32_t k, + int m, + int n, + int k, void* workspace, std::size_t worksize, cudaStream_t stream, diff --git a/cpp/src/distance/distance/specializations/detail/cosine.cu b/cpp/src/distance/distance/specializations/detail/cosine.cu deleted file mode 100644 index efbdfbcd36..0000000000 --- a/cpp/src/distance/distance/specializations/detail/cosine.cu +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include - -namespace raft { -namespace distance { -namespace detail { -template void distance( - const float* x, - const float* y, - float* dist, - int m, - int n, - int k, - void* workspace, - std::size_t worksize, - cudaStream_t stream, - bool isRowMajor, - float metric_arg); - -template void distance( - const double* x, - const double* y, - double* dist, - int m, - int n, - int k, - void* workspace, - std::size_t worksize, - cudaStream_t stream, - bool isRowMajor, - double metric_arg); - -template void -distance( - const float* x, - const float* y, - float* dist, - std::uint32_t m, - std::uint32_t n, - std::uint32_t k, - void* workspace, - std::size_t worksize, - cudaStream_t stream, - bool isRowMajor, - float metric_arg); - -} // namespace detail -} // namespace distance -} // namespace raft diff --git a/cpp/src/distance/distance/specializations/detail/cosine_double_double_double_int.cu b/cpp/src/distance/distance/specializations/detail/cosine_double_double_double_int.cu new file mode 100644 index 0000000000..b10d22716b --- /dev/null +++ b/cpp/src/distance/distance/specializations/detail/cosine_double_double_double_int.cu @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include + +namespace raft { +namespace distance { +namespace detail { + +template void distance( + const double* x, + const double* y, + double* dist, + int m, + int n, + int k, + void* workspace, + std::size_t worksize, + cudaStream_t stream, + bool isRowMajor, + double metric_arg); + +} // namespace detail +} // namespace distance +} // namespace raft diff --git a/cpp/src/distance/distance/specializations/detail/kl_divergence_float_float_float_uint32.cu b/cpp/src/distance/distance/specializations/detail/cosine_float_float_float_int.cu similarity index 81% rename from cpp/src/distance/distance/specializations/detail/kl_divergence_float_float_float_uint32.cu rename to cpp/src/distance/distance/specializations/detail/cosine_float_float_float_int.cu index db12d23f0e..c597826926 100644 --- a/cpp/src/distance/distance/specializations/detail/kl_divergence_float_float_float_uint32.cu +++ b/cpp/src/distance/distance/specializations/detail/cosine_float_float_float_int.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2023, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,15 +19,13 @@ namespace raft { namespace distance { namespace detail { - -template void -distance( +template void distance( const float* x, const float* y, float* dist, - std::uint32_t m, - std::uint32_t n, - std::uint32_t k, + int m, + int n, + int k, void* workspace, std::size_t worksize, cudaStream_t stream, diff --git a/cpp/src/distance/distance/specializations/detail/hamming_unexpanded.cu b/cpp/src/distance/distance/specializations/detail/hamming_unexpanded.cu deleted file mode 100644 index ec46ae4383..0000000000 --- a/cpp/src/distance/distance/specializations/detail/hamming_unexpanded.cu +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include - -namespace raft { -namespace distance { -namespace detail { -template void distance( - const float* x, - const float* y, - float* dist, - int m, - int n, - int k, - void* workspace, - std::size_t worksize, - cudaStream_t stream, - bool isRowMajor, - float metric_arg); - -template void -distance( - const double* x, - const double* y, - double* dist, - int m, - int n, - int k, - void* workspace, - std::size_t worksize, - cudaStream_t stream, - bool isRowMajor, - double metric_arg); - -template void -distance( - const float* x, - const float* y, - float* dist, - std::uint32_t m, - std::uint32_t n, - std::uint32_t k, - void* workspace, - std::size_t worksize, - cudaStream_t stream, - bool isRowMajor, - float metric_arg); - -} // namespace detail -} // namespace distance -} // namespace raft diff --git a/cpp/src/distance/distance/specializations/detail/hamming_unexpanded_double_double_double_int.cu b/cpp/src/distance/distance/specializations/detail/hamming_unexpanded_double_double_double_int.cu new file mode 100644 index 0000000000..7cd9d74667 --- /dev/null +++ b/cpp/src/distance/distance/specializations/detail/hamming_unexpanded_double_double_double_int.cu @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include + +namespace raft { +namespace distance { +namespace detail { + +template void +distance( + const double* x, + const double* y, + double* dist, + int m, + int n, + int k, + void* workspace, + std::size_t worksize, + cudaStream_t stream, + bool isRowMajor, + double metric_arg); + +} // namespace detail +} // namespace distance +} // namespace raft diff --git a/cpp/src/distance/distance/specializations/detail/l2_unexpanded_float_float_float_uint32.cu b/cpp/src/distance/distance/specializations/detail/hamming_unexpanded_float_float_float_int.cu similarity index 81% rename from cpp/src/distance/distance/specializations/detail/l2_unexpanded_float_float_float_uint32.cu rename to cpp/src/distance/distance/specializations/detail/hamming_unexpanded_float_float_float_int.cu index baad4cc451..f38aa01edd 100644 --- a/cpp/src/distance/distance/specializations/detail/l2_unexpanded_float_float_float_uint32.cu +++ b/cpp/src/distance/distance/specializations/detail/hamming_unexpanded_float_float_float_int.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2023, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,15 +19,13 @@ namespace raft { namespace distance { namespace detail { - -template void -distance( +template void distance( const float* x, const float* y, float* dist, - std::uint32_t m, - std::uint32_t n, - std::uint32_t k, + int m, + int n, + int k, void* workspace, std::size_t worksize, cudaStream_t stream, diff --git a/cpp/src/distance/distance/specializations/detail/hellinger_expanded.cu b/cpp/src/distance/distance/specializations/detail/hellinger_expanded.cu deleted file mode 100644 index 8bf8ed8b5a..0000000000 --- a/cpp/src/distance/distance/specializations/detail/hellinger_expanded.cu +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include - -namespace raft { -namespace distance { -namespace detail { -template void distance( - const float* x, - const float* y, - float* dist, - int m, - int n, - int k, - void* workspace, - std::size_t worksize, - cudaStream_t stream, - bool isRowMajor, - float metric_arg); - -template void -distance( - const double* x, - const double* y, - double* dist, - int m, - int n, - int k, - void* workspace, - std::size_t worksize, - cudaStream_t stream, - bool isRowMajor, - double metric_arg); -template void -distance( - const float* x, - const float* y, - float* dist, - std::uint32_t m, - std::uint32_t n, - std::uint32_t k, - void* workspace, - std::size_t worksize, - cudaStream_t stream, - bool isRowMajor, - float metric_arg); - -} // namespace detail -} // namespace distance -} // namespace raft diff --git a/cpp/src/distance/distance/specializations/detail/hellinger_expanded_double_double_double_int.cu b/cpp/src/distance/distance/specializations/detail/hellinger_expanded_double_double_double_int.cu new file mode 100644 index 0000000000..a7a56ddc1e --- /dev/null +++ b/cpp/src/distance/distance/specializations/detail/hellinger_expanded_double_double_double_int.cu @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include + +namespace raft { +namespace distance { +namespace detail { + +template void +distance( + const double* x, + const double* y, + double* dist, + int m, + int n, + int k, + void* workspace, + std::size_t worksize, + cudaStream_t stream, + bool isRowMajor, + double metric_arg); + +} // namespace detail +} // namespace distance +} // namespace raft diff --git a/cpp/src/distance/distance/specializations/detail/hellinger_expanded_float_float_float_int.cu b/cpp/src/distance/distance/specializations/detail/hellinger_expanded_float_float_float_int.cu new file mode 100644 index 0000000000..77403af132 --- /dev/null +++ b/cpp/src/distance/distance/specializations/detail/hellinger_expanded_float_float_float_int.cu @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include + +namespace raft { +namespace distance { +namespace detail { +template void distance( + const float* x, + const float* y, + float* dist, + int m, + int n, + int k, + void* workspace, + std::size_t worksize, + cudaStream_t stream, + bool isRowMajor, + float metric_arg); + +} // namespace detail +} // namespace distance +} // namespace raft diff --git a/cpp/src/distance/distance/specializations/detail/jensen_shannon_float_float_float_uint32.cu b/cpp/src/distance/distance/specializations/detail/jensen_shannon_float_float_float_uint32.cu deleted file mode 100644 index 3fb652479a..0000000000 --- a/cpp/src/distance/distance/specializations/detail/jensen_shannon_float_float_float_uint32.cu +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include - -namespace raft { -namespace distance { -namespace detail { - -template void -distance( - const float* x, - const float* y, - float* dist, - std::uint32_t m, - std::uint32_t n, - std::uint32_t k, - void* workspace, - std::size_t worksize, - cudaStream_t stream, - bool isRowMajor, - float metric_arg); - -} // namespace detail -} // namespace distance -} // namespace raft diff --git a/cpp/src/distance/distance/specializations/detail/l2_sqrt_expanded_float_float_float_uint32.cu b/cpp/src/distance/distance/specializations/detail/l2_sqrt_expanded_float_float_float_uint32.cu deleted file mode 100644 index e85058e34f..0000000000 --- a/cpp/src/distance/distance/specializations/detail/l2_sqrt_expanded_float_float_float_uint32.cu +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include - -namespace raft { -namespace distance { -namespace detail { - -template void -distance( - const float* x, - const float* y, - float* dist, - std::uint32_t m, - std::uint32_t n, - std::uint32_t k, - void* workspace, - std::size_t worksize, - cudaStream_t stream, - bool isRowMajor, - float metric_arg); - -} // namespace detail -} // namespace distance -} // namespace raft diff --git a/cpp/src/distance/distance/specializations/detail/l2_sqrt_unexpanded_float_float_float_uint32.cu b/cpp/src/distance/distance/specializations/detail/l2_sqrt_unexpanded_float_float_float_uint32.cu deleted file mode 100644 index 1531b3b728..0000000000 --- a/cpp/src/distance/distance/specializations/detail/l2_sqrt_unexpanded_float_float_float_uint32.cu +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include - -namespace raft { -namespace distance { -namespace detail { - -template void -distance( - const float* x, - const float* y, - float* dist, - std::uint32_t m, - std::uint32_t n, - std::uint32_t k, - void* workspace, - std::size_t worksize, - cudaStream_t stream, - bool isRowMajor, - float metric_arg); - -} // namespace detail -} // namespace distance -} // namespace raft diff --git a/cpp/src/distance/distance/specializations/detail/russel_rao_float_float_float_uint32.cu b/cpp/src/distance/distance/specializations/detail/russel_rao_float_float_float_uint32.cu deleted file mode 100644 index fcb8d42ab3..0000000000 --- a/cpp/src/distance/distance/specializations/detail/russel_rao_float_float_float_uint32.cu +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include - -namespace raft { -namespace distance { -namespace detail { - -template void -distance( - const float* x, - const float* y, - float* dist, - std::uint32_t m, - std::uint32_t n, - std::uint32_t k, - void* workspace, - std::size_t worksize, - cudaStream_t stream, - bool isRowMajor, - float metric_arg); - -} // namespace detail -} // namespace distance -} // namespace raft