-
Notifications
You must be signed in to change notification settings - Fork 19
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.
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
Speed up aggregation #647
Speed up aggregation #647
Conversation
Move concatenation out of `_aggregate_2_fields`
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Leaving an intermediate review, since I've just covered all of the files directly under the cf/
directory (i.e. not within a sub-directory e.g. data
, mixin
), notably the big one aggregate.py
, and it might be useful to give you time to respond to feedback in the meantime. I'll complete the review by the end of the day.
Generally everything looks good, though do note in particular the comment regarding the higher log levels being captured by the protecting keywords. Otherwise just minor comments so far. Thanks.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Still mid-review. I've just covered the data
directory changes, with some further minor feedback as registered below. I'll try to complete the review tonight.
Co-authored-by: Sadie L. Bartholomew <[email protected]>
Co-authored-by: Sadie L. Bartholomew <[email protected]>
Co-authored-by: Sadie L. Bartholomew <[email protected]>
Co-authored-by: Sadie L. Bartholomew <[email protected]>
Co-authored-by: Sadie L. Bartholomew <[email protected]>
Co-authored-by: Sadie L. Bartholomew <[email protected]>
Co-authored-by: Sadie L. Bartholomew <[email protected]>
Co-authored-by: Sadie L. Bartholomew <[email protected]>
Co-authored-by: Sadie L. Bartholomew <[email protected]>
Co-authored-by: Sadie L. Bartholomew <[email protected]>
Co-authored-by: Sadie L. Bartholomew <[email protected]>
Co-authored-by: Sadie L. Bartholomew <[email protected]>
Co-authored-by: Sadie L. Bartholomew <[email protected]>
…hon into equals-performance-2
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have covered everything but the tests and documentation changes now. Thought I'd leave some more intermediate comments, whilst you appear to be addressing the previous feedback.
Co-authored-by: Sadie L. Bartholomew <[email protected]>
Co-authored-by: Sadie L. Bartholomew <[email protected]>
Co-authored-by: Sadie L. Bartholomew <[email protected]>
Co-authored-by: Sadie L. Bartholomew <[email protected]>
Co-authored-by: Sadie L. Bartholomew <[email protected]>
Co-authored-by: Sadie L. Bartholomew <[email protected]>
Co-authored-by: Sadie L. Bartholomew <[email protected]>
Co-authored-by: Sadie L. Bartholomew <[email protected]>
Co-authored-by: Sadie L. Bartholomew <[email protected]>
Thanks for addressing much feedback so far, David. To aid further review, please can you resolve the conflicts here, since quite a list has developed at this stage... |
Done. |
Oh hell - I've mucked it up. Need to revert all of the last changes. |
I'm not sure why the merge conflicts have disappeared after I reverted their resolutions, but I think everything looks ok .... |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
but I think everything looks ok
The conflict resolution seems fine to me, at this stage.
Just finishing up the review. One question: did you mean to commit the changes under docs
other than under docs/source
, namely those in docs/_downloads
, docs/_images
and docs/recipes
to touch recipe-related content? I am wondering if that was unintentional since it seems unrelated to this PR...
No. Oops. I guess I did something odd and the merged #653 became entrained, somehow. I think it's benign in that it'll all come out in the wash, but if there's a good way of removing these that's also be nice. |
I'll try some git CLI wizardry (or, tomfoolery, if it goes wrong...) to exclude all but |
Thanks, Sadie - sounds like a plan, |
Hi David, all done via using I'll finish the full PR review by checking the testing, within an hour or so. Thanks. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All previous feedback addressed, thanks. I just had the testing to look through to finish the review and I've done that now. It all looks good (though we can remove a skip, as commented in-line). I also did a final sanity check on the state of the PR after the feedback changes and after my push to revert the recipe-related changes that made their way into the PR. All tests pass locally.
All good, please merge!
Co-authored-by: Sadie L. Bartholomew <[email protected]>
Hi Sadie - OK, ready to merge! Thanks for your review of this - really appreciated. |
Fixes #640, #144
Needs
cfunits>=3.3.6
Notes
concatenate
.concatenate
.hash_array
now that we have Dask names.False
. relaxed_units and copy keywords toconcatenate
.concatenate
; cull_graph defaults toFalse
; add potential short-circuit toequals
.conform_units
_infer_direction
.False
. relaxed_units and copy keywords toconcatenate
.Data
objects; don't build stash2standardnames dictionary on import.equivalent
.concatenate
commands fromdef _aggregate_2_fields
todef aggregate
, for reasons described in the new comments.