Fix xaxis_*_iterator shape and strides types - #2747
Open
Stef-Sijben wants to merge 3 commits into
Open
Stef-Sijben wants to merge 3 commits into
Stef-Sijben wants to merge 3 commits into
Conversation
Copy link
Copy Markdown
Sorry, something went wrong.
Test not only `xarray` inputs, but also `xtensor` and `xtensor_fixed`. These are currently failing. Also test some more cases with `column_major` inputs.
An `xaxis_slice_iterator` always refers to a 1d view, so just use an array of size 1 for the shape and stride. Another type would probably be more optimal in case of compile-time fixed size (e.g. `xtensor_fixed`), but at least this is correct. Always use runtime dimensionality `xaxis_iterator` shape and strides. Other types would probably be more optimal in case of compile-time fixed dimension and/or size (e.g. `xtensor`, `xtensor_fixed`), but at least this is correct.
This branch has not been deployed
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Checklist
Description
Fixes #2116.
As described by @dchansen in #2723:
So I changed the type of the shape and strides members in the returned views/iterators as follows:
For both iterators, this loses some compile-time information in certain cases. E.g.:
Someone else would have to look into that if that's desired. However, I think the above paragraph would be more of an optimization, and this fix at least makes the iterators on xtensor and xtensor_fixed functionally correct, in the sense that their views have the correct shape and contain the correct elements.
I also made the iterator test cases type parameterized, so the existing test cases check all of xarray, xtensor, and xtensor_fixed as input types.