From 485d0429264b07908a9d5c1a04670a7933abef96 Mon Sep 17 00:00:00 2001 From: divyegala Date: Thu, 30 Jan 2025 23:02:39 +0000 Subject: [PATCH] working through updates for cuvs --- .../raft/spectral/detail/matrix_wrappers.hpp | 52 ++++++++++--------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/cpp/include/raft/spectral/detail/matrix_wrappers.hpp b/cpp/include/raft/spectral/detail/matrix_wrappers.hpp index f7aa507059..6ac0f9c837 100644 --- a/cpp/include/raft/spectral/detail/matrix_wrappers.hpp +++ b/cpp/include/raft/spectral/detail/matrix_wrappers.hpp @@ -334,11 +334,11 @@ struct laplacian_matrix_t : sparse_matrix_t { laplacian_matrix_t(resources const& raft_handle, sparse_matrix_t const& csr_m) : sparse_matrix_t(raft_handle, - csr_m.row_offsets_, - csr_m.col_indices_, - csr_m.values_, - csr_m.nrows_, - csr_m.nnz_), + csr_m.row_offsets_, + csr_m.col_indices_, + csr_m.values_, + csr_m.nrows_, + csr_m.nnz_), diagonal_(raft_handle, csr_m.nrows_) { vector_t ones{raft_handle, (size_t)csr_m.nrows_}; @@ -382,7 +382,8 @@ struct laplacian_matrix_t : sparse_matrix_t { // Apply adjacency matrix // - sparse_matrix_t::mv(-alpha, x, 1, y, alg, transpose, symmetric); + sparse_matrix_t::mv( + -alpha, x, 1, y, alg, transpose, symmetric); } vector_t diagonal_; @@ -427,36 +428,37 @@ struct modularity_matrix_t : laplacian_matrix_t::mv(alpha, x, 0, y, alg, transpose, symmetric); + sparse_matrix_t::mv( + alpha, x, 0, y, alg, transpose, symmetric); value_type dot_res; // gamma = d'*x // // Cublas::dot(this->n, D.raw(), 1, x, 1, &dot_res); // TODO: Call from public API when ready - RAFT_CUBLAS_TRY( - raft::linalg::detail::cublasdot(cublas_h, - n, - laplacian_matrix_t::diagonal_.raw(), - 1, - x, - 1, - &dot_res, - stream)); + RAFT_CUBLAS_TRY(raft::linalg::detail::cublasdot( + cublas_h, + n, + laplacian_matrix_t::diagonal_.raw(), + 1, + x, + 1, + &dot_res, + stream)); // y = y -(gamma/edge_sum)*d // value_type gamma_ = -dot_res / edge_sum_; // TODO: Call from public API when ready - RAFT_CUBLAS_TRY( - raft::linalg::detail::cublasaxpy(cublas_h, - n, - &gamma_, - laplacian_matrix_t::diagonal_.raw(), - 1, - y, - 1, - stream)); + RAFT_CUBLAS_TRY(raft::linalg::detail::cublasaxpy( + cublas_h, + n, + &gamma_, + laplacian_matrix_t::diagonal_.raw(), + 1, + y, + 1, + stream)); } value_type edge_sum_;