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

Parallel concatenate #5926

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open

Parallel concatenate #5926

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f9e0106
Simplify concatenate
bouweandela Apr 18, 2024
6b01352
First attempt at parallel concatenate
bouweandela Apr 23, 2024
35facc7
Clean up a bit
bouweandela Apr 25, 2024
6e883da
Add support for comparing different data types
bouweandela Apr 26, 2024
7cc9f19
Merge branch 'main' of github.com:scitools/iris into parallel-concate…
bouweandela Apr 26, 2024
add3f66
Undo unnessary change
bouweandela May 15, 2024
eb0b340
More tests
bouweandela May 15, 2024
24615a0
Use faster lookup
bouweandela May 15, 2024
5c68a8e
Merge branch 'main' of github.com:scitools/iris into parallel-concate…
bouweandela May 15, 2024
2540fea
Add test to show that NaNs are considered equal
bouweandela Jun 10, 2024
3bfea80
Merge branch 'main' into parallel-concatenate
bouweandela Jun 10, 2024
5870bcd
Merge branch 'main' of github.com:scitools/iris into parallel-concate…
bouweandela Jun 25, 2024
b59e3dc
Avoid inserting closures into the Dask graph
bouweandela Jun 25, 2024
e91175c
Merge branch 'main' into parallel-concatenate
bouweandela Jun 26, 2024
c2973ae
Fix type hints
bouweandela Jun 26, 2024
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
Prev Previous commit
Next Next commit
Merge branch 'main' of github.com:scitools/iris into parallel-concate… 
…nate
  • Loading branch information
@bouweandela
bouweandela committed Apr 26, 2024
commit 7cc9f192550ad8590ab03d638caa55e3587571f3
1 change: 1 addition & 0 deletions lib/iris/_concatenate.py
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be possible to fall back on 'normal equality' when hash equality is False?

Sorry to add more work to this, but I've been having some offline conversations with @bjlittle and @pp-mo about equality in general and we're concerned about Iris' strictness. The changes here would make Iris more strict than it is already.

We are therefore keen to use hashing as a way to confirm equality quickly and efficiently, while still retaining the chance for more lenient comparisons such as:

  • Allowing NaN (example).
  • Potentially allowing for floating point differences in future (thanks to @larsbarring for insights).

If this would harm the performance gains you are looking for then we would be open to configurable behaviour in concatenate().

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for providing me with feedback! ✨

I've been having some offline conversations with @bjlittle and @pp-mo about equality in general and we're concerned about Iris' strictness.

I agree with this. In ESMValCore we have implemented many workarounds for this to make the life of our users easier.

The changes here would make Iris more strict than it is already.

As far as I'm aware, this pull request does not make any changes to Iris behaviour.
Would you have an example so I can understand when this happens?

I even made the hash comparison work for arrays of different dtypes because I initially expected that that would be allowed, but it turns out that even that is not allowed by the current implementation of concatenate, so I could take that out again. Or we can keep it in case you would be interested in being more lenient w.r.t. this kind of differences in the future.

Allowing NaN

Arrays containing NaNs compare equal with the hashing implementation, I added a test to demonstrate it in 2540fea.

Would it be possible to fall back on 'normal equality' when hash equality is False?

Yes, it would be easy to add the additional comparison here:

iris/lib/iris/_concatenate.py

Lines 1077 to 1078 in 3bfea80

if get_hashes(coord_a.coord) != get_hashes(coord_b.coord):
return False

however, with the current strict implementation of coordinate comparison, there would be no point in doing so because the result would be the same. I'm not too concerned about the performance impact because in our use case, we expect the input to be compatible enough such that the result of the concatenation is a single cube, so the extra comparison would only happen in exceptional cases when there is something wrong with the input data.

Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import numpy as np
from xxhash import xxh3_64

from iris._lazy_data import concatenate as concatenate_arrays
from iris._lazy_data import is_masked_data
import iris.coords
import iris.cube
Expand Down
5 changes: 0 additions & 5 deletions lib/iris/_lazy_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,6 @@ def is_lazy_data(data):
return isinstance(data, da.Array)


def is_masked_data(a):
"""Determine whether the argument is a masked array."""
return isinstance(da.utils.meta_from_array(a), np.ma.MaskedArray)


def is_masked_data(data: np.ndarray | da.Array) -> bool:
"""Return whether the argument is a masked array."""
return isinstance(da.utils.meta_from_array(data), np.ma.MaskedArray)
Expand Down
6 changes: 6 additions & 0 deletions lib/iris/tests/unit/concatenate/test_hashing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# Copyright Iris contributors
#
# This file is part of Iris and is released under the BSD license.
# See LICENSE in the root of the repository for full licensing details.
"""Test array hashing in :mod:`iris._concatenate`."""

import dask.array as da
from dask.base import tokenize
import numpy as np
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.