Skip to content

ARROW-13882: [C++] Improve min_max/hash_min_max type support #11111

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
lidavidm wants to merge 5 commits into from
Closed

ARROW-13882: [C++] Improve min_max/hash_min_max type support #11111

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
46d9b98
ARROW-13882: [C++] Support more types in min_max
lidavidm Sep 7, 2021
4dbcf4f
ARROW-13882: [C++] Fix MSVC
lidavidm Sep 13, 2021
cb1bd17
ARROW-13882: [C++] Fix MSVC
lidavidm Sep 14, 2021
b9f680c
ARROW-13882: [C++] Remove AllTimeUnits
lidavidm Sep 15, 2021
51d1386
Use anonymous namespace
pitrou Sep 16, 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
13 changes: 4 additions & 9 deletions cpp/src/arrow/array/array_binary_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,6 @@ namespace arrow {

using internal::checked_cast;

using StringTypes =
::testing::Types<StringType, LargeStringType, BinaryType, LargeBinaryType>;

using UTF8Types = ::testing::Types<StringType, LargeStringType>;

// ----------------------------------------------------------------------
// String / Binary tests

Expand Down Expand Up @@ -329,7 +324,7 @@ class TestStringArray : public ::testing::Test {
std::shared_ptr<ArrayType> strings_;
};

TYPED_TEST_SUITE(TestStringArray, StringTypes);
TYPED_TEST_SUITE(TestStringArray, BinaryArrowTypes);

TYPED_TEST(TestStringArray, TestArrayBasics) { this->TestArrayBasics(); }

Expand Down Expand Up @@ -386,7 +381,7 @@ class TestUTF8Array : public ::testing::Test {
}
};

TYPED_TEST_SUITE(TestUTF8Array, UTF8Types);
TYPED_TEST_SUITE(TestUTF8Array, StringArrowTypes);

TYPED_TEST(TestUTF8Array, TestValidateUTF8) { this->TestValidateUTF8(); }

Expand Down Expand Up @@ -666,7 +661,7 @@ class TestStringBuilder : public TestBuilder {
std::shared_ptr<ArrayType> result_;
};

TYPED_TEST_SUITE(TestStringBuilder, StringTypes);
TYPED_TEST_SUITE(TestStringBuilder, BinaryArrowTypes);

TYPED_TEST(TestStringBuilder, TestScalarAppend) { this->TestScalarAppend(); }

Expand Down Expand Up @@ -896,7 +891,7 @@ class TestBinaryDataVisitor : public ::testing::Test {
std::shared_ptr<DataType> type_;
};

TYPED_TEST_SUITE(TestBinaryDataVisitor, StringTypes);
TYPED_TEST_SUITE(TestBinaryDataVisitor, BinaryArrowTypes);

TYPED_TEST(TestBinaryDataVisitor, Basics) { this->TestBasics(); }

Expand Down
5 changes: 1 addition & 4 deletions cpp/src/arrow/array/concatenate_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,7 @@ class PrimitiveConcatenateTest : public ConcatenateTest {
public:
};

using PrimitiveTypes =
::testing::Types<BooleanType, Int8Type, UInt8Type, Int16Type, UInt16Type, Int32Type,
UInt32Type, Int64Type, UInt64Type, FloatType, DoubleType>;
TYPED_TEST_SUITE(PrimitiveConcatenateTest, PrimitiveTypes);
TYPED_TEST_SUITE(PrimitiveConcatenateTest, PrimitiveArrowTypes);

TYPED_TEST(PrimitiveConcatenateTest, Primitives) {
this->Check([this](int64_t size, double null_probability, std::shared_ptr<Array>* out) {
Expand Down
11 changes: 6 additions & 5 deletions cpp/src/arrow/compute/kernels/aggregate_basic.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,10 +607,7 @@ void AddMinMaxKernels(KernelInit init,
const std::vector<std::shared_ptr<DataType>>& types,
ScalarAggregateFunction* func, SimdLevel::type simd_level) {
for (const auto& ty : types) {
// any[T] -> scalar[struct<min: T, max: T>]
auto out_ty = struct_({field("min", ty), field("max", ty)});
auto sig = KernelSignature::Make({InputType(ty->id())}, ValueDescr::Scalar(out_ty));
AddAggKernel(std::move(sig), init, func, simd_level);
AddMinMaxKernel(init, ty, func, simd_level);
}
}

Expand Down Expand Up @@ -764,8 +761,12 @@ void RegisterScalarAggregateBasic(FunctionRegistry* registry) {

func = std::make_shared<ScalarAggregateFunction>(
"min_max", Arity::Unary(), &min_max_doc, &default_scalar_aggregate_options);
aggregate::AddMinMaxKernels(aggregate::MinMaxInit, {boolean()}, func.get());
aggregate::AddMinMaxKernels(aggregate::MinMaxInit, {null(), boolean()}, func.get());
aggregate::AddMinMaxKernels(aggregate::MinMaxInit, NumericTypes(), func.get());
aggregate::AddMinMaxKernels(aggregate::MinMaxInit, TemporalTypes(), func.get());
aggregate::AddMinMaxKernels(aggregate::MinMaxInit, BaseBinaryTypes(), func.get());
aggregate::AddMinMaxKernel(aggregate::MinMaxInit, Type::FIXED_SIZE_BINARY, func.get());
aggregate::AddMinMaxKernel(aggregate::MinMaxInit, Type::INTERVAL_MONTHS, func.get());
aggregate::AddMinMaxKernel(aggregate::MinMaxInit, Type::DECIMAL128, func.get());
aggregate::AddMinMaxKernel(aggregate::MinMaxInit, Type::DECIMAL256, func.get());
// Add the SIMD variants for min max
Expand Down
22 changes: 12 additions & 10 deletions cpp/src/arrow/compute/kernels/aggregate_basic_avx2.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,30 +55,32 @@ Result<std::unique_ptr<KernelState>> MeanInitAvx2(KernelContext* ctx,

Result<std::unique_ptr<KernelState>> MinMaxInitAvx2(KernelContext* ctx,
const KernelInitArgs& args) {
ARROW_ASSIGN_OR_RAISE(auto out_type,
args.kernel->signature->out_type().Resolve(ctx, args.inputs));
MinMaxInitState<SimdLevel::AVX2> visitor(
ctx, *args.inputs[0].type, args.kernel->signature->out_type().type(),
ctx, *args.inputs[0].type, std::move(out_type.type),
static_cast<const ScalarAggregateOptions&>(*args.options));
return visitor.Create();
}

void AddSumAvx2AggKernels(ScalarAggregateFunction* func) {
AddBasicAggKernels(SumInitAvx2, internal::SignedIntTypes(), int64(), func,
SimdLevel::AVX2);
AddBasicAggKernels(SumInitAvx2, internal::UnsignedIntTypes(), uint64(), func,
SimdLevel::AVX2);
AddBasicAggKernels(SumInitAvx2, internal::FloatingPointTypes(), float64(), func,
SimdLevel::AVX2);
AddBasicAggKernels(SumInitAvx2, SignedIntTypes(), int64(), func, SimdLevel::AVX2);
AddBasicAggKernels(SumInitAvx2, UnsignedIntTypes(), uint64(), func, SimdLevel::AVX2);
AddBasicAggKernels(SumInitAvx2, FloatingPointTypes(), float64(), func, SimdLevel::AVX2);
}

void AddMeanAvx2AggKernels(ScalarAggregateFunction* func) {
AddBasicAggKernels(MeanInitAvx2, internal::NumericTypes(), float64(), func,
SimdLevel::AVX2);
AddBasicAggKernels(MeanInitAvx2, NumericTypes(), float64(), func, SimdLevel::AVX2);
}

void AddMinMaxAvx2AggKernels(ScalarAggregateFunction* func) {
// Enable int types for AVX2 variants.
// No auto vectorize for float/double as it use fmin/fmax which has NaN handling.
AddMinMaxKernels(MinMaxInitAvx2, internal::IntTypes(), func, SimdLevel::AVX2);
AddMinMaxKernels(MinMaxInitAvx2, IntTypes(), func, SimdLevel::AVX2);
AddMinMaxKernels(MinMaxInitAvx2, TemporalTypes(), func, SimdLevel::AVX2);
AddMinMaxKernels(MinMaxInitAvx2, BaseBinaryTypes(), func, SimdLevel::AVX2);
AddMinMaxKernel(MinMaxInitAvx2, Type::FIXED_SIZE_BINARY, func, SimdLevel::AVX2);
AddMinMaxKernel(MinMaxInitAvx2, Type::INTERVAL_MONTHS, func, SimdLevel::AVX2);
}

} // namespace aggregate
Expand Down
17 changes: 11 additions & 6 deletions cpp/src/arrow/compute/kernels/aggregate_basic_avx512.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,30 +55,35 @@ Result<std::unique_ptr<KernelState>> MeanInitAvx512(KernelContext* ctx,

Result<std::unique_ptr<KernelState>> MinMaxInitAvx512(KernelContext* ctx,
const KernelInitArgs& args) {
ARROW_ASSIGN_OR_RAISE(auto out_type,
args.kernel->signature->out_type().Resolve(ctx, args.inputs));
MinMaxInitState<SimdLevel::AVX512> visitor(
ctx, *args.inputs[0].type, args.kernel->signature->out_type().type(),
ctx, *args.inputs[0].type, std::move(out_type.type),
static_cast<const ScalarAggregateOptions&>(*args.options));
return visitor.Create();
}

void AddSumAvx512AggKernels(ScalarAggregateFunction* func) {
AddBasicAggKernels(SumInitAvx512, internal::SignedIntTypes(), int64(), func,
AddBasicAggKernels(SumInitAvx512, SignedIntTypes(), int64(), func, SimdLevel::AVX512);
AddBasicAggKernels(SumInitAvx512, UnsignedIntTypes(), uint64(), func,
SimdLevel::AVX512);
AddBasicAggKernels(SumInitAvx512, internal::UnsignedIntTypes(), uint64(), func,
SimdLevel::AVX512);
AddBasicAggKernels(SumInitAvx512, internal::FloatingPointTypes(), float64(), func,
AddBasicAggKernels(SumInitAvx512, FloatingPointTypes(), float64(), func,
SimdLevel::AVX512);
}

void AddMeanAvx512AggKernels(ScalarAggregateFunction* func) {
aggregate::AddBasicAggKernels(MeanInitAvx512, internal::NumericTypes(), float64(), func,
aggregate::AddBasicAggKernels(MeanInitAvx512, NumericTypes(), float64(), func,
SimdLevel::AVX512);
}

void AddMinMaxAvx512AggKernels(ScalarAggregateFunction* func) {
// Enable 32/64 int types for avx512 variants, no advantage on 8/16 int.
AddMinMaxKernels(MinMaxInitAvx512, {int32(), uint32(), int64(), uint64()}, func,
SimdLevel::AVX512);
AddMinMaxKernels(MinMaxInitAvx512, TemporalTypes(), func, SimdLevel::AVX512);
AddMinMaxKernels(MinMaxInitAvx512, BaseBinaryTypes(), func, SimdLevel::AVX2);
AddMinMaxKernel(MinMaxInitAvx512, Type::FIXED_SIZE_BINARY, func, SimdLevel::AVX2);
AddMinMaxKernel(MinMaxInitAvx512, Type::INTERVAL_MONTHS, func, SimdLevel::AVX512);
}

} // namespace aggregate
Expand Down
Loading