Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
raydouglass merged 1 commit into from
May 28, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 4 additions & 68 deletions cpp/include/cuvs/cluster/kmeans.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down Expand Up @@ -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.
*
Expand Down Expand Up @@ -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.
*
Expand Down Expand Up @@ -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.
*
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/cluster/kmeans.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>(
Expand Down
8 changes: 4 additions & 4 deletions cpp/src/cluster/kmeans_predict_double.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Copy link
Copy Markdown
Member Author

@divyegala divyegala May 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@enp1s0 for reference, we are reverting this PR because the corresponding function bodies for deprecated functions were missing in the source here. rapidsai/cuml#6810

Copy link
Copy Markdown
Member Author

@divyegala divyegala May 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As you wrote a function annotated with inline that was calling another function in the header, we had a problem in donstream repos. This is because inline is just a suggestion to the compiler, you would need __attribute__((always_inline)) to get this to always work without running into symbol lookup errors.

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
8 changes: 4 additions & 4 deletions cpp/src/cluster/kmeans_predict_float.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading