From 4615f0bdc2312191ebb4903630384523594caf72 Mon Sep 17 00:00:00 2001 From: "Corey J. Nolet" Date: Fri, 15 Nov 2024 16:38:38 -0500 Subject: [PATCH] More updates --- cpp/CMakeLists.txt | 2 +- cpp/include/cuvs/{sparse/embed => dimred}/spectral.hpp | 4 ++-- cpp/include/cuvs/distance/grammian.hpp | 1 + cpp/src/{sparse/embed => dimred}/spectral.cu | 6 +++--- 4 files changed, 7 insertions(+), 6 deletions(-) rename cpp/include/cuvs/{sparse/embed => dimred}/spectral.hpp (95%) rename cpp/src/{sparse/embed => dimred}/spectral.cu (93%) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 5d921332d..18f9f6e6a 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -373,6 +373,7 @@ if(BUILD_SHARED_LIBS) src/distance/distance.cu src/distance/kernel_gram.cu src/distance/pairwise_distance.cu + src/dimred/spectral.cu src/neighbors/brute_force.cu src/neighbors/cagra_build_float.cu src/neighbors/cagra_build_half.cu @@ -462,7 +463,6 @@ if(BUILD_SHARED_LIBS) src/selection/select_k_float_int32_t.cu src/selection/select_k_float_uint32_t.cu src/selection/select_k_half_uint32_t.cu - src/sparse/embed/spectral.cu src/stats/silhouette_score.cu src/stats/trustworthiness_score.cu ${CUVS_MG_ALGOS} diff --git a/cpp/include/cuvs/sparse/embed/spectral.hpp b/cpp/include/cuvs/dimred/spectral.hpp similarity index 95% rename from cpp/include/cuvs/sparse/embed/spectral.hpp rename to cpp/include/cuvs/dimred/spectral.hpp index 7af894bb5..6c6baabb4 100644 --- a/cpp/include/cuvs/sparse/embed/spectral.hpp +++ b/cpp/include/cuvs/dimred/spectral.hpp @@ -17,7 +17,7 @@ #include #include -namespace cuvs::sparse::cluster::spectral { +namespace cuvs::dimred::spectral { /** * Given a COO formatted (symmetric) knn graph, this function computes the spectral embeddings @@ -39,4 +39,4 @@ void fit(const raft::resources& handle, int n_components, raft::device_matrix_view out, unsigned long long seed = 0L); -}; // namespace cuvs::sparse::cluster::spectral +}; // namespace cuvs::dimred::spectral diff --git a/cpp/include/cuvs/distance/grammian.hpp b/cpp/include/cuvs/distance/grammian.hpp index a88b12e8e..0c904d493 100644 --- a/cpp/include/cuvs/distance/grammian.hpp +++ b/cpp/include/cuvs/distance/grammian.hpp @@ -16,6 +16,7 @@ #pragma once +#include #include #include #include diff --git a/cpp/src/sparse/embed/spectral.cu b/cpp/src/dimred/spectral.cu similarity index 93% rename from cpp/src/sparse/embed/spectral.cu rename to cpp/src/dimred/spectral.cu index e31830814..8629518ff 100644 --- a/cpp/src/sparse/embed/spectral.cu +++ b/cpp/src/dimred/spectral.cu @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "../cluster/detail/spectral.cuh" +#include "../sparse/cluster/detail/spectral.cuh" #include #include #include -namespace cuvs::sparse::embed::spectral { +namespace cuvs::dimred::spectral { /** * Given a COO formatted (symmetric) knn graph, this function computes the spectral embeddings @@ -50,4 +50,4 @@ void fit(const raft::resources& handle, out.data_handle(), seed); } -}; // namespace cuvs::sparse::embed::spectral +}; // namespace cuvs::dimred::spectral