Make array equal work with masked Dask arrays and add tests#6325
Merged
pp-mo merged 17 commits intoSciTools:mainfrom Mar 7, 2025
Merged
Make array equal work with masked Dask arrays and add tests#6325pp-mo merged 17 commits intoSciTools:mainfrom
pp-mo merged 17 commits intoSciTools:mainfrom
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #6325 +/- ##
=======================================
Coverage 89.79% 89.80%
=======================================
Files 90 90
Lines 23554 23576 +22
Branches 4391 4398 +7
=======================================
+ Hits 21150 21172 +22
Misses 1662 1662
Partials 742 742 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
bouweandela
added
the
benchmark_this
Contributor
⏱️ Performance Benchmark Report: 7408a83Performance shiftsFull benchmark resultsGenerated by GHA run |
bouweandela
added
benchmark_this
Contributor
⏱️ Performance Benchmark Report: f30aca9Performance shiftsFull benchmark resultsGenerated by GHA run |
Member
Author
|
I suspect the benchmark results are worse because the masks of Dask arrays are now compared and previously were not compared. |
bouweandela
changed the title
bouweandela
changed the title
pp-mo
added
benchmark_this
Contributor
⏱️ Performance Benchmark Report: b341799Performance shiftsFull benchmark resultsGenerated by GHA run |
Member
|
Hmm looks like something subtle has gone wrong here. Assuming we can fix, I am still minded to get this into Iris 3.12, Performance-wise, this looks great, but there is a problem .. See #6349 for my crude assessment of the "combination" with #6339. |
bouweandela
added
benchmark_this
Contributor
⏱️ Performance Benchmark Report: 09805c5Performance shiftsFull benchmark resultsGenerated by GHA run |
bouweandela
added
benchmark_this
Contributor
⏱️ Performance Benchmark Report: 52b3f8cPerformance shiftsFull benchmark resultsGenerated by GHA run |
Member
Author
|
@pp-mo Thanks for the extensive analysis. I think that with the latest commits, the implementation here is now both correct and slightly faster than the original. See the latest benchmark run here #6349 (comment). I've also done a test comparing two ~50GB arrays on my laptop and that works fine too. |
pp-mo
previously requested changes
Mar 6, 2025
Member
pp-mo
left a comment
pp-mo
left a comment
There was a problem hiding this comment.
One tiny tweak to make, otherwise all good now I think
Member
Thanks for your diligence on this @bouweandela Annoying I just found a small thing to change, |
Also consider non-floating point arrays equal with withnans=False
pp-mo
added
benchmark_this
Contributor
⏱️ Performance Benchmark Report: 1cacdd6Performance shiftsFull benchmark resultsGenerated by GHA run |
pp-mo
approved these changes
Mar 7, 2025
Member
pp-mo
left a comment
pp-mo
left a comment
There was a problem hiding this comment.
Now all OK
Thanks again for all your patience @bouweandela !
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
🚀 Pull Request
Description
Make array equal work with masked Dask arrays and add tests.
Closes #6188
Consult Iris pull request check list
Add any of the below labels to trigger actions on this PR: