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

Fix failing C++ tests and revert #2097, #2085. #2168

Merged
merged 7 commits into from
Feb 9, 2024
Merged

Fix failing C++ tests and revert #2097, #2085. #2168

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2483c4a
fix test
mfoerste4 Feb 7, 2024
2e5ab61
review suggestion
mfoerste4 Feb 7, 2024
cfcd6b2
Revert "Allow topk larger than 1024 in CAGRA (#2097)"
cjnolet Feb 8, 2024
1a2eceb
Merge remote-tracking branch 'malte/fix-sparse-dist-test' into branch…
cjnolet Feb 8, 2024
0b6fd78
Fixing style
cjnolet Feb 8, 2024
e087fd9
Revert "Support for fp16 in CAGRA and IVF-PQ (#2085)"
cjnolet Feb 8, 2024
6581448
Fixing styel
cjnolet Feb 8, 2024
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
Next Next commit
fix test
  • Loading branch information
@mfoerste4
mfoerste4 committed Feb 7, 2024
commit 2483c4a26f8dfe07103d8b0d89f741eca91e37e9
8 changes: 6 additions & 2 deletions cpp/include/raft/core/device_mdspan.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,12 @@ auto constexpr make_device_strided_matrix_view(ElementType* ptr,
IndexType stride)
{
constexpr auto is_row_major = std::is_same_v<LayoutPolicy, layout_c_contiguous>;
IndexType stride0 = is_row_major ? (stride > 0 ? stride : n_cols) : 1;
IndexType stride1 = is_row_major ? 1 : (stride > 0 ? stride : n_rows);
constexpr auto is_col_major = std::is_same_v<LayoutPolicy, layout_f_contiguous>;

assert(is_row_major || is_col_major);

IndexType stride0 = is_row_major ? (stride > 0 ? stride : n_cols) : 1;
IndexType stride1 = is_row_major ? 1 : (stride > 0 ? stride : n_rows);

assert(is_row_major ? stride0 >= n_cols : stride1 >= n_rows);
matrix_extent<IndexType> extents{n_rows, n_cols};
Expand Down
10 changes: 7 additions & 3 deletions cpp/include/raft/sparse/linalg/spmm.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,12 @@ void spmm(raft::resources const& handle,
{
bool is_row_major = detail::is_row_major(y, z);

auto z_tmp_view = raft::make_device_strided_matrix_view<ValueType, IndexType, LayoutPolicyZ>(
z.data_handle(), z.extent(0), z.extent(1), is_row_major ? z.stride(0) : z.stride(1));
auto z_tmp_view =
is_row_major
? raft::make_device_strided_matrix_view<ValueType, IndexType, layout_c_contiguous>(
z.data_handle(), z.extent(0), z.extent(1), is_row_major ? z.stride(0) : z.stride(1))
: raft::make_device_strided_matrix_view<ValueType, IndexType, layout_f_contiguous>(
z.data_handle(), z.extent(0), z.extent(1), is_row_major ? z.stride(0) : z.stride(1));

auto descr_x = detail::create_descriptor(x);
auto descr_y = detail::create_descriptor(y);
Expand All @@ -79,4 +83,4 @@ void spmm(raft::resources const& handle,
} // end namespace sparse
} // end namespace raft

#endif
#endif
9 changes: 5 additions & 4 deletions cpp/include/raft/util/input_validation.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022, NVIDIA CORPORATION.
* Copyright (c) 2022-2024, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -39,7 +39,8 @@ constexpr bool is_row_or_column_major(mdspan<ElementType, Extents, layout_right,
template <class ElementType, class Extents, class Accessor>
constexpr bool is_row_or_column_major(mdspan<ElementType, Extents, layout_stride, Accessor> m)
{
return m.is_exhaustive();
return m.stride(0) == typename Extents::index_type(1) ||
m.stride(1) == typename Extents::index_type(1);
}

template <class ElementType, class Extents, class Layout, class Accessor>
Expand All @@ -63,7 +64,7 @@ constexpr bool is_row_major(mdspan<ElementType, Extents, layout_right, Accessor>
template <class ElementType, class Extents, class Accessor>
constexpr bool is_row_major(mdspan<ElementType, Extents, layout_stride, Accessor> m)
{
return m.is_exhaustive() && m.stride(1) == typename Extents::index_type(1);
return m.stride(1) == typename Extents::index_type(1);
}

template <class ElementType, class Extents, class Layout, class Accessor>
Expand All @@ -87,7 +88,7 @@ constexpr bool is_col_major(mdspan<ElementType, Extents, layout_right, Accessor>
template <class ElementType, class Extents, class Accessor>
constexpr bool is_col_major(mdspan<ElementType, Extents, layout_stride, Accessor> m)
{
return m.is_exhaustive() && m.stride(0) == typename Extents::index_type(1);
return m.stride(0) == typename Extents::index_type(1);
}

template <class ElementType, class IndexType, size_t... Exts, class Layout, class Accessor>
Expand Down
Loading