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

[REVIEW] Make documentation uniform for stream and memory resource params #5216

Merged
merged 47 commits into from
May 27, 2020
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
b36998e
update doc uniformly for device memory resource param mr
karthikeyann May 18, 2020
4f8e1a6
Merge branch 'branch-0.14' into doc-uniform-doc
karthikeyann May 18, 2020
50a446c
Merge branch 'fix-docs' of https://github.com/devavret/cudf into doc-…
karthikeyann May 19, 2020
cee0229
remove unused device memory resource param
karthikeyann May 19, 2020
17f524a
changelog entry for PR #5216
karthikeyann May 19, 2020
9070aa8
update doc of param stream in scalar_factories
karthikeyann May 19, 2020
0f4e928
update doc of param stream in scalar.hpp
karthikeyann May 19, 2020
f4058fa
update doc of param stream in column_factories
karthikeyann May 19, 2020
3bae00d
update doc for param stream in column.hpp
karthikeyann May 19, 2020
063fc9d
update doc for param stream in column_device_view.cuh
karthikeyann May 19, 2020
1ac169e
update doc for param stream for table.hpp
karthikeyann May 19, 2020
a6d762f
update doc for param stream for string headers
karthikeyann May 19, 2020
582c247
update doc for param stream for string detail headers
karthikeyann May 19, 2020
028d034
update doc for param stream for string cu files
karthikeyann May 19, 2020
3f9bfcc
update doc for param stream for dictionary headers
karthikeyann May 19, 2020
ac624a2
update doc for param steam in dictionary cu file
karthikeyann May 19, 2020
9fb327c
update doc for param stream in reduction functions
karthikeyann May 19, 2020
c0215a5
update doc for param stream in null_mask.hpp
karthikeyann May 19, 2020
9b8e8c0
update doc for param stream for io readers.hpp
karthikeyann May 19, 2020
0b05b0f
update doc for param stream for io writers.hpp
karthikeyann May 19, 2020
2eeab9d
update doc of param stream for csv headers
karthikeyann May 19, 2020
f2b2bf5
update doc of param stream for orc headers
karthikeyann May 19, 2020
64f56c5
update doc of param stream for parquet headers
karthikeyann May 19, 2020
5fdba29
update doc of param stream for misc io headers
karthikeyann May 19, 2020
17350ce
update doc of param stream for group reductions header
karthikeyann May 19, 2020
f93c829
update doc of param stream for binary op headers
karthikeyann May 19, 2020
3b9d239
update doc for param stream in nvtext headers
karthikeyann May 19, 2020
d3a3300
update doc for param stream in copy headers
karthikeyann May 19, 2020
e5fffae
update doc for param stream in scatter, gather headers
karthikeyann May 19, 2020
af9d392
update doc for param stream in fill headers
karthikeyann May 19, 2020
833995e
update doc for param stream in dlpack.hpp
karthikeyann May 19, 2020
ab1133f
update doc for param stream in hash headers
karthikeyann May 19, 2020
e8f1bad
update doc for param stream in join headers
karthikeyann May 19, 2020
9cc2fb3
update doc for param stream in rolling, rank
karthikeyann May 19, 2020
bbfe3bf
update doc for param stream in search, replace headers
karthikeyann May 19, 2020
139df92
update doc for param stream in transform, hashing, unary op headers
karthikeyann May 19, 2020
4c09ab6
Merge branch 'branch-0.14' of github.com:rapidsai/cudf into doc-unifo…
karthikeyann May 19, 2020
8547a9d
Apply suggestions from code review (Ram)
karthikeyann May 19, 2020
0d115c0
fix extra spacing in detail/transform.hpp
karthikeyann May 19, 2020
13f00c4
Merge branch 'branch-0.14' into doc-uniform-doc
karthikeyann May 19, 2020
1eb7907
add column's device memory in param mr doc
karthikeyann May 21, 2020
2acf660
add device memory to table param mr doc
karthikeyann May 21, 2020
2841464
Merge branch 'branch-0.14' of github.com:rapidsai/cudf into doc-unifo…
karthikeyann May 21, 2020
24f7d26
more doc update for param mr
karthikeyann May 21, 2020
ba502c9
more doc update for param stream
karthikeyann May 21, 2020
1e722ed
Merge branch 'branch-0.14' into doc-uniform-doc
karthikeyann May 26, 2020
2532487
Merge branch 'branch-0.14' into doc-uniform-doc
karthikeyann May 27, 2020
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/binaryop.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ enum class binary_operator : int32_t {
* @param lhs The left operand scalar
* @param rhs The right operand column
* @param output_type The desired data type of the output column
* @param mr Memory resource for allocating output column
* @param mr Device memory resource used to allocate the returned column
* @return std::unique_ptr<column> Output column
* @throw cudf::logic_error if @p lhs and @p rhs dtypes aren't numeric
* @throw cudf::logic_error if @p output_type dtype isn't numeric
Expand All @@ -114,7 +114,7 @@ std::unique_ptr<column> binary_operation(
* @param lhs The left operand column
* @param rhs The right operand scalar
* @param output_type The desired data type of the output column
* @param mr Memory resource for allocating output column
* @param mr Device memory resource used to allocate the returned column
* @return std::unique_ptr<column> Output column
* @throw cudf::logic_error if @p lhs and @p rhs dtypes aren't numeric
* @throw cudf::logic_error if @p output_type dtype isn't numeric
Expand All @@ -138,7 +138,7 @@ std::unique_ptr<column> binary_operation(
* @param lhs The left operand column
* @param rhs The right operand column
* @param output_type The desired data type of the output column
* @param mr Memory resource for allocating output column
* @param mr Device memory resource used to allocate the returned column
* @return std::unique_ptr<column> Output column
* @throw cudf::logic_error if @p lhs and @p rhs are different sizes
* @throw cudf::logic_error if @p lhs and @p rhs dtypes aren't fixed-width
Expand Down Expand Up @@ -167,7 +167,7 @@ std::unique_ptr<column> binary_operation(
* @param output_type The desired data type of the output column. It is assumed
* that output_type is compatible with the output data type
* of the function in the PTX code
* @param mr Memory resource for allocating output column
* @param mr Device memory resource used to allocate the returned column
* @return std::unique_ptr<column> Output column
* @throw cudf::logic_error if @p lhs and @p rhs are different sizes
* @throw cudf::logic_error if @p lhs and @p rhs dtypes aren't numeric
Expand Down
4 changes: 2 additions & 2 deletions cpp/include/cudf/column/column.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class column {
*
* @param other The `column` to copy
* @param stream The stream on which to execute all allocations and copies
* @param mr The resource to use for all allocations
* @param mr Device memory resource to use for all allocations
*/
column(column const& other,
cudaStream_t stream,
Expand Down Expand Up @@ -115,7 +115,7 @@ class column {
* @param view The view to copy
* @param stream The stream on which all allocations and copies will be
* executed
* @param mr The resource to use for all allocations
* @param mr Device memory resource to use for all allocations
*/
explicit column(column_view view,
cudaStream_t stream = 0,
Expand Down
17 changes: 6 additions & 11 deletions cpp/include/cudf/column/column_factories.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -241,8 +241,7 @@ std::unique_ptr<column> make_fixed_width_column(
* (indicating a null string). The size must be the number of bytes.
* @param stream Optional stream for use with all memory allocation
* and device kernels
* @param mr Optional resource to use for device memory
* allocation of the column's `null_mask` and children.
* @param mr Device memory resource used for allocation of the column's `null_mask` and children.
rgsl888prabhu marked this conversation as resolved.
Show resolved Hide resolved
*/
std::unique_ptr<column> make_strings_column(
const rmm::device_vector<thrust::pair<const char*, size_type>>& strings,
Expand Down Expand Up @@ -273,8 +272,7 @@ std::unique_ptr<column> make_strings_column(
* string_views.
* @param stream Optional stream for use with all memory allocation
* and device kernels
* @param mr Optional resource to use for device memory
* allocation of the column's `null_mask` and children.
* @param mr Device memory resource used for allocation of the column's `null_mask` and children.
*/
std::unique_ptr<column> make_strings_column(
const rmm::device_vector<string_view>& string_views,
Expand Down Expand Up @@ -312,8 +310,7 @@ std::unique_ptr<column> make_strings_column(
* first invocation of `column::null_count()`
* @param stream Optional stream for use with all memory allocation
* and device kernels
* @param mr Optional resource to use for device memory
* allocation of the column's `null_mask` and children.
* @param mr Device memory resource used for allocation of the column's `null_mask` and children.
*/
std::unique_ptr<column> make_strings_column(
const rmm::device_vector<char>& strings,
Expand Down Expand Up @@ -353,8 +350,7 @@ std::unique_ptr<column> make_strings_column(
* first invocation of `column::null_count()`
* @param stream Optional stream for use with all memory allocation
* and device kernels
* @param mr Optional resource to use for device memory
* allocation of the column's `null_mask` and children.
* @param mr Device memory resource used for allocation of the column's `null_mask` and children.
*/
std::unique_ptr<column> make_strings_column(
const std::vector<char>& strings,
Expand Down Expand Up @@ -382,8 +378,7 @@ std::unique_ptr<column> make_strings_column(
* Arrow format for nulls is used for interpeting this bitmask.
* @param stream Optional stream for use with all memory allocation
* and device kernels
* @param mr Optional resource to use for device memory
* allocation of the column's `null_mask` and children.
* @param mr Device memory resource used for allocation of the column's `null_mask` and children.
*/
std::unique_ptr<column> make_strings_column(
size_type num_strings,
Expand All @@ -406,7 +401,7 @@ std::unique_ptr<column> make_strings_column(
* @param size The number of rows for the output column.
* @param stream Optional stream for use with all memory allocation
* and device kernels
* @param mr Optional resource to use for device memory.
* @param mr Device memory resource used to allocate the returned column.
*/
std::unique_ptr<column> make_column_from_scalar(
scalar const& s,
Expand Down
7 changes: 3 additions & 4 deletions cpp/include/cudf/concatenate.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ namespace cudf {
* Returns empty `device_buffer` if the column is not nullable
*
* @param views Vector of column views whose bitmask will to be concatenated
* @param mr Optional, the memory resource that will be used for allocating
* the device memory for the new device_buffer
* @param mr Device memory resource used for allocating the new device_buffer
* @return rmm::device_buffer A `device_buffer` containing the bitmasks of all
* the column views in the views vector
*/
Expand All @@ -52,7 +51,7 @@ rmm::device_buffer concatenate_masks(
*
* @param columns_to_concat The column views to be concatenated into a single
* column
* @param mr Optional The resource to use for all allocations
* @param mr Device memory resource used to allocate the returned column.
* @return Unique pointer to a single table having all the rows from the
* elements of `columns_to_concat` respectively in the same order.
*/
Expand Down Expand Up @@ -83,7 +82,7 @@ std::unique_ptr<column> concatenate(
*
* @param tables_to_concat The table views to be concatenated into a single
* table
* @param mr Optional The resource to use for all allocations
* @param mr Device memory resource used to allocate the returned table.
* @return Unique pointer to a single table having all the rows from the
* elements of `tables_to_concat` respectively in the same order.
**/
Expand Down
8 changes: 4 additions & 4 deletions cpp/include/cudf/copying.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ std::unique_ptr<table> gather(
* are to be scattered
* @param check_bounds Optionally perform bounds checking on the values of
* `scatter_map` and throw an error if any of its values are out of bounds.
* @param mr The resource to use for all allocations
* @param mr Device memory resource used to allocate the returned table.
* @return Result of scattering values from source to target
*/
std::unique_ptr<table> scatter(
Expand Down Expand Up @@ -140,7 +140,7 @@ std::unique_ptr<table> scatter(
* are to be scattered
* @param check_bounds Optionally perform bounds checking on the values of
* `scatter_map` and throw an error if any of its values are out of bounds.
* @param mr The resource to use for all allocations
* @param mr Device memory resource used to allocate the returned table.
* @return Result of scattering values from source to target
*/
std::unique_ptr<table> scatter(
Expand Down Expand Up @@ -273,7 +273,7 @@ void copy_range_in_place(column_view const& source,
* @param source_end The index of the last element in the source range
* (exclusive)
* @param target_begin The starting index of the target range (inclusive)
* @param mr Memory resource to allocate the result target column.
* @param mr Device memory resource used to allocate the returned column.
* @return std::unique_ptr<column> The result target column
*/
std::unique_ptr<column> copy_range(
Expand Down Expand Up @@ -709,7 +709,7 @@ std::unique_ptr<table> boolean_mask_scatter(
*
* @param input Column view to get the element from
* @param index Index into `input` to get the element at
* @param mr Optional, The resource to use for all returned allocations
* @param mr Device memory resource used to allocate the returned scalar.
* @return std::unique_ptr<scalar> Scalar containing the single value
*/
std::unique_ptr<scalar> get_element(
Expand Down
8 changes: 4 additions & 4 deletions cpp/include/cudf/detail/binaryop.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ namespace detail {
* @param lhs The left operand scalar
* @param rhs The right operand column
* @param output_type The desired data type of the output column
* @param mr Memory resource for allocating output column
* @param mr Device memory resource used to allocate the returned column
* @param stream CUDA stream on which to execute kernels
* @return std::unique_ptr<column> Output column
*/
Expand All @@ -59,7 +59,7 @@ std::unique_ptr<column> binary_operation(
* @param lhs The left operand column
* @param rhs The right operand scalar
* @param output_type The desired data type of the output column
* @param mr Memory resource for allocating output column
* @param mr Device memory resource used to allocate the returned column
* @param stream CUDA stream on which to execute kernels
* @return std::unique_ptr<column> Output column
*/
Expand All @@ -84,7 +84,7 @@ std::unique_ptr<column> binary_operation(
* @param lhs The left operand column
* @param rhs The right operand column
* @param output_type The desired data type of the output column
* @param mr Memory resource for allocating output column
* @param mr Device memory resource used to allocate the returned column
* @param stream CUDA stream on which to execute kernels
* @return std::unique_ptr<column> Output column
*/
Expand Down Expand Up @@ -113,7 +113,7 @@ std::unique_ptr<column> binary_operation(
* @param output_type The desired data type of the output column. It is assumed
* that output_type is compatible with the output data type
* of the function in the PTX code
* @param mr Memory resource for allocating output column
* @param mr Device memory resource used to allocate the returned column
* @param stream CUDA stream on which to execute kernels
* @return std::unique_ptr<column> Output column
*/
Expand Down
2 changes: 1 addition & 1 deletion cpp/include/cudf/detail/copy_if_else.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ __launch_bounds__(block_size) __global__
* @param rhs Begin iterator of rhs range
* @param filter Function of type `FilterFn` which determines for index `i` where to get the
* corresponding output value from
* @param mr Memory resource to use for allocating the output
* @param mr Device memory resource used to allocate the returned column
* @param stream CUDA stream to perform the computation in
* @return A new column that contains the values from either `lhs` or `rhs` as determined
* by `filter[i]`
Expand Down
2 changes: 1 addition & 1 deletion cpp/include/cudf/detail/copy_range.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ void copy_range_in_place(column_view const& source,
* @param source_end The index of the last element in the source range
* (exclusive)
* @param target_begin The starting index of the target range (inclusive)
* @param mr Memory resource to allocate the result target column.
* @param mr Device memory resource used to allocate the returned column
* @param stream CUDA stream to run this function
* @return std::unique_ptr<column> The result target column
*/
Expand Down
4 changes: 2 additions & 2 deletions cpp/include/cudf/detail/dlpack.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ namespace detail {
* @throw cudf::logic_error if the any of the DLTensor fields are unsupported
*
* @param managed_tensor a 1D or 2D column-major (Fortran order) tensor
* @param mr Optional resource to use for device memory allocation
* @param mr Device memory resource used to allocate the returned table
* @param stream Optional stream on which to execute
*
* @return Table with a copy of the tensor data
Expand All @@ -56,7 +56,7 @@ std::unique_ptr<experimental::table> from_dlpack(
* or if any of columns have non-zero null count
*
* @param input Table to convert to DLPack
* @param mr Optional resource to use for device memory allocation
* @param mr Device memory resource used to allocate the returned DLManagedTensor
* @param stream Optional stream on which to execute
*
* @return 1D or 2D DLPack tensor with a copy of the table data, or nullptr
Expand Down
2 changes: 1 addition & 1 deletion cpp/include/cudf/detail/fill.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ void fill_in_place(mutable_column_view& destination,
* @param begin The starting index of the fill range (inclusive)
* @param end The index of the last element in the fill range (exclusive)
* @param value The scalar value to fill
* @param mr Memory resource to allocate the result output column
* @param mr Device memory resource used to allocate the returned column
* @param stream CUDA stream to run this function
* @return std::unique_ptr<column> The result output column
*/
Expand Down
8 changes: 4 additions & 4 deletions cpp/include/cudf/detail/gather.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ struct column_gatherer_impl {
*map
* @param gather_map_end End of iterator range of integral values representing the gather map
* @param nullify_out_of_bounds Nullify values in `gather_map` that are out of bounds
* @param mr Memory resource to use for all allocations
* @param mr Device memory resource used to allocate the returned column
* @param stream CUDA stream on which to execute kernels
*/
std::unique_ptr<column> operator()(column_view const& source_column,
Expand Down Expand Up @@ -171,7 +171,7 @@ struct column_gatherer_impl<string_view, MapItType> {
*map
* @param gather_map_end End of iterator range of integral values representing the gather map
* @param nullify_out_of_bounds Nullify values in `gather_map` that are out of bounds
* @param mr Memory resource to use for all allocations
* @param mr Device memory resource used to allocate the returned column
* @param stream CUDA stream on which to execute kernels
*/
std::unique_ptr<column> operator()(column_view const& source_column,
Expand Down Expand Up @@ -205,7 +205,7 @@ struct column_gatherer_impl<dictionary32, MapItType> {
* map
* @param gather_map_end End of iterator range of integral values representing the gather map
* @param nullify_out_of_bounds Nullify values in `gather_map` that are out of bounds
* @param mr Memory resource to use for all allocations
* @param mr Device memory resource used to allocate the returned column
* @param stream CUDA stream on which to execute kernels
* @return New dictionary column with gathered rows.
*/
Expand Down Expand Up @@ -272,7 +272,7 @@ struct column_gatherer {
* map
* @param gather_map_end End of iterator range of integral values representing the gather map
* @param nullify_out_of_bounds Nullify values in `gather_map` that are out of bounds
* @param mr Memory resource to use for all allocations
* @param mr Device memory resource used to allocate the returned column
* @param stream CUDA stream on which to execute kernels
*/
template <typename Element, typename MapIterator>
Expand Down
4 changes: 2 additions & 2 deletions cpp/include/cudf/detail/hashing.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ namespace detail {
* @param input The table to partition
* @param columns_to_hash Indices of input columns to hash
* @param num_partitions The number of partitions to use
* @param mr Optional resource to use for device memory allocation
* @param mr Device memory resource used to allocate the returned table
* @param stream Optional stream to use for allocations and copies
*
* @returns An output table and a vector of row offsets to each partition
Expand All @@ -50,7 +50,7 @@ std::pair<std::unique_ptr<experimental::table>, std::vector<size_type>> hash_par
* @param input The table of columns to hash
* @param initial_hash Optional vector of initial hash values for each column.
* If this vector is empty then each element will be hashed as-is.
* @param mr Optional resource to use for device memory allocation
* @param mr Device memory resource used to allocate the returned column
* @param stream Optional stream to use for allocations and copies
*
* @returns A column where each row is the hash of a column from the input
Expand Down
Loading