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

Address issue #229 and fix missing noexcept #230

Merged
merged 1 commit into from
Jan 24, 2023
+12 −8
Merged

Address issue #229 and fix missing noexcept #230

Show file tree
Hide file tree
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
10 changes: 6 additions & 4 deletions include/experimental/__p0009_bits/layout_left.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,18 +116,20 @@ class layout_left::mapping {
)
MDSPAN_CONDITIONAL_EXPLICIT((extents_type::rank() > 0))
MDSPAN_INLINE_FUNCTION _MDSPAN_CONSTEXPR_14
mapping(layout_stride::mapping<OtherExtents> const& other) // NOLINT(google-explicit-constructor)
mapping(layout_stride::mapping<OtherExtents> const& other) noexcept // NOLINT(google-explicit-constructor)
:__extents(other.extents())
{
/*
* TODO: check precondition
* other.required_span_size() is a representable value of type index_type
*/
#ifndef __CUDA_ARCH__
size_t stride = 1;
#if !defined(_MDSPAN_HAS_CUDA) && !defined(_MDSPAN_HAS_HIP) && !defined(NDEBUG)
index_type stride = 1;
for(rank_type r=0; r<__extents.rank(); r++) {
if(stride != other.stride(r))
if(stride != static_cast<index_type>(other.stride(r))) {
// Note this throw will lead to a terminate if triggered since this function is marked noexcept
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not just call assert in that case?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To clarify @dalg24 's comment: assert does something exactly when not defined(NDEBUG) is true, so this should behave effectively like assert. Furthermore, an actual assert may have a better error message, as a noexcept violation might not need to print the exception message.

The nicer way to do this would be to define an MDSPAN_ASSERT macro that Does The Right Thing, but I think it's fine for now just to use assert.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would need to write a function I call inside the assert I guess? Because I don't want to execute the loop unless !NDEBUG

Or do you just want me to replace the innermost if/throw?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

immediately invoked lambda code was worse. reverted to the initial PR

throw std::runtime_error("Assigning layout_stride to layout_left with invalid strides.");
}
stride *= __extents.extent(r);
}
#endif
Expand Down
10 changes: 6 additions & 4 deletions include/experimental/__p0009_bits/layout_right.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,18 +121,20 @@ class layout_right::mapping {
)
MDSPAN_CONDITIONAL_EXPLICIT((extents_type::rank() > 0))
MDSPAN_INLINE_FUNCTION _MDSPAN_CONSTEXPR_14
mapping(layout_stride::mapping<OtherExtents> const& other) // NOLINT(google-explicit-constructor)
mapping(layout_stride::mapping<OtherExtents> const& other) noexcept // NOLINT(google-explicit-constructor)
:__extents(other.extents())
{
/*
* TODO: check precondition
* other.required_span_size() is a representable value of type index_type
*/
#ifndef __CUDA_ARCH__
size_t stride = 1;
#if !defined(_MDSPAN_HAS_CUDA) && !defined(_MDSPAN_HAS_HIP) && !defined(NDEBUG)
index_type stride = 1;
for(rank_type r=__extents.rank(); r>0; r--) {
if(stride != other.stride(r-1))
if(stride != static_cast<index_type>(other.stride(r-1))) {
// Note this throw will lead to a terminate if triggered since this function is marked noexcept
throw std::runtime_error("Assigning layout_stride to layout_right with invalid strides.");
}
stride *= __extents.extent(r-1);
}
#endif
Expand Down