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.

Sign up for GitHub

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

Jump to bottom

Fix rolling operation with dask and bottleneck #2942

Closed
wants to merge 2 commits into from
Closed

Fix rolling operation with dask and bottleneck #2942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
098daf3
Fix: 2940
fujiisoup May 6, 2019
ca96cc3
Remove skipping test for this bug.
fujiisoup May 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions doc/whats-new.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,13 @@ Enhancements
- Character arrays' character dimension name decoding and encoding handled by
``var.encoding['char_dim_name']`` (:issue:`2895`)
By `James McCreight <https://github.com/jmccreight>`_.

Bug fixes
~~~~~~~~~

- a bug fix in rolling with dask and bottleneck
(:issue:`2940`)
By `Keisuke Fujii <https://github.com/fujiisoup>`_.
- indexing with an empty list creates an object with zero-length axis (:issue:`2882`)
By `Mayeul d'Avezac <https://github.com/mdavezac>`_.
- Return correct count for scalar datetime64 arrays (:issue:`2770`)
Expand Down Expand Up @@ -147,9 +150,9 @@ Other enhancements
By `Keisuke Fujii <https://github.com/fujiisoup>`_.
- Added :py:meth:`~xarray.Dataset.drop_dims` (:issue:`1949`).
By `Kevin Squire <https://github.com/kmsquire>`_.
- ``xr.open_zarr`` now accepts manually specified chunks with the ``chunks=``
parameter. ``auto_chunk=True`` is equivalent to ``chunks='auto'`` for
backwards compatibility. The ``overwrite_encoded_chunks`` parameter is
- ``xr.open_zarr`` now accepts manually specified chunks with the ``chunks=``
parameter. ``auto_chunk=True`` is equivalent to ``chunks='auto'`` for
backwards compatibility. The ``overwrite_encoded_chunks`` parameter is
added to remove the original zarr chunk encoding.
By `Lily Wang <https://github.com/lilyminium>`_.

Expand Down
4 changes: 2 additions & 2 deletions xarray/core/rolling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ def wrapped_func(self, **kwargs):
if isinstance(padded.data, dask_array_type):
# Workaround to make the padded chunk size is larger than
# self.window-1
shift = - (self.window + 1) // 2
shift = - (self.window - 1)
offset = (self.window - 1) // 2
valid = (slice(None), ) * axis + (
slice(offset, offset + self.obj.shape[axis]), )
Expand All @@ -285,7 +285,7 @@ def wrapped_func(self, **kwargs):
padded = padded.pad_with_fill_value({self.dim: (0, -shift)})

if isinstance(padded.data, dask_array_type):
values = dask_rolling_wrapper(func, padded,
values = dask_rolling_wrapper(func, padded.data,
window=self.window,
min_count=min_count,
axis=axis)
Expand Down
1 change: 0 additions & 1 deletion xarray/tests/test_dataarray.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3618,7 +3618,6 @@ def test_rolling_wrapped_bottleneck(da, name, center, min_periods):
@pytest.mark.parametrize('center', (True, False, None))
@pytest.mark.parametrize('min_periods', (1, None))
@pytest.mark.parametrize('window', (7, 8))
@pytest.mark.xfail(reason='https://github.com/pydata/xarray/issues/2940')
def test_rolling_wrapped_dask(da_dask, name, center, min_periods, window):
pytest.importorskip('dask.array')
# dask version
Expand Down