Keeping only compute similarity specializations for uint64_t for now (#…

…1255) …(to match other specializations) Authors: - Corey J. Nolet (https://github.com/cjnolet) Approvers: - Ben Frederickson (https://github.com/benfred) URL: #1255
rapidsai · Feb 8, 2023 · ca34321 · ca34321
1 parent ab11cba
commit ca34321
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 69 deletions.
diff --git a/cpp/src/distance/neighbors/specializations/detail/ivfpq_compute_similarity_float_fast.cu b/cpp/src/distance/neighbors/specializations/detail/ivfpq_compute_similarity_float_fast.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.
+ * Copyright (c) 2022-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,11 +21,7 @@
 namespace raft::spatial::knn::ivf_pq::detail {
 
 template struct ivfpq_compute_similarity<uint64_t, float, float>::configured<true, true>;
-template struct ivfpq_compute_similarity<int64_t, float, float>::configured<true, true>;
-template struct ivfpq_compute_similarity<uint32_t, float, float>::configured<true, true>;
 
 template struct ivfpq_compute_similarity<uint64_t, half, float>::configured<true, true>;
-template struct ivfpq_compute_similarity<int64_t, half, float>::configured<true, true>;
-template struct ivfpq_compute_similarity<uint32_t, half, float>::configured<true, true>;
 
 }  // namespace raft::spatial::knn::ivf_pq::detail
diff --git a/...c/distance/neighbors/specializations/detail/ivfpq_compute_similarity_float_no_basediff.cu b/...c/distance/neighbors/specializations/detail/ivfpq_compute_similarity_float_no_basediff.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.
+ * Copyright (c) 2022-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,11 +21,7 @@
 namespace raft::spatial::knn::ivf_pq::detail {
 
 template struct ivfpq_compute_similarity<uint64_t, float, float>::configured<false, true>;
-template struct ivfpq_compute_similarity<int64_t, float, float>::configured<false, true>;
-template struct ivfpq_compute_similarity<uint32_t, float, float>::configured<false, true>;
 
 template struct ivfpq_compute_similarity<uint64_t, half, float>::configured<false, true>;
-template struct ivfpq_compute_similarity<int64_t, half, float>::configured<false, true>;
-template struct ivfpq_compute_similarity<uint32_t, half, float>::configured<false, true>;
 
 }  // namespace raft::spatial::knn::ivf_pq::detail
diff --git a/...c/distance/neighbors/specializations/detail/ivfpq_compute_similarity_float_no_smem_lut.cu b/...c/distance/neighbors/specializations/detail/ivfpq_compute_similarity_float_no_smem_lut.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.
+ * Copyright (c) 2022-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,11 +21,7 @@
 namespace raft::spatial::knn::ivf_pq::detail {
 
 template struct ivfpq_compute_similarity<uint64_t, float, float>::configured<true, false>;
-template struct ivfpq_compute_similarity<int64_t, float, float>::configured<true, false>;
-template struct ivfpq_compute_similarity<uint32_t, float, float>::configured<true, false>;
 
 template struct ivfpq_compute_similarity<uint64_t, half, float>::configured<true, false>;
-template struct ivfpq_compute_similarity<int64_t, half, float>::configured<true, false>;
-template struct ivfpq_compute_similarity<uint32_t, half, float>::configured<true, false>;
 
 }  // namespace raft::spatial::knn::ivf_pq::detail
diff --git a/cpp/src/distance/neighbors/specializations/detail/ivfpq_compute_similarity_fp8s_fast.cu b/cpp/src/distance/neighbors/specializations/detail/ivfpq_compute_similarity_fp8s_fast.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.
+ * Copyright (c) 2022-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,11 +21,7 @@
 namespace raft::spatial::knn::ivf_pq::detail {
 
 template struct ivfpq_compute_similarity<uint64_t, float, fp_8bit<5, true>>::configured<true, true>;
-template struct ivfpq_compute_similarity<int64_t, float, fp_8bit<5, true>>::configured<true, true>;
-template struct ivfpq_compute_similarity<uint32_t, float, fp_8bit<5, true>>::configured<true, true>;
 
 template struct ivfpq_compute_similarity<uint64_t, half, fp_8bit<5, true>>::configured<true, true>;
-template struct ivfpq_compute_similarity<int64_t, half, fp_8bit<5, true>>::configured<true, true>;
-template struct ivfpq_compute_similarity<uint32_t, half, fp_8bit<5, true>>::configured<true, true>;
 
 }  // namespace raft::spatial::knn::ivf_pq::detail
diff --git a/...rc/distance/neighbors/specializations/detail/ivfpq_compute_similarity_fp8s_no_basediff.cu b/...rc/distance/neighbors/specializations/detail/ivfpq_compute_similarity_fp8s_no_basediff.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.
+ * Copyright (c) 2022-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.
@@ -22,12 +22,7 @@ namespace raft::spatial::knn::ivf_pq::detail {
 
 template struct ivfpq_compute_similarity<uint64_t, float, fp_8bit<5, true>>::configured<false,
                                                                                         true>;
-template struct ivfpq_compute_similarity<int64_t, float, fp_8bit<5, true>>::configured<false, true>;
-template struct ivfpq_compute_similarity<uint32_t, float, fp_8bit<5, true>>::configured<false,
-                                                                                        true>;
 
 template struct ivfpq_compute_similarity<uint64_t, half, fp_8bit<5, true>>::configured<false, true>;
-template struct ivfpq_compute_similarity<int64_t, half, fp_8bit<5, true>>::configured<false, true>;
-template struct ivfpq_compute_similarity<uint32_t, half, fp_8bit<5, true>>::configured<false, true>;
 
 }  // namespace raft::spatial::knn::ivf_pq::detail
diff --git a/...rc/distance/neighbors/specializations/detail/ivfpq_compute_similarity_fp8s_no_smem_lut.cu b/...rc/distance/neighbors/specializations/detail/ivfpq_compute_similarity_fp8s_no_smem_lut.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.
+ * Copyright (c) 2022-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.
@@ -22,12 +22,7 @@ namespace raft::spatial::knn::ivf_pq::detail {
 
 template struct ivfpq_compute_similarity<uint64_t, float, fp_8bit<5, true>>::configured<true,
                                                                                         false>;
-template struct ivfpq_compute_similarity<int64_t, float, fp_8bit<5, true>>::configured<true, false>;
-template struct ivfpq_compute_similarity<uint32_t, float, fp_8bit<5, true>>::configured<true,
-                                                                                        false>;
 
 template struct ivfpq_compute_similarity<uint64_t, half, fp_8bit<5, true>>::configured<true, false>;
-template struct ivfpq_compute_similarity<int64_t, half, fp_8bit<5, true>>::configured<true, false>;
-template struct ivfpq_compute_similarity<uint32_t, half, fp_8bit<5, true>>::configured<true, false>;
 
 }  // namespace raft::spatial::knn::ivf_pq::detail
diff --git a/cpp/src/distance/neighbors/specializations/detail/ivfpq_compute_similarity_fp8u_fast.cu b/cpp/src/distance/neighbors/specializations/detail/ivfpq_compute_similarity_fp8u_fast.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.
+ * Copyright (c) 2022-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.
@@ -22,12 +22,7 @@ namespace raft::spatial::knn::ivf_pq::detail {
 
 template struct ivfpq_compute_similarity<uint64_t, float, fp_8bit<5, false>>::configured<true,
                                                                                          true>;
-template struct ivfpq_compute_similarity<int64_t, float, fp_8bit<5, false>>::configured<true, true>;
-template struct ivfpq_compute_similarity<uint32_t, float, fp_8bit<5, false>>::configured<true,
-                                                                                         true>;
 
 template struct ivfpq_compute_similarity<uint64_t, half, fp_8bit<5, false>>::configured<true, true>;
-template struct ivfpq_compute_similarity<int64_t, half, fp_8bit<5, false>>::configured<true, true>;
-template struct ivfpq_compute_similarity<uint32_t, half, fp_8bit<5, false>>::configured<true, true>;
 
 }  // namespace raft::spatial::knn::ivf_pq::detail
diff --git a/...rc/distance/neighbors/specializations/detail/ivfpq_compute_similarity_fp8u_no_basediff.cu b/...rc/distance/neighbors/specializations/detail/ivfpq_compute_similarity_fp8u_no_basediff.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.
+ * Copyright (c) 2022-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.
@@ -22,15 +22,8 @@ namespace raft::spatial::knn::ivf_pq::detail {
 
 template struct ivfpq_compute_similarity<uint64_t, float, fp_8bit<5, false>>::configured<false,
                                                                                          true>;
-template struct ivfpq_compute_similarity<int64_t, float, fp_8bit<5, false>>::configured<false,
-                                                                                        true>;
-template struct ivfpq_compute_similarity<uint32_t, float, fp_8bit<5, false>>::configured<false,
-                                                                                         true>;
 
 template struct ivfpq_compute_similarity<uint64_t, half, fp_8bit<5, false>>::configured<false,
                                                                                         true>;
-template struct ivfpq_compute_similarity<int64_t, half, fp_8bit<5, false>>::configured<false, true>;
-template struct ivfpq_compute_similarity<uint32_t, half, fp_8bit<5, false>>::configured<false,
-                                                                                        true>;
 
 }  // namespace raft::spatial::knn::ivf_pq::detail
diff --git a/...rc/distance/neighbors/specializations/detail/ivfpq_compute_similarity_fp8u_no_smem_lut.cu b/...rc/distance/neighbors/specializations/detail/ivfpq_compute_similarity_fp8u_no_smem_lut.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.
+ * Copyright (c) 2022-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.
@@ -22,15 +22,8 @@ namespace raft::spatial::knn::ivf_pq::detail {
 
 template struct ivfpq_compute_similarity<uint64_t, float, fp_8bit<5, false>>::configured<true,
                                                                                          false>;
-template struct ivfpq_compute_similarity<int64_t, float, fp_8bit<5, false>>::configured<true,
-                                                                                        false>;
-template struct ivfpq_compute_similarity<uint32_t, float, fp_8bit<5, false>>::configured<true,
-                                                                                         false>;
 
 template struct ivfpq_compute_similarity<uint64_t, half, fp_8bit<5, false>>::configured<true,
                                                                                         false>;
-template struct ivfpq_compute_similarity<int64_t, half, fp_8bit<5, false>>::configured<true, false>;
-template struct ivfpq_compute_similarity<uint32_t, half, fp_8bit<5, false>>::configured<true,
-                                                                                        false>;
 
 }  // namespace raft::spatial::knn::ivf_pq::detail
diff --git a/cpp/src/distance/neighbors/specializations/detail/ivfpq_compute_similarity_half_fast.cu b/cpp/src/distance/neighbors/specializations/detail/ivfpq_compute_similarity_half_fast.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.
+ * Copyright (c) 2022-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,11 +21,7 @@
 namespace raft::spatial::knn::ivf_pq::detail {
 
 template struct ivfpq_compute_similarity<uint64_t, float, half>::configured<true, true>;
-template struct ivfpq_compute_similarity<int64_t, float, half>::configured<true, true>;
-template struct ivfpq_compute_similarity<uint32_t, float, half>::configured<true, true>;
 
 template struct ivfpq_compute_similarity<uint64_t, half, half>::configured<true, true>;
-template struct ivfpq_compute_similarity<int64_t, half, half>::configured<true, true>;
-template struct ivfpq_compute_similarity<uint32_t, half, half>::configured<true, true>;
 
 }  // namespace raft::spatial::knn::ivf_pq::detail
diff --git a/...rc/distance/neighbors/specializations/detail/ivfpq_compute_similarity_half_no_basediff.cu b/...rc/distance/neighbors/specializations/detail/ivfpq_compute_similarity_half_no_basediff.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.
+ * Copyright (c) 2022-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,11 +21,7 @@
 namespace raft::spatial::knn::ivf_pq::detail {
 
 template struct ivfpq_compute_similarity<uint64_t, float, half>::configured<false, true>;
-template struct ivfpq_compute_similarity<int64_t, float, half>::configured<false, true>;
-template struct ivfpq_compute_similarity<uint32_t, float, half>::configured<false, true>;
 
 template struct ivfpq_compute_similarity<uint64_t, half, half>::configured<false, true>;
-template struct ivfpq_compute_similarity<int64_t, half, half>::configured<false, true>;
-template struct ivfpq_compute_similarity<uint32_t, half, half>::configured<false, true>;
 
 }  // namespace raft::spatial::knn::ivf_pq::detail
diff --git a/...rc/distance/neighbors/specializations/detail/ivfpq_compute_similarity_half_no_smem_lut.cu b/...rc/distance/neighbors/specializations/detail/ivfpq_compute_similarity_half_no_smem_lut.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.
+ * Copyright (c) 2022-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,11 +21,7 @@
 namespace raft::spatial::knn::ivf_pq::detail {
 
 template struct ivfpq_compute_similarity<uint64_t, float, half>::configured<true, false>;
-template struct ivfpq_compute_similarity<int64_t, float, half>::configured<true, false>;
-template struct ivfpq_compute_similarity<uint32_t, float, half>::configured<true, false>;
 
 template struct ivfpq_compute_similarity<uint64_t, half, half>::configured<true, false>;
-template struct ivfpq_compute_similarity<int64_t, half, half>::configured<true, false>;
-template struct ivfpq_compute_similarity<uint32_t, half, half>::configured<true, false>;
 
 }  // namespace raft::spatial::knn::ivf_pq::detail