Skip to content

REF: simplify groupby nullable wrapping #46236

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 5 commits into from
Mar 6, 2022
Merged

REF: simplify groupby nullable wrapping #46236

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
3fa0f6a
troubleshoot 32bit build
jbrockmendel Mar 5, 2022
d2247d2
troubleshoot
jbrockmendel Mar 6, 2022
f1a2099
Merge branch 'main' into ref-gbops-3
jbrockmendel Mar 6, 2022
434fe4f
troubleshoot 32bit build
jbrockmendel Mar 6, 2022
a3357d0
fixed
jbrockmendel Mar 6, 2022
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 pandas/_libs/groupby.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1238,6 +1238,7 @@ def group_nth(
if nobs[i, j] < min_count:
if uses_mask:
result_mask[i, j] = True
out[i, j] = 0
elif iu_64_floating_obj_t is int64_t:
# TODO: only if datetimelike?
out[i, j] = NPY_NAT
Expand Down
27 changes: 11 additions & 16 deletions pandas/core/groupby/ops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,7 @@ def _reconstruct_ea_result(
"""
Construct an ExtensionArray result from an ndarray result.
"""
dtype: BaseMaskedDtype | StringDtype

if isinstance(values.dtype, StringDtype):
dtype = values.dtype
Expand All @@ -375,19 +376,17 @@ def _reconstruct_ea_result(

elif isinstance(values.dtype, BaseMaskedDtype):
new_dtype = self._get_result_dtype(values.dtype.numpy_dtype)
dtype = BaseMaskedDtype.from_numpy_dtype(new_dtype)
# error: Incompatible types in assignment (expression has type
# "BaseMaskedDtype", variable has type "StringDtype")
dtype = BaseMaskedDtype.from_numpy_dtype( # type: ignore[assignment]
new_dtype
)
cls = dtype.construct_array_type()
# "Type[BaseMaskedArray]", variable has type "Type[BaseStringArray]")
cls = dtype.construct_array_type() # type: ignore[assignment]
return cls._from_sequence(res_values, dtype=dtype)

elif needs_i8_conversion(values.dtype):
assert res_values.dtype.kind != "f" # just to be on the safe side
i8values = res_values.view("i8")
# error: Too many arguments for "ExtensionArray"
return type(values)(i8values, dtype=values.dtype) # type: ignore[call-arg]
elif isinstance(values, (DatetimeArray, TimedeltaArray, PeriodArray)):
# In to_cython_values we took a view as M8[ns]
assert res_values.dtype == "M8[ns]"
res_values = res_values.view(values._ndarray.dtype)
return values._from_backing_data(res_values)

raise NotImplementedError

Expand Down Expand Up @@ -425,12 +424,8 @@ def _masked_ea_wrap_cython_operation(
**kwargs,
)

new_dtype = self._get_result_dtype(orig_values.dtype.numpy_dtype)
dtype = BaseMaskedDtype.from_numpy_dtype(new_dtype)
# TODO: avoid cast as res_values *should* already have the right
# dtype; last attempt ran into trouble on 32bit linux build
res_values = res_values.astype(dtype.type, copy=False)

# res_values should already have the correct dtype, we just need to
# wrap in a MaskedArray
return orig_values._maybe_mask_result(res_values, result_mask)

@final
Expand Down