Skip to content

CLN: remove unused row_bool_subset #27466

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 1 commit into from
Jul 20, 2019
Merged

CLN: remove unused row_bool_subset #27466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 0 additions & 44 deletions pandas/_libs/lib.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,50 +688,6 @@ def generate_bins_dt64(ndarray[int64_t] values, const int64_t[:] binner,
return bins


@cython.boundscheck(False)
@cython.wraparound(False)
def row_bool_subset(const float64_t[:, :] values,
ndarray[uint8_t, cast=True] mask):
cdef:
Py_ssize_t i, j, n, k, pos = 0
ndarray[float64_t, ndim=2] out

n, k = (<object>values).shape
assert (n == len(mask))

out = np.empty((mask.sum(), k), dtype=np.float64)

for i in range(n):
if mask[i]:
for j in range(k):
out[pos, j] = values[i, j]
pos += 1

return out


@cython.boundscheck(False)
@cython.wraparound(False)
def row_bool_subset_object(ndarray[object, ndim=2] values,
ndarray[uint8_t, cast=True] mask):
cdef:
Py_ssize_t i, j, n, k, pos = 0
ndarray[object, ndim=2] out

n, k = (<object>values).shape
assert (n == len(mask))

out = np.empty((mask.sum(), k), dtype=object)

for i in range(n):
if mask[i]:
for j in range(k):
out[pos, j] = values[i, j]
pos += 1

return out


@cython.boundscheck(False)
@cython.wraparound(False)
def get_level_sorter(const int64_t[:] label,
Expand Down
12 changes: 2 additions & 10 deletions pandas/core/groupby/ops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
ensure_float64,
ensure_int64,
ensure_int_or_float,
ensure_object,
ensure_platform_int,
is_bool_dtype,
is_categorical_dtype,
Expand Down Expand Up @@ -567,15 +566,8 @@ def _cython_operation(self, kind, values, how, axis, min_count=-1, **kwargs):
result[mask] = np.nan

if kind == "aggregate" and self._filter_empty_groups and not counts.all():
if result.ndim == 2:
try:
result = lib.row_bool_subset(result, (counts > 0).view(np.uint8))
except ValueError:
result = lib.row_bool_subset_object(
ensure_object(result), (counts > 0).view(np.uint8)
)
else:
result = result[counts > 0]
assert result.ndim != 2
result = result[counts > 0]

if vdim == 1 and arity == 1:
result = result[:, 0]
Expand Down