Skip to content

Commit

Permalink
kokkos#6805: fix formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
nmm0 committed May 15, 2024
1 parent ca856a9 commit 8479e8e
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 9 deletions.
18 changes: 12 additions & 6 deletions core/src/View/MDSpan/Kokkos_MDSpan_Layout.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,18 @@ KOKKOS_INLINE_FUNCTION auto mapping_from_view_mapping(const VM &view_mapping) {
Kokkos::layout_stride>) {
return mapping_type(extents_from_view_mapping<extents_type>(view_mapping),
strides);
} else if constexpr (VM::Rank > 1 && std::is_same_v<typename mapping_type::layout_type,
Kokkos::Experimental::layout_left_padded<Kokkos::dynamic_extent>>) {
return mapping_type(extents_from_view_mapping<extents_type>(view_mapping), strides[1]);
} else if constexpr (VM::Rank > 1 && std::is_same_v<typename mapping_type::layout_type,
Kokkos::Experimental::layout_right_padded<Kokkos::dynamic_extent>>) {
return mapping_type(extents_from_view_mapping<extents_type>(view_mapping), strides[VM::Rank - 2]);
} else if constexpr (VM::Rank > 1 &&
std::is_same_v<typename mapping_type::layout_type,
Kokkos::Experimental::layout_left_padded<
Kokkos::dynamic_extent>>) {
return mapping_type(extents_from_view_mapping<extents_type>(view_mapping),
strides[1]);
} else if constexpr (VM::Rank > 1 &&
std::is_same_v<typename mapping_type::layout_type,
Kokkos::Experimental::layout_right_padded<
Kokkos::dynamic_extent>>) {
return mapping_type(extents_from_view_mapping<extents_type>(view_mapping),
strides[VM::Rank - 2]);
} else {
return mapping_type(extents_from_view_mapping<extents_type>(view_mapping));
}
Expand Down
6 changes: 3 additions & 3 deletions core/unit_test/TestMDSpanConversion.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,9 @@ struct TestViewMDSpanConversion {
constexpr bool is_strided_layout =
std::is_same_v<typename MDSpanLayoutMapping::layout_type,
Kokkos::layout_stride>;
if constexpr ( !is_strided_layout )
{
static_assert(natural_mdspan_type::mapping_type::padding_value == Kokkos::dynamic_extent);
if constexpr (!is_strided_layout) {
static_assert(natural_mdspan_type::mapping_type::padding_value ==
Kokkos::dynamic_extent);
}
// test conversion operator to natural mdspan
{
Expand Down

0 comments on commit 8479e8e

Please sign in to comment.