Merge branch 'main' into opt-condense-hierarchy

Author: jinsolp

cpp/CMakeLists.txt

@@ -514,8 +514,7 @@ if(BUILD_CUML_CPP_LIBRARY)
 
   if(all_algo OR spectralclustering_algo)
     target_sources(
-      cuml_objs PRIVATE src/spectral/spectral.cu src/spectral/spectral_clustering.cu
-                        src/spectral/spectral_embedding.cu
+      cuml_objs PRIVATE src/spectral/spectral_clustering.cu src/spectral/spectral_embedding.cu
     )
   endif()
 

cpp/include/cuml/cluster/spectral.hpp

@@ -26,8 +26,8 @@ void predict_impl(const raft::handle_t& handle,
                   idx_t* labels,
                   value_t& inertia)
 {
-  auto X_view = raft::make_device_matrix_view(X, n_samples, n_features);
-  std::optional<raft::device_vector_view<const value_t>> sw = std::nullopt;
+  auto X_view = raft::make_device_matrix_view<const value_t, idx_t>(X, n_samples, n_features);
+  std::optional<raft::device_vector_view<const value_t, idx_t>> sw = std::nullopt;
   if (sample_weight != nullptr)
     sw = std::make_optional(
       raft::make_device_vector_view<const value_t, idx_t>(sample_weight, n_samples));

cpp/src/kmeans/kmeans_predict.cu

@@ -22,10 +22,10 @@ void transform_impl(const raft::handle_t& handle,
                     idx_t n_features,
                     value_t* X_new)
 {
-  auto X_view = raft::make_device_matrix_view<const value_t, idx_t>(X, n_samples, n_features);
+  auto X_view = raft::make_device_matrix_view<const value_t, int>(X, n_samples, n_features);
   auto centroids_view =
-    raft::make_device_matrix_view<const value_t, idx_t>(centroids, params.n_clusters, n_features);
-  auto rX_new = raft::make_device_matrix_view<value_t, idx_t>(X_new, n_samples, n_features);
+    raft::make_device_matrix_view<const value_t, int>(centroids, params.n_clusters, n_features);
+  auto rX_new = raft::make_device_matrix_view<value_t, int>(X_new, n_samples, n_features);
 
   cuvs::cluster::kmeans::transform(handle, params.to_cuvs(), X_view, centroids_view, rX_new);
 }

cpp/src/kmeans/kmeans_transform.cu

@@ -154,7 +154,7 @@ void brute_force_knn(const raft::handle_t& handle,
       raft::make_device_matrix_view<const int64_t, int64_t>(out_I, n * input.size(), k),
       raft::make_device_matrix_view<float, int64_t>(res_D, n, k),
       raft::make_device_matrix_view<int64_t, int64_t>(res_I, n, k),
-      raft::make_device_vector_view<int64_t>(trans.data(), trans.size()));
+      raft::make_device_vector_view<int64_t, int64_t>(trans.data(), trans.size()));
   }
 
   if (translations == nullptr) delete id_ranges;

cpp/src/knn/knn.cu

@@ -714,7 +714,7 @@ void reduce(opg_knn_param<in_t, ind_t, dist_t, out_t>& params,
       work.res_I.data(), batch_size * work.idxRanks.size(), params.k),
     raft::make_device_matrix_view<dist_t, int64_t>(distances, batch_size, params.k),
     raft::make_device_matrix_view<ind_t, int64_t>(indices, batch_size, params.k),
-    raft::make_device_vector_view<trans_t>(trans.data(), trans.size()));
+    raft::make_device_vector_view<trans_t, int64_t>(trans.data(), trans.size()));
   handle.sync_stream(handle.get_stream());
   RAFT_CUDA_TRY(cudaPeekAtLastError());