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.

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

Correct the last warnings and issues when using newer cuda versions #8525

Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
4 changes: 1 addition & 3 deletions cpp/src/replace/clamp.cu
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,8 @@ std::unique_ptr<cudf::column> clamp_string_column(strings_column_view const& inp
return bytes;
};

auto offset_and_char =
auto [offsets_column, chars_column] =
form_offsets_and_char_column(d_input, null_count, offsets_transformer, stream, mr);
auto offsets_column(std::move(offset_and_char.first));
auto chars_column(std::move(offset_and_char.second));

auto d_offsets = offsets_column->view().template data<size_type>();
auto d_chars = chars_column->mutable_view().template data<char>();
Expand Down
26 changes: 23 additions & 3 deletions cpp/src/rolling/grouped_rolling.cu
Original file line number Diff line number Diff line change
Expand Up @@ -843,12 +843,32 @@ struct dispatch_grouped_range_rolling_window {
CUDF_FAIL("Unsupported OrderBy column type.");
}

template <typename OrderByColumnType, typename... Args>
template <typename OrderByColumnType>
std::enable_if_t<detail::is_supported_order_by_column_type<OrderByColumnType>(),
std::unique_ptr<column>>
operator()(Args&&... args) const
operator()(column_view const& input,
column_view const& orderby_column,
cudf::order const& timestamp_ordering,
rmm::device_uvector<cudf::size_type> const& group_offsets,
rmm::device_uvector<cudf::size_type> const& group_labels,
range_window_bounds preceding_window,
range_window_bounds following_window,
size_type min_periods,
rolling_aggregation const& aggr,
rmm::cuda_stream_view stream,
rmm::mr::device_memory_resource* mr) const
{
return grouped_range_rolling_window_impl<OrderByColumnType>(std::forward<Args>(args)...);
return grouped_range_rolling_window_impl<OrderByColumnType>(input,
orderby_column,
timestamp_ordering,
group_offsets,
group_labels,
preceding_window,
following_window,
min_periods,
aggr,
stream,
mr);
}
};

Expand Down
4 changes: 2 additions & 2 deletions cpp/src/rolling/rolling_detail.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ struct DeviceRollingRowNumber {

struct agg_specific_empty_output {
template <typename InputType, aggregation::Kind op>
std::unique_ptr<column> operator()(column_view const& input, rolling_aggregation const& agg) const
std::unique_ptr<column> operator()(column_view const& input, rolling_aggregation const&) const
{
using target_type = cudf::detail::target_type_t<InputType, op>;

Expand Down Expand Up @@ -627,7 +627,7 @@ class rolling_aggregation_preprocessor final : public cudf::detail::simple_aggre
// COLLECT_SET aggregations do not peform a rolling operation at all. They get processed
// entirely in the finalize() step.
std::vector<std::unique_ptr<aggregation>> visit(
data_type col_type, cudf::detail::collect_set_aggregation const& agg) override
data_type, cudf::detail::collect_set_aggregation const&) override
{
return {};
}
Expand Down
12 changes: 6 additions & 6 deletions cpp/tests/utilities/column_utilities.cu
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ class corresponding_rows_not_equivalent {
}

template <typename T, typename... Args>
__device__ std::enable_if_t<not std::is_floating_point<T>::value, bool> operator()(Args... args)
__device__ std::enable_if_t<not std::is_floating_point<T>::value, bool> operator()(Args...)
{
// Non-floating point inequality is checked already
return true;
Expand Down Expand Up @@ -550,7 +550,7 @@ struct column_view_printer {
template <typename Element, typename std::enable_if_t<is_numeric<Element>()>* = nullptr>
void operator()(cudf::column_view const& col,
std::vector<std::string>& out,
std::string const& indent)
std::string const&)
{
auto h_data = cudf::test::to_host<Element>(col);

Expand Down Expand Up @@ -591,7 +591,7 @@ struct column_view_printer {
template <typename Element, typename std::enable_if_t<cudf::is_fixed_point<Element>()>* = nullptr>
void operator()(cudf::column_view const& col,
std::vector<std::string>& out,
std::string const& indent)
std::string const&)
{
auto const h_data = cudf::test::to_host<Element>(col);
if (col.nullable()) {
Expand All @@ -615,7 +615,7 @@ struct column_view_printer {
typename std::enable_if_t<std::is_same<Element, cudf::string_view>::value>* = nullptr>
void operator()(cudf::column_view const& col,
std::vector<std::string>& out,
std::string const& indent)
std::string const&)
{
//
// Implementation for strings, call special to_host variant
Expand All @@ -638,7 +638,7 @@ struct column_view_printer {
typename std::enable_if_t<std::is_same<Element, cudf::dictionary32>::value>* = nullptr>
void operator()(cudf::column_view const& col,
std::vector<std::string>& out,
std::string const& indent)
std::string const&)
{
cudf::dictionary_column_view dictionary(col);
if (col.is_empty()) return;
Expand All @@ -661,7 +661,7 @@ struct column_view_printer {
template <typename Element, typename std::enable_if_t<is_duration<Element>()>* = nullptr>
void operator()(cudf::column_view const& col,
std::vector<std::string>& out,
std::string const& indent)
std::string const&)
{
auto h_data = cudf::test::to_host<Element>(col);

Expand Down