Merge pull request rapidsai#951 from divyegala/revert-pr-915

Revert "Fix kmeans::predict argument order (rapidsai#915)"

Author: divyegala

cpp/include/cuvs/cluster/kmeans.hpp

@@ -519,26 +519,10 @@ void predict(raft::resources const& handle,
              raft::device_matrix_view<const float, int> X,
              std::optional<raft::device_vector_view<const float, int>> sample_weight,
              raft::device_matrix_view<const float, int> centroids,
-             bool normalize_weight,
              raft::device_vector_view<int, int> labels,
+             bool normalize_weight,
              raft::host_scalar_view<float> inertia);
 
-// This overload is retained for backward compatibility.
-[[deprecated(
-  "The argument order of kmeans::predict has been corrected. Please use the new function "
-  "instead.")]]
-inline void predict(raft::resources const& handle,
-                    const kmeans::params& params,
-                    raft::device_matrix_view<const float, int> X,
-                    std::optional<raft::device_vector_view<const float, int>> sample_weight,
-                    raft::device_matrix_view<const float, int> centroids,
-                    raft::device_vector_view<int, int> labels,
-                    bool normalize_weight,
-                    raft::host_scalar_view<float> inertia)
-{
-  predict(handle, params, X, sample_weight, centroids, normalize_weight, labels, inertia);
-}
-
 /**
  * @brief Predict the closest cluster each sample in X belongs to.
  *
@@ -593,26 +577,10 @@ void predict(raft::resources const& handle,
              raft::device_matrix_view<const float, int> X,
              std::optional<raft::device_vector_view<const float, int>> sample_weight,
              raft::device_matrix_view<const float, int> centroids,
-             bool normalize_weight,
              raft::device_vector_view<int64_t, int> labels,
+             bool normalize_weight,
              raft::host_scalar_view<float> inertia);
 
-// This overload is retained for backward compatibility.
-[[deprecated(
-  "The argument order of kmeans::predict has been corrected. Please use the new function "
-  "instead.")]]
-inline void predict(raft::resources const& handle,
-                    const kmeans::params& params,
-                    raft::device_matrix_view<const float, int> X,
-                    std::optional<raft::device_vector_view<const float, int>> sample_weight,
-                    raft::device_matrix_view<const float, int> centroids,
-                    raft::device_vector_view<int64_t, int> labels,
-                    bool normalize_weight,
-                    raft::host_scalar_view<float> inertia)
-{
-  predict(handle, params, X, sample_weight, centroids, normalize_weight, labels, inertia);
-}
-
 /**
  * @brief Predict the closest cluster each sample in X belongs to.
  *
@@ -667,26 +635,10 @@ void predict(raft::resources const& handle,
              raft::device_matrix_view<const double, int> X,
              std::optional<raft::device_vector_view<const double, int>> sample_weight,
              raft::device_matrix_view<const double, int> centroids,
-             bool normalize_weight,
              raft::device_vector_view<int, int> labels,
+             bool normalize_weight,
              raft::host_scalar_view<double> inertia);
 
-// This overload is retained for backward compatibility.
-[[deprecated(
-  "The argument order of kmeans::predict has been corrected. Please use the new function "
-  "instead.")]]
-inline void predict(raft::resources const& handle,
-                    const kmeans::params& params,
-                    raft::device_matrix_view<const double, int> X,
-                    std::optional<raft::device_vector_view<const double, int>> sample_weight,
-                    raft::device_matrix_view<const double, int> centroids,
-                    raft::device_vector_view<int, int> labels,
-                    bool normalize_weight,
-                    raft::host_scalar_view<double> inertia)
-{
-  predict(handle, params, X, sample_weight, centroids, normalize_weight, labels, inertia);
-}
-
 /**
  * @brief Predict the closest cluster each sample in X belongs to.
  *
@@ -741,26 +693,10 @@ void predict(raft::resources const& handle,
              raft::device_matrix_view<const double, int> X,
              std::optional<raft::device_vector_view<const double, int>> sample_weight,
              raft::device_matrix_view<const double, int> centroids,
-             bool normalize_weight,
              raft::device_vector_view<int64_t, int> labels,
+             bool normalize_weight,
              raft::host_scalar_view<double> inertia);
 
-// This overload is retained for backward compatibility.
-[[deprecated(
-  "The argument order of kmeans::predict has been corrected. Please use the new function "
-  "instead.")]]
-inline void predict(raft::resources const& handle,
-                    const kmeans::params& params,
-                    raft::device_matrix_view<const double, int> X,
-                    std::optional<raft::device_vector_view<const double, int>> sample_weight,
-                    raft::device_matrix_view<const double, int> centroids,
-                    raft::device_vector_view<int64_t, int> labels,
-                    bool normalize_weight,
-                    raft::host_scalar_view<double> inertia)
-{
-  predict(handle, params, X, sample_weight, centroids, normalize_weight, labels, inertia);
-}
-
 /**
  * @brief Predict the closest cluster each sample in X belongs to.
  *

cpp/src/cluster/kmeans.cuh

@@ -163,8 +163,8 @@ void predict(raft::resources const& handle,
              raft::device_matrix_view<const DataT, IndexT> X,
              std::optional<raft::device_vector_view<const DataT, IndexT>> sample_weight,
              raft::device_matrix_view<const DataT, IndexT> centroids,
-             bool normalize_weight,
              raft::device_vector_view<IndexT, IndexT> labels,
+             bool normalize_weight,
              raft::host_scalar_view<DataT> inertia)
 {
   cuvs::cluster::kmeans::detail::kmeans_predict<DataT, IndexT>(

cpp/src/cluster/kmeans_predict_double.cu

@@ -24,26 +24,26 @@ void predict(raft::resources const& handle,
              raft::device_matrix_view<const double, int> X,
              std::optional<raft::device_vector_view<const double, int>> sample_weight,
              raft::device_matrix_view<const double, int> centroids,
-             bool normalize_weight,
              raft::device_vector_view<int, int> labels,
+             bool normalize_weight,
              raft::host_scalar_view<double> inertia)
 
 {
   cuvs::cluster::kmeans::predict<double, int>(
-    handle, params, X, sample_weight, centroids, normalize_weight, labels, inertia);
+    handle, params, X, sample_weight, centroids, labels, normalize_weight, inertia);
 }
 
 void predict(raft::resources const& handle,
              const kmeans::params& params,
              raft::device_matrix_view<const double, int> X,
              std::optional<raft::device_vector_view<const double, int>> sample_weight,
              raft::device_matrix_view<const double, int> centroids,
-             bool normalize_weight,
              raft::device_vector_view<int64_t, int> labels,
+             bool normalize_weight,
              raft::host_scalar_view<double> inertia)
 
 {
   cuvs::cluster::kmeans::predict<double, int64_t>(
-    handle, params, X, sample_weight, centroids, normalize_weight, labels, inertia);
+    handle, params, X, sample_weight, centroids, labels, normalize_weight, inertia);
 }
 }  // namespace cuvs::cluster::kmeans

cpp/src/cluster/kmeans_predict_float.cu

@@ -24,25 +24,25 @@ void predict(raft::resources const& handle,
              raft::device_matrix_view<const float, int> X,
              std::optional<raft::device_vector_view<const float, int>> sample_weight,
              raft::device_matrix_view<const float, int> centroids,
-             bool normalize_weight,
              raft::device_vector_view<int, int> labels,
+             bool normalize_weight,
              raft::host_scalar_view<float> inertia)
 
 {
   cuvs::cluster::kmeans::predict<float, int>(
-    handle, params, X, sample_weight, centroids, normalize_weight, labels, inertia);
+    handle, params, X, sample_weight, centroids, labels, normalize_weight, inertia);
 }
 void predict(raft::resources const& handle,
              const kmeans::params& params,
              raft::device_matrix_view<const float, int> X,
              std::optional<raft::device_vector_view<const float, int>> sample_weight,
              raft::device_matrix_view<const float, int> centroids,
-             bool normalize_weight,
              raft::device_vector_view<int64_t, int> labels,
+             bool normalize_weight,
              raft::host_scalar_view<float> inertia)
 
 {
   cuvs::cluster::kmeans::predict<float, int64_t>(
-    handle, params, X, sample_weight, centroids, normalize_weight, labels, inertia);
+    handle, params, X, sample_weight, centroids, labels, normalize_weight, inertia);
 }
 }  // namespace cuvs::cluster::kmeans