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

Fixes retrieval of chunk sizes for datasets #83

Merged
merged 3 commits into from
Mar 21, 2022
Merged

Fixes retrieval of chunk sizes for datasets #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01e5bea
fixed retrieval of chunk sizes for datasets
tomchor Mar 19, 2022
474e9aa
Update core.py
tomchor Mar 21, 2022
64dbac8
updated wgats-new.rst
tomchor Mar 21, 2022
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: 10 additions & 1 deletion docs/whats-new.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
What's New
==========
v0.3.0 (unreleased)
v0.3.1
-------------------

Bug fixes
~~~~~~~~~~~~~
- Fixed a bug that prevented parallel frame saving to work with `xarray.Datasets` (:pull:`83`).
By `Tomas Chor <https://github.com/tomchor>`.


v0.3.0 (2022/3/17)
-------------------

Documentation
Expand Down
12 changes: 8 additions & 4 deletions xmovie/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,9 +304,7 @@ def __init__(
if input_check:
if isinstance(self.data, xr.Dataset):
raise ValueError(
"xmovie presets do not yet support the input of xr.Datasets. \
In order to use datasets as inputs, set `input_check` to False. \
Note that this requires you to manually set colorlimits etc."
"xmovie presets do not yet fully support the input of xr.Datasets.\nIn order to use datasets as inputs, set `input_check` to False.\nNote that this requires you to manually set colorlimits etc."
)

# Set defaults
Expand Down Expand Up @@ -414,7 +412,13 @@ def save_frames_parallel(self, odir, parallel_compute_kwargs=dict()):
raise ValueError(
f"Input data needs to be a dask array to save in parallel. Please chunk the input with single chunks along {framedim}."
)
framedim_chunks = da.chunks[da.dims.index(framedim)]

if type(da) is xr.DataArray:
framedim_chunks = da.chunks[da.dims.index(framedim)]
elif type(da) is xr.Dataset:
framedim_chunks = da.chunks[framedim]
else:
raise(TypeError("`da` must be either an xarray.DataArray or xarray.Dataset"))

if not all([chunk == 1 for chunk in framedim_chunks]):
raise ValueError(
Expand Down