-
-
Notifications
You must be signed in to change notification settings - Fork 18.5k
PERF: fix regression in creation of resulting index in RollingGroupby #38057
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
Changes from 3 commits
1679318
30fb295
fd9991c
413d701
f785ca4
19c9d3e
062e298
4546fd7
9e9c8de
cf64f20
485f399
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -225,6 +225,19 @@ def time_rolling_offset(self, method): | |
getattr(self.groupby_roll_offset, method)() | ||
|
||
|
||
class Groupby2: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can you rename to GroupbyLowNumberOfGroups or similar |
||
# https://github.com/pandas-dev/pandas/issues/38038 | ||
# specific example where the rolling operation on a larger dataframe | ||
# is relatively cheap, but creation of MultiIndex of result can be expensive | ||
|
||
def setup(self): | ||
N = 100000 | ||
self.df = pd.DataFrame({"A": [1, 2] * int(N / 2), "B": np.random.randn(N)}) | ||
|
||
def time_rolling_multiindex_creation(self): | ||
self.df.groupby("A").rolling(3).mean() | ||
|
||
|
||
class GroupbyEWM: | ||
|
||
params = ["cython", "numba"] | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -50,7 +50,6 @@ | |
|
||
from pandas.core.aggregation import aggregate | ||
from pandas.core.base import DataError, SelectionMixin | ||
import pandas.core.common as com | ||
from pandas.core.construction import extract_array | ||
from pandas.core.groupby.base import GotItemMixin, ShallowMixin | ||
from pandas.core.indexes.api import Index, MultiIndex | ||
|
@@ -791,22 +790,28 @@ def _apply( | |
# Our result will have still kept the column in the result | ||
result = result.drop(columns=column_keys, errors="ignore") | ||
|
||
result_index_data = [] | ||
for key, values in self._groupby.grouper.indices.items(): | ||
for value in values: | ||
data = [ | ||
*com.maybe_make_list(key), | ||
*com.maybe_make_list( | ||
grouped_object_index[value] | ||
if grouped_object_index is not None | ||
else [] | ||
), | ||
] | ||
result_index_data.append(tuple(data)) | ||
|
||
result_index = MultiIndex.from_tuples( | ||
result_index_data, names=result_index_names | ||
codes = self._groupby.grouper.codes | ||
levels = self._groupby.grouper.levels | ||
|
||
group_indices = self._groupby.grouper.indices.values() | ||
if group_indices: | ||
indexer = np.concatenate(list(self._groupby.grouper.indices.values())) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nit: I think this can simply be |
||
else: | ||
indexer = np.array([], dtype=np.intp) | ||
codes = [c.take(indexer) for c in codes] | ||
|
||
if grouped_object_index is not None: | ||
jreback marked this conversation as resolved.
Show resolved
Hide resolved
|
||
if isinstance(grouped_object_index, MultiIndex): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. maybe more clear
|
||
idx = grouped_object_index.take(indexer) | ||
else: | ||
idx = MultiIndex.from_arrays([grouped_object_index.take(indexer)]) | ||
codes.extend(list(idx.codes)) | ||
levels.extend(list(idx.levels)) | ||
|
||
result_index = MultiIndex( | ||
levels, codes, names=result_index_names, verify_integrity=False | ||
) | ||
|
||
result.index = result_index | ||
return result | ||
|
||
|
Uh oh!
There was an error while loading. Please reload this page.