Fix to_iris conversion issues #2111
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
shoyer
reviewed
May 14, 2018
xarray/core/duck_array_ops.py
Outdated
| @@ -101,6 +101,9 @@ def isnull(data): | |||
| einsum = _dask_or_eager_func('einsum', array_args=slice(1, None), | |||
| requires_dask='0.17.3') | |||
|
|
|||
| masked_invalid = _dask_or_eager_func('masked_invalid', eager_module=np.ma, | |||
| dask_module=dask_array.ma) | |||
There was a problem hiding this comment.
Unfortunately this breaks if dask is not installed:
xarray/__init__.py:6: in <module>
from .core.alignment import align, broadcast, broadcast_arrays
xarray/core/alignment.py:11: in <module>
from .indexing import get_indexer_nd
xarray/core/indexing.py:11: in <module>
from . import duck_array_ops, nputils, utils
xarray/core/duck_array_ops.py:105: in <module>
dask_module=dask_array.ma)
E AttributeError: 'NoneType' object has no attribute 'ma'
Instead, we need something like dask_module=getattr(dask_array, 'ma', None)
|
Would you mind adding a brief note about this bug-fix for whats-new.rst? |
|
thanks! |
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.
Add test for issue fixed in Fix decode cf with dask #2047
Add workaround for da.ma.masked_invalid setting a bad chunksize when given a DataArray rather than a Dask array. Tested manually but unsure how best to add a unit test for this.
Closes from_iris converts dask array into numpy array #2046
Tests added (for all bug fixes or enhancements)
Tests passed (for all non-documentation changes)