Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions include/experimental/__p2630_bits/submdspan_extents.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -266,11 +266,11 @@ struct extents_constructor<0, Extents, NewStaticExtents...> {

} // namespace detail

// submdspan_extents creates new extents given src extents and submdspan slice
// subextents creates new extents given src extents and submdspan slice
// specifiers
template <class IndexType, size_t... Extents, class... SliceSpecifiers>
MDSPAN_INLINE_FUNCTION
constexpr auto submdspan_extents(const extents<IndexType, Extents...> &src_exts,
constexpr auto subextents(const extents<IndexType, Extents...> &src_exts,
SliceSpecifiers... slices) {

using ext_t = extents<IndexType, Extents...>;
Expand Down
10 changes: 5 additions & 5 deletions include/experimental/__p2630_bits/submdspan_mapping.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ layout_left::mapping<Extents>::submdspan_mapping_impl(

// compute sub extents
using src_ext_t = Extents;
auto dst_ext = submdspan_extents(extents(), slices...);
auto dst_ext = subextents(extents(), slices...);
using dst_ext_t = decltype(dst_ext);

// figure out sub layout type
Expand Down Expand Up @@ -272,7 +272,7 @@ layout_left_padded<PaddingValue>::mapping<Extents>::submdspan_mapping_impl(

// compute sub extents
using src_ext_t = Extents;
auto dst_ext = submdspan_extents(extents(), slices...);
auto dst_ext = subextents(extents(), slices...);
using dst_ext_t = decltype(dst_ext);

if constexpr (Extents::rank() == 0) { // rank-0 case
Expand Down Expand Up @@ -440,7 +440,7 @@ layout_right::mapping<Extents>::submdspan_mapping_impl(

// compute sub extents
using src_ext_t = Extents;
auto dst_ext = submdspan_extents(extents(), slices...);
auto dst_ext = subextents(extents(), slices...);
using dst_ext_t = decltype(dst_ext);

// figure out sub layout type
Expand Down Expand Up @@ -508,7 +508,7 @@ layout_right_padded<PaddingValue>::mapping<Extents>::submdspan_mapping_impl(

// compute sub extents
using src_ext_t = Extents;
auto dst_ext = submdspan_extents(extents(), slices...);
auto dst_ext = subextents(extents(), slices...);
using dst_ext_t = decltype(dst_ext);

if constexpr (Extents::rank() == 0) { // rank-0 case
Expand Down Expand Up @@ -585,7 +585,7 @@ layout_stride::mapping<Extents>::submdspan_mapping_impl(
// Implements mandate check
detail::check_submdspan_slice_mandates<Extents>(std::make_index_sequence<Extents::rank()>(), slices...);

auto dst_ext = submdspan_extents(extents(), slices...);
auto dst_ext = subextents(extents(), slices...);
using dst_ext_t = decltype(dst_ext);
auto inv_map = detail::inv_map_rank(std::integral_constant<size_t, 0>(),
std::index_sequence<>(), slices...);
Expand Down
Loading