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.

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

Fix syntax error in test related to cupy (#9000) #9008

Closed

Conversation

hmaarrfk
Copy link
Contributor

@hmaarrfk hmaarrfk commented May 6, 2024

Port of #9000

  • Closes #xxxx
  • Tests added
  • User visible changes (including notable bug fixes) are documented in whats-new.rst
  • New functions/methods are listed in api.rst

andersy005 and others added 7 commits April 9, 2024 17:43
* add .oindex and .vindex to BackendArray

* Add support for .oindex and .vindex in H5NetCDFArrayWrapper

* Add support for .oindex and .vindex in NetCDF4ArrayWrapper, PydapArrayWrapper, NioArrayWrapper, and ZarrArrayWrapper

* add deprecation warning

* Fix deprecation warning message formatting

* add tests

* Update xarray/core/indexing.py

Co-authored-by: Deepak Cherian <[email protected]>

* Update ZarrArrayWrapper class in xarray/backends/zarr.py

Co-authored-by: Deepak Cherian <[email protected]>

---------

Co-authored-by: Deepak Cherian <[email protected]>
* origin/main:
  clean up the upstream-dev setup script (pydata#8986)
  Skip flaky `test_open_mfdataset_manyfiles` test (pydata#8989)
  Remove `.drop` warning allow (pydata#8988)
  Add notes on when to add ignores to warnings (pydata#8987)
  Docstring and documentation improvement for the Dataset class (pydata#8973)
…dexing adapters and explicitly indexed arrays (pydata#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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: Deepak Cherian <[email protected]>
* origin/main:
  call `np.cross` with 3D vectors only (pydata#8993)
  Mark `test_use_cftime_false_standard_calendar_in_range` as an expected failure (pydata#8996)
  Migration of datatree/ops.py -> datatree_ops.py (pydata#8976)
  avoid a couple of warnings in `polyfit` (pydata#8939)
I suspect the CIs don't have cupy which meant that this line didn't get
hit.

Recreation:

```
mamba create --name xr_py10 python=3.10 --channel conda-forge --override-channels
mamba activate xr_py10
pip install -e . -vv
pip install pytest
mamba install cupy
```

```
pytest xarray/tests/test_array_api.py -x
```

Fails on my machine.

Happy to provide more info
@hmaarrfk hmaarrfk marked this pull request as ready for review May 6, 2024 19:30
@mathause
Copy link
Collaborator

@andersy005 did something go wrong with the merge/rebase?
@hmaarrfk this looked the same as #9000 - isn't this already commited?

(or maybe I am misunderstanding something)

@keewis
Copy link
Collaborator

keewis commented May 10, 2024

the difference is the target branch: the fix is already on main, this goes to the namedarray feature branch (backend-indexing)

@andersy005
Copy link
Member

I am closing this pull request as I've updated the backend-indexing branch and resolved the merge conflicts.

@andersy005 andersy005 closed this May 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants