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

Closes #3864 max and min of bool to return bool like numpy #3901

Merged
merged 2 commits into from
Dec 3, 2024
Merged

Closes #3864 max and min of bool to return bool like numpy #3901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6e1a00
Closes #3864 max and min of bool to return bool like numpy
ajpotts Nov 15, 2024
731203b
Merge branch 'master' into 3864_max_and_min_of_bool_to_return_bool_li…
ajpotts Nov 21, 2024
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
12 changes: 6 additions & 6 deletions src/ReductionMsg.chpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,18 +92,18 @@ module ReductionMsg
}

@arkouda.registerCommand
proc maxAll(const ref x:[?d] ?t, skipNan: bool): reductionReturnType(t) throws
proc maxAll(const ref x:[?d] ?t, skipNan: bool): t throws
where t==int || t==real || t==uint(64) || t==bool
{
use SliceReductionOps;
return getMaxSlice(x, x.domain, skipNan);
}

@arkouda.registerCommand
proc max(const ref x:[?d] ?t, axis: list(int), skipNan: bool): [] reductionReturnType(t) throws
proc max(const ref x:[?d] ?t, axis: list(int), skipNan: bool): [] t throws
where t==int || t==real || t==uint(64) || t==bool {
use SliceReductionOps;
type opType = reductionReturnType(t);
type opType = t;
const (valid, axes) = validateNegativeAxes(axis, x.rank);
if !valid {
throw new Error("Invalid axis value(s) '%?' in slicing reduction".format(axis));
Expand All @@ -117,18 +117,18 @@ module ReductionMsg
}

@arkouda.registerCommand
proc minAll(const ref x:[?d] ?t, skipNan: bool): reductionReturnType(t) throws
proc minAll(const ref x:[?d] ?t, skipNan: bool): t throws
where t==int || t==real || t==uint(64) || t==bool
{
use SliceReductionOps;
return getMinSlice(x, x.domain, skipNan);
}

@arkouda.registerCommand
proc min(const ref x:[?d] ?t, axis: list(int), skipNan: bool): [] reductionReturnType(t) throws
proc min(const ref x:[?d] ?t, axis: list(int), skipNan: bool): [] t throws
where t==int || t==real || t==uint(64) || t==bool {
use SliceReductionOps;
type opType = reductionReturnType(t);
type opType = t;
const (valid, axes) = validateNegativeAxes(axis, x.rank);
if !valid {
throw new Error("Invalid axis value(s) '%?' in slicing reduction".format(axis));
Expand Down
8 changes: 0 additions & 8 deletions tests/pdarrayclass_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

# TODO: add unint8 to DTYPES


class TestPdarrayClass:

@pytest.mark.skip_if_max_rank_less_than(2)
Expand Down Expand Up @@ -141,14 +140,7 @@ def assert_reduction_ops_match(
np_op = getattr(numpy, op)
nda = pda.to_ndarray()

# TODO: remove cast when #3864 is resolved.
ak_result = ak_op(pda, axis=axis)
if op in ["max", "min"] and pda.dtype == ak.bool_:
if isinstance(ak_result, ak.pdarray):
ak_result = ak.cast(ak_result, dt=ak.bool_)
else:
ak_result = np.bool_(ak_result)

ak_assert_equivalent(ak_result, np_op(nda, axis=axis))

@pytest.mark.parametrize("op", INDEX_REDUCTION_OPS)
Expand Down
Loading