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 11 commits into
base: main
Choose a base branch
from
Open

Parallel concatenate #5926

Changes from 1 commit
Commits
Show all changes
11 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
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
Add test to show that NaNs are considered equal
  • Loading branch information
@bouweandela
bouweandela committed Jun 10, 2024
commit 2540fea5b8cf0b25192c1d6c1cff6df8a0065d8e
1 change: 1 addition & 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
Expand Up @@ -16,6 +16,7 @@
[
(np.arange(2), da.arange(2), True),
(np.array([1], dtype=np.float32), np.array([1], dtype=bool), True),
(np.array([np.nan, 1.0]), np.array([np.nan, 1.0]), True),
(np.ma.array([1, 2], mask=[0, 1]), np.ma.array([1, 2], mask=[0, 1]), True),
(np.ma.array([1, 2], mask=[0, 1]), np.ma.array([1, 2], mask=[0, 0]), False),
(da.arange(6).reshape((2, 3)), da.arange(6, chunks=1).reshape((2, 3)), True),
Expand Down