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.

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

FIX-#6781: Use pandas.api.types.pandas_dtype to convert to valid numpy and pandas only dtypes #6788

Merged
merged 5 commits into from
Dec 1, 2023
Merged

FIX-#6781: Use pandas.api.types.pandas_dtype to convert to valid numpy and pandas only dtypes #6788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bd01d93
Check dtype validity
JignyasAnand Nov 30, 2023
9bfc4e7
Use pandas API and formatted code
JignyasAnand Nov 30, 2023
056ee08
Added tests for issue #6781
JignyasAnand Nov 30, 2023
be1b38e
skip test if native engine
JignyasAnand Dec 1, 2023
4156a6c
Update modin/pandas/test/dataframe/test_reduce.py
anmyachev Dec 1, 2023
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
3 changes: 2 additions & 1 deletion modin/core/dataframe/pandas/dataframe/dataframe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1960,7 +1960,8 @@ def _compute_tree_reduce_metadata(self, axis, new_parts, dtypes=None):
dtypes = self.copy_dtypes_cache()
elif dtypes is not None:
dtypes = pandas.Series(
[np.dtype(dtypes)] * len(new_axes[1]), index=new_axes[1]
[pandas.api.types.pandas_dtype(dtypes)] * len(new_axes[1]),
index=new_axes[1],
)

result = self.__constructor__(
Expand Down
10 changes: 9 additions & 1 deletion modin/pandas/test/dataframe/test_reduce.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from pandas._testing import assert_series_equal

import modin.pandas as pd
from modin.config import NPartitions, StorageFormat
from modin.config import Engine, NPartitions, StorageFormat
from modin.pandas.test.utils import (
arg_keys,
assert_dtypes_equal,
Expand Down Expand Up @@ -306,6 +306,14 @@ def test_sum(data, axis, skipna, is_transposed):
df_equals(modin_result, pandas_result)


@pytest.mark.skipif(Engine.get() == "Native", reason="Fails on HDK")
JignyasAnand marked this conversation as resolved.
Show resolved Hide resolved
@pytest.mark.parametrize("dtype", ["int64", "Int64"])
def test_dtype_consistency(dtype):
# test for issue #6781
res_dtype = pd.DataFrame([1, 2, 3, 4], dtype=dtype).sum().dtype
assert res_dtype == pandas.api.types.pandas_dtype(dtype)


@pytest.mark.parametrize("fn", ["prod, sum"])
@pytest.mark.parametrize(
"numeric_only", bool_arg_values, ids=arg_keys("numeric_only", bool_arg_keys)
Expand Down
Loading