add caching for view strides #652
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
JohanMabille
requested changes
Feb 19, 2018
include/xtensor/xview.hpp
Outdated
| @@ -166,7 +166,7 @@ namespace xt | |||
| data() const; | |||
|
|
|||
| template <class T = xexpression_type> | |||
| std::enable_if_t<has_raw_data_interface<T>::value, strides_type> | |||
| std::enable_if_t<has_raw_data_interface<T>::value, strides_type&> | |||
There was a problem hiding this comment.
the return type should be const strides_type&
include/xtensor/xview.hpp
Outdated
| if (m_strides_computed) | ||
| { | ||
| return m_strides; | ||
| } |
There was a problem hiding this comment.
I would prefer something like:
if(!m_strides_computed)
{
m_strides = compute_strides();
m_strides_computed = true;
}
return m_strides;for the following reasons:
- you avoid mutiple return points
- all the caching logic is done in the same place, and
compute_stridesis now a stateless function (that's more flexible for future refactoring / cache policy changes etc).
include/xtensor/xview.hpp
Outdated
| { | ||
| return m_strides; | ||
| } | ||
| m_strides = xtl::make_sequence<strides_type>(dimension(), 0); |
There was a problem hiding this comment.
This shows another bug in the computaion of the strides: the new_axis were not taken into account in the previous code. Now that you fixed that, you also need to fix the loop.
|
Also the failing case that triggered the bug should be added to the test suite |
wolfv
force-pushed
the
fix_view_transpose
branch
from
a0e7b00
to
341baba
Compare
JohanMabille
approved these changes
Feb 20, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes #651