Enable explicit use of key tuples (instead of *Indexer objects) in indexing adapters and explicitly indexed arrays #8870
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
andersy005
changed the title
Illviljan
reviewed
Mar 26, 2024
4 tasks
This commit updates the `explicit_indexing_adapter` function to accept both `ExplicitIndexer` and the new `CompatIndexedTuple`. The `CompatIndexedTuple` is designed to facilitate the transition towards using raw tuples by carrying additional metadata about the indexing type (basic, vectorized, or outer).
dcherian
reviewed
Apr 30, 2024
dcherian
reviewed
Apr 30, 2024
dcherian
reviewed
Apr 30, 2024
dcherian
reviewed
Apr 30, 2024
| @@ -5811,7 +5811,7 @@ def _getitem(self, key): | |||
|
|
|||
| with warnings.catch_warnings(record=True) as w: | |||
| warnings.simplefilter("always") | |||
| la.vindex[indexer].get_duck_array() | |||
| la.vindex[indexer.tuple].get_duck_array() | |||
There was a problem hiding this comment.
Suggested change
| la.vindex[indexer.tuple].get_duck_array() | |
| la[indexer].get_duck_array() |
This is where we check for backcompat warnings in custom backends. Is the warning being raised when we pass .tuple to .vindex? It should not be..
There was a problem hiding this comment.
i intend to look into this later today
dcherian
reviewed
Apr 30, 2024
dcherian
reviewed
Apr 30, 2024
dcherian
reviewed
Apr 30, 2024
dcherian
reviewed
Apr 30, 2024
Co-authored-by: Deepak Cherian <dcherian@users.noreply.github.com>
dcherian
reviewed
Apr 30, 2024
dcherian
reviewed
Apr 30, 2024
xarray/core/indexing.py
Outdated
| key = BasicIndexer( | ||
| indexer.tuple if isinstance(indexer, ExplicitIndexer) else indexer | ||
| ) | ||
| return type(self)(self.array, self._updated_key(key)) |
There was a problem hiding this comment.
Let's fix self._updated_key to not need Indexer objects
There was a problem hiding this comment.
added some initial updates with support for raw tuples as input. however, there's still use of indexer objects within the method itself. my attempts at completely removing indexer objects resulted in plenty of issues that i wasn't ready to address :). will look into this later today as well
dcherian
reviewed
Apr 30, 2024
dcherian
reviewed
Apr 30, 2024
|
Very nice work, Anderson! We can address the backend warnings in the next PR |
andersy005
added a commit
that referenced
this pull request
May 10, 2024
…dexing adapters and explicitly indexed arrays (#8870) * pass key tuple to indexing adapters and explicitly indexed arrays * update indexing in StackedBytesArray * Update indexing in StackedBytesArray * Add _IndexerKey type to _typing.py * Update indexing in StackedBytesArray * use tuple indexing in test_backend_array_deprecation_warning * Add support for CompatIndexedTuple in explicit indexing adapter This commit updates the `explicit_indexing_adapter` function to accept both `ExplicitIndexer` and the new `CompatIndexedTuple`. The `CompatIndexedTuple` is designed to facilitate the transition towards using raw tuples by carrying additional metadata about the indexing type (basic, vectorized, or outer). * remove unused code * type hint fixes * fix docstrings * fix tests * fix docstrings * Apply suggestions from code review Co-authored-by: Deepak Cherian <dcherian@users.noreply.github.com> * update docstrings and pass tuples directly * Some test cleanup * update docstring * use `BasicIndexer` instead of `CompatIndexedTuple` * support explicit indexing with tuples * fix mypy errors * remove unused IndexerMaker * Update LazilyIndexedArray._updated_key to support explicit indexing with tuples --------- Co-authored-by: Deepak Cherian <dcherian@users.noreply.github.com> Co-authored-by: Deepak Cherian <deepak@cherian.net>
andersy005
added a commit
to hmaarrfk/xarray
that referenced
this pull request
May 10, 2024
* backend-indexing: Trigger CI only if code files are modified. (pydata#9006) Enable explicit use of key tuples (instead of *Indexer objects) in indexing adapters and explicitly indexed arrays (pydata#8870) add `.oindex` and `.vindex` to `BackendArray` (pydata#8885) temporary enable CI triggers on feature branch Avoid auto creation of indexes in concat (pydata#8872) Fix benchmark CI (pydata#9013) Avoid extra read from disk when creating Pandas Index. (pydata#8893) Add a benchmark to monitor performance for large dataset indexing (pydata#9012) Zarr: Optimize `region="auto"` detection (pydata#8997) Trigger CI only if code files are modified. (pydata#9006) Fix for ruff 0.4.3 (pydata#9007) Port negative frequency fix for `pandas.date_range` to `cftime_range` (pydata#8999) Bump codecov/codecov-action from 4.3.0 to 4.3.1 in the actions group (pydata#9004) Speed up localize (pydata#8536) Simplify fast path (pydata#9001) Add argument check_dims to assert_allclose to allow transposed inputs (pydata#5733) (pydata#8991) Fix syntax error in test related to cupy (pydata#9000)
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.
xarray.namedarray(Part 1) #8856whats-new.rstapi.rst