Skip to content
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

BUG: Support rolling adaption to Xorbits #560

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions python/xorbits/core/adapter.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
from .._mars.dataframe.datastore.to_vineyard import (
DataFrameToVineyardChunk as MarsDataFrameToVineyardChunk,
)
from .._mars.dataframe.groupby.rolling import GroupByRolling as MarsGroupByRolling
from .._mars.dataframe.indexing.at import DataFrameAt as MarsDataFrameAt
from .._mars.dataframe.indexing.iat import DataFrameIat as MarsDataFrameIat
from .._mars.dataframe.indexing.iloc import DataFrameIloc as MarsDataFrameIloc
Expand Down
6 changes: 6 additions & 0 deletions python/xorbits/pandas/groupby.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import pandas

from ..core import DataRef, DataType
from ..core.adapter import MarsGetAttrProxy, MarsGroupByRolling, register_converter
from ..core.data import register_cls_to_type
from ..core.utils.docstring import attach_module_callable_docstring

Expand All @@ -37,3 +38,8 @@ class SeriesGroupBy(DataRef):
attach_module_callable_docstring(
SeriesGroupBy, pandas, pandas.core.groupby.SeriesGroupBy
)


@register_converter(from_cls_list=[MarsGroupByRolling])
class GroupByRolling(MarsGetAttrProxy):
pass
27 changes: 27 additions & 0 deletions python/xorbits/pandas/tests/test_groupby.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Copyright 2022-2023 XProbe Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

import pandas as pd

from ... import pandas as xpd


def test_groupby_rolling(setup):
df = pd.DataFrame({"Group": ["A", "A", "B", "B", "B"], "Value": [1, 2, 3, 4, 5]})
xdf = xpd.DataFrame(df)

rolling_x_mean = xdf.groupby("Group")["Value"].rolling(window=2).mean().to_pandas()
rolling_mean = df.groupby("Group")["Value"].rolling(window=2).mean()

pd.testing.assert_series_equal(rolling_x_mean, rolling_mean)