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

Change exceptions thrown by copying APIs #15319

Merged
merged 5 commits into from
Mar 18, 2024
Merged

Change exceptions thrown by copying APIs #15319

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5f25b8f
Change all exceptions in copying APIs
vyasr Mar 15, 2024
388e11b
Fix all tests
vyasr Mar 15, 2024
f97544c
Include stdexcept in all files using stdlib exceptions
vyasr Mar 18, 2024
0630e34
Improve comment
vyasr Mar 18, 2024
6880d69
Merge remote-tracking branch 'upstream/branch-24.04' into feat/copyin…
vyasr Mar 18, 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
8 changes: 4 additions & 4 deletions cpp/include/cudf/contiguous_split.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023, NVIDIA CORPORATION.
* Copyright (c) 2023-2024, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -106,9 +106,9 @@ struct packed_table {
* @endcode
*
*
* @throws cudf::logic_error if `splits` has end index > size of `input`.
* @throws cudf::logic_error When the value in `splits` is not in the range [0, input.size()).
* @throws cudf::logic_error When the values in the `splits` are 'strictly decreasing'.
* @throws std::out_of_range if `splits` has end index > size of `input`.
* @throws std::out_of_range When the value in `splits` is not in the range [0, input.size()).
* @throws std::invalid_argument When the values in the `splits` are 'strictly decreasing'.
*
* @param input View of a table to split
* @param splits A vector of indices where the view will be split
Expand Down
100 changes: 56 additions & 44 deletions cpp/include/cudf/copying.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018-2023, NVIDIA CORPORATION.
* Copyright (c) 2018-2024, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -66,7 +66,7 @@ enum class out_of_bounds_policy : bool {
* For dictionary columns, the keys column component is copied and not trimmed
* if the gather results in abandoned key elements.
*
* @throws cudf::logic_error if gather_map contains null values.
* @throws std::invalid_argument if gather_map contains null values.
*
* @param source_table The input columns whose rows will be gathered
* @param gather_map View into a non-nullable column of integral indices that maps the
Expand Down Expand Up @@ -152,6 +152,13 @@ std::unique_ptr<column> reverse(
* A negative value `i` in the `scatter_map` is interpreted as `i+n`, where `n`
* is the number of rows in the `target` table.
*
* @throws std::invalid_argument if the number of columns in source does not match the number of
* columns in target
* @throws std::invalid_argument if the number of rows in source does not match the number of
* elements in scatter_map
* @throws cudf::data_type_error if the data types of the source and target columns do not match
* @throws std::invalid_argument if scatter_map contains null values
*
* @param source The input columns containing values to be scattered into the
* target columns
* @param scatter_map A non-nullable column of integral indices that maps the
Expand Down Expand Up @@ -191,6 +198,11 @@ std::unique_ptr<table> scatter(
* If any values in `scatter_map` are outside of the interval [-n, n) where `n`
* is the number of rows in the `target` table, behavior is undefined.
*
* @throws std::invalid_argument if the number of scalars does not match the number of columns in
* target
* @throws std::invalid_argument if indices contains null values
* @throws cudf::data_type_error if the data types of the scalars and target columns do not match
*
* @param source The input scalars containing values to be scattered into the
* target columns
* @param indices A non-nullable column of integral indices that indicate
Expand Down Expand Up @@ -302,15 +314,15 @@ std::unique_ptr<table> empty_like(table_view const& input_table);
* If @p source and @p target refer to the same elements and the ranges overlap,
* the behavior is undefined.
*
* @throws cudf::logic_error if memory reallocation is required (e.g. for
* @throws cudf::data_type_error if memory reallocation is required (e.g. for
* variable width types).
* @throws cudf::logic_error for invalid range (if
* @throws std::out_of_range for invalid range (if
* @p source_begin > @p source_end, @p source_begin < 0,
* @p source_begin >= @p source.size(), @p source_end > @p source.size(),
* @p target_begin < 0, target_begin >= @p target.size(), or
* @p target_begin + (@p source_end - @p source_begin) > @p target.size()).
* @throws cudf::logic_error if @p target and @p source have different types.
* @throws cudf::logic_error if @p source has null values and @p target is not
* @throws cudf::data_type_error if @p target and @p source have different types.
* @throws std::invalid_argument if @p source has null values and @p target is not
* nullable.
*
* @param source The column to copy from
Expand Down Expand Up @@ -341,12 +353,12 @@ void copy_range_in_place(column_view const& source,
* If @p source and @p target refer to the same elements and the ranges overlap,
* the behavior is undefined.
*
* @throws cudf::logic_error for invalid range (if
* @throws std::out_of_range for invalid range (if
* @p source_begin > @p source_end, @p source_begin < 0,
* @p source_begin >= @p source.size(), @p source_end > @p source.size(),
* @p target_begin < 0, target_begin >= @p target.size(), or
* @p target_begin + (@p source_end - @p source_begin) > @p target.size()).
vyasr marked this conversation as resolved.
Show resolved Hide resolved
* @throws cudf::logic_error if @p target and @p source have different types.
* @throws cudf::data_type_error if @p target and @p source have different types.
*
* @param source The column to copy from inside the range
* @param target The column to copy from outside the range
Expand Down Expand Up @@ -399,8 +411,8 @@ std::unique_ptr<column> copy_range(
* @param stream CUDA stream used for device memory operations and kernel launches
* @param mr Device memory resource used to allocate the returned result's device memory
*
* @throw cudf::logic_error if @p input dtype is neither fixed-width nor string type
* @throw cudf::logic_error if @p fill_value dtype does not match @p input dtype.
* @throw cudf::data_type_error if @p input dtype is neither fixed-width nor string type
* @throw cudf::data_type_error if @p fill_value dtype does not match @p input dtype.
*
* @return The shifted column
*/
Expand Down Expand Up @@ -432,9 +444,9 @@ std::unique_ptr<column> shift(
* output: {{12, 14}, {20, 22, 24, 26}, {14, 16}, {}}
* @endcode
*
* @throws cudf::logic_error if `indices` size is not even.
* @throws cudf::logic_error When the values in the pair are strictly decreasing.
* @throws cudf::logic_error When any of the values in the pair don't belong to
* @throws std::invalid_argument if `indices` size is not even.
* @throws std::invalid_argument When the values in the pair are strictly decreasing.
* @throws std::out_of_range When any of the values in the pair don't belong to
* the range [0, input.size()).
*
* @param input View of column to slice
Expand Down Expand Up @@ -476,9 +488,9 @@ std::vector<column_view> slice(column_view const& input,
* {{52, 54}, {60, 22, 24, 26}, {14, 16}, {}}]
* @endcode
*
* @throws cudf::logic_error if `indices` size is not even.
* @throws cudf::logic_error When the values in the pair are strictly decreasing.
* @throws cudf::logic_error When any of the values in the pair don't belong to
* @throws std::invalid_argument if `indices` size is not even.
* @throws std::invalid_argument When the values in the pair are strictly decreasing.
* @throws std::out_of_range When any of the values in the pair don't belong to
* the range [0, input.size()).
*
* @param input View of table to slice
Expand Down Expand Up @@ -521,9 +533,9 @@ std::vector<table_view> slice(table_view const& input,
* output: {{10, 12}, {14, 16, 18}, {20, 22, 24, 26}, {28}}
* @endcode
*
* @throws cudf::logic_error if `splits` has end index > size of `input`.
* @throws cudf::logic_error When the value in `splits` is not in the range [0, input.size()).
* @throws cudf::logic_error When the values in the `splits` are 'strictly decreasing'.
* @throws std::out_of_range if `splits` has end index > size of `input`.
* @throws std::out_of_range When the value in `splits` is not in the range [0, input.size()).
* @throws std::invalid_argument When the values in the `splits` are 'strictly decreasing'.
*
* @param input View of column to split
* @param splits Indices where the view will be split
Expand Down Expand Up @@ -567,9 +579,9 @@ std::vector<column_view> split(column_view const& input,
* {{50, 52}, {54, 56, 58}, {60, 62, 64, 66}, {68}}]
* @endcode
*
* @throws cudf::logic_error if `splits` has end index > size of `input`.
* @throws cudf::logic_error When the value in `splits` is not in the range [0, input.size()).
* @throws cudf::logic_error When the values in the `splits` are 'strictly decreasing'.
* @throws std::out_of_range if `splits` has end index > size of `input`.
* @throws std::out_of_range When the value in `splits` is not in the range [0, input.size()).
* @throws std::invalid_argument When the values in the `splits` are 'strictly decreasing'.
*
* @param input View of a table to split
* @param splits Indices where the view will be split
Expand All @@ -594,10 +606,10 @@ std::vector<table_view> split(table_view const& input,
* Selects each element i in the output column from either @p rhs or @p lhs using the following
* rule: `output[i] = (boolean_mask.valid(i) and boolean_mask[i]) ? lhs[i] : rhs[i]`
*
* @throws cudf::logic_error if lhs and rhs are not of the same type
* @throws cudf::logic_error if lhs and rhs are not of the same length
* @throws cudf::logic_error if boolean mask is not of type bool
* @throws cudf::logic_error if boolean mask is not of the same length as lhs and rhs
* @throws cudf::data_type_error if lhs and rhs are not of the same type
* @throws std::invalid_argument if lhs and rhs are not of the same length
* @throws cudf::data_type_error if boolean mask is not of type bool
* @throws std::invalid_argument if boolean mask is not of the same length as lhs and rhs
* @param lhs left-hand column_view
* @param rhs right-hand column_view
* @param boolean_mask column of `type_id::BOOL8` representing "left (true) / right (false)"
Expand All @@ -621,9 +633,9 @@ std::unique_ptr<column> copy_if_else(
* Selects each element i in the output column from either @p rhs or @p lhs using the following
* rule: `output[i] = (boolean_mask.valid(i) and boolean_mask[i]) ? lhs : rhs[i]`
*
* @throws cudf::logic_error if lhs and rhs are not of the same type
* @throws cudf::logic_error if boolean mask is not of type bool
* @throws cudf::logic_error if boolean mask is not of the same length as rhs
* @throws cudf::data_type_error if lhs and rhs are not of the same type
* @throws cudf::data_type_error if boolean mask is not of type bool
* @throws std::invalid_argument if boolean mask is not of the same length as lhs and rhs
* @param lhs left-hand scalar
* @param rhs right-hand column_view
* @param boolean_mask column of `type_id::BOOL8` representing "left (true) / right (false)"
Expand All @@ -647,9 +659,9 @@ std::unique_ptr<column> copy_if_else(
* Selects each element i in the output column from either @p rhs or @p lhs using the following
* rule: `output[i] = (boolean_mask.valid(i) and boolean_mask[i]) ? lhs[i] : rhs`
*
* @throws cudf::logic_error if lhs and rhs are not of the same type
* @throws cudf::logic_error if boolean mask is not of type bool
* @throws cudf::logic_error if boolean mask is not of the same length as lhs
* @throws cudf::data_type_error if lhs and rhs are not of the same type
* @throws cudf::data_type_error if boolean mask is not of type bool
* @throws std::invalid_argument if boolean mask is not of the same length as lhs and rhs
* @param lhs left-hand column_view
* @param rhs right-hand scalar
* @param boolean_mask column of `type_id::BOOL8` representing "left (true) / right (false)"
Expand Down Expand Up @@ -713,11 +725,11 @@ std::unique_ptr<column> copy_if_else(
* output: {{ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10}}
* @endcode
*
* @throw cudf::logic_error if input.num_columns() != target.num_columns()
* @throws cudf::logic_error if any `i`th input_column type != `i`th target_column type
* @throws cudf::logic_error if boolean_mask.type() != bool
* @throws cudf::logic_error if boolean_mask.size() != target.num_rows()
* @throws cudf::logic_error if number of `true` in `boolean_mask` > input.num_rows()
* @throws std::invalid_argument if input.num_columns() != target.num_columns()
* @throws cudf::data_type_error if any `i`th input_column type != `i`th target_column type
* @throws cudf::data_type_error if boolean_mask.type() != bool
* @throws std::invalid_argument if boolean_mask.size() != target.num_rows()
* @throws std::invalid_argument if number of `true` in `boolean_mask` > input.num_rows()
*
* @param input table_view (set of dense columns) to scatter
* @param target table_view to modify with scattered values from `input`
Expand All @@ -740,8 +752,8 @@ std::unique_ptr<table> boolean_mask_scatter(
*
* @ingroup copy_scatter
*
* The `i`th scalar in `input` will be written to all columns of the output
* table at the location of the `i`th true value in `boolean_mask`.
* The `i`th scalar in `input` will be written to the ith column of the output
* table at the location of every true value in `boolean_mask`.
* All other rows in the output will equal the same row in `target`.
*
* @code{.pseudo}
Expand All @@ -753,10 +765,10 @@ std::unique_ptr<table> boolean_mask_scatter(
* output: {{ 11, 2, 3, 4, 11, 11, 7, 11, 11, 10}}
* @endcode
*
* @throw cudf::logic_error if input.size() != target.num_columns()
* @throws cudf::logic_error if any `i`th input_scalar type != `i`th target_column type
* @throws cudf::logic_error if boolean_mask.type() != bool
* @throws cudf::logic_error if boolean_mask.size() != target.size()
* @throws std::invalid_argument if input.size() != target.num_columns()
* @throws cudf::data_type_error if any `i`th input_column type != `i`th target_column type
* @throws cudf::data_type_error if boolean_mask.type() != bool
* @throws std::invalid_argument if boolean_mask.size() != target.num_rows()
*
* @param input scalars to scatter
* @param target table_view to modify with scattered values from `input`
Expand All @@ -779,7 +791,7 @@ std::unique_ptr<table> boolean_mask_scatter(
* @warning This function is expensive (invokes a kernel launch). So, it is not
* recommended to be used in performance sensitive code or inside a loop.
*
* @throws cudf::logic_error if `index` is not within the range `[0, input.size())`
* @throws std::out_of_range if `index` is not within the range `[0, input.size())`
*
* @param input Column view to get the element from
* @param index Index into `input` to get the element at
Expand Down
9 changes: 6 additions & 3 deletions cpp/include/cudf/detail/null_mask.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,13 +368,16 @@ template <typename IndexIterator>
size_type validate_segmented_indices(IndexIterator indices_begin, IndexIterator indices_end)
{
auto const num_indices = static_cast<size_type>(std::distance(indices_begin, indices_end));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be using thrust::distance instead of std::distance? I'm not sure if std::distance works on all iterator types. (I could be wrong here.)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a good question. I think it's worth making the change since I can see some code paths that call through to this with thrust iterators. I'm guessing everything works fine or we'd be seeing bugs, but best to be safe nonetheless.

I'll do this in a separate PR though.

CUDF_EXPECTS(num_indices % 2 == 0, "Array of indices needs to have an even number of elements.");
CUDF_EXPECTS(num_indices % 2 == 0,
"Array of indices needs to have an even number of elements.",
std::invalid_argument);
size_type const num_segments = num_indices / 2;
for (size_type i = 0; i < num_segments; i++) {
auto begin = indices_begin[2 * i];
auto end = indices_begin[2 * i + 1];
CUDF_EXPECTS(begin >= 0, "Starting index cannot be negative.");
CUDF_EXPECTS(end >= begin, "End index cannot be smaller than the starting index.");
CUDF_EXPECTS(begin >= 0, "Starting index cannot be negative.", std::out_of_range);
CUDF_EXPECTS(
end >= begin, "End index cannot be smaller than the starting index.", std::invalid_argument);
}
return num_segments;
}
Expand Down
11 changes: 7 additions & 4 deletions cpp/src/copying/contiguous_split.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@

#include <cstddef>
#include <numeric>
#include <stdexcept>

namespace cudf {
namespace {
Expand Down Expand Up @@ -1729,13 +1730,15 @@ bool check_inputs(cudf::table_view const& input, std::vector<size_type> const& s
if (input.num_columns() == 0) { return true; }
if (splits.size() > 0) {
CUDF_EXPECTS(splits.back() <= input.column(0).size(),
"splits can't exceed size of input columns");
"splits can't exceed size of input columns",
std::out_of_range);
}
size_type begin = 0;
for (auto end : splits) {
CUDF_EXPECTS(begin >= 0, "Starting index cannot be negative.");
CUDF_EXPECTS(end >= begin, "End index cannot be smaller than the starting index.");
CUDF_EXPECTS(end <= input.column(0).size(), "Slice range out of bounds.");
CUDF_EXPECTS(begin >= 0, "Starting index cannot be negative.", std::out_of_range);
CUDF_EXPECTS(
end >= begin, "End index cannot be smaller than the starting index.", std::invalid_argument);
CUDF_EXPECTS(end <= input.column(0).size(), "Slice range out of bounds.", std::out_of_range);
begin = end;
}
return input.column(0).size() == 0;
Expand Down
28 changes: 18 additions & 10 deletions cpp/src/copying/copy.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019-2023, NVIDIA CORPORATION.
* Copyright (c) 2019-2024, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -319,7 +319,8 @@ std::unique_ptr<column> copy_if_else(Left const& lhs,
rmm::mr::device_memory_resource* mr)
{
CUDF_EXPECTS(boolean_mask.type() == data_type(type_id::BOOL8),
"Boolean mask column must be of type type_id::BOOL8");
"Boolean mask column must be of type type_id::BOOL8",
cudf::data_type_error);

if (boolean_mask.is_empty()) { return cudf::empty_like(lhs); }

Expand Down Expand Up @@ -356,9 +357,11 @@ std::unique_ptr<column> copy_if_else(column_view const& lhs,
rmm::mr::device_memory_resource* mr)
{
CUDF_EXPECTS(boolean_mask.size() == lhs.size(),
"Boolean mask column must be the same size as lhs and rhs columns");
CUDF_EXPECTS(lhs.size() == rhs.size(), "Both columns must be of the size");
CUDF_EXPECTS(lhs.type() == rhs.type(), "Both inputs must be of the same type");
"Boolean mask column must be the same size as lhs and rhs columns",
std::invalid_argument);
CUDF_EXPECTS(lhs.size() == rhs.size(), "Both columns must be of the size", std::invalid_argument);
CUDF_EXPECTS(
lhs.type() == rhs.type(), "Both inputs must be of the same type", cudf::data_type_error);

return copy_if_else(lhs, rhs, lhs.has_nulls(), rhs.has_nulls(), boolean_mask, stream, mr);
}
Expand All @@ -370,11 +373,13 @@ std::unique_ptr<column> copy_if_else(scalar const& lhs,
rmm::mr::device_memory_resource* mr)
{
CUDF_EXPECTS(boolean_mask.size() == rhs.size(),
"Boolean mask column must be the same size as rhs column");
"Boolean mask column must be the same size as rhs column",
std::invalid_argument);

auto rhs_type =
cudf::is_dictionary(rhs.type()) ? cudf::dictionary_column_view(rhs).keys_type() : rhs.type();
CUDF_EXPECTS(lhs.type() == rhs_type, "Both inputs must be of the same type");
CUDF_EXPECTS(
lhs.type() == rhs_type, "Both inputs must be of the same type", cudf::data_type_error);

return copy_if_else(lhs, rhs, !lhs.is_valid(stream), rhs.has_nulls(), boolean_mask, stream, mr);
}
Expand All @@ -386,11 +391,13 @@ std::unique_ptr<column> copy_if_else(column_view const& lhs,
rmm::mr::device_memory_resource* mr)
{
CUDF_EXPECTS(boolean_mask.size() == lhs.size(),
"Boolean mask column must be the same size as lhs column");
"Boolean mask column must be the same size as lhs column",
std::invalid_argument);

auto lhs_type =
cudf::is_dictionary(lhs.type()) ? cudf::dictionary_column_view(lhs).keys_type() : lhs.type();
CUDF_EXPECTS(lhs_type == rhs.type(), "Both inputs must be of the same type");
CUDF_EXPECTS(
lhs_type == rhs.type(), "Both inputs must be of the same type", cudf::data_type_error);

return copy_if_else(lhs, rhs, lhs.has_nulls(), !rhs.is_valid(stream), boolean_mask, stream, mr);
}
Expand All @@ -401,7 +408,8 @@ std::unique_ptr<column> copy_if_else(scalar const& lhs,
rmm::cuda_stream_view stream,
rmm::mr::device_memory_resource* mr)
{
CUDF_EXPECTS(lhs.type() == rhs.type(), "Both inputs must be of the same type");
CUDF_EXPECTS(
lhs.type() == rhs.type(), "Both inputs must be of the same type", cudf::data_type_error);
vyasr marked this conversation as resolved.
Show resolved Hide resolved
return copy_if_else(
lhs, rhs, !lhs.is_valid(stream), !rhs.is_valid(stream), boolean_mask, stream, mr);
}
Expand Down
Loading
Loading