Remove cudf._lib.groupby in favor of inlining pylibcudf #17582
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
mroeschke
added
Python
Matt711
reviewed
Dec 18, 2024
Comment on lines
763
to
804
| if ( | ||
| is_string_dtype(col) | ||
| and agg not in _STRING_AGGS | ||
| and ( | ||
| str_agg in {"cumsum", "cummin", "cummax"} | ||
| or not ( | ||
| any( | ||
| a in str_agg | ||
| for a in { | ||
| "count", | ||
| "max", | ||
| "min", | ||
| "first", | ||
| "last", | ||
| "nunique", | ||
| "unique", | ||
| "nth", | ||
| } | ||
| ) | ||
| or (agg is list) | ||
| ) | ||
| ) | ||
| ): | ||
| raise TypeError( | ||
| f"function is not supported for this dtype: {agg}" | ||
| ) | ||
| elif ( | ||
| _is_categorical_dtype(col) | ||
| and agg not in _CATEGORICAL_AGGS | ||
| and ( | ||
| str_agg in {"cumsum", "cummin", "cummax"} | ||
| or not ( | ||
| any( | ||
| a in str_agg | ||
| for a in {"count", "max", "min", "unique"} | ||
| ) | ||
| ) | ||
| ) | ||
| ): | ||
| raise TypeError( | ||
| f"{col.dtype} type does not support {agg} operations" | ||
| ) |
There was a problem hiding this comment.
Would you be okay with moving this logic out into separate functions that determine if an aggregation is not supported for string and categorical types? They can be nested in _aggregate. Eg.
def _is_unsupported_for_string(col, str_agg):
cumulative_agg = str_agg in {"cumsum", "cummin", "cummax"}
basic_agg = any(a in str_agg for a in {
"count", "max", "min", "first", "last", "nunique", "unique", "nth"
})
return (
is_string_dtype(col)
and str_agg not in _STRING_AGGS
and (cumulative_agg or (not basic_agg and str_agg != "list"))
)
def _is_unsupported_for_categorical(col, str_agg):
cumulative_agg = atr_agg in {"cumsum", "cummin", "cummax"}
basic_agg = any(a in str_agg for a in {"count", "max", "min", "unique"})
return (
_is_categorical_dtype(col)
and agg_str not in _CATEGORICAL_AGGS
and (cumulative_agg or not basic_agg)
)
There was a problem hiding this comment.
Maybe use a singledispatch function on the dtype.
There was a problem hiding this comment.
Sure thing. Was able adapt this to use singledispatch
3 tasks
Matt711
approved these changes
Dec 19, 2024
|
|
||
| def _is_all_scan_aggregate(all_aggs: list[list[str]]) -> bool: | ||
| """ | ||
| Returns true if all are scan aggregations. |
There was a problem hiding this comment.
nitpick
Suggested change
| Returns true if all are scan aggregations. | |
| Returns True if all are scan aggregations. |
| if self._dropna | ||
| else plc.types.NullPolicy.INCLUDE, | ||
| ) | ||
| # Do we need this because we just check _spill_locks in test_spillable_df_groupby? |
There was a problem hiding this comment.
Should we rephrase this as a note?
Suggested change
| # Do we need this because we just check _spill_locks in test_spillable_df_groupby? | |
| # Note: We return a SimpleNamespace with an additional _spill_locks | |
| # attribute solely to verify that the spill_lock is set correctly. |
| or agg_obj.kind in valid_aggregations | ||
| ): | ||
| included_aggregations_i.append((agg, agg_obj.kind)) | ||
| col_aggregations.append(agg_obj.c_obj) |
There was a problem hiding this comment.
Can we call this a plc_obj? And change this line too https://github.com/rapidsai/cudf/blob/branch-25.02/python/cudf/cudf/core/_internals/aggregation.py#L32
Suggested change
| col_aggregations.append(agg_obj.c_obj) | |
| col_aggregations.append(agg_obj.plc_obj) |
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.
Description
Contributes to #17317
Checklist