-
-
Notifications
You must be signed in to change notification settings - Fork 19.1k
PERF: Try fast/slow paths only once in DataFrameGroupby.transform #42195
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
Merged
Merged
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
7b86fdb
PERF: Try fast/slow paths only once in DataFrameGroupby.transform
rhshadrach b70e420
Avoid checking path each iteration
rhshadrach 15d238a
fix
rhshadrach 36de30e
Make process_result return instead of mutate
rhshadrach 2c1d337
Merge branch 'master' of https://github.com/pandas-dev/pandas into gr…
rhshadrach 2d40eaa
whatsnew
rhshadrach ec9515b
Comment, refactor, and narrow typing
rhshadrach 2bea964
r -> res_frame
rhshadrach File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1308,42 +1308,35 @@ def _transform_general(self, func, *args, **kwargs): | |
gen = self.grouper.get_iterator(obj, axis=self.axis) | ||
fast_path, slow_path = self._define_paths(func, *args, **kwargs) | ||
|
||
for name, group in gen: | ||
if group.size == 0: | ||
continue | ||
# Determine whether to use slow or fast path by evaluating on the first group. | ||
# Need to handle the case of an empty generator and process the result so that | ||
# it does not need to be computed again. | ||
try: | ||
name, group = next(gen) | ||
jreback marked this conversation as resolved.
Show resolved
Hide resolved
|
||
except StopIteration: | ||
pass | ||
else: | ||
object.__setattr__(group, "name", name) | ||
|
||
# Try slow path and fast path. | ||
try: | ||
path, res = self._choose_path(fast_path, slow_path, group) | ||
except TypeError: | ||
return self._transform_item_by_item(obj, fast_path) | ||
except ValueError as err: | ||
msg = "transform must return a scalar value for each group" | ||
raise ValueError(msg) from err | ||
|
||
if isinstance(res, Series): | ||
|
||
# we need to broadcast across the | ||
# other dimension; this will preserve dtypes | ||
# GH14457 | ||
if res.index.is_(obj.index): | ||
r = concat([res] * len(group.columns), axis=1) | ||
r.columns = group.columns | ||
r.index = group.index | ||
else: | ||
r = self.obj._constructor( | ||
np.concatenate([res.values] * len(group.index)).reshape( | ||
group.shape | ||
), | ||
columns=group.columns, | ||
index=group.index, | ||
) | ||
|
||
applied.append(r) | ||
else: | ||
if group.size > 0: | ||
res = _wrap_transform_general_frame(self.obj, group, res) | ||
applied.append(res) | ||
|
||
# Compute and process with the remaining groups | ||
for name, group in gen: | ||
if group.size == 0: | ||
continue | ||
object.__setattr__(group, "name", name) | ||
res = path(group) | ||
res = _wrap_transform_general_frame(self.obj, group, res) | ||
applied.append(res) | ||
|
||
concat_index = obj.columns if self.axis == 0 else obj.index | ||
other_axis = 1 if self.axis == 0 else 0 # switches between 0 & 1 | ||
concatenated = concat(applied, axis=self.axis, verify_integrity=False) | ||
|
@@ -1853,3 +1846,28 @@ def func(df): | |
return self._python_apply_general(func, self._obj_with_exclusions) | ||
|
||
boxplot = boxplot_frame_groupby | ||
|
||
|
||
def _wrap_transform_general_frame( | ||
obj: DataFrame, group: DataFrame, res: DataFrame | Series | ||
) -> DataFrame: | ||
from pandas import concat | ||
|
||
if isinstance(res, Series): | ||
# we need to broadcast across the | ||
# other dimension; this will preserve dtypes | ||
# GH14457 | ||
if res.index.is_(obj.index): | ||
r = concat([res] * len(group.columns), axis=1) | ||
r.columns = group.columns | ||
r.index = group.index | ||
else: | ||
r = obj._constructor( | ||
np.concatenate([res.values] * len(group.index)).reshape(group.shape), | ||
columns=group.columns, | ||
index=group.index, | ||
) | ||
assert isinstance(r, DataFrame) | ||
return r | ||
|
||
else: | ||
return res |
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.
Uh oh!
There was an error while loading. Please reload this page.