diff --git a/cpp/src/neighbors/detail/cagra/compute_distance-ext.cuh b/cpp/src/neighbors/detail/cagra/compute_distance-ext.cuh
index 1dbc843d0..86de55db6 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance-ext.cuh
+++ b/cpp/src/neighbors/detail/cagra/compute_distance-ext.cuh
@@ -25,564 +25,26 @@
 
 #pragma once
 
-#include "compute_distance_standard.cuh"
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_standard.hpp"
+#include "compute_distance_vpq.hpp"
 
 namespace cuvs::neighbors::cagra::detail {
 
-extern template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                     8,
-                                                     128,
-                                                     float,
-                                                     uint32_t,
-                                                     float>;
-extern template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::InnerProduct,
-                                                     8,
-                                                     128,
-                                                     float,
-                                                     uint32_t,
-                                                     float>;
-extern template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                    8,
-                                                    128,
-                                                    8,
-                                                    2,
-                                                    half,
-                                                    float,
-                                                    uint32_t,
-                                                    float>;
-extern template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                    8,
-                                                    128,
-                                                    8,
-                                                    4,
-                                                    half,
-                                                    float,
-                                                    uint32_t,
-                                                    float>;
-extern template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                     16,
-                                                     256,
-                                                     float,
-                                                     uint32_t,
-                                                     float>;
-extern template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::InnerProduct,
-                                                     16,
-                                                     256,
-                                                     float,
-                                                     uint32_t,
-                                                     float>;
-extern template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                    16,
-                                                    256,
-                                                    8,
-                                                    2,
-                                                    half,
-                                                    float,
-                                                    uint32_t,
-                                                    float>;
-extern template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                    16,
-                                                    256,
-                                                    8,
-                                                    4,
-                                                    half,
-                                                    float,
-                                                    uint32_t,
-                                                    float>;
-extern template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                     32,
-                                                     512,
-                                                     float,
-                                                     uint32_t,
-                                                     float>;
-extern template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::InnerProduct,
-                                                     32,
-                                                     512,
-                                                     float,
-                                                     uint32_t,
-                                                     float>;
-extern template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                    32,
-                                                    512,
-                                                    8,
-                                                    2,
-                                                    half,
-                                                    float,
-                                                    uint32_t,
-                                                    float>;
-extern template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                    32,
-                                                    512,
-                                                    8,
-                                                    4,
-                                                    half,
-                                                    float,
-                                                    uint32_t,
-                                                    float>;
-extern template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                     8,
-                                                     128,
-                                                     half,
-                                                     uint32_t,
-                                                     float>;
-extern template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::InnerProduct,
-                                                     8,
-                                                     128,
-                                                     half,
-                                                     uint32_t,
-                                                     float>;
-extern template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                    8,
-                                                    128,
-                                                    8,
-                                                    2,
-                                                    half,
-                                                    half,
-                                                    uint32_t,
-                                                    float>;
-extern template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                    8,
-                                                    128,
-                                                    8,
-                                                    4,
-                                                    half,
-                                                    half,
-                                                    uint32_t,
-                                                    float>;
-extern template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                     16,
-                                                     256,
-                                                     half,
-                                                     uint32_t,
-                                                     float>;
-extern template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::InnerProduct,
-                                                     16,
-                                                     256,
-                                                     half,
-                                                     uint32_t,
-                                                     float>;
-extern template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                    16,
-                                                    256,
-                                                    8,
-                                                    2,
-                                                    half,
-                                                    half,
-                                                    uint32_t,
-                                                    float>;
-extern template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                    16,
-                                                    256,
-                                                    8,
-                                                    4,
-                                                    half,
-                                                    half,
-                                                    uint32_t,
-                                                    float>;
-extern template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                     32,
-                                                     512,
-                                                     half,
-                                                     uint32_t,
-                                                     float>;
-extern template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::InnerProduct,
-                                                     32,
-                                                     512,
-                                                     half,
-                                                     uint32_t,
-                                                     float>;
-extern template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                    32,
-                                                    512,
-                                                    8,
-                                                    2,
-                                                    half,
-                                                    half,
-                                                    uint32_t,
-                                                    float>;
-extern template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                    32,
-                                                    512,
-                                                    8,
-                                                    4,
-                                                    half,
-                                                    half,
-                                                    uint32_t,
-                                                    float>;
-extern template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                     8,
-                                                     128,
-                                                     int8_t,
-                                                     uint32_t,
-                                                     float>;
-extern template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::InnerProduct,
-                                                     8,
-                                                     128,
-                                                     int8_t,
-                                                     uint32_t,
-                                                     float>;
-extern template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                    8,
-                                                    128,
-                                                    8,
-                                                    2,
-                                                    half,
-                                                    int8_t,
-                                                    uint32_t,
-                                                    float>;
-extern template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                    8,
-                                                    128,
-                                                    8,
-                                                    4,
-                                                    half,
-                                                    int8_t,
-                                                    uint32_t,
-                                                    float>;
-extern template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                     16,
-                                                     256,
-                                                     int8_t,
-                                                     uint32_t,
-                                                     float>;
-extern template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::InnerProduct,
-                                                     16,
-                                                     256,
-                                                     int8_t,
-                                                     uint32_t,
-                                                     float>;
-extern template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                    16,
-                                                    256,
-                                                    8,
-                                                    2,
-                                                    half,
-                                                    int8_t,
-                                                    uint32_t,
-                                                    float>;
-extern template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                    16,
-                                                    256,
-                                                    8,
-                                                    4,
-                                                    half,
-                                                    int8_t,
-                                                    uint32_t,
-                                                    float>;
-extern template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                     32,
-                                                     512,
-                                                     int8_t,
-                                                     uint32_t,
-                                                     float>;
-extern template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::InnerProduct,
-                                                     32,
-                                                     512,
-                                                     int8_t,
-                                                     uint32_t,
-                                                     float>;
-extern template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                    32,
-                                                    512,
-                                                    8,
-                                                    2,
-                                                    half,
-                                                    int8_t,
-                                                    uint32_t,
-                                                    float>;
-extern template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                    32,
-                                                    512,
-                                                    8,
-                                                    4,
-                                                    half,
-                                                    int8_t,
-                                                    uint32_t,
-                                                    float>;
-extern template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                     8,
-                                                     128,
-                                                     uint8_t,
-                                                     uint32_t,
-                                                     float>;
-extern template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::InnerProduct,
-                                                     8,
-                                                     128,
-                                                     uint8_t,
-                                                     uint32_t,
-                                                     float>;
-extern template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                    8,
-                                                    128,
-                                                    8,
-                                                    2,
-                                                    half,
-                                                    uint8_t,
-                                                    uint32_t,
-                                                    float>;
-extern template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                    8,
-                                                    128,
-                                                    8,
-                                                    4,
-                                                    half,
-                                                    uint8_t,
-                                                    uint32_t,
-                                                    float>;
-extern template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                     16,
-                                                     256,
-                                                     uint8_t,
-                                                     uint32_t,
-                                                     float>;
-extern template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::InnerProduct,
-                                                     16,
-                                                     256,
-                                                     uint8_t,
-                                                     uint32_t,
-                                                     float>;
-extern template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                    16,
-                                                    256,
-                                                    8,
-                                                    2,
-                                                    half,
-                                                    uint8_t,
-                                                    uint32_t,
-                                                    float>;
-extern template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                    16,
-                                                    256,
-                                                    8,
-                                                    4,
-                                                    half,
-                                                    uint8_t,
-                                                    uint32_t,
-                                                    float>;
-extern template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                     32,
-                                                     512,
-                                                     uint8_t,
-                                                     uint32_t,
-                                                     float>;
-extern template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::InnerProduct,
-                                                     32,
-                                                     512,
-                                                     uint8_t,
-                                                     uint32_t,
-                                                     float>;
-extern template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                    32,
-                                                    512,
-                                                    8,
-                                                    2,
-                                                    half,
-                                                    uint8_t,
-                                                    uint32_t,
-                                                    float>;
-extern template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                    32,
-                                                    512,
-                                                    8,
-                                                    4,
-                                                    half,
-                                                    uint8_t,
-                                                    uint32_t,
-                                                    float>;
-extern template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                     8,
-                                                     128,
-                                                     float,
-                                                     uint64_t,
-                                                     float>;
-extern template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::InnerProduct,
-                                                     8,
-                                                     128,
-                                                     float,
-                                                     uint64_t,
-                                                     float>;
-extern template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                    8,
-                                                    128,
-                                                    8,
-                                                    2,
-                                                    half,
-                                                    float,
-                                                    uint64_t,
-                                                    float>;
-extern template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                    8,
-                                                    128,
-                                                    8,
-                                                    4,
-                                                    half,
-                                                    float,
-                                                    uint64_t,
-                                                    float>;
-extern template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                     16,
-                                                     256,
-                                                     float,
-                                                     uint64_t,
-                                                     float>;
-extern template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::InnerProduct,
-                                                     16,
-                                                     256,
-                                                     float,
-                                                     uint64_t,
-                                                     float>;
-extern template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                    16,
-                                                    256,
-                                                    8,
-                                                    2,
-                                                    half,
-                                                    float,
-                                                    uint64_t,
-                                                    float>;
-extern template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                    16,
-                                                    256,
-                                                    8,
-                                                    4,
-                                                    half,
-                                                    float,
-                                                    uint64_t,
-                                                    float>;
-extern template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                     32,
-                                                     512,
-                                                     float,
-                                                     uint64_t,
-                                                     float>;
-extern template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::InnerProduct,
-                                                     32,
-                                                     512,
-                                                     float,
-                                                     uint64_t,
-                                                     float>;
-extern template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                    32,
-                                                    512,
-                                                    8,
-                                                    2,
-                                                    half,
-                                                    float,
-                                                    uint64_t,
-                                                    float>;
-extern template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                    32,
-                                                    512,
-                                                    8,
-                                                    4,
-                                                    half,
-                                                    float,
-                                                    uint64_t,
-                                                    float>;
-extern template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                     8,
-                                                     128,
-                                                     half,
-                                                     uint64_t,
-                                                     float>;
-extern template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::InnerProduct,
-                                                     8,
-                                                     128,
-                                                     half,
-                                                     uint64_t,
-                                                     float>;
-extern template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                    8,
-                                                    128,
-                                                    8,
-                                                    2,
-                                                    half,
-                                                    half,
-                                                    uint64_t,
-                                                    float>;
-extern template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                    8,
-                                                    128,
-                                                    8,
-                                                    4,
-                                                    half,
-                                                    half,
-                                                    uint64_t,
-                                                    float>;
-extern template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                     16,
-                                                     256,
-                                                     half,
-                                                     uint64_t,
-                                                     float>;
-extern template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::InnerProduct,
-                                                     16,
-                                                     256,
-                                                     half,
-                                                     uint64_t,
-                                                     float>;
-extern template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                    16,
-                                                    256,
-                                                    8,
-                                                    2,
-                                                    half,
-                                                    half,
-                                                    uint64_t,
-                                                    float>;
-extern template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                    16,
-                                                    256,
-                                                    8,
-                                                    4,
-                                                    half,
-                                                    half,
-                                                    uint64_t,
-                                                    float>;
-extern template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                     32,
-                                                     512,
-                                                     half,
-                                                     uint64_t,
-                                                     float>;
-extern template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::InnerProduct,
-                                                     32,
-                                                     512,
-                                                     half,
-                                                     uint64_t,
-                                                     float>;
-extern template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                    32,
-                                                    512,
-                                                    8,
-                                                    2,
-                                                    half,
-                                                    half,
-                                                    uint64_t,
-                                                    float>;
-extern template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                                    32,
-                                                    512,
-                                                    8,
-                                                    4,
-                                                    half,
-                                                    half,
-                                                    uint64_t,
-                                                    float>;
-extern template struct standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+
+extern template struct standard_descriptor_spec<DistanceType::L2Expanded,
                                                 8,
                                                 128,
                                                 float,
                                                 uint32_t,
                                                 float>;
-extern template struct standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
+extern template struct standard_descriptor_spec<DistanceType::InnerProduct,
                                                 8,
                                                 128,
                                                 float,
                                                 uint32_t,
                                                 float>;
-extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                            8,
                                            128,
                                            8,
@@ -591,7 +53,7 @@ extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expan
                                            float,
                                            uint32_t,
                                            float>;
-extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                            8,
                                            128,
                                            8,
@@ -600,19 +62,19 @@ extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expan
                                            float,
                                            uint32_t,
                                            float>;
-extern template struct standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct standard_descriptor_spec<DistanceType::L2Expanded,
                                                 16,
                                                 256,
                                                 float,
                                                 uint32_t,
                                                 float>;
-extern template struct standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
+extern template struct standard_descriptor_spec<DistanceType::InnerProduct,
                                                 16,
                                                 256,
                                                 float,
                                                 uint32_t,
                                                 float>;
-extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                            16,
                                            256,
                                            8,
@@ -621,7 +83,7 @@ extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expan
                                            float,
                                            uint32_t,
                                            float>;
-extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                            16,
                                            256,
                                            8,
@@ -630,19 +92,19 @@ extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expan
                                            float,
                                            uint32_t,
                                            float>;
-extern template struct standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct standard_descriptor_spec<DistanceType::L2Expanded,
                                                 32,
                                                 512,
                                                 float,
                                                 uint32_t,
                                                 float>;
-extern template struct standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
+extern template struct standard_descriptor_spec<DistanceType::InnerProduct,
                                                 32,
                                                 512,
                                                 float,
                                                 uint32_t,
                                                 float>;
-extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                            32,
                                            512,
                                            8,
@@ -651,7 +113,7 @@ extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expan
                                            float,
                                            uint32_t,
                                            float>;
-extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                            32,
                                            512,
                                            8,
@@ -660,19 +122,19 @@ extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expan
                                            float,
                                            uint32_t,
                                            float>;
-extern template struct standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct standard_descriptor_spec<DistanceType::L2Expanded,
                                                 8,
                                                 128,
                                                 half,
                                                 uint32_t,
                                                 float>;
-extern template struct standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
+extern template struct standard_descriptor_spec<DistanceType::InnerProduct,
                                                 8,
                                                 128,
                                                 half,
                                                 uint32_t,
                                                 float>;
-extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                            8,
                                            128,
                                            8,
@@ -681,7 +143,7 @@ extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expan
                                            half,
                                            uint32_t,
                                            float>;
-extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                            8,
                                            128,
                                            8,
@@ -690,19 +152,19 @@ extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expan
                                            half,
                                            uint32_t,
                                            float>;
-extern template struct standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct standard_descriptor_spec<DistanceType::L2Expanded,
                                                 16,
                                                 256,
                                                 half,
                                                 uint32_t,
                                                 float>;
-extern template struct standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
+extern template struct standard_descriptor_spec<DistanceType::InnerProduct,
                                                 16,
                                                 256,
                                                 half,
                                                 uint32_t,
                                                 float>;
-extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                            16,
                                            256,
                                            8,
@@ -711,7 +173,7 @@ extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expan
                                            half,
                                            uint32_t,
                                            float>;
-extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                            16,
                                            256,
                                            8,
@@ -720,19 +182,19 @@ extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expan
                                            half,
                                            uint32_t,
                                            float>;
-extern template struct standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct standard_descriptor_spec<DistanceType::L2Expanded,
                                                 32,
                                                 512,
                                                 half,
                                                 uint32_t,
                                                 float>;
-extern template struct standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
+extern template struct standard_descriptor_spec<DistanceType::InnerProduct,
                                                 32,
                                                 512,
                                                 half,
                                                 uint32_t,
                                                 float>;
-extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                            32,
                                            512,
                                            8,
@@ -741,7 +203,7 @@ extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expan
                                            half,
                                            uint32_t,
                                            float>;
-extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                            32,
                                            512,
                                            8,
@@ -750,19 +212,19 @@ extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expan
                                            half,
                                            uint32_t,
                                            float>;
-extern template struct standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct standard_descriptor_spec<DistanceType::L2Expanded,
                                                 8,
                                                 128,
                                                 int8_t,
                                                 uint32_t,
                                                 float>;
-extern template struct standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
+extern template struct standard_descriptor_spec<DistanceType::InnerProduct,
                                                 8,
                                                 128,
                                                 int8_t,
                                                 uint32_t,
                                                 float>;
-extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                            8,
                                            128,
                                            8,
@@ -771,7 +233,7 @@ extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expan
                                            int8_t,
                                            uint32_t,
                                            float>;
-extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                            8,
                                            128,
                                            8,
@@ -780,19 +242,19 @@ extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expan
                                            int8_t,
                                            uint32_t,
                                            float>;
-extern template struct standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct standard_descriptor_spec<DistanceType::L2Expanded,
                                                 16,
                                                 256,
                                                 int8_t,
                                                 uint32_t,
                                                 float>;
-extern template struct standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
+extern template struct standard_descriptor_spec<DistanceType::InnerProduct,
                                                 16,
                                                 256,
                                                 int8_t,
                                                 uint32_t,
                                                 float>;
-extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                            16,
                                            256,
                                            8,
@@ -801,7 +263,7 @@ extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expan
                                            int8_t,
                                            uint32_t,
                                            float>;
-extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                            16,
                                            256,
                                            8,
@@ -810,19 +272,19 @@ extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expan
                                            int8_t,
                                            uint32_t,
                                            float>;
-extern template struct standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct standard_descriptor_spec<DistanceType::L2Expanded,
                                                 32,
                                                 512,
                                                 int8_t,
                                                 uint32_t,
                                                 float>;
-extern template struct standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
+extern template struct standard_descriptor_spec<DistanceType::InnerProduct,
                                                 32,
                                                 512,
                                                 int8_t,
                                                 uint32_t,
                                                 float>;
-extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                            32,
                                            512,
                                            8,
@@ -831,7 +293,7 @@ extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expan
                                            int8_t,
                                            uint32_t,
                                            float>;
-extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                            32,
                                            512,
                                            8,
@@ -840,19 +302,19 @@ extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expan
                                            int8_t,
                                            uint32_t,
                                            float>;
-extern template struct standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct standard_descriptor_spec<DistanceType::L2Expanded,
                                                 8,
                                                 128,
                                                 uint8_t,
                                                 uint32_t,
                                                 float>;
-extern template struct standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
+extern template struct standard_descriptor_spec<DistanceType::InnerProduct,
                                                 8,
                                                 128,
                                                 uint8_t,
                                                 uint32_t,
                                                 float>;
-extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                            8,
                                            128,
                                            8,
@@ -861,7 +323,7 @@ extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expan
                                            uint8_t,
                                            uint32_t,
                                            float>;
-extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                            8,
                                            128,
                                            8,
@@ -870,19 +332,19 @@ extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expan
                                            uint8_t,
                                            uint32_t,
                                            float>;
-extern template struct standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct standard_descriptor_spec<DistanceType::L2Expanded,
                                                 16,
                                                 256,
                                                 uint8_t,
                                                 uint32_t,
                                                 float>;
-extern template struct standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
+extern template struct standard_descriptor_spec<DistanceType::InnerProduct,
                                                 16,
                                                 256,
                                                 uint8_t,
                                                 uint32_t,
                                                 float>;
-extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                            16,
                                            256,
                                            8,
@@ -891,7 +353,7 @@ extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expan
                                            uint8_t,
                                            uint32_t,
                                            float>;
-extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                            16,
                                            256,
                                            8,
@@ -900,19 +362,19 @@ extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expan
                                            uint8_t,
                                            uint32_t,
                                            float>;
-extern template struct standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct standard_descriptor_spec<DistanceType::L2Expanded,
                                                 32,
                                                 512,
                                                 uint8_t,
                                                 uint32_t,
                                                 float>;
-extern template struct standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
+extern template struct standard_descriptor_spec<DistanceType::InnerProduct,
                                                 32,
                                                 512,
                                                 uint8_t,
                                                 uint32_t,
                                                 float>;
-extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                            32,
                                            512,
                                            8,
@@ -921,7 +383,7 @@ extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expan
                                            uint8_t,
                                            uint32_t,
                                            float>;
-extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                            32,
                                            512,
                                            8,
@@ -930,19 +392,19 @@ extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expan
                                            uint8_t,
                                            uint32_t,
                                            float>;
-extern template struct standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct standard_descriptor_spec<DistanceType::L2Expanded,
                                                 8,
                                                 128,
                                                 float,
                                                 uint64_t,
                                                 float>;
-extern template struct standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
+extern template struct standard_descriptor_spec<DistanceType::InnerProduct,
                                                 8,
                                                 128,
                                                 float,
                                                 uint64_t,
                                                 float>;
-extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                            8,
                                            128,
                                            8,
@@ -951,7 +413,7 @@ extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expan
                                            float,
                                            uint64_t,
                                            float>;
-extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                            8,
                                            128,
                                            8,
@@ -960,19 +422,19 @@ extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expan
                                            float,
                                            uint64_t,
                                            float>;
-extern template struct standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct standard_descriptor_spec<DistanceType::L2Expanded,
                                                 16,
                                                 256,
                                                 float,
                                                 uint64_t,
                                                 float>;
-extern template struct standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
+extern template struct standard_descriptor_spec<DistanceType::InnerProduct,
                                                 16,
                                                 256,
                                                 float,
                                                 uint64_t,
                                                 float>;
-extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                            16,
                                            256,
                                            8,
@@ -981,7 +443,7 @@ extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expan
                                            float,
                                            uint64_t,
                                            float>;
-extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                            16,
                                            256,
                                            8,
@@ -990,19 +452,19 @@ extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expan
                                            float,
                                            uint64_t,
                                            float>;
-extern template struct standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct standard_descriptor_spec<DistanceType::L2Expanded,
                                                 32,
                                                 512,
                                                 float,
                                                 uint64_t,
                                                 float>;
-extern template struct standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
+extern template struct standard_descriptor_spec<DistanceType::InnerProduct,
                                                 32,
                                                 512,
                                                 float,
                                                 uint64_t,
                                                 float>;
-extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                            32,
                                            512,
                                            8,
@@ -1011,7 +473,7 @@ extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expan
                                            float,
                                            uint64_t,
                                            float>;
-extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                            32,
                                            512,
                                            8,
@@ -1020,19 +482,19 @@ extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expan
                                            float,
                                            uint64_t,
                                            float>;
-extern template struct standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct standard_descriptor_spec<DistanceType::L2Expanded,
                                                 8,
                                                 128,
                                                 half,
                                                 uint64_t,
                                                 float>;
-extern template struct standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
+extern template struct standard_descriptor_spec<DistanceType::InnerProduct,
                                                 8,
                                                 128,
                                                 half,
                                                 uint64_t,
                                                 float>;
-extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                            8,
                                            128,
                                            8,
@@ -1041,7 +503,7 @@ extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expan
                                            half,
                                            uint64_t,
                                            float>;
-extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                            8,
                                            128,
                                            8,
@@ -1050,19 +512,19 @@ extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expan
                                            half,
                                            uint64_t,
                                            float>;
-extern template struct standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct standard_descriptor_spec<DistanceType::L2Expanded,
                                                 16,
                                                 256,
                                                 half,
                                                 uint64_t,
                                                 float>;
-extern template struct standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
+extern template struct standard_descriptor_spec<DistanceType::InnerProduct,
                                                 16,
                                                 256,
                                                 half,
                                                 uint64_t,
                                                 float>;
-extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                            16,
                                            256,
                                            8,
@@ -1071,7 +533,7 @@ extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expan
                                            half,
                                            uint64_t,
                                            float>;
-extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                            16,
                                            256,
                                            8,
@@ -1080,19 +542,19 @@ extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expan
                                            half,
                                            uint64_t,
                                            float>;
-extern template struct standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct standard_descriptor_spec<DistanceType::L2Expanded,
                                                 32,
                                                 512,
                                                 half,
                                                 uint64_t,
                                                 float>;
-extern template struct standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
+extern template struct standard_descriptor_spec<DistanceType::InnerProduct,
                                                 32,
                                                 512,
                                                 half,
                                                 uint64_t,
                                                 float>;
-extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                            32,
                                            512,
                                            8,
@@ -1101,7 +563,7 @@ extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expan
                                            half,
                                            uint64_t,
                                            float>;
-extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+extern template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                            32,
                                            512,
                                            8,
@@ -1112,1068 +574,152 @@ extern template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expan
                                            float>;
 
 extern template struct instance_selector<
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           8,
-                           128,
-                           float,
-                           uint32_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           8,
-                           128,
-                           float,
-                           uint32_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      8,
-                      128,
-                      8,
-                      2,
-                      half,
-                      float,
-                      uint32_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      8,
-                      128,
-                      8,
-                      4,
-                      half,
-                      float,
-                      uint32_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           16,
-                           256,
-                           float,
-                           uint32_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           16,
-                           256,
-                           float,
-                           uint32_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      16,
-                      256,
-                      8,
-                      2,
-                      half,
-                      float,
-                      uint32_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      16,
-                      256,
-                      8,
-                      4,
-                      half,
-                      float,
-                      uint32_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           32,
-                           512,
-                           float,
-                           uint32_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           32,
-                           512,
-                           float,
-                           uint32_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      32,
-                      512,
-                      8,
-                      2,
-                      half,
-                      float,
-                      uint32_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      32,
-                      512,
-                      8,
-                      4,
-                      half,
-                      float,
-                      uint32_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded, 8, 128, half, uint32_t, float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           8,
-                           128,
-                           half,
-                           uint32_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      8,
-                      128,
-                      8,
-                      2,
-                      half,
-                      half,
-                      uint32_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      8,
-                      128,
-                      8,
-                      4,
-                      half,
-                      half,
-                      uint32_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           16,
-                           256,
-                           half,
-                           uint32_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           16,
-                           256,
-                           half,
-                           uint32_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      16,
-                      256,
-                      8,
-                      2,
-                      half,
-                      half,
-                      uint32_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      16,
-                      256,
-                      8,
-                      4,
-                      half,
-                      half,
-                      uint32_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           32,
-                           512,
-                           half,
-                           uint32_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           32,
-                           512,
-                           half,
-                           uint32_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      32,
-                      512,
-                      8,
-                      2,
-                      half,
-                      half,
-                      uint32_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      32,
-                      512,
-                      8,
-                      4,
-                      half,
-                      half,
-                      uint32_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           8,
-                           128,
-                           int8_t,
-                           uint32_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           8,
-                           128,
-                           int8_t,
-                           uint32_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      8,
-                      128,
-                      8,
-                      2,
-                      half,
-                      int8_t,
-                      uint32_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      8,
-                      128,
-                      8,
-                      4,
-                      half,
-                      int8_t,
-                      uint32_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           16,
-                           256,
-                           int8_t,
-                           uint32_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           16,
-                           256,
-                           int8_t,
-                           uint32_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      16,
-                      256,
-                      8,
-                      2,
-                      half,
-                      int8_t,
-                      uint32_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      16,
-                      256,
-                      8,
-                      4,
-                      half,
-                      int8_t,
-                      uint32_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           32,
-                           512,
-                           int8_t,
-                           uint32_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           32,
-                           512,
-                           int8_t,
-                           uint32_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      32,
-                      512,
-                      8,
-                      2,
-                      half,
-                      int8_t,
-                      uint32_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      32,
-                      512,
-                      8,
-                      4,
-                      half,
-                      int8_t,
-                      uint32_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           8,
-                           128,
-                           uint8_t,
-                           uint32_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           8,
-                           128,
-                           uint8_t,
-                           uint32_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      8,
-                      128,
-                      8,
-                      2,
-                      half,
-                      uint8_t,
-                      uint32_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      8,
-                      128,
-                      8,
-                      4,
-                      half,
-                      uint8_t,
-                      uint32_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           16,
-                           256,
-                           uint8_t,
-                           uint32_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           16,
-                           256,
-                           uint8_t,
-                           uint32_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      16,
-                      256,
-                      8,
-                      2,
-                      half,
-                      uint8_t,
-                      uint32_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      16,
-                      256,
-                      8,
-                      4,
-                      half,
-                      uint8_t,
-                      uint32_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           32,
-                           512,
-                           uint8_t,
-                           uint32_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           32,
-                           512,
-                           uint8_t,
-                           uint32_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      32,
-                      512,
-                      8,
-                      2,
-                      half,
-                      uint8_t,
-                      uint32_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      32,
-                      512,
-                      8,
-                      4,
-                      half,
-                      uint8_t,
-                      uint32_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           8,
-                           128,
-                           float,
-                           uint64_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           8,
-                           128,
-                           float,
-                           uint64_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      8,
-                      128,
-                      8,
-                      2,
-                      half,
-                      float,
-                      uint64_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      8,
-                      128,
-                      8,
-                      4,
-                      half,
-                      float,
-                      uint64_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           16,
-                           256,
-                           float,
-                           uint64_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           16,
-                           256,
-                           float,
-                           uint64_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      16,
-                      256,
-                      8,
-                      2,
-                      half,
-                      float,
-                      uint64_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      16,
-                      256,
-                      8,
-                      4,
-                      half,
-                      float,
-                      uint64_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           32,
-                           512,
-                           float,
-                           uint64_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           32,
-                           512,
-                           float,
-                           uint64_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      32,
-                      512,
-                      8,
-                      2,
-                      half,
-                      float,
-                      uint64_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      32,
-                      512,
-                      8,
-                      4,
-                      half,
-                      float,
-                      uint64_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded, 8, 128, half, uint64_t, float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           8,
-                           128,
-                           half,
-                           uint64_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      8,
-                      128,
-                      8,
-                      2,
-                      half,
-                      half,
-                      uint64_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      8,
-                      128,
-                      8,
-                      4,
-                      half,
-                      half,
-                      uint64_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           16,
-                           256,
-                           half,
-                           uint64_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           16,
-                           256,
-                           half,
-                           uint64_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      16,
-                      256,
-                      8,
-                      2,
-                      half,
-                      half,
-                      uint64_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      16,
-                      256,
-                      8,
-                      4,
-                      half,
-                      half,
-                      uint64_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           32,
-                           512,
-                           half,
-                           uint64_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           32,
-                           512,
-                           half,
-                           uint64_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      32,
-                      512,
-                      8,
-                      2,
-                      half,
-                      half,
-                      uint64_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      32,
-                      512,
-                      8,
-                      4,
-                      half,
-                      half,
-                      uint64_t,
-                      float>>;
+  standard_descriptor_spec<DistanceType::L2Expanded, 8, 128, float, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 8, 128, float, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 8, 128, 8, 2, half, float, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 8, 128, 8, 4, half, float, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 16, 256, float, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 16, 256, float, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 16, 256, 8, 2, half, float, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 16, 256, 8, 4, half, float, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 32, 512, float, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 32, 512, float, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 32, 512, 8, 2, half, float, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 32, 512, 8, 4, half, float, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 8, 128, half, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 8, 128, half, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 8, 128, 8, 2, half, half, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 8, 128, 8, 4, half, half, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 16, 256, half, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 16, 256, half, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 16, 256, 8, 2, half, half, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 16, 256, 8, 4, half, half, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 32, 512, half, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 32, 512, half, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 32, 512, 8, 2, half, half, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 32, 512, 8, 4, half, half, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 8, 128, int8_t, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 8, 128, int8_t, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 8, 128, 8, 2, half, int8_t, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 8, 128, 8, 4, half, int8_t, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 16, 256, int8_t, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 16, 256, int8_t, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 16, 256, 8, 2, half, int8_t, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 16, 256, 8, 4, half, int8_t, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 32, 512, int8_t, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 32, 512, int8_t, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 32, 512, 8, 2, half, int8_t, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 32, 512, 8, 4, half, int8_t, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 8, 128, uint8_t, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 8, 128, uint8_t, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 8, 128, 8, 2, half, uint8_t, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 8, 128, 8, 4, half, uint8_t, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 16, 256, uint8_t, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 16, 256, uint8_t, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 16, 256, 8, 2, half, uint8_t, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 16, 256, 8, 4, half, uint8_t, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 32, 512, uint8_t, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 32, 512, uint8_t, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 32, 512, 8, 2, half, uint8_t, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 32, 512, 8, 4, half, uint8_t, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 8, 128, float, uint64_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 8, 128, float, uint64_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 8, 128, 8, 2, half, float, uint64_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 8, 128, 8, 4, half, float, uint64_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 16, 256, float, uint64_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 16, 256, float, uint64_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 16, 256, 8, 2, half, float, uint64_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 16, 256, 8, 4, half, float, uint64_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 32, 512, float, uint64_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 32, 512, float, uint64_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 32, 512, 8, 2, half, float, uint64_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 32, 512, 8, 4, half, float, uint64_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 8, 128, half, uint64_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 8, 128, half, uint64_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 8, 128, 8, 2, half, half, uint64_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 8, 128, 8, 4, half, half, uint64_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 16, 256, half, uint64_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 16, 256, half, uint64_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 16, 256, 8, 2, half, half, uint64_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 16, 256, 8, 4, half, half, uint64_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 32, 512, half, uint64_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 32, 512, half, uint64_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 32, 512, 8, 2, half, half, uint64_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 32, 512, 8, 4, half, half, uint64_t, float>>;
 
 using descriptor_instances = instance_selector<
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           8,
-                           128,
-                           float,
-                           uint32_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           8,
-                           128,
-                           float,
-                           uint32_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      8,
-                      128,
-                      8,
-                      2,
-                      half,
-                      float,
-                      uint32_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      8,
-                      128,
-                      8,
-                      4,
-                      half,
-                      float,
-                      uint32_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           16,
-                           256,
-                           float,
-                           uint32_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           16,
-                           256,
-                           float,
-                           uint32_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      16,
-                      256,
-                      8,
-                      2,
-                      half,
-                      float,
-                      uint32_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      16,
-                      256,
-                      8,
-                      4,
-                      half,
-                      float,
-                      uint32_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           32,
-                           512,
-                           float,
-                           uint32_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           32,
-                           512,
-                           float,
-                           uint32_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      32,
-                      512,
-                      8,
-                      2,
-                      half,
-                      float,
-                      uint32_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      32,
-                      512,
-                      8,
-                      4,
-                      half,
-                      float,
-                      uint32_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded, 8, 128, half, uint32_t, float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           8,
-                           128,
-                           half,
-                           uint32_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      8,
-                      128,
-                      8,
-                      2,
-                      half,
-                      half,
-                      uint32_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      8,
-                      128,
-                      8,
-                      4,
-                      half,
-                      half,
-                      uint32_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           16,
-                           256,
-                           half,
-                           uint32_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           16,
-                           256,
-                           half,
-                           uint32_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      16,
-                      256,
-                      8,
-                      2,
-                      half,
-                      half,
-                      uint32_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      16,
-                      256,
-                      8,
-                      4,
-                      half,
-                      half,
-                      uint32_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           32,
-                           512,
-                           half,
-                           uint32_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           32,
-                           512,
-                           half,
-                           uint32_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      32,
-                      512,
-                      8,
-                      2,
-                      half,
-                      half,
-                      uint32_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      32,
-                      512,
-                      8,
-                      4,
-                      half,
-                      half,
-                      uint32_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           8,
-                           128,
-                           int8_t,
-                           uint32_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           8,
-                           128,
-                           int8_t,
-                           uint32_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      8,
-                      128,
-                      8,
-                      2,
-                      half,
-                      int8_t,
-                      uint32_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      8,
-                      128,
-                      8,
-                      4,
-                      half,
-                      int8_t,
-                      uint32_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           16,
-                           256,
-                           int8_t,
-                           uint32_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           16,
-                           256,
-                           int8_t,
-                           uint32_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      16,
-                      256,
-                      8,
-                      2,
-                      half,
-                      int8_t,
-                      uint32_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      16,
-                      256,
-                      8,
-                      4,
-                      half,
-                      int8_t,
-                      uint32_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           32,
-                           512,
-                           int8_t,
-                           uint32_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           32,
-                           512,
-                           int8_t,
-                           uint32_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      32,
-                      512,
-                      8,
-                      2,
-                      half,
-                      int8_t,
-                      uint32_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      32,
-                      512,
-                      8,
-                      4,
-                      half,
-                      int8_t,
-                      uint32_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           8,
-                           128,
-                           uint8_t,
-                           uint32_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           8,
-                           128,
-                           uint8_t,
-                           uint32_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      8,
-                      128,
-                      8,
-                      2,
-                      half,
-                      uint8_t,
-                      uint32_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      8,
-                      128,
-                      8,
-                      4,
-                      half,
-                      uint8_t,
-                      uint32_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           16,
-                           256,
-                           uint8_t,
-                           uint32_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           16,
-                           256,
-                           uint8_t,
-                           uint32_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      16,
-                      256,
-                      8,
-                      2,
-                      half,
-                      uint8_t,
-                      uint32_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      16,
-                      256,
-                      8,
-                      4,
-                      half,
-                      uint8_t,
-                      uint32_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           32,
-                           512,
-                           uint8_t,
-                           uint32_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           32,
-                           512,
-                           uint8_t,
-                           uint32_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      32,
-                      512,
-                      8,
-                      2,
-                      half,
-                      uint8_t,
-                      uint32_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      32,
-                      512,
-                      8,
-                      4,
-                      half,
-                      uint8_t,
-                      uint32_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           8,
-                           128,
-                           float,
-                           uint64_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           8,
-                           128,
-                           float,
-                           uint64_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      8,
-                      128,
-                      8,
-                      2,
-                      half,
-                      float,
-                      uint64_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      8,
-                      128,
-                      8,
-                      4,
-                      half,
-                      float,
-                      uint64_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           16,
-                           256,
-                           float,
-                           uint64_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           16,
-                           256,
-                           float,
-                           uint64_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      16,
-                      256,
-                      8,
-                      2,
-                      half,
-                      float,
-                      uint64_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      16,
-                      256,
-                      8,
-                      4,
-                      half,
-                      float,
-                      uint64_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           32,
-                           512,
-                           float,
-                           uint64_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           32,
-                           512,
-                           float,
-                           uint64_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      32,
-                      512,
-                      8,
-                      2,
-                      half,
-                      float,
-                      uint64_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      32,
-                      512,
-                      8,
-                      4,
-                      half,
-                      float,
-                      uint64_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded, 8, 128, half, uint64_t, float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           8,
-                           128,
-                           half,
-                           uint64_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      8,
-                      128,
-                      8,
-                      2,
-                      half,
-                      half,
-                      uint64_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      8,
-                      128,
-                      8,
-                      4,
-                      half,
-                      half,
-                      uint64_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           16,
-                           256,
-                           half,
-                           uint64_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           16,
-                           256,
-                           half,
-                           uint64_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      16,
-                      256,
-                      8,
-                      2,
-                      half,
-                      half,
-                      uint64_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      16,
-                      256,
-                      8,
-                      4,
-                      half,
-                      half,
-                      uint64_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           32,
-                           512,
-                           half,
-                           uint64_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           32,
-                           512,
-                           half,
-                           uint64_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      32,
-                      512,
-                      8,
-                      2,
-                      half,
-                      half,
-                      uint64_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      32,
-                      512,
-                      8,
-                      4,
-                      half,
-                      half,
-                      uint64_t,
-                      float>>;
+  standard_descriptor_spec<DistanceType::L2Expanded, 8, 128, float, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 8, 128, float, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 8, 128, 8, 2, half, float, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 8, 128, 8, 4, half, float, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 16, 256, float, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 16, 256, float, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 16, 256, 8, 2, half, float, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 16, 256, 8, 4, half, float, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 32, 512, float, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 32, 512, float, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 32, 512, 8, 2, half, float, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 32, 512, 8, 4, half, float, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 8, 128, half, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 8, 128, half, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 8, 128, 8, 2, half, half, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 8, 128, 8, 4, half, half, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 16, 256, half, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 16, 256, half, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 16, 256, 8, 2, half, half, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 16, 256, 8, 4, half, half, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 32, 512, half, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 32, 512, half, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 32, 512, 8, 2, half, half, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 32, 512, 8, 4, half, half, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 8, 128, int8_t, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 8, 128, int8_t, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 8, 128, 8, 2, half, int8_t, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 8, 128, 8, 4, half, int8_t, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 16, 256, int8_t, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 16, 256, int8_t, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 16, 256, 8, 2, half, int8_t, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 16, 256, 8, 4, half, int8_t, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 32, 512, int8_t, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 32, 512, int8_t, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 32, 512, 8, 2, half, int8_t, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 32, 512, 8, 4, half, int8_t, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 8, 128, uint8_t, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 8, 128, uint8_t, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 8, 128, 8, 2, half, uint8_t, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 8, 128, 8, 4, half, uint8_t, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 16, 256, uint8_t, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 16, 256, uint8_t, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 16, 256, 8, 2, half, uint8_t, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 16, 256, 8, 4, half, uint8_t, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 32, 512, uint8_t, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 32, 512, uint8_t, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 32, 512, 8, 2, half, uint8_t, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 32, 512, 8, 4, half, uint8_t, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 8, 128, float, uint64_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 8, 128, float, uint64_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 8, 128, 8, 2, half, float, uint64_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 8, 128, 8, 4, half, float, uint64_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 16, 256, float, uint64_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 16, 256, float, uint64_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 16, 256, 8, 2, half, float, uint64_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 16, 256, 8, 4, half, float, uint64_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 32, 512, float, uint64_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 32, 512, float, uint64_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 32, 512, 8, 2, half, float, uint64_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 32, 512, 8, 4, half, float, uint64_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 8, 128, half, uint64_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 8, 128, half, uint64_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 8, 128, 8, 2, half, half, uint64_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 8, 128, 8, 4, half, half, uint64_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 16, 256, half, uint64_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 16, 256, half, uint64_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 16, 256, 8, 2, half, half, uint64_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 16, 256, 8, 4, half, half, uint64_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 32, 512, half, uint64_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 32, 512, half, uint64_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 32, 512, 8, 2, half, half, uint64_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 32, 512, 8, 4, half, half, uint64_t, float>>;
 
 template <typename DataT, typename IndexT, typename DistanceT, typename DatasetT>
 auto dataset_descriptor_init(const cagra::search_params& params,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance.cu b/cpp/src/neighbors/detail/cagra/compute_distance.cu
index 5d480f57a..387b4c71b 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance.cu
@@ -27,536 +27,80 @@
 
 namespace cuvs::neighbors::cagra::detail {
 
+using namespace cuvs::distance;
+
 template struct instance_selector<
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           8,
-                           128,
-                           float,
-                           uint32_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           8,
-                           128,
-                           float,
-                           uint32_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      8,
-                      128,
-                      8,
-                      2,
-                      half,
-                      float,
-                      uint32_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      8,
-                      128,
-                      8,
-                      4,
-                      half,
-                      float,
-                      uint32_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           16,
-                           256,
-                           float,
-                           uint32_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           16,
-                           256,
-                           float,
-                           uint32_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      16,
-                      256,
-                      8,
-                      2,
-                      half,
-                      float,
-                      uint32_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      16,
-                      256,
-                      8,
-                      4,
-                      half,
-                      float,
-                      uint32_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           32,
-                           512,
-                           float,
-                           uint32_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           32,
-                           512,
-                           float,
-                           uint32_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      32,
-                      512,
-                      8,
-                      2,
-                      half,
-                      float,
-                      uint32_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      32,
-                      512,
-                      8,
-                      4,
-                      half,
-                      float,
-                      uint32_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded, 8, 128, half, uint32_t, float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           8,
-                           128,
-                           half,
-                           uint32_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      8,
-                      128,
-                      8,
-                      2,
-                      half,
-                      half,
-                      uint32_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      8,
-                      128,
-                      8,
-                      4,
-                      half,
-                      half,
-                      uint32_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           16,
-                           256,
-                           half,
-                           uint32_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           16,
-                           256,
-                           half,
-                           uint32_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      16,
-                      256,
-                      8,
-                      2,
-                      half,
-                      half,
-                      uint32_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      16,
-                      256,
-                      8,
-                      4,
-                      half,
-                      half,
-                      uint32_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           32,
-                           512,
-                           half,
-                           uint32_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           32,
-                           512,
-                           half,
-                           uint32_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      32,
-                      512,
-                      8,
-                      2,
-                      half,
-                      half,
-                      uint32_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      32,
-                      512,
-                      8,
-                      4,
-                      half,
-                      half,
-                      uint32_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           8,
-                           128,
-                           int8_t,
-                           uint32_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           8,
-                           128,
-                           int8_t,
-                           uint32_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      8,
-                      128,
-                      8,
-                      2,
-                      half,
-                      int8_t,
-                      uint32_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      8,
-                      128,
-                      8,
-                      4,
-                      half,
-                      int8_t,
-                      uint32_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           16,
-                           256,
-                           int8_t,
-                           uint32_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           16,
-                           256,
-                           int8_t,
-                           uint32_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      16,
-                      256,
-                      8,
-                      2,
-                      half,
-                      int8_t,
-                      uint32_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      16,
-                      256,
-                      8,
-                      4,
-                      half,
-                      int8_t,
-                      uint32_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           32,
-                           512,
-                           int8_t,
-                           uint32_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           32,
-                           512,
-                           int8_t,
-                           uint32_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      32,
-                      512,
-                      8,
-                      2,
-                      half,
-                      int8_t,
-                      uint32_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      32,
-                      512,
-                      8,
-                      4,
-                      half,
-                      int8_t,
-                      uint32_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           8,
-                           128,
-                           uint8_t,
-                           uint32_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           8,
-                           128,
-                           uint8_t,
-                           uint32_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      8,
-                      128,
-                      8,
-                      2,
-                      half,
-                      uint8_t,
-                      uint32_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      8,
-                      128,
-                      8,
-                      4,
-                      half,
-                      uint8_t,
-                      uint32_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           16,
-                           256,
-                           uint8_t,
-                           uint32_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           16,
-                           256,
-                           uint8_t,
-                           uint32_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      16,
-                      256,
-                      8,
-                      2,
-                      half,
-                      uint8_t,
-                      uint32_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      16,
-                      256,
-                      8,
-                      4,
-                      half,
-                      uint8_t,
-                      uint32_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           32,
-                           512,
-                           uint8_t,
-                           uint32_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           32,
-                           512,
-                           uint8_t,
-                           uint32_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      32,
-                      512,
-                      8,
-                      2,
-                      half,
-                      uint8_t,
-                      uint32_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      32,
-                      512,
-                      8,
-                      4,
-                      half,
-                      uint8_t,
-                      uint32_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           8,
-                           128,
-                           float,
-                           uint64_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           8,
-                           128,
-                           float,
-                           uint64_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      8,
-                      128,
-                      8,
-                      2,
-                      half,
-                      float,
-                      uint64_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      8,
-                      128,
-                      8,
-                      4,
-                      half,
-                      float,
-                      uint64_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           16,
-                           256,
-                           float,
-                           uint64_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           16,
-                           256,
-                           float,
-                           uint64_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      16,
-                      256,
-                      8,
-                      2,
-                      half,
-                      float,
-                      uint64_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      16,
-                      256,
-                      8,
-                      4,
-                      half,
-                      float,
-                      uint64_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           32,
-                           512,
-                           float,
-                           uint64_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           32,
-                           512,
-                           float,
-                           uint64_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      32,
-                      512,
-                      8,
-                      2,
-                      half,
-                      float,
-                      uint64_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      32,
-                      512,
-                      8,
-                      4,
-                      half,
-                      float,
-                      uint64_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded, 8, 128, half, uint64_t, float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           8,
-                           128,
-                           half,
-                           uint64_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      8,
-                      128,
-                      8,
-                      2,
-                      half,
-                      half,
-                      uint64_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      8,
-                      128,
-                      8,
-                      4,
-                      half,
-                      half,
-                      uint64_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           16,
-                           256,
-                           half,
-                           uint64_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           16,
-                           256,
-                           half,
-                           uint64_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      16,
-                      256,
-                      8,
-                      2,
-                      half,
-                      half,
-                      uint64_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      16,
-                      256,
-                      8,
-                      4,
-                      half,
-                      half,
-                      uint64_t,
-                      float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                           32,
-                           512,
-                           half,
-                           uint64_t,
-                           float>,
-  standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                           32,
-                           512,
-                           half,
-                           uint64_t,
-                           float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      32,
-                      512,
-                      8,
-                      2,
-                      half,
-                      half,
-                      uint64_t,
-                      float>,
-  vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                      32,
-                      512,
-                      8,
-                      4,
-                      half,
-                      half,
-                      uint64_t,
-                      float>>;
+  standard_descriptor_spec<DistanceType::L2Expanded, 8, 128, float, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 8, 128, float, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 8, 128, 8, 2, half, float, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 8, 128, 8, 4, half, float, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 16, 256, float, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 16, 256, float, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 16, 256, 8, 2, half, float, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 16, 256, 8, 4, half, float, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 32, 512, float, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 32, 512, float, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 32, 512, 8, 2, half, float, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 32, 512, 8, 4, half, float, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 8, 128, half, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 8, 128, half, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 8, 128, 8, 2, half, half, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 8, 128, 8, 4, half, half, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 16, 256, half, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 16, 256, half, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 16, 256, 8, 2, half, half, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 16, 256, 8, 4, half, half, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 32, 512, half, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 32, 512, half, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 32, 512, 8, 2, half, half, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 32, 512, 8, 4, half, half, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 8, 128, int8_t, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 8, 128, int8_t, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 8, 128, 8, 2, half, int8_t, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 8, 128, 8, 4, half, int8_t, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 16, 256, int8_t, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 16, 256, int8_t, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 16, 256, 8, 2, half, int8_t, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 16, 256, 8, 4, half, int8_t, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 32, 512, int8_t, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 32, 512, int8_t, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 32, 512, 8, 2, half, int8_t, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 32, 512, 8, 4, half, int8_t, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 8, 128, uint8_t, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 8, 128, uint8_t, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 8, 128, 8, 2, half, uint8_t, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 8, 128, 8, 4, half, uint8_t, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 16, 256, uint8_t, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 16, 256, uint8_t, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 16, 256, 8, 2, half, uint8_t, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 16, 256, 8, 4, half, uint8_t, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 32, 512, uint8_t, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 32, 512, uint8_t, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 32, 512, 8, 2, half, uint8_t, uint32_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 32, 512, 8, 4, half, uint8_t, uint32_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 8, 128, float, uint64_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 8, 128, float, uint64_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 8, 128, 8, 2, half, float, uint64_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 8, 128, 8, 4, half, float, uint64_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 16, 256, float, uint64_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 16, 256, float, uint64_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 16, 256, 8, 2, half, float, uint64_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 16, 256, 8, 4, half, float, uint64_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 32, 512, float, uint64_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 32, 512, float, uint64_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 32, 512, 8, 2, half, float, uint64_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 32, 512, 8, 4, half, float, uint64_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 8, 128, half, uint64_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 8, 128, half, uint64_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 8, 128, 8, 2, half, half, uint64_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 8, 128, 8, 4, half, half, uint64_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 16, 256, half, uint64_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 16, 256, half, uint64_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 16, 256, 8, 2, half, half, uint64_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 16, 256, 8, 4, half, half, uint64_t, float>,
+  standard_descriptor_spec<DistanceType::L2Expanded, 32, 512, half, uint64_t, float>,
+  standard_descriptor_spec<DistanceType::InnerProduct, 32, 512, half, uint64_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 32, 512, 8, 2, half, half, uint64_t, float>,
+  vpq_descriptor_spec<DistanceType::L2Expanded, 32, 512, 8, 4, half, half, uint64_t, float>>;
 
 }  // namespace cuvs::neighbors::cagra::detail
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_00_generate.py b/cpp/src/neighbors/detail/cagra/compute_distance_00_generate.py
index 1f2b24e10..1b0743901 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_00_generate.py
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_00_generate.py
@@ -43,6 +43,7 @@
 
 namespace cuvs::neighbors::cagra::detail {{
 
+using namespace cuvs::distance;
 {content}
 
 }}  // namespace cuvs::neighbors::cagra::detail
@@ -69,7 +70,7 @@
     half_uint64=("half", "uint64_t", "float"),
 )
 
-metric_prefix = 'cuvs::distance::DistanceType::'
+metric_prefix = 'DistanceType::'
 
 specs = []
 descs = []
@@ -90,17 +91,10 @@
         # CAGRA
         for metric in ['L2Expanded', 'InnerProduct']:
             path = f"compute_distance_standard_{metric}_{type_path}_dim{mxdim}_t{team}.cu"
-            includes = '#include "compute_distance_standard.cuh"'
+            includes = '#include "compute_distance_standard-impl.cuh"'
             params = f"{metric_prefix}{metric}, {team}, {mxdim}, {data_t}, {idx_t}, {distance_t}"
             spec = f"standard_descriptor_spec<{params}>"
-            desc = f"standard_dataset_descriptor_t<{params}>"
-            content = f"""
-template struct {desc};
-template <>
-const void* {spec}::init_kernel = reinterpret_cast<const void*>(&standard_dataset_descriptor_init_kernel<{params}>);
-template struct {spec};
-"""
-            descs.append(desc)
+            content = f"""template struct {spec};"""
             specs.append(spec)
             with open(path, "w") as f:
                 f.write(template.format(includes=includes, content=content))
@@ -112,17 +106,10 @@
                 for pq_bit in pq_bits:
                     for metric in ['L2Expanded']:
                         path = f"compute_distance_vpq_{metric}_{type_path}_dim{mxdim}_t{team}_{pq_bit}pq_{pq_len}subd_{code_book_t}.cu"
-                        includes = '#include "compute_distance_vpq.cuh"'
+                        includes = '#include "compute_distance_vpq-impl.cuh"'
                         params = f"{metric_prefix}{metric}, {team}, {mxdim}, {pq_bit}, {pq_len}, {code_book_t}, {data_t}, {idx_t}, {distance_t}"
                         spec = f"vpq_descriptor_spec<{params}>"
-                        desc = f"cagra_q_dataset_descriptor_t<{params}>"
-                        content = f"""
-template struct {desc};
-template <>
-const void* {spec}::init_kernel = reinterpret_cast<const void*>(&vpq_dataset_descriptor_init_kernel<{params}>);
-template struct {spec};
-"""
-                        descs.append(desc)
+                        content = f"""template struct {spec};"""
                         specs.append(spec)
                         with open(path, "w") as f:
                             f.write(template.format(includes=includes, content=content))
@@ -132,12 +119,11 @@
     includes = '''
 #pragma once
 
-#include "compute_distance_standard.cuh"
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_standard.hpp"
+#include "compute_distance_vpq.hpp"
 '''
     newline = "\n"
     contents = f'''
-{newline.join(map(lambda s: "extern template struct " + s + ";", descs))}
 {newline.join(map(lambda s: "extern template struct " + s + ";", specs))}
 
 extern template struct
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard.cuh b/cpp/src/neighbors/detail/cagra/compute_distance_standard-impl.cuh
similarity index 83%
rename from cpp/src/neighbors/detail/cagra/compute_distance_standard.cuh
rename to cpp/src/neighbors/detail/cagra/compute_distance_standard-impl.cuh
index c1d38ead1..7fe5242a9 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard.cuh
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard-impl.cuh
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include "compute_distance.hpp"
+#include "compute_distance_standard.hpp"
 
 #include <cuvs/distance/distance.hpp>
 #include <cuvs/neighbors/common.hpp>
@@ -262,57 +262,30 @@ template <cuvs::distance::DistanceType Metric,
           typename DataT,
           typename IndexT,
           typename DistanceT>
-struct standard_descriptor_spec : public instance_spec<DataT, IndexT, DistanceT> {
-  using base_type = instance_spec<DataT, IndexT, DistanceT>;
-  using typename base_type::data_type;
-  using typename base_type::distance_type;
-  using typename base_type::host_type;
-  using typename base_type::index_type;
-
-  template <typename DatasetT>
-  constexpr static inline bool accepts_dataset()
-  {
-    return is_strided_dataset_v<DatasetT>;
-  }
-
-  using descriptor_type =
+dataset_descriptor_host<DataT, IndexT, DistanceT>
+standard_descriptor_spec<Metric, TeamSize, DatasetBlockDim, DataT, IndexT, DistanceT>::init_(
+  const cagra::search_params& params,
+  const DataT* ptr,
+  IndexT size,
+  uint32_t dim,
+  uint32_t ld,
+  rmm::cuda_stream_view stream)
+{
+  using desc_type =
     standard_dataset_descriptor_t<Metric, TeamSize, DatasetBlockDim, DataT, IndexT, DistanceT>;
-  static const void* init_kernel;
-
-  template <typename DatasetT>
-  static auto init(const cagra::search_params& params,
-                   const DatasetT& dataset,
-                   cuvs::distance::DistanceType metric,
-                   rmm::cuda_stream_view stream) -> host_type
-  {
-    descriptor_type dd_host{nullptr,
-                            nullptr,
-                            dataset.view().data_handle(),
-                            IndexT(dataset.n_rows()),
-                            dataset.dim(),
-                            dataset.stride()};
-    host_type result{dd_host, stream, DatasetBlockDim};
-    void* args[] =  // NOLINT
-      {&result.dev_ptr,
-       &descriptor_type::ptr(dd_host.args),
-       &dd_host.size,
-       &dd_host.args.dim,
-       &descriptor_type::ld(dd_host.args)};
-    RAFT_CUDA_TRY(cudaLaunchKernel(init_kernel, 1, 1, args, 0, stream));
-    return result;
-  }
+  using base_type = typename desc_type::base_type;
+  desc_type dd_host{nullptr, nullptr, ptr, size, dim, ld};
+  host_type result{dd_host, stream, DatasetBlockDim};
 
-  template <typename DatasetT>
-  static auto priority(const cagra::search_params& params,
-                       const DatasetT& dataset,
-                       cuvs::distance::DistanceType metric) -> double
-  {
-    // If explicit team_size is specified and doesn't match the instance, discard it
-    if (params.team_size != 0 && TeamSize != params.team_size) { return -1.0; }
-    if (Metric != metric) { return -1.0; }
-    // Otherwise, favor the closest dataset dimensionality.
-    return 1.0 / (0.1 + std::abs(double(dataset.dim()) - double(DatasetBlockDim)));
-  }
-};
+  standard_dataset_descriptor_init_kernel<Metric,
+                                          TeamSize,
+                                          DatasetBlockDim,
+                                          DataT,
+                                          IndexT,
+                                          DistanceT>
+    <<<1, 1, 0, stream>>>(result.dev_ptr, ptr, size, dim, desc_type::ld(dd_host.args));
+  RAFT_CUDA_TRY(cudaPeekAtLastError());
+  return result;
+}
 
 }  // namespace cuvs::neighbors::cagra::detail
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard.hpp b/cpp/src/neighbors/detail/cagra/compute_distance_standard.hpp
new file mode 100644
index 000000000..df1b77e86
--- /dev/null
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard.hpp
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 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.
+ * 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.
+ */
+#pragma once
+
+#include "compute_distance.hpp"
+
+#include <cuvs/distance/distance.hpp>
+
+#include <type_traits>
+
+namespace cuvs::neighbors::cagra::detail {
+
+template <cuvs::distance::DistanceType Metric,
+          uint32_t TeamSize,
+          uint32_t DatasetBlockDim,
+          typename DataT,
+          typename IndexT,
+          typename DistanceT>
+struct standard_descriptor_spec : public instance_spec<DataT, IndexT, DistanceT> {
+  using base_type = instance_spec<DataT, IndexT, DistanceT>;
+  using typename base_type::data_type;
+  using typename base_type::distance_type;
+  using typename base_type::host_type;
+  using typename base_type::index_type;
+
+  template <typename DatasetT>
+  constexpr static inline bool accepts_dataset()
+  {
+    return is_strided_dataset_v<DatasetT>;
+  }
+
+  template <typename DatasetT>
+  static auto init(const cagra::search_params& params,
+                   const DatasetT& dataset,
+                   cuvs::distance::DistanceType metric,
+                   rmm::cuda_stream_view stream) -> host_type
+  {
+    return init_(params,
+                 dataset.view().data_handle(),
+                 IndexT(dataset.n_rows()),
+                 dataset.dim(),
+                 dataset.stride(),
+                 stream);
+  }
+
+  template <typename DatasetT>
+  static auto priority(const cagra::search_params& params,
+                       const DatasetT& dataset,
+                       cuvs::distance::DistanceType metric) -> double
+  {
+    // If explicit team_size is specified and doesn't match the instance, discard it
+    if (params.team_size != 0 && TeamSize != params.team_size) { return -1.0; }
+    if (Metric != metric) { return -1.0; }
+    // Otherwise, favor the closest dataset dimensionality.
+    return 1.0 / (0.1 + std::abs(double(dataset.dim()) - double(DatasetBlockDim)));
+  }
+
+ private:
+  static dataset_descriptor_host<DataT, IndexT, DistanceT> init_(const cagra::search_params& params,
+                                                                 const DataT* ptr,
+                                                                 IndexT size,
+                                                                 uint32_t dim,
+                                                                 uint32_t ld,
+                                                                 rmm::cuda_stream_view stream);
+};
+
+}  // namespace cuvs::neighbors::cagra::detail
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_float_uint32_dim128_t8.cu b/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_float_uint32_dim128_t8.cu
index bc1900856..af5e89a76 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_float_uint32_dim128_t8.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_float_uint32_dim128_t8.cu
@@ -23,31 +23,12 @@
  *
  */
 
-#include "compute_distance_standard.cuh"
+#include "compute_distance_standard-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::InnerProduct,
-                                              8,
-                                              128,
-                                              float,
-                                              uint32_t,
-                                              float>;
-template <>
-const void* standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                                     8,
-                                     128,
-                                     float,
-                                     uint32_t,
-                                     float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &standard_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::InnerProduct,
-                                             8,
-                                             128,
-                                             float,
-                                             uint32_t,
-                                             float>);
-template struct standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
+using namespace cuvs::distance;
+template struct standard_descriptor_spec<DistanceType::InnerProduct,
                                          8,
                                          128,
                                          float,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_float_uint32_dim256_t16.cu b/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_float_uint32_dim256_t16.cu
index aaf339c51..332eb6bf9 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_float_uint32_dim256_t16.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_float_uint32_dim256_t16.cu
@@ -23,31 +23,12 @@
  *
  */
 
-#include "compute_distance_standard.cuh"
+#include "compute_distance_standard-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::InnerProduct,
-                                              16,
-                                              256,
-                                              float,
-                                              uint32_t,
-                                              float>;
-template <>
-const void* standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                                     16,
-                                     256,
-                                     float,
-                                     uint32_t,
-                                     float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &standard_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::InnerProduct,
-                                             16,
-                                             256,
-                                             float,
-                                             uint32_t,
-                                             float>);
-template struct standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
+using namespace cuvs::distance;
+template struct standard_descriptor_spec<DistanceType::InnerProduct,
                                          16,
                                          256,
                                          float,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_float_uint32_dim512_t32.cu b/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_float_uint32_dim512_t32.cu
index 0a1b4c8dc..3e5c11240 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_float_uint32_dim512_t32.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_float_uint32_dim512_t32.cu
@@ -23,31 +23,12 @@
  *
  */
 
-#include "compute_distance_standard.cuh"
+#include "compute_distance_standard-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::InnerProduct,
-                                              32,
-                                              512,
-                                              float,
-                                              uint32_t,
-                                              float>;
-template <>
-const void* standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                                     32,
-                                     512,
-                                     float,
-                                     uint32_t,
-                                     float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &standard_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::InnerProduct,
-                                             32,
-                                             512,
-                                             float,
-                                             uint32_t,
-                                             float>);
-template struct standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
+using namespace cuvs::distance;
+template struct standard_descriptor_spec<DistanceType::InnerProduct,
                                          32,
                                          512,
                                          float,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_float_uint64_dim128_t8.cu b/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_float_uint64_dim128_t8.cu
index 134f1efd8..df761ab25 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_float_uint64_dim128_t8.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_float_uint64_dim128_t8.cu
@@ -23,31 +23,12 @@
  *
  */
 
-#include "compute_distance_standard.cuh"
+#include "compute_distance_standard-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::InnerProduct,
-                                              8,
-                                              128,
-                                              float,
-                                              uint64_t,
-                                              float>;
-template <>
-const void* standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                                     8,
-                                     128,
-                                     float,
-                                     uint64_t,
-                                     float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &standard_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::InnerProduct,
-                                             8,
-                                             128,
-                                             float,
-                                             uint64_t,
-                                             float>);
-template struct standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
+using namespace cuvs::distance;
+template struct standard_descriptor_spec<DistanceType::InnerProduct,
                                          8,
                                          128,
                                          float,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_float_uint64_dim256_t16.cu b/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_float_uint64_dim256_t16.cu
index 1350b74ad..b7e5eb2e9 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_float_uint64_dim256_t16.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_float_uint64_dim256_t16.cu
@@ -23,31 +23,12 @@
  *
  */
 
-#include "compute_distance_standard.cuh"
+#include "compute_distance_standard-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::InnerProduct,
-                                              16,
-                                              256,
-                                              float,
-                                              uint64_t,
-                                              float>;
-template <>
-const void* standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                                     16,
-                                     256,
-                                     float,
-                                     uint64_t,
-                                     float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &standard_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::InnerProduct,
-                                             16,
-                                             256,
-                                             float,
-                                             uint64_t,
-                                             float>);
-template struct standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
+using namespace cuvs::distance;
+template struct standard_descriptor_spec<DistanceType::InnerProduct,
                                          16,
                                          256,
                                          float,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_float_uint64_dim512_t32.cu b/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_float_uint64_dim512_t32.cu
index ceab122fb..fd2a6b276 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_float_uint64_dim512_t32.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_float_uint64_dim512_t32.cu
@@ -23,31 +23,12 @@
  *
  */
 
-#include "compute_distance_standard.cuh"
+#include "compute_distance_standard-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::InnerProduct,
-                                              32,
-                                              512,
-                                              float,
-                                              uint64_t,
-                                              float>;
-template <>
-const void* standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                                     32,
-                                     512,
-                                     float,
-                                     uint64_t,
-                                     float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &standard_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::InnerProduct,
-                                             32,
-                                             512,
-                                             float,
-                                             uint64_t,
-                                             float>);
-template struct standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
+using namespace cuvs::distance;
+template struct standard_descriptor_spec<DistanceType::InnerProduct,
                                          32,
                                          512,
                                          float,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_half_uint32_dim128_t8.cu b/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_half_uint32_dim128_t8.cu
index e94500dad..92ca114f7 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_half_uint32_dim128_t8.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_half_uint32_dim128_t8.cu
@@ -23,35 +23,11 @@
  *
  */
 
-#include "compute_distance_standard.cuh"
+#include "compute_distance_standard-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::InnerProduct,
-                                              8,
-                                              128,
-                                              half,
-                                              uint32_t,
-                                              float>;
-template <>
-const void* standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                                     8,
-                                     128,
-                                     half,
-                                     uint32_t,
-                                     float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &standard_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::InnerProduct,
-                                             8,
-                                             128,
-                                             half,
-                                             uint32_t,
-                                             float>);
-template struct standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                                         8,
-                                         128,
-                                         half,
-                                         uint32_t,
-                                         float>;
+using namespace cuvs::distance;
+template struct standard_descriptor_spec<DistanceType::InnerProduct, 8, 128, half, uint32_t, float>;
 
 }  // namespace cuvs::neighbors::cagra::detail
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_half_uint32_dim256_t16.cu b/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_half_uint32_dim256_t16.cu
index f1ace30cc..cfad79f3a 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_half_uint32_dim256_t16.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_half_uint32_dim256_t16.cu
@@ -23,31 +23,12 @@
  *
  */
 
-#include "compute_distance_standard.cuh"
+#include "compute_distance_standard-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::InnerProduct,
-                                              16,
-                                              256,
-                                              half,
-                                              uint32_t,
-                                              float>;
-template <>
-const void* standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                                     16,
-                                     256,
-                                     half,
-                                     uint32_t,
-                                     float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &standard_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::InnerProduct,
-                                             16,
-                                             256,
-                                             half,
-                                             uint32_t,
-                                             float>);
-template struct standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
+using namespace cuvs::distance;
+template struct standard_descriptor_spec<DistanceType::InnerProduct,
                                          16,
                                          256,
                                          half,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_half_uint32_dim512_t32.cu b/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_half_uint32_dim512_t32.cu
index a5f2aae13..8c208044b 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_half_uint32_dim512_t32.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_half_uint32_dim512_t32.cu
@@ -23,31 +23,12 @@
  *
  */
 
-#include "compute_distance_standard.cuh"
+#include "compute_distance_standard-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::InnerProduct,
-                                              32,
-                                              512,
-                                              half,
-                                              uint32_t,
-                                              float>;
-template <>
-const void* standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                                     32,
-                                     512,
-                                     half,
-                                     uint32_t,
-                                     float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &standard_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::InnerProduct,
-                                             32,
-                                             512,
-                                             half,
-                                             uint32_t,
-                                             float>);
-template struct standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
+using namespace cuvs::distance;
+template struct standard_descriptor_spec<DistanceType::InnerProduct,
                                          32,
                                          512,
                                          half,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_half_uint64_dim128_t8.cu b/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_half_uint64_dim128_t8.cu
index 800debf5d..291d16ddd 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_half_uint64_dim128_t8.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_half_uint64_dim128_t8.cu
@@ -23,35 +23,11 @@
  *
  */
 
-#include "compute_distance_standard.cuh"
+#include "compute_distance_standard-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::InnerProduct,
-                                              8,
-                                              128,
-                                              half,
-                                              uint64_t,
-                                              float>;
-template <>
-const void* standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                                     8,
-                                     128,
-                                     half,
-                                     uint64_t,
-                                     float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &standard_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::InnerProduct,
-                                             8,
-                                             128,
-                                             half,
-                                             uint64_t,
-                                             float>);
-template struct standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                                         8,
-                                         128,
-                                         half,
-                                         uint64_t,
-                                         float>;
+using namespace cuvs::distance;
+template struct standard_descriptor_spec<DistanceType::InnerProduct, 8, 128, half, uint64_t, float>;
 
 }  // namespace cuvs::neighbors::cagra::detail
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_half_uint64_dim256_t16.cu b/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_half_uint64_dim256_t16.cu
index 4528426c7..32a18ff3e 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_half_uint64_dim256_t16.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_half_uint64_dim256_t16.cu
@@ -23,31 +23,12 @@
  *
  */
 
-#include "compute_distance_standard.cuh"
+#include "compute_distance_standard-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::InnerProduct,
-                                              16,
-                                              256,
-                                              half,
-                                              uint64_t,
-                                              float>;
-template <>
-const void* standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                                     16,
-                                     256,
-                                     half,
-                                     uint64_t,
-                                     float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &standard_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::InnerProduct,
-                                             16,
-                                             256,
-                                             half,
-                                             uint64_t,
-                                             float>);
-template struct standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
+using namespace cuvs::distance;
+template struct standard_descriptor_spec<DistanceType::InnerProduct,
                                          16,
                                          256,
                                          half,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_half_uint64_dim512_t32.cu b/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_half_uint64_dim512_t32.cu
index 45782089c..27dba0ebb 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_half_uint64_dim512_t32.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_half_uint64_dim512_t32.cu
@@ -23,31 +23,12 @@
  *
  */
 
-#include "compute_distance_standard.cuh"
+#include "compute_distance_standard-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::InnerProduct,
-                                              32,
-                                              512,
-                                              half,
-                                              uint64_t,
-                                              float>;
-template <>
-const void* standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                                     32,
-                                     512,
-                                     half,
-                                     uint64_t,
-                                     float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &standard_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::InnerProduct,
-                                             32,
-                                             512,
-                                             half,
-                                             uint64_t,
-                                             float>);
-template struct standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
+using namespace cuvs::distance;
+template struct standard_descriptor_spec<DistanceType::InnerProduct,
                                          32,
                                          512,
                                          half,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_int8_uint32_dim128_t8.cu b/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_int8_uint32_dim128_t8.cu
index 95725e7ee..929df5bbe 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_int8_uint32_dim128_t8.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_int8_uint32_dim128_t8.cu
@@ -23,31 +23,12 @@
  *
  */
 
-#include "compute_distance_standard.cuh"
+#include "compute_distance_standard-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::InnerProduct,
-                                              8,
-                                              128,
-                                              int8_t,
-                                              uint32_t,
-                                              float>;
-template <>
-const void* standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                                     8,
-                                     128,
-                                     int8_t,
-                                     uint32_t,
-                                     float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &standard_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::InnerProduct,
-                                             8,
-                                             128,
-                                             int8_t,
-                                             uint32_t,
-                                             float>);
-template struct standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
+using namespace cuvs::distance;
+template struct standard_descriptor_spec<DistanceType::InnerProduct,
                                          8,
                                          128,
                                          int8_t,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_int8_uint32_dim256_t16.cu b/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_int8_uint32_dim256_t16.cu
index 17fa88635..3cc4a2c95 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_int8_uint32_dim256_t16.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_int8_uint32_dim256_t16.cu
@@ -23,31 +23,12 @@
  *
  */
 
-#include "compute_distance_standard.cuh"
+#include "compute_distance_standard-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::InnerProduct,
-                                              16,
-                                              256,
-                                              int8_t,
-                                              uint32_t,
-                                              float>;
-template <>
-const void* standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                                     16,
-                                     256,
-                                     int8_t,
-                                     uint32_t,
-                                     float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &standard_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::InnerProduct,
-                                             16,
-                                             256,
-                                             int8_t,
-                                             uint32_t,
-                                             float>);
-template struct standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
+using namespace cuvs::distance;
+template struct standard_descriptor_spec<DistanceType::InnerProduct,
                                          16,
                                          256,
                                          int8_t,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_int8_uint32_dim512_t32.cu b/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_int8_uint32_dim512_t32.cu
index d6f1b03b7..a87e866eb 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_int8_uint32_dim512_t32.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_int8_uint32_dim512_t32.cu
@@ -23,31 +23,12 @@
  *
  */
 
-#include "compute_distance_standard.cuh"
+#include "compute_distance_standard-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::InnerProduct,
-                                              32,
-                                              512,
-                                              int8_t,
-                                              uint32_t,
-                                              float>;
-template <>
-const void* standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                                     32,
-                                     512,
-                                     int8_t,
-                                     uint32_t,
-                                     float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &standard_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::InnerProduct,
-                                             32,
-                                             512,
-                                             int8_t,
-                                             uint32_t,
-                                             float>);
-template struct standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
+using namespace cuvs::distance;
+template struct standard_descriptor_spec<DistanceType::InnerProduct,
                                          32,
                                          512,
                                          int8_t,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_uint8_uint32_dim128_t8.cu b/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_uint8_uint32_dim128_t8.cu
index 9afca54ea..650d9ecac 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_uint8_uint32_dim128_t8.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_uint8_uint32_dim128_t8.cu
@@ -23,31 +23,12 @@
  *
  */
 
-#include "compute_distance_standard.cuh"
+#include "compute_distance_standard-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::InnerProduct,
-                                              8,
-                                              128,
-                                              uint8_t,
-                                              uint32_t,
-                                              float>;
-template <>
-const void* standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                                     8,
-                                     128,
-                                     uint8_t,
-                                     uint32_t,
-                                     float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &standard_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::InnerProduct,
-                                             8,
-                                             128,
-                                             uint8_t,
-                                             uint32_t,
-                                             float>);
-template struct standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
+using namespace cuvs::distance;
+template struct standard_descriptor_spec<DistanceType::InnerProduct,
                                          8,
                                          128,
                                          uint8_t,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_uint8_uint32_dim256_t16.cu b/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_uint8_uint32_dim256_t16.cu
index 97c6489a9..6f7f4b97f 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_uint8_uint32_dim256_t16.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_uint8_uint32_dim256_t16.cu
@@ -23,31 +23,12 @@
  *
  */
 
-#include "compute_distance_standard.cuh"
+#include "compute_distance_standard-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::InnerProduct,
-                                              16,
-                                              256,
-                                              uint8_t,
-                                              uint32_t,
-                                              float>;
-template <>
-const void* standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                                     16,
-                                     256,
-                                     uint8_t,
-                                     uint32_t,
-                                     float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &standard_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::InnerProduct,
-                                             16,
-                                             256,
-                                             uint8_t,
-                                             uint32_t,
-                                             float>);
-template struct standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
+using namespace cuvs::distance;
+template struct standard_descriptor_spec<DistanceType::InnerProduct,
                                          16,
                                          256,
                                          uint8_t,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_uint8_uint32_dim512_t32.cu b/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_uint8_uint32_dim512_t32.cu
index 43d0a9958..e7b96ab49 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_uint8_uint32_dim512_t32.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard_InnerProduct_uint8_uint32_dim512_t32.cu
@@ -23,31 +23,12 @@
  *
  */
 
-#include "compute_distance_standard.cuh"
+#include "compute_distance_standard-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::InnerProduct,
-                                              32,
-                                              512,
-                                              uint8_t,
-                                              uint32_t,
-                                              float>;
-template <>
-const void* standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
-                                     32,
-                                     512,
-                                     uint8_t,
-                                     uint32_t,
-                                     float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &standard_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::InnerProduct,
-                                             32,
-                                             512,
-                                             uint8_t,
-                                             uint32_t,
-                                             float>);
-template struct standard_descriptor_spec<cuvs::distance::DistanceType::InnerProduct,
+using namespace cuvs::distance;
+template struct standard_descriptor_spec<DistanceType::InnerProduct,
                                          32,
                                          512,
                                          uint8_t,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_float_uint32_dim128_t8.cu b/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_float_uint32_dim128_t8.cu
index 645032af9..b45cf3669 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_float_uint32_dim128_t8.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_float_uint32_dim128_t8.cu
@@ -23,35 +23,11 @@
  *
  */
 
-#include "compute_distance_standard.cuh"
+#include "compute_distance_standard-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                              8,
-                                              128,
-                                              float,
-                                              uint32_t,
-                                              float>;
-template <>
-const void* standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                     8,
-                                     128,
-                                     float,
-                                     uint32_t,
-                                     float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &standard_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                             8,
-                                             128,
-                                             float,
-                                             uint32_t,
-                                             float>);
-template struct standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                         8,
-                                         128,
-                                         float,
-                                         uint32_t,
-                                         float>;
+using namespace cuvs::distance;
+template struct standard_descriptor_spec<DistanceType::L2Expanded, 8, 128, float, uint32_t, float>;
 
 }  // namespace cuvs::neighbors::cagra::detail
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_float_uint32_dim256_t16.cu b/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_float_uint32_dim256_t16.cu
index cdb315bac..7d1206c37 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_float_uint32_dim256_t16.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_float_uint32_dim256_t16.cu
@@ -23,35 +23,11 @@
  *
  */
 
-#include "compute_distance_standard.cuh"
+#include "compute_distance_standard-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                              16,
-                                              256,
-                                              float,
-                                              uint32_t,
-                                              float>;
-template <>
-const void* standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                     16,
-                                     256,
-                                     float,
-                                     uint32_t,
-                                     float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &standard_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                             16,
-                                             256,
-                                             float,
-                                             uint32_t,
-                                             float>);
-template struct standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                         16,
-                                         256,
-                                         float,
-                                         uint32_t,
-                                         float>;
+using namespace cuvs::distance;
+template struct standard_descriptor_spec<DistanceType::L2Expanded, 16, 256, float, uint32_t, float>;
 
 }  // namespace cuvs::neighbors::cagra::detail
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_float_uint32_dim512_t32.cu b/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_float_uint32_dim512_t32.cu
index 49053a2d6..251316b2c 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_float_uint32_dim512_t32.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_float_uint32_dim512_t32.cu
@@ -23,35 +23,11 @@
  *
  */
 
-#include "compute_distance_standard.cuh"
+#include "compute_distance_standard-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                              32,
-                                              512,
-                                              float,
-                                              uint32_t,
-                                              float>;
-template <>
-const void* standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                     32,
-                                     512,
-                                     float,
-                                     uint32_t,
-                                     float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &standard_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                             32,
-                                             512,
-                                             float,
-                                             uint32_t,
-                                             float>);
-template struct standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                         32,
-                                         512,
-                                         float,
-                                         uint32_t,
-                                         float>;
+using namespace cuvs::distance;
+template struct standard_descriptor_spec<DistanceType::L2Expanded, 32, 512, float, uint32_t, float>;
 
 }  // namespace cuvs::neighbors::cagra::detail
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_float_uint64_dim128_t8.cu b/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_float_uint64_dim128_t8.cu
index 5a534718b..7a8c4059c 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_float_uint64_dim128_t8.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_float_uint64_dim128_t8.cu
@@ -23,35 +23,11 @@
  *
  */
 
-#include "compute_distance_standard.cuh"
+#include "compute_distance_standard-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                              8,
-                                              128,
-                                              float,
-                                              uint64_t,
-                                              float>;
-template <>
-const void* standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                     8,
-                                     128,
-                                     float,
-                                     uint64_t,
-                                     float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &standard_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                             8,
-                                             128,
-                                             float,
-                                             uint64_t,
-                                             float>);
-template struct standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                         8,
-                                         128,
-                                         float,
-                                         uint64_t,
-                                         float>;
+using namespace cuvs::distance;
+template struct standard_descriptor_spec<DistanceType::L2Expanded, 8, 128, float, uint64_t, float>;
 
 }  // namespace cuvs::neighbors::cagra::detail
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_float_uint64_dim256_t16.cu b/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_float_uint64_dim256_t16.cu
index 7e85fa349..fcc65a48e 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_float_uint64_dim256_t16.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_float_uint64_dim256_t16.cu
@@ -23,35 +23,11 @@
  *
  */
 
-#include "compute_distance_standard.cuh"
+#include "compute_distance_standard-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                              16,
-                                              256,
-                                              float,
-                                              uint64_t,
-                                              float>;
-template <>
-const void* standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                     16,
-                                     256,
-                                     float,
-                                     uint64_t,
-                                     float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &standard_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                             16,
-                                             256,
-                                             float,
-                                             uint64_t,
-                                             float>);
-template struct standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                         16,
-                                         256,
-                                         float,
-                                         uint64_t,
-                                         float>;
+using namespace cuvs::distance;
+template struct standard_descriptor_spec<DistanceType::L2Expanded, 16, 256, float, uint64_t, float>;
 
 }  // namespace cuvs::neighbors::cagra::detail
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_float_uint64_dim512_t32.cu b/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_float_uint64_dim512_t32.cu
index 4bc254679..833dac9c4 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_float_uint64_dim512_t32.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_float_uint64_dim512_t32.cu
@@ -23,35 +23,11 @@
  *
  */
 
-#include "compute_distance_standard.cuh"
+#include "compute_distance_standard-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                              32,
-                                              512,
-                                              float,
-                                              uint64_t,
-                                              float>;
-template <>
-const void* standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                     32,
-                                     512,
-                                     float,
-                                     uint64_t,
-                                     float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &standard_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                             32,
-                                             512,
-                                             float,
-                                             uint64_t,
-                                             float>);
-template struct standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                         32,
-                                         512,
-                                         float,
-                                         uint64_t,
-                                         float>;
+using namespace cuvs::distance;
+template struct standard_descriptor_spec<DistanceType::L2Expanded, 32, 512, float, uint64_t, float>;
 
 }  // namespace cuvs::neighbors::cagra::detail
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_half_uint32_dim128_t8.cu b/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_half_uint32_dim128_t8.cu
index c0fe52caf..e3870df40 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_half_uint32_dim128_t8.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_half_uint32_dim128_t8.cu
@@ -23,35 +23,11 @@
  *
  */
 
-#include "compute_distance_standard.cuh"
+#include "compute_distance_standard-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                              8,
-                                              128,
-                                              half,
-                                              uint32_t,
-                                              float>;
-template <>
-const void* standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                     8,
-                                     128,
-                                     half,
-                                     uint32_t,
-                                     float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &standard_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                             8,
-                                             128,
-                                             half,
-                                             uint32_t,
-                                             float>);
-template struct standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                         8,
-                                         128,
-                                         half,
-                                         uint32_t,
-                                         float>;
+using namespace cuvs::distance;
+template struct standard_descriptor_spec<DistanceType::L2Expanded, 8, 128, half, uint32_t, float>;
 
 }  // namespace cuvs::neighbors::cagra::detail
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_half_uint32_dim256_t16.cu b/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_half_uint32_dim256_t16.cu
index b585e1f80..1253d7cd4 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_half_uint32_dim256_t16.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_half_uint32_dim256_t16.cu
@@ -23,35 +23,11 @@
  *
  */
 
-#include "compute_distance_standard.cuh"
+#include "compute_distance_standard-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                              16,
-                                              256,
-                                              half,
-                                              uint32_t,
-                                              float>;
-template <>
-const void* standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                     16,
-                                     256,
-                                     half,
-                                     uint32_t,
-                                     float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &standard_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                             16,
-                                             256,
-                                             half,
-                                             uint32_t,
-                                             float>);
-template struct standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                         16,
-                                         256,
-                                         half,
-                                         uint32_t,
-                                         float>;
+using namespace cuvs::distance;
+template struct standard_descriptor_spec<DistanceType::L2Expanded, 16, 256, half, uint32_t, float>;
 
 }  // namespace cuvs::neighbors::cagra::detail
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_half_uint32_dim512_t32.cu b/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_half_uint32_dim512_t32.cu
index 91de967e8..792532c2c 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_half_uint32_dim512_t32.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_half_uint32_dim512_t32.cu
@@ -23,35 +23,11 @@
  *
  */
 
-#include "compute_distance_standard.cuh"
+#include "compute_distance_standard-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                              32,
-                                              512,
-                                              half,
-                                              uint32_t,
-                                              float>;
-template <>
-const void* standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                     32,
-                                     512,
-                                     half,
-                                     uint32_t,
-                                     float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &standard_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                             32,
-                                             512,
-                                             half,
-                                             uint32_t,
-                                             float>);
-template struct standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                         32,
-                                         512,
-                                         half,
-                                         uint32_t,
-                                         float>;
+using namespace cuvs::distance;
+template struct standard_descriptor_spec<DistanceType::L2Expanded, 32, 512, half, uint32_t, float>;
 
 }  // namespace cuvs::neighbors::cagra::detail
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_half_uint64_dim128_t8.cu b/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_half_uint64_dim128_t8.cu
index b77b84793..b3a466f46 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_half_uint64_dim128_t8.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_half_uint64_dim128_t8.cu
@@ -23,35 +23,11 @@
  *
  */
 
-#include "compute_distance_standard.cuh"
+#include "compute_distance_standard-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                              8,
-                                              128,
-                                              half,
-                                              uint64_t,
-                                              float>;
-template <>
-const void* standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                     8,
-                                     128,
-                                     half,
-                                     uint64_t,
-                                     float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &standard_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                             8,
-                                             128,
-                                             half,
-                                             uint64_t,
-                                             float>);
-template struct standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                         8,
-                                         128,
-                                         half,
-                                         uint64_t,
-                                         float>;
+using namespace cuvs::distance;
+template struct standard_descriptor_spec<DistanceType::L2Expanded, 8, 128, half, uint64_t, float>;
 
 }  // namespace cuvs::neighbors::cagra::detail
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_half_uint64_dim256_t16.cu b/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_half_uint64_dim256_t16.cu
index 7ce86c034..a11701e5a 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_half_uint64_dim256_t16.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_half_uint64_dim256_t16.cu
@@ -23,35 +23,11 @@
  *
  */
 
-#include "compute_distance_standard.cuh"
+#include "compute_distance_standard-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                              16,
-                                              256,
-                                              half,
-                                              uint64_t,
-                                              float>;
-template <>
-const void* standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                     16,
-                                     256,
-                                     half,
-                                     uint64_t,
-                                     float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &standard_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                             16,
-                                             256,
-                                             half,
-                                             uint64_t,
-                                             float>);
-template struct standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                         16,
-                                         256,
-                                         half,
-                                         uint64_t,
-                                         float>;
+using namespace cuvs::distance;
+template struct standard_descriptor_spec<DistanceType::L2Expanded, 16, 256, half, uint64_t, float>;
 
 }  // namespace cuvs::neighbors::cagra::detail
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_half_uint64_dim512_t32.cu b/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_half_uint64_dim512_t32.cu
index 507d709eb..9ed0a32ee 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_half_uint64_dim512_t32.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_half_uint64_dim512_t32.cu
@@ -23,35 +23,11 @@
  *
  */
 
-#include "compute_distance_standard.cuh"
+#include "compute_distance_standard-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                              32,
-                                              512,
-                                              half,
-                                              uint64_t,
-                                              float>;
-template <>
-const void* standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                     32,
-                                     512,
-                                     half,
-                                     uint64_t,
-                                     float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &standard_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                             32,
-                                             512,
-                                             half,
-                                             uint64_t,
-                                             float>);
-template struct standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                         32,
-                                         512,
-                                         half,
-                                         uint64_t,
-                                         float>;
+using namespace cuvs::distance;
+template struct standard_descriptor_spec<DistanceType::L2Expanded, 32, 512, half, uint64_t, float>;
 
 }  // namespace cuvs::neighbors::cagra::detail
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_int8_uint32_dim128_t8.cu b/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_int8_uint32_dim128_t8.cu
index c5c7a7b4c..c9c960cf9 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_int8_uint32_dim128_t8.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_int8_uint32_dim128_t8.cu
@@ -23,35 +23,11 @@
  *
  */
 
-#include "compute_distance_standard.cuh"
+#include "compute_distance_standard-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                              8,
-                                              128,
-                                              int8_t,
-                                              uint32_t,
-                                              float>;
-template <>
-const void* standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                     8,
-                                     128,
-                                     int8_t,
-                                     uint32_t,
-                                     float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &standard_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                             8,
-                                             128,
-                                             int8_t,
-                                             uint32_t,
-                                             float>);
-template struct standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                         8,
-                                         128,
-                                         int8_t,
-                                         uint32_t,
-                                         float>;
+using namespace cuvs::distance;
+template struct standard_descriptor_spec<DistanceType::L2Expanded, 8, 128, int8_t, uint32_t, float>;
 
 }  // namespace cuvs::neighbors::cagra::detail
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_int8_uint32_dim256_t16.cu b/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_int8_uint32_dim256_t16.cu
index 8d237f58b..d7a12804b 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_int8_uint32_dim256_t16.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_int8_uint32_dim256_t16.cu
@@ -23,31 +23,12 @@
  *
  */
 
-#include "compute_distance_standard.cuh"
+#include "compute_distance_standard-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                              16,
-                                              256,
-                                              int8_t,
-                                              uint32_t,
-                                              float>;
-template <>
-const void* standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                     16,
-                                     256,
-                                     int8_t,
-                                     uint32_t,
-                                     float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &standard_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                             16,
-                                             256,
-                                             int8_t,
-                                             uint32_t,
-                                             float>);
-template struct standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct standard_descriptor_spec<DistanceType::L2Expanded,
                                          16,
                                          256,
                                          int8_t,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_int8_uint32_dim512_t32.cu b/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_int8_uint32_dim512_t32.cu
index cf3ea2eda..a4f06c283 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_int8_uint32_dim512_t32.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_int8_uint32_dim512_t32.cu
@@ -23,31 +23,12 @@
  *
  */
 
-#include "compute_distance_standard.cuh"
+#include "compute_distance_standard-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                              32,
-                                              512,
-                                              int8_t,
-                                              uint32_t,
-                                              float>;
-template <>
-const void* standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                     32,
-                                     512,
-                                     int8_t,
-                                     uint32_t,
-                                     float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &standard_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                             32,
-                                             512,
-                                             int8_t,
-                                             uint32_t,
-                                             float>);
-template struct standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct standard_descriptor_spec<DistanceType::L2Expanded,
                                          32,
                                          512,
                                          int8_t,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_uint8_uint32_dim128_t8.cu b/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_uint8_uint32_dim128_t8.cu
index b8c80709d..199f05e49 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_uint8_uint32_dim128_t8.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_uint8_uint32_dim128_t8.cu
@@ -23,31 +23,12 @@
  *
  */
 
-#include "compute_distance_standard.cuh"
+#include "compute_distance_standard-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                              8,
-                                              128,
-                                              uint8_t,
-                                              uint32_t,
-                                              float>;
-template <>
-const void* standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                     8,
-                                     128,
-                                     uint8_t,
-                                     uint32_t,
-                                     float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &standard_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                             8,
-                                             128,
-                                             uint8_t,
-                                             uint32_t,
-                                             float>);
-template struct standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct standard_descriptor_spec<DistanceType::L2Expanded,
                                          8,
                                          128,
                                          uint8_t,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_uint8_uint32_dim256_t16.cu b/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_uint8_uint32_dim256_t16.cu
index 2c1fb61c2..0962ecd82 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_uint8_uint32_dim256_t16.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_uint8_uint32_dim256_t16.cu
@@ -23,31 +23,12 @@
  *
  */
 
-#include "compute_distance_standard.cuh"
+#include "compute_distance_standard-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                              16,
-                                              256,
-                                              uint8_t,
-                                              uint32_t,
-                                              float>;
-template <>
-const void* standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                     16,
-                                     256,
-                                     uint8_t,
-                                     uint32_t,
-                                     float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &standard_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                             16,
-                                             256,
-                                             uint8_t,
-                                             uint32_t,
-                                             float>);
-template struct standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct standard_descriptor_spec<DistanceType::L2Expanded,
                                          16,
                                          256,
                                          uint8_t,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_uint8_uint32_dim512_t32.cu b/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_uint8_uint32_dim512_t32.cu
index fb4ad12d1..9c7e4ab03 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_uint8_uint32_dim512_t32.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_standard_L2Expanded_uint8_uint32_dim512_t32.cu
@@ -23,31 +23,12 @@
  *
  */
 
-#include "compute_distance_standard.cuh"
+#include "compute_distance_standard-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct standard_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                              32,
-                                              512,
-                                              uint8_t,
-                                              uint32_t,
-                                              float>;
-template <>
-const void* standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                     32,
-                                     512,
-                                     uint8_t,
-                                     uint32_t,
-                                     float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &standard_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                             32,
-                                             512,
-                                             uint8_t,
-                                             uint32_t,
-                                             float>);
-template struct standard_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct standard_descriptor_spec<DistanceType::L2Expanded,
                                          32,
                                          512,
                                          uint8_t,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq.cuh b/cpp/src/neighbors/detail/cagra/compute_distance_vpq-impl.cuh
similarity index 81%
rename from cpp/src/neighbors/detail/cagra/compute_distance_vpq.cuh
rename to cpp/src/neighbors/detail/cagra/compute_distance_vpq-impl.cuh
index 69c570417..22b543994 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq.cuh
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq-impl.cuh
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "compute_distance.hpp"
+#include "compute_distance_vpq.hpp"
 
 #include <cuvs/distance/distance.hpp>
 #include <raft/util/device_loads_stores.cuh>
@@ -30,13 +30,13 @@ template <cuvs::distance::DistanceType Metric,
           uint32_t DatasetBlockDim,
           uint32_t PQ_BITS,
           uint32_t PQ_LEN,
-          typename CodeBookT,
+          typename CodebookT,
           typename DataT,
           typename IndexT,
           typename DistanceT>
 struct cagra_q_dataset_descriptor_t : public dataset_descriptor_base_t<DataT, IndexT, DistanceT> {
   using base_type   = dataset_descriptor_base_t<DataT, IndexT, DistanceT>;
-  using CODE_BOOK_T = CodeBookT;
+  using CODE_BOOK_T = CodebookT;
   using QUERY_T     = half;
   using base_type::args;
   using base_type::extra_ptr3;
@@ -119,7 +119,7 @@ struct cagra_q_dataset_descriptor_t : public dataset_descriptor_base_t<DataT, In
                                                  std::uint32_t n_subspace,
                                                  const CODE_BOOK_T* vq_code_book_ptr,
                                                  const CODE_BOOK_T* pq_code_book_ptr,
-                                                 std::size_t size,
+                                                 IndexT size,
                                                  std::uint32_t dim)
     : base_type(setup_workspace_impl,
                 compute_distance_impl,
@@ -359,26 +359,26 @@ template <cuvs::distance::DistanceType Metric,
           uint32_t DatasetBlockDim,
           uint32_t PqBits,
           uint32_t PqLen,
-          typename CodeBookT,
+          typename CodebookT,
           typename DataT,
           typename IndexT,
           typename DistanceT>
 __launch_bounds__(1, 1) __global__
   void vpq_dataset_descriptor_init_kernel(dataset_descriptor_base_t<DataT, IndexT, DistanceT>* out,
                                           const std::uint8_t* encoded_dataset_ptr,
-                                          std::uint32_t encoded_dataset_dim,
-                                          std::uint32_t n_subspace,
-                                          const CodeBookT* vq_code_book_ptr,
-                                          const CodeBookT* pq_code_book_ptr,
-                                          std::size_t size,
-                                          std::uint32_t dim)
+                                          uint32_t encoded_dataset_dim,
+                                          uint32_t n_subspace,
+                                          const CodebookT* vq_code_book_ptr,
+                                          const CodebookT* pq_code_book_ptr,
+                                          IndexT size,
+                                          uint32_t dim)
 {
   using desc_type = cagra_q_dataset_descriptor_t<Metric,
                                                  TeamSize,
                                                  DatasetBlockDim,
                                                  PqBits,
                                                  PqLen,
-                                                 CodeBookT,
+                                                 CodebookT,
                                                  DataT,
                                                  IndexT,
                                                  DistanceT>;
@@ -404,81 +404,64 @@ template <cuvs::distance::DistanceType Metric,
           typename DataT,
           typename IndexT,
           typename DistanceT>
-struct vpq_descriptor_spec : public instance_spec<DataT, IndexT, DistanceT> {
-  using base_type = instance_spec<DataT, IndexT, DistanceT>;
-  using typename base_type::data_type;
-  using typename base_type::distance_type;
-  using typename base_type::host_type;
-  using typename base_type::index_type;
-
-  template <typename DatasetT>
-  constexpr static inline auto accepts_dataset()
-    -> std::enable_if_t<is_vpq_dataset_v<DatasetT>, bool>
-  {
-    return std::is_same_v<typename DatasetT::math_type, CodebookT>;
-  }
-
-  template <typename DatasetT>
-  constexpr static inline auto accepts_dataset()
-    -> std::enable_if_t<!is_vpq_dataset_v<DatasetT>, bool>
-  {
-    return false;
-  }
-
-  using descriptor_type = cagra_q_dataset_descriptor_t<Metric,
-                                                       TeamSize,
-                                                       DatasetBlockDim,
-                                                       PqBits,
-                                                       PqLen,
-                                                       CodebookT,
-                                                       DataT,
-                                                       IndexT,
-                                                       DistanceT>;
-  static const void* init_kernel;
-
-  template <typename DatasetT>
-  static auto init(const cagra::search_params& params,
-                   const DatasetT& dataset,
-                   cuvs::distance::DistanceType metric,
-                   rmm::cuda_stream_view stream) -> host_type
-  {
-    descriptor_type dd_host{nullptr,
-                            nullptr,
-                            dataset.data.data_handle(),
-                            dataset.encoded_row_length(),
-                            dataset.pq_dim(),
-                            dataset.vq_code_book.data_handle(),
-                            dataset.pq_code_book.data_handle(),
-                            IndexT(dataset.n_rows()),
-                            dataset.dim()};
-    host_type result{dd_host, stream, DatasetBlockDim};
-    void* args[] =  // NOLINT
-      {&result.dev_ptr,
-       &descriptor_type::encoded_dataset_ptr(dd_host.args),
-       &descriptor_type::encoded_dataset_dim(dd_host.args),
-       &descriptor_type::n_subspace(dd_host.args),
-       &descriptor_type::vq_code_book_ptr(dd_host.args),
-       &dd_host.pq_code_book_ptr(),
-       &dd_host.size,
-       &dd_host.args.dim};
-    RAFT_CUDA_TRY(cudaLaunchKernel(init_kernel, 1, 1, args, 0, stream));
-    return result;
-  }
+dataset_descriptor_host<DataT, IndexT, DistanceT>
+vpq_descriptor_spec<Metric,
+                    TeamSize,
+                    DatasetBlockDim,
+                    PqBits,
+                    PqLen,
+                    CodebookT,
+                    DataT,
+                    IndexT,
+                    DistanceT>::init_(const cagra::search_params& params,
+                                      const std::uint8_t* encoded_dataset_ptr,
+                                      uint32_t encoded_dataset_dim,
+                                      uint32_t n_subspace,
+                                      const CodebookT* vq_code_book_ptr,
+                                      const CodebookT* pq_code_book_ptr,
+                                      IndexT size,
+                                      uint32_t dim,
+                                      rmm::cuda_stream_view stream)
+{
+  using desc_type = cagra_q_dataset_descriptor_t<Metric,
+                                                 TeamSize,
+                                                 DatasetBlockDim,
+                                                 PqBits,
+                                                 PqLen,
+                                                 CodebookT,
+                                                 DataT,
+                                                 IndexT,
+                                                 DistanceT>;
+  using base_type = typename desc_type::base_type;
 
-  template <typename DatasetT>
-  static auto priority(const cagra::search_params& params,
-                       const DatasetT& dataset,
-                       cuvs::distance::DistanceType metric) -> double
-  {
-    // If explicit team_size is specified and doesn't match the instance, discard it
-    if (params.team_size != 0 && TeamSize != params.team_size) { return -1.0; }
-    if (cuvs::distance::DistanceType::L2Expanded != metric) { return -1.0; }
-    // Match codebook params
-    if (dataset.pq_bits() != PqBits) { return -1.0; }
-    if (dataset.pq_len() != PqLen) { return -1.0; }
-    // Otherwise, favor the closest dataset dimensionality.
-    return 1.0 / (0.1 + std::abs(double(dataset.dim()) - double(DatasetBlockDim)));
-  }
-};
+  desc_type dd_host{nullptr,
+                    nullptr,
+                    encoded_dataset_ptr,
+                    encoded_dataset_dim,
+                    n_subspace,
+                    vq_code_book_ptr,
+                    pq_code_book_ptr,
+                    size,
+                    dim};
+  host_type result{dd_host, stream, DatasetBlockDim};
+  vpq_dataset_descriptor_init_kernel<Metric,
+                                     TeamSize,
+                                     DatasetBlockDim,
+                                     PqBits,
+                                     PqLen,
+                                     CodebookT,
+                                     DataT,
+                                     IndexT,
+                                     DistanceT><<<1, 1, 0, stream>>>(result.dev_ptr,
+                                                                     encoded_dataset_ptr,
+                                                                     encoded_dataset_dim,
+                                                                     n_subspace,
+                                                                     vq_code_book_ptr,
+                                                                     pq_code_book_ptr,
+                                                                     size,
+                                                                     dim);
+  RAFT_CUDA_TRY(cudaPeekAtLastError());
+  return result;
+}
 
 }  // namespace cuvs::neighbors::cagra::detail
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq.hpp b/cpp/src/neighbors/detail/cagra/compute_distance_vpq.hpp
new file mode 100644
index 000000000..9d5b0b6c0
--- /dev/null
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq.hpp
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2023-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.
+ * 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.
+ */
+
+#pragma once
+
+#include "compute_distance.hpp"
+
+#include <cuvs/distance/distance.hpp>
+
+#include <type_traits>
+
+namespace cuvs::neighbors::cagra::detail {
+
+template <cuvs::distance::DistanceType Metric,
+          uint32_t TeamSize,
+          uint32_t DatasetBlockDim,
+          uint32_t PqBits,
+          uint32_t PqLen,
+          typename CodebookT,
+          typename DataT,
+          typename IndexT,
+          typename DistanceT>
+struct vpq_descriptor_spec : public instance_spec<DataT, IndexT, DistanceT> {
+  using base_type = instance_spec<DataT, IndexT, DistanceT>;
+  using typename base_type::data_type;
+  using typename base_type::distance_type;
+  using typename base_type::host_type;
+  using typename base_type::index_type;
+
+  template <typename DatasetT>
+  constexpr static inline auto accepts_dataset()
+    -> std::enable_if_t<is_vpq_dataset_v<DatasetT>, bool>
+  {
+    return std::is_same_v<typename DatasetT::math_type, CodebookT>;
+  }
+
+  template <typename DatasetT>
+  constexpr static inline auto accepts_dataset()
+    -> std::enable_if_t<!is_vpq_dataset_v<DatasetT>, bool>
+  {
+    return false;
+  }
+
+  template <typename DatasetT>
+  static auto init(const cagra::search_params& params,
+                   const DatasetT& dataset,
+                   cuvs::distance::DistanceType metric,
+                   rmm::cuda_stream_view stream) -> host_type
+  {
+    return init_(params,
+                 dataset.data.data_handle(),
+                 dataset.encoded_row_length(),
+                 dataset.pq_dim(),
+                 dataset.vq_code_book.data_handle(),
+                 dataset.pq_code_book.data_handle(),
+                 IndexT(dataset.n_rows()),
+                 dataset.dim(),
+                 stream);
+  }
+
+  template <typename DatasetT>
+  static auto priority(const cagra::search_params& params,
+                       const DatasetT& dataset,
+                       cuvs::distance::DistanceType metric) -> double
+  {
+    // If explicit team_size is specified and doesn't match the instance, discard it
+    if (params.team_size != 0 && TeamSize != params.team_size) { return -1.0; }
+    if (cuvs::distance::DistanceType::L2Expanded != metric) { return -1.0; }
+    // Match codebook params
+    if (dataset.pq_bits() != PqBits) { return -1.0; }
+    if (dataset.pq_len() != PqLen) { return -1.0; }
+    // Otherwise, favor the closest dataset dimensionality.
+    return 1.0 / (0.1 + std::abs(double(dataset.dim()) - double(DatasetBlockDim)));
+  }
+
+ private:
+  static dataset_descriptor_host<DataT, IndexT, DistanceT> init_(
+    const cagra::search_params& params,
+    const std::uint8_t* encoded_dataset_ptr,
+    uint32_t encoded_dataset_dim,
+    uint32_t n_subspace,
+    const CodebookT* vq_code_book_ptr,
+    const CodebookT* pq_code_book_ptr,
+    IndexT size,
+    uint32_t dim,
+    rmm::cuda_stream_view stream);
+};
+
+}  // namespace cuvs::neighbors::cagra::detail
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint32_dim128_t8_8pq_2subd_half.cu b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint32_dim128_t8_8pq_2subd_half.cu
index 7abc27bda..a56a5a9df 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint32_dim128_t8_8pq_2subd_half.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint32_dim128_t8_8pq_2subd_half.cu
@@ -23,40 +23,12 @@
  *
  */
 
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_vpq-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                             8,
-                                             128,
-                                             8,
-                                             2,
-                                             half,
-                                             float,
-                                             uint32_t,
-                                             float>;
-template <>
-const void* vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                8,
-                                128,
-                                8,
-                                2,
-                                half,
-                                float,
-                                uint32_t,
-                                float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &vpq_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                        8,
-                                        128,
-                                        8,
-                                        2,
-                                        half,
-                                        float,
-                                        uint32_t,
-                                        float>);
-template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                     8,
                                     128,
                                     8,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint32_dim128_t8_8pq_4subd_half.cu b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint32_dim128_t8_8pq_4subd_half.cu
index 6407d4b3b..f58a8c7df 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint32_dim128_t8_8pq_4subd_half.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint32_dim128_t8_8pq_4subd_half.cu
@@ -23,40 +23,12 @@
  *
  */
 
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_vpq-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                             8,
-                                             128,
-                                             8,
-                                             4,
-                                             half,
-                                             float,
-                                             uint32_t,
-                                             float>;
-template <>
-const void* vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                8,
-                                128,
-                                8,
-                                4,
-                                half,
-                                float,
-                                uint32_t,
-                                float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &vpq_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                        8,
-                                        128,
-                                        8,
-                                        4,
-                                        half,
-                                        float,
-                                        uint32_t,
-                                        float>);
-template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                     8,
                                     128,
                                     8,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint32_dim256_t16_8pq_2subd_half.cu b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint32_dim256_t16_8pq_2subd_half.cu
index f8d19f4ea..bdc072e61 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint32_dim256_t16_8pq_2subd_half.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint32_dim256_t16_8pq_2subd_half.cu
@@ -23,40 +23,12 @@
  *
  */
 
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_vpq-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                             16,
-                                             256,
-                                             8,
-                                             2,
-                                             half,
-                                             float,
-                                             uint32_t,
-                                             float>;
-template <>
-const void* vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                16,
-                                256,
-                                8,
-                                2,
-                                half,
-                                float,
-                                uint32_t,
-                                float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &vpq_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                        16,
-                                        256,
-                                        8,
-                                        2,
-                                        half,
-                                        float,
-                                        uint32_t,
-                                        float>);
-template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                     16,
                                     256,
                                     8,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint32_dim256_t16_8pq_4subd_half.cu b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint32_dim256_t16_8pq_4subd_half.cu
index e649829c1..301c8c55b 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint32_dim256_t16_8pq_4subd_half.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint32_dim256_t16_8pq_4subd_half.cu
@@ -23,40 +23,12 @@
  *
  */
 
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_vpq-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                             16,
-                                             256,
-                                             8,
-                                             4,
-                                             half,
-                                             float,
-                                             uint32_t,
-                                             float>;
-template <>
-const void* vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                16,
-                                256,
-                                8,
-                                4,
-                                half,
-                                float,
-                                uint32_t,
-                                float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &vpq_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                        16,
-                                        256,
-                                        8,
-                                        4,
-                                        half,
-                                        float,
-                                        uint32_t,
-                                        float>);
-template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                     16,
                                     256,
                                     8,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint32_dim512_t32_8pq_2subd_half.cu b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint32_dim512_t32_8pq_2subd_half.cu
index ce47d2c63..05ebeae2b 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint32_dim512_t32_8pq_2subd_half.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint32_dim512_t32_8pq_2subd_half.cu
@@ -23,40 +23,12 @@
  *
  */
 
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_vpq-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                             32,
-                                             512,
-                                             8,
-                                             2,
-                                             half,
-                                             float,
-                                             uint32_t,
-                                             float>;
-template <>
-const void* vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                32,
-                                512,
-                                8,
-                                2,
-                                half,
-                                float,
-                                uint32_t,
-                                float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &vpq_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                        32,
-                                        512,
-                                        8,
-                                        2,
-                                        half,
-                                        float,
-                                        uint32_t,
-                                        float>);
-template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                     32,
                                     512,
                                     8,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint32_dim512_t32_8pq_4subd_half.cu b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint32_dim512_t32_8pq_4subd_half.cu
index 9e8159e13..e343d938c 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint32_dim512_t32_8pq_4subd_half.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint32_dim512_t32_8pq_4subd_half.cu
@@ -23,40 +23,12 @@
  *
  */
 
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_vpq-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                             32,
-                                             512,
-                                             8,
-                                             4,
-                                             half,
-                                             float,
-                                             uint32_t,
-                                             float>;
-template <>
-const void* vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                32,
-                                512,
-                                8,
-                                4,
-                                half,
-                                float,
-                                uint32_t,
-                                float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &vpq_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                        32,
-                                        512,
-                                        8,
-                                        4,
-                                        half,
-                                        float,
-                                        uint32_t,
-                                        float>);
-template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                     32,
                                     512,
                                     8,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint64_dim128_t8_8pq_2subd_half.cu b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint64_dim128_t8_8pq_2subd_half.cu
index b24552f5e..9a8b945d2 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint64_dim128_t8_8pq_2subd_half.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint64_dim128_t8_8pq_2subd_half.cu
@@ -23,40 +23,12 @@
  *
  */
 
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_vpq-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                             8,
-                                             128,
-                                             8,
-                                             2,
-                                             half,
-                                             float,
-                                             uint64_t,
-                                             float>;
-template <>
-const void* vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                8,
-                                128,
-                                8,
-                                2,
-                                half,
-                                float,
-                                uint64_t,
-                                float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &vpq_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                        8,
-                                        128,
-                                        8,
-                                        2,
-                                        half,
-                                        float,
-                                        uint64_t,
-                                        float>);
-template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                     8,
                                     128,
                                     8,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint64_dim128_t8_8pq_4subd_half.cu b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint64_dim128_t8_8pq_4subd_half.cu
index f34f3d6ce..da7d99af3 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint64_dim128_t8_8pq_4subd_half.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint64_dim128_t8_8pq_4subd_half.cu
@@ -23,40 +23,12 @@
  *
  */
 
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_vpq-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                             8,
-                                             128,
-                                             8,
-                                             4,
-                                             half,
-                                             float,
-                                             uint64_t,
-                                             float>;
-template <>
-const void* vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                8,
-                                128,
-                                8,
-                                4,
-                                half,
-                                float,
-                                uint64_t,
-                                float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &vpq_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                        8,
-                                        128,
-                                        8,
-                                        4,
-                                        half,
-                                        float,
-                                        uint64_t,
-                                        float>);
-template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                     8,
                                     128,
                                     8,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint64_dim256_t16_8pq_2subd_half.cu b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint64_dim256_t16_8pq_2subd_half.cu
index f1bbfdc49..cc3a0344c 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint64_dim256_t16_8pq_2subd_half.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint64_dim256_t16_8pq_2subd_half.cu
@@ -23,40 +23,12 @@
  *
  */
 
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_vpq-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                             16,
-                                             256,
-                                             8,
-                                             2,
-                                             half,
-                                             float,
-                                             uint64_t,
-                                             float>;
-template <>
-const void* vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                16,
-                                256,
-                                8,
-                                2,
-                                half,
-                                float,
-                                uint64_t,
-                                float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &vpq_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                        16,
-                                        256,
-                                        8,
-                                        2,
-                                        half,
-                                        float,
-                                        uint64_t,
-                                        float>);
-template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                     16,
                                     256,
                                     8,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint64_dim256_t16_8pq_4subd_half.cu b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint64_dim256_t16_8pq_4subd_half.cu
index 9f41de84d..bd24b48f3 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint64_dim256_t16_8pq_4subd_half.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint64_dim256_t16_8pq_4subd_half.cu
@@ -23,40 +23,12 @@
  *
  */
 
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_vpq-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                             16,
-                                             256,
-                                             8,
-                                             4,
-                                             half,
-                                             float,
-                                             uint64_t,
-                                             float>;
-template <>
-const void* vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                16,
-                                256,
-                                8,
-                                4,
-                                half,
-                                float,
-                                uint64_t,
-                                float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &vpq_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                        16,
-                                        256,
-                                        8,
-                                        4,
-                                        half,
-                                        float,
-                                        uint64_t,
-                                        float>);
-template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                     16,
                                     256,
                                     8,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint64_dim512_t32_8pq_2subd_half.cu b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint64_dim512_t32_8pq_2subd_half.cu
index 2eed65e94..cc3f1fb59 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint64_dim512_t32_8pq_2subd_half.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint64_dim512_t32_8pq_2subd_half.cu
@@ -23,40 +23,12 @@
  *
  */
 
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_vpq-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                             32,
-                                             512,
-                                             8,
-                                             2,
-                                             half,
-                                             float,
-                                             uint64_t,
-                                             float>;
-template <>
-const void* vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                32,
-                                512,
-                                8,
-                                2,
-                                half,
-                                float,
-                                uint64_t,
-                                float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &vpq_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                        32,
-                                        512,
-                                        8,
-                                        2,
-                                        half,
-                                        float,
-                                        uint64_t,
-                                        float>);
-template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                     32,
                                     512,
                                     8,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint64_dim512_t32_8pq_4subd_half.cu b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint64_dim512_t32_8pq_4subd_half.cu
index 54f8e58e4..0559b86e1 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint64_dim512_t32_8pq_4subd_half.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_float_uint64_dim512_t32_8pq_4subd_half.cu
@@ -23,40 +23,12 @@
  *
  */
 
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_vpq-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                             32,
-                                             512,
-                                             8,
-                                             4,
-                                             half,
-                                             float,
-                                             uint64_t,
-                                             float>;
-template <>
-const void* vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                32,
-                                512,
-                                8,
-                                4,
-                                half,
-                                float,
-                                uint64_t,
-                                float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &vpq_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                        32,
-                                        512,
-                                        8,
-                                        4,
-                                        half,
-                                        float,
-                                        uint64_t,
-                                        float>);
-template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                     32,
                                     512,
                                     8,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint32_dim128_t8_8pq_2subd_half.cu b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint32_dim128_t8_8pq_2subd_half.cu
index e63fc260a..5d950351f 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint32_dim128_t8_8pq_2subd_half.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint32_dim128_t8_8pq_2subd_half.cu
@@ -23,40 +23,12 @@
  *
  */
 
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_vpq-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                             8,
-                                             128,
-                                             8,
-                                             2,
-                                             half,
-                                             half,
-                                             uint32_t,
-                                             float>;
-template <>
-const void* vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                8,
-                                128,
-                                8,
-                                2,
-                                half,
-                                half,
-                                uint32_t,
-                                float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &vpq_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                        8,
-                                        128,
-                                        8,
-                                        2,
-                                        half,
-                                        half,
-                                        uint32_t,
-                                        float>);
-template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                     8,
                                     128,
                                     8,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint32_dim128_t8_8pq_4subd_half.cu b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint32_dim128_t8_8pq_4subd_half.cu
index 3f89f4fb0..453e15df3 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint32_dim128_t8_8pq_4subd_half.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint32_dim128_t8_8pq_4subd_half.cu
@@ -23,40 +23,12 @@
  *
  */
 
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_vpq-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                             8,
-                                             128,
-                                             8,
-                                             4,
-                                             half,
-                                             half,
-                                             uint32_t,
-                                             float>;
-template <>
-const void* vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                8,
-                                128,
-                                8,
-                                4,
-                                half,
-                                half,
-                                uint32_t,
-                                float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &vpq_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                        8,
-                                        128,
-                                        8,
-                                        4,
-                                        half,
-                                        half,
-                                        uint32_t,
-                                        float>);
-template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                     8,
                                     128,
                                     8,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint32_dim256_t16_8pq_2subd_half.cu b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint32_dim256_t16_8pq_2subd_half.cu
index 7bd75f5fc..c79cb74b6 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint32_dim256_t16_8pq_2subd_half.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint32_dim256_t16_8pq_2subd_half.cu
@@ -23,40 +23,12 @@
  *
  */
 
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_vpq-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                             16,
-                                             256,
-                                             8,
-                                             2,
-                                             half,
-                                             half,
-                                             uint32_t,
-                                             float>;
-template <>
-const void* vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                16,
-                                256,
-                                8,
-                                2,
-                                half,
-                                half,
-                                uint32_t,
-                                float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &vpq_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                        16,
-                                        256,
-                                        8,
-                                        2,
-                                        half,
-                                        half,
-                                        uint32_t,
-                                        float>);
-template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                     16,
                                     256,
                                     8,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint32_dim256_t16_8pq_4subd_half.cu b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint32_dim256_t16_8pq_4subd_half.cu
index 761df5fdc..dee326d54 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint32_dim256_t16_8pq_4subd_half.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint32_dim256_t16_8pq_4subd_half.cu
@@ -23,40 +23,12 @@
  *
  */
 
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_vpq-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                             16,
-                                             256,
-                                             8,
-                                             4,
-                                             half,
-                                             half,
-                                             uint32_t,
-                                             float>;
-template <>
-const void* vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                16,
-                                256,
-                                8,
-                                4,
-                                half,
-                                half,
-                                uint32_t,
-                                float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &vpq_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                        16,
-                                        256,
-                                        8,
-                                        4,
-                                        half,
-                                        half,
-                                        uint32_t,
-                                        float>);
-template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                     16,
                                     256,
                                     8,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint32_dim512_t32_8pq_2subd_half.cu b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint32_dim512_t32_8pq_2subd_half.cu
index ed13b8730..a1ef9ba92 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint32_dim512_t32_8pq_2subd_half.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint32_dim512_t32_8pq_2subd_half.cu
@@ -23,40 +23,12 @@
  *
  */
 
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_vpq-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                             32,
-                                             512,
-                                             8,
-                                             2,
-                                             half,
-                                             half,
-                                             uint32_t,
-                                             float>;
-template <>
-const void* vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                32,
-                                512,
-                                8,
-                                2,
-                                half,
-                                half,
-                                uint32_t,
-                                float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &vpq_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                        32,
-                                        512,
-                                        8,
-                                        2,
-                                        half,
-                                        half,
-                                        uint32_t,
-                                        float>);
-template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                     32,
                                     512,
                                     8,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint32_dim512_t32_8pq_4subd_half.cu b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint32_dim512_t32_8pq_4subd_half.cu
index 49b834d3a..f2f01c8d4 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint32_dim512_t32_8pq_4subd_half.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint32_dim512_t32_8pq_4subd_half.cu
@@ -23,40 +23,12 @@
  *
  */
 
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_vpq-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                             32,
-                                             512,
-                                             8,
-                                             4,
-                                             half,
-                                             half,
-                                             uint32_t,
-                                             float>;
-template <>
-const void* vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                32,
-                                512,
-                                8,
-                                4,
-                                half,
-                                half,
-                                uint32_t,
-                                float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &vpq_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                        32,
-                                        512,
-                                        8,
-                                        4,
-                                        half,
-                                        half,
-                                        uint32_t,
-                                        float>);
-template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                     32,
                                     512,
                                     8,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint64_dim128_t8_8pq_2subd_half.cu b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint64_dim128_t8_8pq_2subd_half.cu
index 38fdc4e66..b962f6706 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint64_dim128_t8_8pq_2subd_half.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint64_dim128_t8_8pq_2subd_half.cu
@@ -23,40 +23,12 @@
  *
  */
 
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_vpq-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                             8,
-                                             128,
-                                             8,
-                                             2,
-                                             half,
-                                             half,
-                                             uint64_t,
-                                             float>;
-template <>
-const void* vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                8,
-                                128,
-                                8,
-                                2,
-                                half,
-                                half,
-                                uint64_t,
-                                float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &vpq_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                        8,
-                                        128,
-                                        8,
-                                        2,
-                                        half,
-                                        half,
-                                        uint64_t,
-                                        float>);
-template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                     8,
                                     128,
                                     8,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint64_dim128_t8_8pq_4subd_half.cu b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint64_dim128_t8_8pq_4subd_half.cu
index 6a38f2cfe..5d1f85316 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint64_dim128_t8_8pq_4subd_half.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint64_dim128_t8_8pq_4subd_half.cu
@@ -23,40 +23,12 @@
  *
  */
 
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_vpq-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                             8,
-                                             128,
-                                             8,
-                                             4,
-                                             half,
-                                             half,
-                                             uint64_t,
-                                             float>;
-template <>
-const void* vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                8,
-                                128,
-                                8,
-                                4,
-                                half,
-                                half,
-                                uint64_t,
-                                float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &vpq_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                        8,
-                                        128,
-                                        8,
-                                        4,
-                                        half,
-                                        half,
-                                        uint64_t,
-                                        float>);
-template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                     8,
                                     128,
                                     8,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint64_dim256_t16_8pq_2subd_half.cu b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint64_dim256_t16_8pq_2subd_half.cu
index c730ae78c..eb31e7b06 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint64_dim256_t16_8pq_2subd_half.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint64_dim256_t16_8pq_2subd_half.cu
@@ -23,40 +23,12 @@
  *
  */
 
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_vpq-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                             16,
-                                             256,
-                                             8,
-                                             2,
-                                             half,
-                                             half,
-                                             uint64_t,
-                                             float>;
-template <>
-const void* vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                16,
-                                256,
-                                8,
-                                2,
-                                half,
-                                half,
-                                uint64_t,
-                                float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &vpq_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                        16,
-                                        256,
-                                        8,
-                                        2,
-                                        half,
-                                        half,
-                                        uint64_t,
-                                        float>);
-template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                     16,
                                     256,
                                     8,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint64_dim256_t16_8pq_4subd_half.cu b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint64_dim256_t16_8pq_4subd_half.cu
index abe38cceb..e3bd42313 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint64_dim256_t16_8pq_4subd_half.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint64_dim256_t16_8pq_4subd_half.cu
@@ -23,40 +23,12 @@
  *
  */
 
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_vpq-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                             16,
-                                             256,
-                                             8,
-                                             4,
-                                             half,
-                                             half,
-                                             uint64_t,
-                                             float>;
-template <>
-const void* vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                16,
-                                256,
-                                8,
-                                4,
-                                half,
-                                half,
-                                uint64_t,
-                                float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &vpq_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                        16,
-                                        256,
-                                        8,
-                                        4,
-                                        half,
-                                        half,
-                                        uint64_t,
-                                        float>);
-template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                     16,
                                     256,
                                     8,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint64_dim512_t32_8pq_2subd_half.cu b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint64_dim512_t32_8pq_2subd_half.cu
index 871e9410b..7387d141b 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint64_dim512_t32_8pq_2subd_half.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint64_dim512_t32_8pq_2subd_half.cu
@@ -23,40 +23,12 @@
  *
  */
 
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_vpq-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                             32,
-                                             512,
-                                             8,
-                                             2,
-                                             half,
-                                             half,
-                                             uint64_t,
-                                             float>;
-template <>
-const void* vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                32,
-                                512,
-                                8,
-                                2,
-                                half,
-                                half,
-                                uint64_t,
-                                float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &vpq_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                        32,
-                                        512,
-                                        8,
-                                        2,
-                                        half,
-                                        half,
-                                        uint64_t,
-                                        float>);
-template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                     32,
                                     512,
                                     8,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint64_dim512_t32_8pq_4subd_half.cu b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint64_dim512_t32_8pq_4subd_half.cu
index 6fc02d616..fd26fe89b 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint64_dim512_t32_8pq_4subd_half.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_half_uint64_dim512_t32_8pq_4subd_half.cu
@@ -23,40 +23,12 @@
  *
  */
 
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_vpq-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                             32,
-                                             512,
-                                             8,
-                                             4,
-                                             half,
-                                             half,
-                                             uint64_t,
-                                             float>;
-template <>
-const void* vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                32,
-                                512,
-                                8,
-                                4,
-                                half,
-                                half,
-                                uint64_t,
-                                float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &vpq_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                        32,
-                                        512,
-                                        8,
-                                        4,
-                                        half,
-                                        half,
-                                        uint64_t,
-                                        float>);
-template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                     32,
                                     512,
                                     8,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_int8_uint32_dim128_t8_8pq_2subd_half.cu b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_int8_uint32_dim128_t8_8pq_2subd_half.cu
index ad0c1ea21..1afccb8fd 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_int8_uint32_dim128_t8_8pq_2subd_half.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_int8_uint32_dim128_t8_8pq_2subd_half.cu
@@ -23,40 +23,12 @@
  *
  */
 
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_vpq-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                             8,
-                                             128,
-                                             8,
-                                             2,
-                                             half,
-                                             int8_t,
-                                             uint32_t,
-                                             float>;
-template <>
-const void* vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                8,
-                                128,
-                                8,
-                                2,
-                                half,
-                                int8_t,
-                                uint32_t,
-                                float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &vpq_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                        8,
-                                        128,
-                                        8,
-                                        2,
-                                        half,
-                                        int8_t,
-                                        uint32_t,
-                                        float>);
-template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                     8,
                                     128,
                                     8,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_int8_uint32_dim128_t8_8pq_4subd_half.cu b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_int8_uint32_dim128_t8_8pq_4subd_half.cu
index 493c5d799..28ea523ee 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_int8_uint32_dim128_t8_8pq_4subd_half.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_int8_uint32_dim128_t8_8pq_4subd_half.cu
@@ -23,40 +23,12 @@
  *
  */
 
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_vpq-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                             8,
-                                             128,
-                                             8,
-                                             4,
-                                             half,
-                                             int8_t,
-                                             uint32_t,
-                                             float>;
-template <>
-const void* vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                8,
-                                128,
-                                8,
-                                4,
-                                half,
-                                int8_t,
-                                uint32_t,
-                                float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &vpq_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                        8,
-                                        128,
-                                        8,
-                                        4,
-                                        half,
-                                        int8_t,
-                                        uint32_t,
-                                        float>);
-template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                     8,
                                     128,
                                     8,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_int8_uint32_dim256_t16_8pq_2subd_half.cu b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_int8_uint32_dim256_t16_8pq_2subd_half.cu
index 09b4dcd1e..eca36cc36 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_int8_uint32_dim256_t16_8pq_2subd_half.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_int8_uint32_dim256_t16_8pq_2subd_half.cu
@@ -23,40 +23,12 @@
  *
  */
 
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_vpq-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                             16,
-                                             256,
-                                             8,
-                                             2,
-                                             half,
-                                             int8_t,
-                                             uint32_t,
-                                             float>;
-template <>
-const void* vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                16,
-                                256,
-                                8,
-                                2,
-                                half,
-                                int8_t,
-                                uint32_t,
-                                float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &vpq_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                        16,
-                                        256,
-                                        8,
-                                        2,
-                                        half,
-                                        int8_t,
-                                        uint32_t,
-                                        float>);
-template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                     16,
                                     256,
                                     8,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_int8_uint32_dim256_t16_8pq_4subd_half.cu b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_int8_uint32_dim256_t16_8pq_4subd_half.cu
index 50369096b..89aed8afc 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_int8_uint32_dim256_t16_8pq_4subd_half.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_int8_uint32_dim256_t16_8pq_4subd_half.cu
@@ -23,40 +23,12 @@
  *
  */
 
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_vpq-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                             16,
-                                             256,
-                                             8,
-                                             4,
-                                             half,
-                                             int8_t,
-                                             uint32_t,
-                                             float>;
-template <>
-const void* vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                16,
-                                256,
-                                8,
-                                4,
-                                half,
-                                int8_t,
-                                uint32_t,
-                                float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &vpq_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                        16,
-                                        256,
-                                        8,
-                                        4,
-                                        half,
-                                        int8_t,
-                                        uint32_t,
-                                        float>);
-template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                     16,
                                     256,
                                     8,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_int8_uint32_dim512_t32_8pq_2subd_half.cu b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_int8_uint32_dim512_t32_8pq_2subd_half.cu
index 247b52bda..ff646b22c 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_int8_uint32_dim512_t32_8pq_2subd_half.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_int8_uint32_dim512_t32_8pq_2subd_half.cu
@@ -23,40 +23,12 @@
  *
  */
 
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_vpq-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                             32,
-                                             512,
-                                             8,
-                                             2,
-                                             half,
-                                             int8_t,
-                                             uint32_t,
-                                             float>;
-template <>
-const void* vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                32,
-                                512,
-                                8,
-                                2,
-                                half,
-                                int8_t,
-                                uint32_t,
-                                float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &vpq_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                        32,
-                                        512,
-                                        8,
-                                        2,
-                                        half,
-                                        int8_t,
-                                        uint32_t,
-                                        float>);
-template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                     32,
                                     512,
                                     8,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_int8_uint32_dim512_t32_8pq_4subd_half.cu b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_int8_uint32_dim512_t32_8pq_4subd_half.cu
index dccd08910..633a805c7 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_int8_uint32_dim512_t32_8pq_4subd_half.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_int8_uint32_dim512_t32_8pq_4subd_half.cu
@@ -23,40 +23,12 @@
  *
  */
 
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_vpq-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                             32,
-                                             512,
-                                             8,
-                                             4,
-                                             half,
-                                             int8_t,
-                                             uint32_t,
-                                             float>;
-template <>
-const void* vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                32,
-                                512,
-                                8,
-                                4,
-                                half,
-                                int8_t,
-                                uint32_t,
-                                float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &vpq_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                        32,
-                                        512,
-                                        8,
-                                        4,
-                                        half,
-                                        int8_t,
-                                        uint32_t,
-                                        float>);
-template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                     32,
                                     512,
                                     8,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_uint8_uint32_dim128_t8_8pq_2subd_half.cu b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_uint8_uint32_dim128_t8_8pq_2subd_half.cu
index 75c74e704..3a09161ea 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_uint8_uint32_dim128_t8_8pq_2subd_half.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_uint8_uint32_dim128_t8_8pq_2subd_half.cu
@@ -23,40 +23,12 @@
  *
  */
 
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_vpq-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                             8,
-                                             128,
-                                             8,
-                                             2,
-                                             half,
-                                             uint8_t,
-                                             uint32_t,
-                                             float>;
-template <>
-const void* vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                8,
-                                128,
-                                8,
-                                2,
-                                half,
-                                uint8_t,
-                                uint32_t,
-                                float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &vpq_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                        8,
-                                        128,
-                                        8,
-                                        2,
-                                        half,
-                                        uint8_t,
-                                        uint32_t,
-                                        float>);
-template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                     8,
                                     128,
                                     8,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_uint8_uint32_dim128_t8_8pq_4subd_half.cu b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_uint8_uint32_dim128_t8_8pq_4subd_half.cu
index d87fd66e8..85331d243 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_uint8_uint32_dim128_t8_8pq_4subd_half.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_uint8_uint32_dim128_t8_8pq_4subd_half.cu
@@ -23,40 +23,12 @@
  *
  */
 
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_vpq-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                             8,
-                                             128,
-                                             8,
-                                             4,
-                                             half,
-                                             uint8_t,
-                                             uint32_t,
-                                             float>;
-template <>
-const void* vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                8,
-                                128,
-                                8,
-                                4,
-                                half,
-                                uint8_t,
-                                uint32_t,
-                                float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &vpq_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                        8,
-                                        128,
-                                        8,
-                                        4,
-                                        half,
-                                        uint8_t,
-                                        uint32_t,
-                                        float>);
-template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                     8,
                                     128,
                                     8,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_uint8_uint32_dim256_t16_8pq_2subd_half.cu b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_uint8_uint32_dim256_t16_8pq_2subd_half.cu
index d6d651bc3..a7719074a 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_uint8_uint32_dim256_t16_8pq_2subd_half.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_uint8_uint32_dim256_t16_8pq_2subd_half.cu
@@ -23,40 +23,12 @@
  *
  */
 
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_vpq-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                             16,
-                                             256,
-                                             8,
-                                             2,
-                                             half,
-                                             uint8_t,
-                                             uint32_t,
-                                             float>;
-template <>
-const void* vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                16,
-                                256,
-                                8,
-                                2,
-                                half,
-                                uint8_t,
-                                uint32_t,
-                                float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &vpq_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                        16,
-                                        256,
-                                        8,
-                                        2,
-                                        half,
-                                        uint8_t,
-                                        uint32_t,
-                                        float>);
-template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                     16,
                                     256,
                                     8,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_uint8_uint32_dim256_t16_8pq_4subd_half.cu b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_uint8_uint32_dim256_t16_8pq_4subd_half.cu
index e36faf918..7dd028b82 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_uint8_uint32_dim256_t16_8pq_4subd_half.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_uint8_uint32_dim256_t16_8pq_4subd_half.cu
@@ -23,40 +23,12 @@
  *
  */
 
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_vpq-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                             16,
-                                             256,
-                                             8,
-                                             4,
-                                             half,
-                                             uint8_t,
-                                             uint32_t,
-                                             float>;
-template <>
-const void* vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                16,
-                                256,
-                                8,
-                                4,
-                                half,
-                                uint8_t,
-                                uint32_t,
-                                float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &vpq_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                        16,
-                                        256,
-                                        8,
-                                        4,
-                                        half,
-                                        uint8_t,
-                                        uint32_t,
-                                        float>);
-template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                     16,
                                     256,
                                     8,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_uint8_uint32_dim512_t32_8pq_2subd_half.cu b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_uint8_uint32_dim512_t32_8pq_2subd_half.cu
index bc3e8e524..78f37b135 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_uint8_uint32_dim512_t32_8pq_2subd_half.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_uint8_uint32_dim512_t32_8pq_2subd_half.cu
@@ -23,40 +23,12 @@
  *
  */
 
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_vpq-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                             32,
-                                             512,
-                                             8,
-                                             2,
-                                             half,
-                                             uint8_t,
-                                             uint32_t,
-                                             float>;
-template <>
-const void* vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                32,
-                                512,
-                                8,
-                                2,
-                                half,
-                                uint8_t,
-                                uint32_t,
-                                float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &vpq_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                        32,
-                                        512,
-                                        8,
-                                        2,
-                                        half,
-                                        uint8_t,
-                                        uint32_t,
-                                        float>);
-template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                     32,
                                     512,
                                     8,
diff --git a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_uint8_uint32_dim512_t32_8pq_4subd_half.cu b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_uint8_uint32_dim512_t32_8pq_4subd_half.cu
index 3c63592b6..d3eb20a05 100644
--- a/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_uint8_uint32_dim512_t32_8pq_4subd_half.cu
+++ b/cpp/src/neighbors/detail/cagra/compute_distance_vpq_L2Expanded_uint8_uint32_dim512_t32_8pq_4subd_half.cu
@@ -23,40 +23,12 @@
  *
  */
 
-#include "compute_distance_vpq.cuh"
+#include "compute_distance_vpq-impl.cuh"
 
 namespace cuvs::neighbors::cagra::detail {
 
-template struct cagra_q_dataset_descriptor_t<cuvs::distance::DistanceType::L2Expanded,
-                                             32,
-                                             512,
-                                             8,
-                                             4,
-                                             half,
-                                             uint8_t,
-                                             uint32_t,
-                                             float>;
-template <>
-const void* vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
-                                32,
-                                512,
-                                8,
-                                4,
-                                half,
-                                uint8_t,
-                                uint32_t,
-                                float>::init_kernel =
-  reinterpret_cast<const void*>(
-    &vpq_dataset_descriptor_init_kernel<cuvs::distance::DistanceType::L2Expanded,
-                                        32,
-                                        512,
-                                        8,
-                                        4,
-                                        half,
-                                        uint8_t,
-                                        uint32_t,
-                                        float>);
-template struct vpq_descriptor_spec<cuvs::distance::DistanceType::L2Expanded,
+using namespace cuvs::distance;
+template struct vpq_descriptor_spec<DistanceType::L2Expanded,
                                     32,
                                     512,
                                     8,