From 1d10f7228e014b4be87f61fd12a971f0c192608c Mon Sep 17 00:00:00 2001 From: viclafargue Date: Thu, 30 Jan 2025 14:49:43 +0000 Subject: [PATCH] fixing issues --- cpp/include/raft/sparse/linalg/degree.cuh | 2 +- cpp/include/raft/sparse/linalg/detail/spectral.cuh | 4 ++-- cpp/include/raft/sparse/op/detail/filter.cuh | 6 +++--- cpp/include/raft/sparse/op/filter.cuh | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cpp/include/raft/sparse/linalg/degree.cuh b/cpp/include/raft/sparse/linalg/degree.cuh index 567eb187c1..9ce7321de0 100644 --- a/cpp/include/raft/sparse/linalg/degree.cuh +++ b/cpp/include/raft/sparse/linalg/degree.cuh @@ -36,7 +36,7 @@ namespace linalg { template void coo_degree(const T* rows, nnz_type nnz, outT* results, cudaStream_t stream) { - detail::coo_degree<64, T>(rows, (nnz_type)nnz, results, stream); + detail::coo_degree<64, T>(rows, nnz, results, stream); } /** diff --git a/cpp/include/raft/sparse/linalg/detail/spectral.cuh b/cpp/include/raft/sparse/linalg/detail/spectral.cuh index 103030cbad..87dfa045fe 100644 --- a/cpp/include/raft/sparse/linalg/detail/spectral.cuh +++ b/cpp/include/raft/sparse/linalg/detail/spectral.cuh @@ -49,7 +49,7 @@ void fit_embedding(raft::resources const& handle, rows, cols, vals, - static_cast(nnz), + static_cast(nnz), static_cast(n), src_offsets.data(), dst_cols.data(), @@ -72,7 +72,7 @@ void fit_embedding(raft::resources const& handle, value_type* vs = dst_vals.data(); raft::spectral::matrix::sparse_matrix_t const r_csr_m{ - handle, ro, ci, vs, static_cast(n), nnz}; + handle, ro, ci, vs, static_cast(n), static_cast(nnz)}; index_type neigvs = n_components + 1; index_type maxiter = 4000; // default reset value (when set to 0); diff --git a/cpp/include/raft/sparse/op/detail/filter.cuh b/cpp/include/raft/sparse/op/detail/filter.cuh index e0d072e8bb..c5c095462d 100644 --- a/cpp/include/raft/sparse/op/detail/filter.cuh +++ b/cpp/include/raft/sparse/op/detail/filter.cuh @@ -153,8 +153,8 @@ void coo_remove_scalar(COO* in, rmm::device_uvector row_count_nz(in->n_rows, stream); rmm::device_uvector row_count(in->n_rows, stream); - RAFT_CUDA_TRY(cudaMemsetAsync(row_count_nz.data(), 0, (idx_t)in->n_rows * sizeof(idx_t), stream)); - RAFT_CUDA_TRY(cudaMemsetAsync(row_count.data(), 0, (idx_t)in->n_rows * sizeof(idx_t), stream)); + RAFT_CUDA_TRY(cudaMemsetAsync(row_count_nz.data(), 0, (nnz_t)in->n_rows * sizeof(nnz_t), stream)); + RAFT_CUDA_TRY(cudaMemsetAsync(row_count.data(), 0, (nnz_t)in->n_rows * sizeof(nnz_t), stream)); linalg::coo_degree(in->rows(), in->nnz, row_count.data(), stream); RAFT_CUDA_TRY(cudaPeekAtLastError()); @@ -164,7 +164,7 @@ void coo_remove_scalar(COO* in, RAFT_CUDA_TRY(cudaPeekAtLastError()); thrust::device_ptr d_row_count_nz = thrust::device_pointer_cast(row_count_nz.data()); - uint64_t out_nnz = + nnz_t out_nnz = thrust::reduce(rmm::exec_policy(stream), d_row_count_nz, d_row_count_nz + in->n_rows); out->allocate(out_nnz, in->n_rows, in->n_cols, false, stream); diff --git a/cpp/include/raft/sparse/op/filter.cuh b/cpp/include/raft/sparse/op/filter.cuh index 5541a375d2..c257585c0e 100644 --- a/cpp/include/raft/sparse/op/filter.cuh +++ b/cpp/include/raft/sparse/op/filter.cuh @@ -46,7 +46,7 @@ template void coo_remove_scalar(const idx_t* rows, const idx_t* cols, const T* vals, - int nnz, + nnz_t nnz, idx_t* crows, idx_t* ccols, T* cvals,