Skip to content

Don't try and merge 0-d arrays #42

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
marqh merged 1 commit into from
Feb 15, 2017
Merged

Don't try and merge 0-d arrays #42

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 lib/iris/_merge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1078,16 +1078,16 @@ def _multidim_daskstack(stack):

"""
if stack.ndim == 0:
# Handle array scalar inputs, as biggus does.
dask_components = stack[()]
# A 0-d array cannot be merged.
result = stack.item()
elif stack.ndim == 1:
# 'Another' base case : simple 1-d goes direct in dask.
dask_components = list(stack)
result = da.stack(list(stack))
else:
# Recurse because dask.stack does not do multi-dimensional.
dask_components = [_multidim_daskstack(subarray)
for subarray in stack]
return da.stack(dask_components)
result = da.stack([_multidim_daskstack(subarray)
for subarray in stack])
return result


class ProtoCube(object):
Expand Down