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

[WIP] Serialize/deserialize with libcudf pack/unpack #5025

Closed
wants to merge 114 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
114 commits
Select commit Hold shift + click to select a range
7a9c48f
table_view pack: first commit.
devavret Apr 17, 2020
3a884e7
Add cudf::unpack
devavret Apr 17, 2020
6e3f23a
Pack-unpack tests fixed width nullable columns
devavret Apr 18, 2020
d43f287
Fix bug of pack still using old table view after contiguous split
devavret Apr 20, 2020
1862f0b
Fixed the case where columns could have nulls.
devavret Apr 20, 2020
a19b5ef
Tests and fix for string columns
devavret Apr 21, 2020
055fada
changelog
devavret Apr 21, 2020
0ac61f2
Use stream and mr in pack. Remove both from unpack
devavret Apr 21, 2020
b3cd355
Change table_data ref to base_ptr as per review
devavret Apr 21, 2020
d0d20f5
Change packed_table to hide serialized_column type
devavret Apr 22, 2020
f211a85
Change API to take ownership of packed_table in unpack
devavret Apr 22, 2020
e80b8d9
Merge branch 'branch-0.14' into pack-unpack
devavret Apr 22, 2020
9fd6985
clang format of code in this PR
devavret Apr 22, 2020
4428907
Change packed_table.table_metadata to unique_ptr
devavret Apr 22, 2020
aac9b14
Initial pack support in Cython
devavret Apr 23, 2020
38a6dff
Cython bindings for unpack
devavret Apr 23, 2020
7e3fb84
Move BufferArrayFromVector from parquet to utils
devavret Apr 23, 2020
2adc6b1
Documentation for pack/unpack
devavret Apr 23, 2020
a52d18b
Fixing style CI
devavret Apr 23, 2020
7f0bef8
Refactor unpack to avoid passing counter around
devavret Apr 23, 2020
110df91
Merge branch 'branch-0.14' of https://github.com/rapidsai/cudf into s…
shwina Apr 24, 2020
44acd2e
Modified pack to work with vector of columns
devavret Apr 24, 2020
b3ca181
Merge branch 'pack-unpack' of https://github.com/devavret/cudf into s…
shwina Apr 27, 2020
66eaeee
Add pack/unpack based serialization
shwina Apr 27, 2020
124a509
Handle any kind of device object in dask_serialize_cudf_object
shwina Apr 27, 2020
fa8c207
Add level_names setter
shwina Apr 27, 2020
7963f5f
Better handling of metadata in serialize/deserialize
shwina Apr 27, 2020
e97d949
Changelog
shwina Apr 28, 2020
0862cc6
Merge branch 'branch-0.14' of https://github.com/rapidsai/cudf into s…
shwina Apr 28, 2020
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
05c22f3
Add deprecation warnings to nvstrings, nvcategory, nvtext
harrism May 22, 2020
c8f2d30
Fix import
harrism May 22, 2020
02c365d
Changelog for #5254
harrism May 22, 2020
5d6868c
Merge branch 'branch-0.14' into pack-unpack
devavret May 22, 2020
ba12d9f
put back column_split_info because it don't need to be exposed anymore.
devavret May 22, 2020
1e722ed
Merge branch 'branch-0.14' into doc-uniform-doc
karthikeyann May 26, 2020
caff618
Fix compilation failure
codereport May 26, 2020
62a6864
Update CHANGELOG
codereport May 26, 2020
71c25f3
Merge branch 'branch-0.14' of https://github.com/rapidsai/cudf into f…
rgsl888prabhu May 26, 2020
cfc99b2
DeprecationWarning for nvstrings, nvcategory and nvtext
rgsl888prabhu May 26, 2020
23abde3
CHANGELOG.md
rgsl888prabhu May 26, 2020
610da49
style and CHANGELOG
rgsl888prabhu May 26, 2020
b765578
addressing reviews
rgsl888prabhu May 26, 2020
81b66d2
Merge branch 'branch-0.14' into bug-fp-debug-fail
codereport May 27, 2020
cfd4b33
Fix unit tests
codereport May 27, 2020
ad45fe2
Update cpp/tests/fixed_point/fixed_point_tests.cu
codereport May 27, 2020
954e1d5
Update cpp/tests/fixed_point/fixed_point_tests.cu
codereport May 27, 2020
2532487
Merge branch 'branch-0.14' into doc-uniform-doc
karthikeyann May 27, 2020
eebed57
Step one remove unused libraries
revans2 May 27, 2020
2f41c1f
Cleanup java dependencies
revans2 May 27, 2020
c7065dd
Update changelog
revans2 May 27, 2020
312106c
Addressing reviews
rgsl888prabhu May 27, 2020
8f451e7
Merge branch 'branch-0.14' into fea-deprecate-nvstrings
rgsl888prabhu May 27, 2020
84d895d
addressing reviews
rgsl888prabhu May 27, 2020
4f0b409
Merge branch 'fea-deprecate-nvstrings' of https://github.com/harrism/…
rgsl888prabhu May 27, 2020
0f47cc6
Addressed review comments
revans2 May 27, 2020
1bc72f5
spell check
revans2 May 27, 2020
45858a6
moving the nvstring condition below
rgsl888prabhu May 27, 2020
4520d0f
Merge pull request #5216 from karthikeyann/doc-uniform-doc
karthikeyann May 27, 2020
2bc016c
Merge branch 'pack-unpack' of https://github.com/devavret/cudf into s…
shwina May 27, 2020
9dca5ab
Merge pull request #5254 from harrism/fea-deprecate-nvstrings
May 27, 2020
5a607ff
Merge pull request #5285 from codereport/bug-fp-debug-fail
codereport May 27, 2020
7d7904c
Merge branch 'branch-0.14' into fix-deps
revans2 May 27, 2020
f7470a8
Merge pull request #5298 from revans2/fix-deps
revans2 May 27, 2020
afc2b5e
Hack around current Serializable requirements
shwina May 27, 2020
eb2975b
Merge branch 'branch-0.14' of https://github.com/rapidsai/cudf into s…
shwina May 27, 2020
ff406d8
Handle host frames in serialization
jakirkham May 28, 2020
83e9c4b
Revert "Hack around current Serializable requirements"
shwina May 28, 2020
d51bd54
Merge branch 'hdl_host_frames_ser' into serialize-with-pack-unpack
shwina May 28, 2020
0dec2e3
Convert DeviceBuffer<->Buffer when calling pack/unpack
shwina May 28, 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
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
- PR #5288 Drop `auto_pickle` decorator #5288
- PR #5231 Type `Buffer` as `uint8`
- PR #5308 Coerce frames to `Buffer`s in deserialization
- PR #5309 Handle host frames in serialization

## Bug Fixes

Expand All @@ -27,6 +28,7 @@
- PR #4789 Disallow timestamp sum and diffs via binary ops
- PR #4815 Add JNI total memory allocated API
- PR #4906 Add Java bindings for interleave_columns
- PR #4941 Add `cudf::pack` and `cudf::unpack`
- PR #4900 Add `get_element` to obtain scalar from a column given an index
- PR #4938 Add Java bindings for strip
- PR #4923 Add Java and JNI bindings for string split
Expand All @@ -49,6 +51,7 @@
- PR #5192 Add support for `cudf.to_datetime`
- PR #5203 Add Java bindings for is_integer and is_float
- PR #5205 Add ci test for libcudf, libnvstrings headers existence check in meta.yml
- PR #5293 Add Java bindings for replace_with_backrefs

## Improvements

Expand Down Expand Up @@ -167,6 +170,7 @@
- PR #4998 Clean up dispatch of aggregation methods in result_cache
- PR #5000 Performance improvements in `isin` and dask_cudf backend
- PR #5002 Fix Column.__reduce__ to accept `null_count`
- PR #5025 Serialize/deserialize with libcudf pack/unpack
- PR #5006 Add Java bindings for strip, lstrip and rstrip
- PR #5047 Add Cython binding for libcudf++ CSV reader
- PR #5027 Move nvstrings standalone docs pages to libcudf doxygen pages
Expand Down Expand Up @@ -214,6 +218,10 @@
- PR #5233 Remove experimental namespace used during libcudf++ refactor
- PR #5213 Documentation enhancements to `cudf` python APIs
- PR #5251 Fix more mispellings in cpp comments and strings
- PR #5254 Deprecate nvstrings, nvcategory and nvtext
- PR #5270 Add support to check for "NaT" and "None" strings while typecasting to `datetime64`
- PR #5298 Remove unused native deps from java library
- PR #5216 Make documentation uniform for params
- PR #5261 Add short git commit to conda package name

## Bug Fixes
Expand Down Expand Up @@ -341,6 +349,7 @@
- PR #5224 Add new headers from 5198 to libcudf/meta.yaml
- PR #5228 Fix datetime64 scalar dtype handling for unsupported time units
- PR #5256 ORC reader: fix loading individual timestamp columns
- PR #5285 Fix DEBUG compilation failure due to `fixed_point.hpp`


# cuDF 0.13.0 (31 Mar 2020)
Expand Down
1 change: 1 addition & 0 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,7 @@ add_library(cudf
src/copying/slice.cpp
src/copying/split.cpp
src/copying/contiguous_split.cu
src/copying/pack.cpp
src/copying/copy_range.cu
src/copying/get_element.cu
src/filling/fill.cu
Expand Down
8 changes: 4 additions & 4 deletions cpp/include/cudf/binaryop.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,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's device memory
* @return Output column of `output_type` type containing the result of
* the binary operation
* @throw cudf::logic_error if @p output_type dtype isn't fixed-width
Expand All @@ -111,7 +111,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's device memory
* @return Output column of `output_type` type containing the result of
* the binary operation
* @throw cudf::logic_error if @p output_type dtype isn't fixed-width
Expand All @@ -134,7 +134,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's device memory
* @return Output column of `output_type` type containing the result of
* the binary operation
* @throw cudf::logic_error if @p lhs and @p rhs are different sizes
Expand Down Expand Up @@ -162,7 +162,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's device memory
* @return Output column of `output_type` type containing the result of
* the binary operation
* @throw cudf::logic_error if @p lhs and @p rhs are different sizes
Expand Down
9 changes: 4 additions & 5 deletions cpp/include/cudf/column/column.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ class column {
* and copies.
*
* @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 stream CUDA stream used for device memory operations.
* @param mr Device memory resource to use for all device memory allocations
*/
column(column const& other,
cudaStream_t stream,
Expand Down Expand Up @@ -113,9 +113,8 @@ class column {
* This accounts for the `column_view`'s offset.
*
* @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 stream CUDA stream used for device memory operations.
* @param mr Device memory resource to use for all device memory allocations
*/
explicit column(column_view view,
cudaStream_t stream = 0,
Expand Down
6 changes: 2 additions & 4 deletions cpp/include/cudf/column/column_device_view.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -373,8 +373,7 @@ class alignas(16) column_device_view : public detail::column_device_view_base {
* A `column_device_view` should be passed by value into GPU kernels.
*
* @param source_view The `column_view` to make usable in device code
* @param stream optional, stream on which the memory for children will be
* allocated
* @param stream CUDA stream used for device memory operations for children columns.
* @return A `unique_ptr` to a `column_device_view` that makes the data from
*`source_view` available in device memory.
*/
Expand Down Expand Up @@ -465,8 +464,7 @@ class alignas(16) mutable_column_device_view : public detail::column_device_view
* A `mutable_column_device_view` should be passed by value into GPU kernels.
*
* @param source_view The `column_view` to make usable in device code
* @param stream optional, stream on which the memory for children will be
* allocated
* @param stream CUDA stream used for device memory operations for children columns.
* @return A `unique_ptr` to a `mutable_column_device_view` that makes the
* data from `source_view` available in device memory.
*/
Expand Down
76 changes: 29 additions & 47 deletions cpp/include/cudf/column/column_factories.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,8 @@ std::unique_ptr<column> make_empty_column(data_type type);
* @param[in] size The number of elements in the column
* @param[in] state Optional, controls allocation/initialization of the
* column's null mask. By default, no null mask is allocated.
* @param[in] stream Optional stream on which to issue all memory allocation and
* device kernels
* @param[in] mr Optional resource to use for device memory
* allocation of the column's `data` and `null_mask`.
* @param[in] stream CUDA stream used for device memory operations and kernel launches.
* @param[in] mr Device memory resource used to allocate the returned column's device memory
*/
std::unique_ptr<column> make_numeric_column(
data_type type,
Expand All @@ -76,10 +74,8 @@ std::unique_ptr<column> make_numeric_column(
* @param[in] size The number of elements in the column
* @param[in] null_mask Null mask to use for this column.
* @param[in] null_count Optional number of nulls in the null_mask.
* @param[in] stream Optional stream on which to issue all memory allocation and
* device kernels
* @param[in] mr Optional resource to use for device memory
* allocation of the column's `data` and `null_mask`.
* @param[in] stream CUDA stream used for device memory operations and kernel launches.
* @param[in] mr Device memory resource used to allocate the returned column's device memory
*/
template <typename B>
std::unique_ptr<column> make_numeric_column(
Expand Down Expand Up @@ -112,10 +108,8 @@ std::unique_ptr<column> make_numeric_column(
* @param[in] size The number of elements in the column
* @param[in] state Optional, controls allocation/initialization of the
* column's null mask. By default, no null mask is allocated.
* @param[in] stream Optional stream on which to issue all memory allocation and
* device kernels
* @param[in] mr Optional resource to use for device memory
* allocation of the column's `data` and `null_mask`.
* @param[in] stream CUDA stream used for device memory operations and kernel launches.
* @param[in] mr Device memory resource used to allocate the returned column's device memory
*/
std::unique_ptr<column> make_timestamp_column(
data_type type,
Expand All @@ -138,10 +132,8 @@ std::unique_ptr<column> make_timestamp_column(
* @param[in] size The number of elements in the column
* @param[in] null_mask Null mask to use for this column.
* @param[in] null_count Optional number of nulls in the null_mask.
* @param[in] stream Optional stream on which to issue all memory allocation and
* device kernels
* @param[in] mr Optional resource to use for device memory
* allocation of the column's `data` and `null_mask`.
* @param[in] stream CUDA stream used for device memory operations and kernel launches.
* @param[in] mr Device memory resource used to allocate the returned column's device memory
*/
template <typename B>
std::unique_ptr<column> make_timestamp_column(
Expand Down Expand Up @@ -174,10 +166,8 @@ std::unique_ptr<column> make_timestamp_column(
* @param[in] size The number of elements in the column
* @param[in] state Optional, controls allocation/initialization of the
* column's null mask. By default, no null mask is allocated.
* @param[in] stream Optional stream on which to issue all memory allocation and device
* kernels
* @param[in] mr Optional resource to use for device memory
* allocation of the column's `data` and `null_mask`.
* @param[in] stream CUDA stream used for device memory operations and kernel launches.
* @param[in] mr Device memory resource used to allocate the returned column's device memory
*/
std::unique_ptr<column> make_fixed_width_column(
data_type type,
Expand All @@ -200,10 +190,8 @@ std::unique_ptr<column> make_fixed_width_column(
* @param[in] size The number of elements in the column
* @param[in] null_mask Null mask to use for this column.
* @param[in] null_count Optional number of nulls in the null_mask.
* @param[in] stream Optional stream on which to issue all memory allocation and device
* kernels
* @param[in] mr Optional resource to use for device memory
* allocation of the column's `data` and `null_mask`.
* @param[in] stream CUDA stream used for device memory operations and kernel launches.
* @param[in] mr Device memory resource used to allocate the returned column's device memory
*/
template <typename B>
std::unique_ptr<column> make_fixed_width_column(
Expand Down Expand Up @@ -239,10 +227,9 @@ std::unique_ptr<column> make_fixed_width_column(
* @param strings The vector of pointer/size pairs.
* Each pointer must be a device memory address or `nullptr`
* (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 stream CUDA stream used for device memory operations and kernel launches.
* @param mr Device memory resource used for allocation of the column's `null_mask` and children
* columns' device memory.
*/
std::unique_ptr<column> make_strings_column(
const rmm::device_vector<thrust::pair<const char*, size_type>>& strings,
Expand Down Expand Up @@ -271,10 +258,9 @@ std::unique_ptr<column> make_strings_column(
* bytes.
* @param null_placeholder string_view indicating null string in given list of
* 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 stream CUDA stream used for device memory operations and kernel launches.
* @param mr Device memory resource used for allocation of the column's `null_mask` and children
* columns' device memory.
*/
std::unique_ptr<column> make_strings_column(
const rmm::device_vector<string_view>& string_views,
Expand Down Expand Up @@ -310,10 +296,9 @@ std::unique_ptr<column> make_strings_column(
* @param null_count The number of null string entries. If equal to
* `UNKNOWN_NULL_COUNT`, the null count will be computed dynamically on the
* 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 stream CUDA stream used for device memory operations and kernel launches.
* @param mr Device memory resource used for allocation of the column's `null_mask` and children
* columns' device memory.
*/
std::unique_ptr<column> make_strings_column(
const rmm::device_vector<char>& strings,
Expand Down Expand Up @@ -351,10 +336,9 @@ std::unique_ptr<column> make_strings_column(
* @param null_count The number of null string entries. If equal to
* `UNKNOWN_NULL_COUNT`, the null count will be computed dynamically on the
* 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 stream CUDA stream used for device memory operations and kernel launches.
* @param mr Device memory resource used for allocation of the column's `null_mask` and children
* columns' device memory.
*/
std::unique_ptr<column> make_strings_column(
const std::vector<char>& strings,
Expand All @@ -380,10 +364,9 @@ std::unique_ptr<column> make_strings_column(
* @param null_count The number of null string entries.
* @param null_mask The bits specifying the null strings in device memory.
* 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 stream CUDA stream used for device memory operations and kernel launches.
* @param mr Device memory resource used for allocation of the column's `null_mask` and children
* columns' device memory.
*/
std::unique_ptr<column> make_strings_column(
size_type num_strings,
Expand All @@ -404,9 +387,8 @@ std::unique_ptr<column> make_strings_column(
*
* @param s The scalar to use for values in the 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 stream CUDA stream used for device memory operations and kernel launches.
* @param mr Device memory resource used to allocate the returned column's device memory.
*/
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's device memory.
* @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's device memory.
* @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
Loading