Updating APIs to account for const types

rapidsai · Apr 23, 2024 · 28b115c · 28b115c
1 parent 59fe3fd
commit 28b115c
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 36 deletions.
diff --git a/cpp/src/distance/distance-ext.cuh b/cpp/src/distance/distance-ext.cuh
@@ -760,8 +760,8 @@ instantiate_raft_distance_pairwise_distance(double, int);
 #define instantiate_raft_distance_distance(DistT, DataT, AccT, OutT, layout, IdxT)       \
   extern template void cuvs::distance::distance<DistT, DataT, AccT, OutT, layout, IdxT>( \
     raft::resources const& handle,                                                       \
-    raft::device_matrix_view<DataT, IdxT, layout> const x,                               \
-    raft::device_matrix_view<DataT, IdxT, layout> const y,                               \
+    raft::device_matrix_view<const DataT, IdxT, layout> const x,                         \
+    raft::device_matrix_view<const DataT, IdxT, layout> const y,                         \
     raft::device_matrix_view<OutT, IdxT, layout> dist,                                   \
     DataT metric_arg)
 
@@ -1052,8 +1052,8 @@ instantiate_raft_distance_distance(cuvs::distance::DistanceType::RusselRaoExpand
 #define instantiate_raft_distance_pairwise_distance(DataT, layout, IdxT) \
   extern template void cuvs::distance::pairwise_distance(                \
     raft::resources const& handle,                                       \
-    raft::device_matrix_view<DataT, IdxT, layout> const x,               \
-    raft::device_matrix_view<DataT, IdxT, layout> const y,               \
+    raft::device_matrix_view<const DataT, IdxT, layout> const x,         \
+    raft::device_matrix_view<const DataT, IdxT, layout> const y,         \
     raft::device_matrix_view<DataT, IdxT, layout> dist,                  \
     cuvs::distance::DistanceType metric,                                 \
     DataT metric_arg)

diff --git a/cpp/src/distance/distance-inl.cuh b/cpp/src/distance/distance-inl.cuh
@@ -394,8 +394,8 @@ template <cuvs::distance::DistanceType DistT,
           typename layout = raft::layout_c_contiguous,
           typename IdxT   = int>
 void distance(raft::resources const& handle,
-              raft::device_matrix_view<DataT, IdxT, layout> const x,
-              raft::device_matrix_view<DataT, IdxT, layout> const y,
+              raft::device_matrix_view<const DataT, IdxT, layout> const x,
+              raft::device_matrix_view<const DataT, IdxT, layout> const y,
               raft::device_matrix_view<OutT, IdxT, layout> dist,
               DataT metric_arg = 2.0f)
 {
@@ -437,8 +437,8 @@ void distance(raft::resources const& handle,
  */
 template <typename Type, typename layout = raft::layout_c_contiguous, typename IdxT = int>
 void pairwise_distance(raft::resources const& handle,
-                       raft::device_matrix_view<Type, IdxT, layout> const x,
-                       raft::device_matrix_view<Type, IdxT, layout> const y,
+                       raft::device_matrix_view<const Type, IdxT, layout> const x,
+                       raft::device_matrix_view<const Type, IdxT, layout> const y,
                        raft::device_matrix_view<Type, IdxT, layout> dist,
                        cuvs::distance::DistanceType metric,
                        Type metric_arg = 2.0f)

diff --git a/cpp/src/distance/distance.cu b/cpp/src/distance/distance.cu
@@ -628,8 +628,8 @@ instantiate_raft_distance_pairwise_distance(double, int);
 #define instantiate_raft_distance_distance(DistT, DataT, AccT, OutT, layout, IdxT) \
   template void cuvs::distance::distance<DistT, DataT, AccT, OutT, layout, IdxT>(  \
     raft::resources const& handle,                                                 \
-    raft::device_matrix_view<DataT, IdxT, layout> const x,                         \
-    raft::device_matrix_view<DataT, IdxT, layout> const y,                         \
+    raft::device_matrix_view<const DataT, IdxT, layout> const x,                   \
+    raft::device_matrix_view<const DataT, IdxT, layout> const y,                   \
     raft::device_matrix_view<OutT, IdxT, layout> dist,                             \
     DataT metric_arg)
 
@@ -920,8 +920,8 @@ instantiate_raft_distance_distance(cuvs::distance::DistanceType::RusselRaoExpand
 #define instantiate_raft_distance_pairwise_distance(DataT, layout, IdxT) \
   template void cuvs::distance::pairwise_distance(                       \
     raft::resources const& handle,                                       \
-    raft::device_matrix_view<DataT, IdxT, layout> const x,               \
-    raft::device_matrix_view<DataT, IdxT, layout> const y,               \
+    raft::device_matrix_view<const DataT, IdxT, layout> const x,         \
+    raft::device_matrix_view<const DataT, IdxT, layout> const y,         \
     raft::device_matrix_view<DataT, IdxT, layout> dist,                  \
     cuvs::distance::DistanceType metric,                                 \
     DataT metric_arg)

diff --git a/cpp/src/distance/pairwise_distance.cu b/cpp/src/distance/pairwise_distance.cu
@@ -25,42 +25,46 @@ namespace cuvs::distance {
  * @defgroup pairwise_distance_runtime Pairwise Distances Runtime API
  * @{
  */
-void pairwise_distance(raft::resources const& handle,
-                       raft::device_matrix_view<float, int, raft::layout_c_contiguous> const x,
-                       raft::device_matrix_view<float, int, raft::layout_c_contiguous> const y,
-                       raft::device_matrix_view<float, int, raft::layout_c_contiguous> dist,
-                       cuvs::distance::DistanceType metric,
-                       float metric_arg)
+void pairwise_distance(
+  raft::resources const& handle,
+  raft::device_matrix_view<const float, int, raft::layout_c_contiguous> const x,
+  raft::device_matrix_view<const float, int, raft::layout_c_contiguous> const y,
+  raft::device_matrix_view<float, int, raft::layout_c_contiguous> dist,
+  cuvs::distance::DistanceType metric,
+  float metric_arg)
 {
   pairwise_distance<float, raft::layout_c_contiguous, int>(handle, x, y, dist, metric, metric_arg);
 }
 
-void pairwise_distance(raft::resources const& handle,
-                       raft::device_matrix_view<double, int, raft::layout_c_contiguous> const x,
-                       raft::device_matrix_view<double, int, raft::layout_c_contiguous> const y,
-                       raft::device_matrix_view<double, int, raft::layout_c_contiguous> dist,
-                       cuvs::distance::DistanceType metric,
-                       double metric_arg)
+void pairwise_distance(
+  raft::resources const& handle,
+  raft::device_matrix_view<const double, int, raft::layout_c_contiguous> const x,
+  raft::device_matrix_view<const double, int, raft::layout_c_contiguous> const y,
+  raft::device_matrix_view<double, int, raft::layout_c_contiguous> dist,
+  cuvs::distance::DistanceType metric,
+  double metric_arg)
 {
   pairwise_distance<double, raft::layout_c_contiguous, int>(handle, x, y, dist, metric, metric_arg);
 }
 
-void pairwise_distance(raft::resources const& handle,
-                       raft::device_matrix_view<float, int, raft::layout_f_contiguous> const x,
-                       raft::device_matrix_view<float, int, raft::layout_f_contiguous> const y,
-                       raft::device_matrix_view<float, int, raft::layout_f_contiguous> dist,
-                       cuvs::distance::DistanceType metric,
-                       float metric_arg)
+void pairwise_distance(
+  raft::resources const& handle,
+  raft::device_matrix_view<const float, int, raft::layout_f_contiguous> const x,
+  raft::device_matrix_view<const float, int, raft::layout_f_contiguous> const y,
+  raft::device_matrix_view<float, int, raft::layout_f_contiguous> dist,
+  cuvs::distance::DistanceType metric,
+  float metric_arg)
 {
   pairwise_distance<float, raft::layout_f_contiguous, int>(handle, x, y, dist, metric, metric_arg);
 }
 
-void pairwise_distance(raft::resources const& handle,
-                       raft::device_matrix_view<double, int, raft::layout_f_contiguous> const x,
-                       raft::device_matrix_view<double, int, raft::layout_f_contiguous> const y,
-                       raft::device_matrix_view<double, int, raft::layout_f_contiguous> dist,
-                       cuvs::distance::DistanceType metric,
-                       double metric_arg)
+void pairwise_distance(
+  raft::resources const& handle,
+  raft::device_matrix_view<const double, int, raft::layout_f_contiguous> const x,
+  raft::device_matrix_view<const double, int, raft::layout_f_contiguous> const y,
+  raft::device_matrix_view<double, int, raft::layout_f_contiguous> dist,
+  cuvs::distance::DistanceType metric,
+  double metric_arg)
 {
   pairwise_distance<double, raft::layout_f_contiguous, int>(handle, x, y, dist, metric, metric_arg);
 }