Skip to content

Update map_blocks to use chunksizes property. #6776

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

Merged
merged 3 commits into from
Jul 14, 2022
Merged

Update map_blocks to use chunksizes property. #6776

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
0ef21c0
Update map_blocks to use chunksizes property.
dcherian Jul 12, 2022
f3cf3b6
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 12, 2022
72ec730
fix typing
dcherian Jul 12, 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
12 changes: 6 additions & 6 deletions xarray/core/parallel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,19 +373,19 @@ def _wrapper(
new_indexes = template_indexes - set(input_indexes)
indexes = {dim: input_indexes[dim] for dim in preserved_indexes}
indexes.update({k: template._indexes[k] for k in new_indexes})
output_chunks = {
output_chunks: Mapping[Hashable, tuple[int, ...]] = {
dim: input_chunks[dim] for dim in template.dims if dim in input_chunks
}

else:
# template xarray object has been provided with proper sizes and chunk shapes
indexes = dict(template._indexes)
if isinstance(template, DataArray):
output_chunks = dict(
zip(template.dims, template.chunks) # type: ignore[arg-type]
output_chunks = template.chunksizes
if not output_chunks:
raise ValueError(
"Provided template has no dask arrays. "
" Please construct a template with appropriately chunked dask arrays."
)
else:
output_chunks = dict(template.chunks)

for dim in output_chunks:
if dim in input_chunks and len(input_chunks[dim]) != len(output_chunks[dim]):
Expand Down
9 changes: 9 additions & 0 deletions xarray/tests/test_dask.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1243,6 +1243,15 @@ def sumda(da1, da2):
)
xr.testing.assert_equal((da1 + da2).sum("x"), mapped)

# bad template: not chunked
with pytest.raises(ValueError, match="Provided template has no dask arrays"):
xr.map_blocks(
lambda a, b: (a + b).sum("x"),
da1,
args=[da2],
template=da1.sum("x").compute(),
)


@pytest.mark.parametrize("obj", [make_da(), make_ds()])
def test_map_blocks_add_attrs(obj):
Expand Down