Skip to content
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

[REVIEW] Fix padding assertion in sparse Gram evaluation #1521

Merged
merged 1 commit into from
May 17, 2023
Merged

[REVIEW] Fix padding assertion in sparse Gram evaluation #1521

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
15 changes: 8 additions & 7 deletions cpp/include/raft/distance/detail/kernels/gram_matrix.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,18 +464,19 @@ class GramMatrixBase {
csr_input_matrix_view_t<math_t> x2,
dense_output_matrix_view_t<math_t> out)
{
// check is_row_major consistency
bool is_row_major = get_is_row_major(out);
int ld_out = is_row_major ? out.stride(0) : out.stride(1);
int minor_out = is_row_major ? out.extent(1) : out.extent(0);
ASSERT(ld_out == minor_out, "Sparse linear Kernel distance does not support ld_out parameter");
// check layout consistency (w.r.t. strides a matrix might be both row & col major)
bool is_row_major_nopad = get_is_row_major(out) && out.stride(0) == out.extent(1);
bool is_col_major_nopad = get_is_col_major(out) && out.stride(1) == out.extent(0);

ASSERT(is_row_major_nopad || is_col_major_nopad,
"Sparse linear Kernel distance does not support ld_out parameter");

auto x1_structure = x1.structure_view();
auto x2_structure = x2.structure_view();
raft::sparse::distance::distances_config_t<int, math_t> dist_config(handle);

// switch a,b based on is_row_major
if (!is_row_major) {
// switch a,b based on data layout
if (is_col_major_nopad) {
dist_config.a_nrows = x2_structure.get_n_rows();
dist_config.a_ncols = x2_structure.get_n_cols();
dist_config.a_nnz = x2_structure.get_nnz();
Expand Down