Fix multi-source reading in JSON byte range reader #15671
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
shrshi
added
bug
vuule
reviewed
May 7, 2024
vuule
approved these changes
May 10, 2024
ttnghia
reviewed
May 10, 2024
ttnghia
reviewed
May 10, 2024
cpp/src/io/json/read_json.cu
Outdated
|
|
||
| // If this is a multi-file source, we scatter the JSON line delimiters between files | ||
| if (sources.size() > 1) { | ||
| static_assert(num_delimiter_chars == 1, | ||
| "Currently only single-character delimiters are supported"); | ||
| auto const delimiter_source = thrust::make_constant_iterator('\n'); | ||
| auto const d_delimiter_map = cudf::detail::make_device_uvector_async( | ||
| host_span<size_type const>{delimiter_map.data(), delimiter_map.size() - 1}, | ||
| host_span<size_type const>{delimiter_map.data(), delimiter_map.size()}, |
There was a problem hiding this comment.
Indeed a vector is implicitly converted into host_span.
Suggested change
| host_span<size_type const>{delimiter_map.data(), delimiter_map.size()}, | |
| delimiter_map, |
There was a problem hiding this comment.
doesn't work well with templated calls.
Maybe the explicit construction here can be avoiding by specifying the type with make_device_uvector_async<size_type const>. The combination of implicit conversion and templated functions is pretty annoying.
There was a problem hiding this comment.
That's what I thought as well, but the implicit conversion works here 😲
There was a problem hiding this comment.
ah, because it's calling a different overload of make_device_uvector_async:
rmm::device_uvector<typename Container::value_type> make_device_uvector_async(
Container const& c, rmm::cuda_stream_view stream, rmm::device_async_resource_ref mr)
ttnghia
approved these changes
May 10, 2024
|
/merge |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR fixes the number of bytes read and corrects the offsets for the delimiters added to the buffer when reading across multiple sources.
Checklist