Add handling for string by-columns in dask-cudf groupby #10830
Merged
Conversation
This file contains 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
charlesbluca
added
bug
bdice
requested changes
May 11, 2022
charlesbluca
commented
May 11, 2022
bdice
reviewed
May 11, 2022
| for c in self.obj.columns: | ||
| if c != self.by: | ||
| yield c | ||
|
|
||
| @_dask_cudf_nvtx_annotate | ||
| @_check_groupby_supported | ||
| def count(self, split_every=None, split_out=1): | ||
| return groupby_agg( |
There was a problem hiding this comment.
It looks like these aggregations are still highly repetitive. Could we do this (perhaps in a follow-up PR) and reduce a few dozen lines?
# Internal helper method
def _make_groupby_agg(self, agg_name, split_every=None, split_out=1):
return groupby_agg(
self.obj,
self.by,
{c: agg_name for c in self._columns_not_in_by()},
split_every=split_every,
split_out=split_out,
sep=self.sep,
sort=self.sort,
as_index=self.as_index,
**self.dropna,
)and then call it in each function?
@_dask_cudf_nvtx_annotate
@_check_groupby_supported
def count(self, split_every=None, split_out=1):
return self._make_groupby_agg("count", split_every, split_out)There was a problem hiding this comment.
This suggestion may also apply to Series groupby, so I'd do this in a later PR and keep the scope constrained here.
There was a problem hiding this comment.
That makes sense to me - happy to open up a separate PR handling this 🙂
bdice
approved these changes
May 11, 2022
Codecov Report
@@ Coverage Diff @@
## branch-22.06 #10830 +/- ##
================================================
- Coverage 86.40% 86.32% -0.09%
================================================
Files 143 144 +1
Lines 22448 22654 +206
================================================
+ Hits 19396 19555 +159
- Misses 3052 3099 +47
Continue to review full report at Codecov.
|
galipremsagar
approved these changes
May 11, 2022
galipremsagar
added
5 - Ready to Merge
|
@gpucibot merge |
rapids-bot bot
pushed a commit
that referenced
this pull request
Dec 2, 2022
Motivated by #10830 (comment), this PR attempts to consolidate some repetitive aspects of dask-cudf's groupby code with `_make_groupby_agg_call`, which replaces all `groupby_agg` calls made in groupby.py, which takes as input the few things that vary between calls. Note that while this doesn't depend on #10830, it will be much easier to review once that is merged in, as I have based my work off the initial consolidation efforts that were made there. cc @bdice Authors: - Charles Blackmon-Luca (https://github.com/charlesbluca) Approvers: - Richard (Rick) Zamora (https://github.com/rjzamora) URL: #10835
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Converts string
by-columns to lists when calling aggregation methods, which expectGroupby.byto be a list or tuple.We might be able to do this conversion when initializing the groupby object, just started off with this approach as it seems like upstream Dask is pretty careful not to overwrite the original
byinput if it's a string.Closes #10829