Skip to content

ARROW-13937: [C++][Compute] Add explicit output values to sign function and fix unary type checks #11113

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

Closed
edponce wants to merge 2 commits into from
Closed

ARROW-13937: [C++][Compute] Add explicit output values to sign function and fix unary type checks #11113

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
717b8f9
add explicit output values to unsigned int variant
edponce Sep 8, 2021
459e926
fix unary arithmetic enable_if type checks
edponce Sep 13, 2021
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
47 changes: 30 additions & 17 deletions cpp/src/arrow/compute/kernels/scalar_arithmetic.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include <cmath>
#include <limits>
#include <utility>
#include <vector>

#include "arrow/compute/kernels/codegen_internal.h"
#include "arrow/compute/kernels/common.h"
Expand Down Expand Up @@ -78,24 +79,27 @@ using enable_if_decimal_value =

struct AbsoluteValue {
template <typename T, typename Arg>
static constexpr enable_if_floating_point<T> Call(KernelContext*, T arg, Status*) {
static constexpr enable_if_floating_point<Arg, T> Call(KernelContext*, Arg arg,
Status*) {
return std::fabs(arg);
}

template <typename T, typename Arg>
static constexpr enable_if_unsigned_c_integer<T> Call(KernelContext*, T arg, Status*) {
static constexpr enable_if_unsigned_c_integer<Arg, T> Call(KernelContext*, Arg arg,
Status*) {
return arg;
}

template <typename T, typename Arg>
static constexpr enable_if_signed_c_integer<T> Call(KernelContext*, T arg, Status* st) {
static constexpr enable_if_signed_c_integer<Arg, T> Call(KernelContext*, Arg arg,
Status* st) {
return (arg < 0) ? arrow::internal::SafeSignedNegate(arg) : arg;
}
};

struct AbsoluteValueChecked {
template <typename T, typename Arg>
static enable_if_signed_c_integer<T> Call(KernelContext*, Arg arg, Status* st) {
static enable_if_signed_c_integer<Arg, T> Call(KernelContext*, Arg arg, Status* st) {
static_assert(std::is_same<T, Arg>::value, "");
if (arg == std::numeric_limits<Arg>::min()) {
*st = Status::Invalid("overflow");
Expand All @@ -105,13 +109,15 @@ struct AbsoluteValueChecked {
}

template <typename T, typename Arg>
static enable_if_unsigned_c_integer<T> Call(KernelContext* ctx, Arg arg, Status* st) {
static enable_if_unsigned_c_integer<Arg, T> Call(KernelContext* ctx, Arg arg,
Status* st) {
static_assert(std::is_same<T, Arg>::value, "");
return arg;
}

template <typename T, typename Arg>
static constexpr enable_if_floating_point<T> Call(KernelContext*, Arg arg, Status* st) {
static constexpr enable_if_floating_point<Arg, T> Call(KernelContext*, Arg arg,
Status* st) {
static_assert(std::is_same<T, Arg>::value, "");
return std::fabs(arg);
}
Expand Down Expand Up @@ -378,7 +384,7 @@ struct Negate {

struct NegateChecked {
template <typename T, typename Arg>
static enable_if_signed_c_integer<T> Call(KernelContext*, Arg arg, Status* st) {
static enable_if_signed_c_integer<Arg, T> Call(KernelContext*, Arg arg, Status* st) {
static_assert(std::is_same<T, Arg>::value, "");
T result = 0;
if (ARROW_PREDICT_FALSE(NegateWithOverflow(arg, &result))) {
Expand All @@ -388,15 +394,17 @@ struct NegateChecked {
}

template <typename T, typename Arg>
static enable_if_unsigned_c_integer<T> Call(KernelContext* ctx, Arg arg, Status* st) {
static enable_if_unsigned_c_integer<Arg, T> Call(KernelContext* ctx, Arg arg,
Status* st) {
static_assert(std::is_same<T, Arg>::value, "");
DCHECK(false) << "This is included only for the purposes of instantiability from the "
"arithmetic kernel generator";
return 0;
}

template <typename T, typename Arg>
static constexpr enable_if_floating_point<T> Call(KernelContext*, Arg arg, Status* st) {
static constexpr enable_if_floating_point<Arg, T> Call(KernelContext*, Arg arg,
Status* st) {
static_assert(std::is_same<T, Arg>::value, "");
return -arg;
}
Expand Down Expand Up @@ -466,18 +474,20 @@ struct PowerChecked {

struct Sign {
template <typename T, typename Arg>
static constexpr enable_if_floating_point<T> Call(KernelContext*, Arg arg, Status*) {
static constexpr enable_if_floating_point<Arg, T> Call(KernelContext*, Arg arg,
Status*) {
return std::isnan(arg) ? arg : ((arg == 0) ? 0 : (std::signbit(arg) ? -1 : 1));
}

template <typename T, typename Arg>
static constexpr enable_if_unsigned_c_integer<T> Call(KernelContext*, Arg arg,
Status*) {
return arg > 0;
static constexpr enable_if_unsigned_c_integer<Arg, T> Call(KernelContext*, Arg arg,
Status*) {
return (arg > 0) ? 1 : 0;
}

template <typename T, typename Arg>
static constexpr enable_if_signed_c_integer<T> Call(KernelContext*, Arg arg, Status*) {
static constexpr enable_if_signed_c_integer<Arg, T> Call(KernelContext*, Arg arg,
Status*) {
return (arg > 0) ? 1 : ((arg == 0) ? 0 : -1);
}
};
Expand Down Expand Up @@ -854,21 +864,24 @@ struct LogbChecked {

struct Floor {
template <typename T, typename Arg>
static constexpr enable_if_floating_point<T> Call(KernelContext*, Arg arg, Status*) {
static constexpr enable_if_floating_point<Arg, T> Call(KernelContext*, Arg arg,
Status*) {
return std::floor(arg);
}
};

struct Ceil {
template <typename T, typename Arg>
static constexpr enable_if_floating_point<T> Call(KernelContext*, Arg arg, Status*) {
static constexpr enable_if_floating_point<Arg, T> Call(KernelContext*, Arg arg,
Status*) {
return std::ceil(arg);
}
};

struct Trunc {
template <typename T, typename Arg>
static constexpr enable_if_floating_point<T> Call(KernelContext*, Arg arg, Status*) {
static constexpr enable_if_floating_point<Arg, T> Call(KernelContext*, Arg arg,
Status*) {
return std::trunc(arg);
}
};
Expand Down