Skip to content

Commit 6498d6b

Browse files
committed
PERF: fix pandas-dev#32976 slow group by for categorical columns
Aggregate categorical codes with fast cython aggregation for select `how` operations.
1 parent 8aa7072 commit 6498d6b

File tree

4 files changed

+73
-3
lines changed

4 files changed

+73
-3
lines changed

asv_bench/benchmarks/groupby.py

+29
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
from pandas import (
88
Categorical,
9+
CategoricalDtype,
910
DataFrame,
1011
MultiIndex,
1112
Series,
@@ -473,6 +474,7 @@ def time_sum(self):
473474

474475

475476
class Categories:
477+
# benchmark grouping by categoricals
476478
def setup(self):
477479
N = 10 ** 5
478480
arr = np.random.random(N)
@@ -510,6 +512,33 @@ def time_groupby_extra_cat_nosort(self):
510512
self.df_extra_cat.groupby("a", sort=False)["b"].count()
511513

512514

515+
class CategoricalFrame:
516+
# benchmark grouping with operations on categorical values (GH #32976)
517+
param_names = ["groupby_type", "value_type", "agg_method"]
518+
params = [(int, ), (int, str), ('last', 'head', 'count')]
519+
520+
def setup(self, groupby_type, value_type, agg_method):
521+
SIZE = 100000
522+
GROUPS = 1000
523+
CARDINALITY = 10
524+
CAT = CategoricalDtype([value_type(i) for i in range(CARDINALITY)])
525+
df = DataFrame(
526+
{
527+
"group": [
528+
groupby_type(np.random.randint(0, GROUPS)) for i in range(SIZE)
529+
],
530+
"cat": [np.random.choice(CAT.categories) for i in range(SIZE)],
531+
}
532+
)
533+
self.df_cat_values = df.astype({"cat": CAT})
534+
535+
def time_groupby(self, groupby_type, value_type, agg_method):
536+
getattr(self.df_cat_values.groupby("group"), agg_method)()
537+
538+
def time_groupby_ordered(self, groupby_type, value_type, agg_method):
539+
getattr(self.df_cat_values.groupby("group", sort=True), agg_method)()
540+
541+
513542
class Datelike:
514543
# GH 14338
515544
params = ["period_range", "date_range", "date_range_tz"]

doc/source/whatsnew/v1.1.0.rst

+2-1
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ Other API changes
226226
- ``loc`` lookups with an object-dtype :class:`Index` and an integer key will now raise ``KeyError`` instead of ``TypeError`` when key is missing (:issue:`31905`)
227227
- Using a :func:`pandas.api.indexers.BaseIndexer` with ``count``, ``min``, ``max``, ``median``, ``skew``, ``cov``, ``corr`` will now return correct results for any monotonic :func:`pandas.api.indexers.BaseIndexer` descendant (:issue:`32865`)
228228
- Added a :func:`pandas.api.indexers.FixedForwardWindowIndexer` class to support forward-looking windows during ``rolling`` operations.
229-
-
229+
- :meth:`DataFrame.groupby` aggregations of categorical series will now return a :class:`Categorical` while preserving the codes and categories of the original series
230230

231231
Backwards incompatible API changes
232232
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -507,6 +507,7 @@ Performance improvements
507507
:meth:`DataFrame.sparse.from_spmatrix` constructor (:issue:`32821`,
508508
:issue:`32825`, :issue:`32826`, :issue:`32856`, :issue:`32858`).
509509
- Performance improvement in reductions (sum, prod, min, max) for nullable (integer and boolean) dtypes (:issue:`30982`, :issue:`33261`, :issue:`33442`).
510+
- Performance improvement in :meth:`DataFrame.groupby` when aggregating categorical data (:issue:`32976`)
510511

511512

512513
.. ---------------------------------------------------------------------------

pandas/core/groupby/ops.py

+41-1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
from pandas.core.dtypes.missing import _maybe_fill, isna
4040

4141
import pandas.core.algorithms as algorithms
42+
from pandas.core.arrays.categorical import Categorical
4243
from pandas.core.base import SelectionMixin
4344
import pandas.core.common as com
4445
from pandas.core.frame import DataFrame
@@ -461,7 +462,7 @@ def _cython_operation(
461462

462463
# categoricals are only 1d, so we
463464
# are not setup for dim transforming
464-
if is_categorical_dtype(values) or is_sparse(values):
465+
if is_sparse(values):
465466
raise NotImplementedError(f"{values.dtype} dtype not supported")
466467
elif is_datetime64_any_dtype(values):
467468
if how in ["add", "prod", "cumsum", "cumprod"]:
@@ -482,6 +483,29 @@ def _cython_operation(
482483

483484
is_datetimelike = needs_i8_conversion(values.dtype)
484485
is_numeric = is_numeric_dtype(values.dtype)
486+
is_categorical = is_categorical_dtype(values)
487+
cat_method_blacklist = (
488+
"add",
489+
"median",
490+
"prod",
491+
"sem",
492+
"cumsum",
493+
"sum",
494+
"cummin",
495+
"mean",
496+
"max",
497+
"skew",
498+
"cumprod",
499+
"cummax",
500+
"rank",
501+
"pct_change",
502+
"min",
503+
"var",
504+
"mad",
505+
"describe",
506+
"std",
507+
"quantile",
508+
)
485509

486510
if is_datetimelike:
487511
values = values.view("int64")
@@ -497,6 +521,17 @@ def _cython_operation(
497521
values = ensure_int_or_float(values)
498522
elif is_numeric and not is_complex_dtype(values):
499523
values = ensure_float64(values)
524+
elif is_categorical:
525+
if how in cat_method_blacklist:
526+
raise NotImplementedError(
527+
f"{values.dtype} dtype not supported for `how` argument {how}"
528+
)
529+
values, categories, ordered = (
530+
values.codes.astype(np.int64),
531+
values.categories,
532+
values.ordered,
533+
)
534+
is_numeric = True
500535
else:
501536
values = values.astype(object)
502537

@@ -584,6 +619,11 @@ def _cython_operation(
584619
result = type(orig_values)(result.astype(np.int64), dtype=orig_values.dtype)
585620
elif is_datetimelike and kind == "aggregate":
586621
result = result.astype(orig_values.dtype)
622+
elif is_categorical:
623+
# re-create categories
624+
result = Categorical.from_codes(
625+
result, categories=categories, ordered=ordered,
626+
)
587627

588628
return result, names
589629

pandas/tests/groupby/aggregate/test_aggregate.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ def test_agg_cython_category_not_implemented_fallback():
466466
result = df.groupby("col_num").col_cat.first()
467467
expected = pd.Series(
468468
[1, 2, 3], index=pd.Index([1, 2, 3], name="col_num"), name="col_cat"
469-
)
469+
).astype("category")
470470
tm.assert_series_equal(result, expected)
471471

472472
result = df.groupby("col_num").agg({"col_cat": "first"})

0 commit comments

Comments
 (0)