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

Implement cudf::group_by (hash) for decimal32 and decimal64 #7190

Merged
merged 13 commits into from
Feb 5, 2021
Merged

Implement cudf::group_by (hash) for decimal32 and decimal64 #7190

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
34f02c2
Initial changes (10.2 not working)
codereport Jan 20, 2021
a13b306
Disable 10.2
codereport Jan 28, 2021
2e6bb53
Push code down to update_target_element
codereport Feb 2, 2021
cd04a8e
Clang format
codereport Feb 2, 2021
d22fb16
Final changes
codereport Feb 3, 2021
4c361d4
Clang format
codereport Feb 3, 2021
85f5c5d
Merge branch 'branch-0.18' into fp-groupby-hash
codereport Feb 3, 2021
5b6dcd1
Clean up
codereport Feb 4, 2021
ac86d89
Temporarily turn on test (shoud fail on 10.2)
codereport Feb 4, 2021
364135e
Revert "Temporarily turn on test (shoud fail on 10.2)"
codereport Feb 4, 2021
44d7ca6
Split up tests, disable correctly
codereport Feb 4, 2021
06f2add
Address PR comment
codereport Feb 4, 2021
d6028c1
Merge branch 'branch-0.19' into fp-groupby-hash
codereport Feb 4, 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
83 changes: 83 additions & 0 deletions cpp/include/cudf/detail/aggregation/aggregation.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,34 @@ struct update_target_element<
}
};

template <typename Source, bool target_has_nulls, bool source_has_nulls>
struct update_target_element<Source,
aggregation::MIN,
target_has_nulls,
source_has_nulls,
std::enable_if_t<is_fixed_point<Source>()>> {
__device__ void operator()(mutable_column_device_view target,
size_type target_index,
column_device_view source,
size_type source_index) const noexcept
{
#if (__CUDACC_VER_MAJOR__ != 10) or (__CUDACC_VER_MINOR__ != 2)

if (source_has_nulls and source.is_null(source_index)) { return; }

using Target = target_type_t<Source, aggregation::MIN>;
using DeviceTarget = device_storage_type_t<Target>;
using DeviceSource = device_storage_type_t<Source>;
codereport marked this conversation as resolved.
Show resolved Hide resolved

atomicMin(&target.element<DeviceTarget>(target_index),
static_cast<DeviceTarget>(source.element<DeviceSource>(source_index)));

if (target_has_nulls and target.is_null(target_index)) { target.set_valid(target_index); }

#endif
}
};

template <typename Source, bool target_has_nulls, bool source_has_nulls>
struct update_target_element<
Source,
Expand All @@ -151,6 +179,34 @@ struct update_target_element<
}
};

template <typename Source, bool target_has_nulls, bool source_has_nulls>
struct update_target_element<Source,
aggregation::MAX,
target_has_nulls,
source_has_nulls,
std::enable_if_t<is_fixed_point<Source>()>> {
__device__ void operator()(mutable_column_device_view target,
size_type target_index,
column_device_view source,
size_type source_index) const noexcept
{
#if (__CUDACC_VER_MAJOR__ != 10) or (__CUDACC_VER_MINOR__ != 2)

if (source_has_nulls and source.is_null(source_index)) { return; }

using Target = target_type_t<Source, aggregation::MAX>;
using DeviceTarget = device_storage_type_t<Target>;
using DeviceSource = device_storage_type_t<Source>;

atomicMax(&target.element<DeviceTarget>(target_index),
static_cast<DeviceTarget>(source.element<DeviceSource>(source_index)));

if (target_has_nulls and target.is_null(target_index)) { target.set_valid(target_index); }

#endif
}
};

template <typename Source, bool target_has_nulls, bool source_has_nulls>
struct update_target_element<
Source,
Expand All @@ -173,6 +229,33 @@ struct update_target_element<
}
};

template <typename Source, bool target_has_nulls, bool source_has_nulls>
struct update_target_element<Source,
aggregation::SUM,
target_has_nulls,
source_has_nulls,
std::enable_if_t<is_fixed_point<Source>()>> {
__device__ void operator()(mutable_column_device_view target,
size_type target_index,
column_device_view source,
size_type source_index) const noexcept
{
#if (__CUDACC_VER_MAJOR__ != 10) or (__CUDACC_VER_MINOR__ != 2)

if (source_has_nulls and source.is_null(source_index)) { return; }

using Target = target_type_t<Source, aggregation::SUM>;
using DeviceTarget = device_storage_type_t<Target>;
using DeviceSource = device_storage_type_t<Source>;

atomicAdd(&target.element<DeviceTarget>(target_index),
static_cast<DeviceTarget>(source.element<DeviceSource>(source_index)));

if (target_has_nulls and target.is_null(target_index)) { target.set_valid(target_index); }
#endif
}
};

/**
* @brief Function object to update a single element in a target column using
* the dictionary key addressed by the specific index.
Expand Down
18 changes: 18 additions & 0 deletions cpp/tests/groupby/group_count_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,8 @@ TYPED_TEST(FixedPointTestBothReps, GroupBySumProductMinMaxDecimalAsValue)
auto const expect_vals_min = fp_wrapper{{0, 1, 2}, scale};
auto const expect_vals_max = fp_wrapper{{6, 9, 8}, scale};

// group_by sort tests

auto agg1 = cudf::make_sum_aggregation();
test_single_agg(
keys, vals, expect_keys, expect_vals_sum, std::move(agg1), force_use_sort_impl::YES);
Expand All @@ -237,6 +239,22 @@ TYPED_TEST(FixedPointTestBothReps, GroupBySumProductMinMaxDecimalAsValue)
EXPECT_THROW(
test_single_agg(keys, vals, expect_keys, {}, std::move(agg4), force_use_sort_impl::YES),
cudf::logic_error);

// commented out until we drop support for CUDA 10.2
// group_by hash tests

// auto agg5 = cudf::make_sum_aggregation();
// test_single_agg(keys, vals, expect_keys, expect_vals_sum, std::move(agg5));

// auto agg6 = cudf::make_min_aggregation();
// test_single_agg(keys, vals, expect_keys, expect_vals_min, std::move(agg6));

// auto agg7 = cudf::make_max_aggregation();
// test_single_agg(keys, vals, expect_keys, expect_vals_max, std::move(agg7));

// auto agg8 = cudf::make_product_aggregation();
// EXPECT_THROW(test_single_agg(keys, vals, expect_keys, {}, std::move(agg8)),
// cudf::logic_error);
}
}

Expand Down