Skip to content

REF: avoid group_selection_context #51096

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Feb 1, 2023
Merged

REF: avoid group_selection_context #51096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions pandas/core/groupby/generic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,7 @@ def apply(self, func, *args, **kwargs) -> Series:
def aggregate(self, func=None, *args, engine=None, engine_kwargs=None, **kwargs):

if maybe_use_numba(engine):
with self._group_selection_context():
data = self._selected_obj
data = self._obj_with_exclusions
result = self._aggregate_with_numba(
data.to_frame(), func, *args, engine_kwargs=engine_kwargs, **kwargs
)
Expand Down Expand Up @@ -1234,8 +1233,7 @@ class DataFrameGroupBy(GroupBy[DataFrame]):
def aggregate(self, func=None, *args, engine=None, engine_kwargs=None, **kwargs):

if maybe_use_numba(engine):
with self._group_selection_context():
data = self._selected_obj
data = self._obj_with_exclusions
result = self._aggregate_with_numba(
data, func, *args, engine_kwargs=engine_kwargs, **kwargs
)
Expand Down
30 changes: 15 additions & 15 deletions pandas/core/groupby/groupby.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1277,7 +1277,7 @@ def _wrap_applied_output(
# numba

@final
def _numba_prep(self, data):
def _numba_prep(self, data: DataFrame):
ids, _, ngroups = self.grouper.group_info
sorted_index = get_group_index_sorter(ids, ngroups)
sorted_ids = algorithms.take_nd(ids, sorted_index, allow_fill=False)
Expand Down Expand Up @@ -1337,7 +1337,9 @@ def _numba_agg_general(
return data._constructor(result, index=index, **result_kwargs)

@final
def _transform_with_numba(self, data, func, *args, engine_kwargs=None, **kwargs):
def _transform_with_numba(
self, data: DataFrame, func, *args, engine_kwargs=None, **kwargs
):
"""
Perform groupby transform routine with the numba engine.

Expand All @@ -1363,7 +1365,9 @@ def _transform_with_numba(self, data, func, *args, engine_kwargs=None, **kwargs)
return result.take(np.argsort(sorted_index), axis=0)

@final
def _aggregate_with_numba(self, data, func, *args, engine_kwargs=None, **kwargs):
def _aggregate_with_numba(
self, data: DataFrame, func, *args, engine_kwargs=None, **kwargs
):
"""
Perform groupby aggregation routine with the numba engine.

Expand Down Expand Up @@ -1529,15 +1533,13 @@ def _agg_general(
npfunc: Callable,
):

with self._group_selection_context():
# try a cython aggregation if we can
result = self._cython_agg_general(
how=alias,
alt=npfunc,
numeric_only=numeric_only,
min_count=min_count,
)
return result.__finalize__(self.obj, method="groupby")
result = self._cython_agg_general(
how=alias,
alt=npfunc,
numeric_only=numeric_only,
min_count=min_count,
)
return result.__finalize__(self.obj, method="groupby")

def _agg_py_fallback(
self, values: ArrayLike, ndim: int, alt: Callable
Expand Down Expand Up @@ -1647,9 +1649,7 @@ def _cython_transform(
def _transform(self, func, *args, engine=None, engine_kwargs=None, **kwargs):

if maybe_use_numba(engine):
# TODO: tests with self._selected_obj.ndim == 1 on DataFrameGroupBy
with self._group_selection_context():
data = self._selected_obj
data = self._obj_with_exclusions
df = data if data.ndim == 2 else data.to_frame()
result = self._transform_with_numba(
df, func, *args, engine_kwargs=engine_kwargs, **kwargs
Expand Down