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

Jump to bottom

Replace thrust::max_element with thrust::reduce in strings findall_re #7428

Merged
merged 1 commit into from
Feb 25, 2021
Merged

Replace thrust::max_element with thrust::reduce in strings findall_re #7428

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
61 changes: 32 additions & 29 deletions cpp/src/strings/findall.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

#include <cudf/column/column.hpp>
#include <cudf/column/column_device_view.cuh>
#include <cudf/column/column_factories.hpp>
#include <cudf/detail/null_mask.hpp>
#include <cudf/detail/nvtx/ranges.hpp>
#include <cudf/strings/detail/strings_column_factories.cuh>
#include <cudf/strings/detail/utilities.hpp>
#include <cudf/strings/findall.hpp>
#include <cudf/strings/string_view.cuh>
Expand Down Expand Up @@ -118,42 +118,43 @@ std::unique_ptr<table> findall_re(
rmm::mr::device_memory_resource* mr = rmm::mr::get_current_device_resource(),
rmm::cuda_stream_view stream = rmm::cuda_stream_default)
{
auto strings_count = strings.size();
auto strings_column = column_device_view::create(strings.parent(), stream);
auto d_strings = *strings_column;
auto const strings_count = strings.size();
auto const d_strings = column_device_view::create(strings.parent(), stream);

auto d_flags = detail::get_character_flags_table();
auto const d_flags = detail::get_character_flags_table();
// compile regex into device object
auto prog = reprog_device::create(pattern, d_flags, strings_count, stream);
auto d_prog = *prog;
int regex_insts = prog->insts_counts();
auto const d_prog = reprog_device::create(pattern, d_flags, strings_count, stream);
auto const regex_insts = d_prog->insts_counts();

rmm::device_vector<size_type> find_counts(strings_count);
auto d_find_counts = find_counts.data().get();
rmm::device_uvector<size_type> find_counts(strings_count, stream);
auto d_find_counts = find_counts.data();

if ((regex_insts > MAX_STACK_INSTS) || (regex_insts <= RX_SMALL_INSTS))
thrust::transform(rmm::exec_policy(stream),
thrust::make_counting_iterator<size_type>(0),
thrust::make_counting_iterator<size_type>(strings_count),
d_find_counts,
findall_count_fn<RX_STACK_SMALL>{d_strings, d_prog});
findall_count_fn<RX_STACK_SMALL>{*d_strings, *d_prog});
else if (regex_insts <= RX_MEDIUM_INSTS)
thrust::transform(rmm::exec_policy(stream),
thrust::make_counting_iterator<size_type>(0),
thrust::make_counting_iterator<size_type>(strings_count),
d_find_counts,
findall_count_fn<RX_STACK_MEDIUM>{d_strings, d_prog});
findall_count_fn<RX_STACK_MEDIUM>{*d_strings, *d_prog});
else
thrust::transform(rmm::exec_policy(stream),
thrust::make_counting_iterator<size_type>(0),
thrust::make_counting_iterator<size_type>(strings_count),
d_find_counts,
findall_count_fn<RX_STACK_LARGE>{d_strings, d_prog});
findall_count_fn<RX_STACK_LARGE>{*d_strings, *d_prog});

std::vector<std::unique_ptr<column>> results;

size_type columns =
*thrust::max_element(rmm::exec_policy(stream), find_counts.begin(), find_counts.end());
size_type const columns = thrust::reduce(rmm::exec_policy(stream),
find_counts.begin(),
find_counts.end(),
0,
thrust::maximum<size_type>{});
// boundary case: if no columns, return all nulls column (issue #119)
if (columns == 0)
results.emplace_back(std::make_unique<column>(
Expand All @@ -164,30 +165,32 @@ std::unique_ptr<table> findall_re(
strings_count));

for (int32_t column_index = 0; column_index < columns; ++column_index) {
rmm::device_vector<string_index_pair> indices(strings_count);
string_index_pair* d_indices = indices.data().get();
rmm::device_uvector<string_index_pair> indices(strings_count, stream);
auto d_indices = indices.data();

if ((regex_insts > MAX_STACK_INSTS) || (regex_insts <= RX_SMALL_INSTS))
thrust::transform(rmm::exec_policy(stream),
thrust::make_counting_iterator<size_type>(0),
thrust::make_counting_iterator<size_type>(strings_count),
d_indices,
findall_fn<RX_STACK_SMALL>{d_strings, d_prog, column_index, d_find_counts});
thrust::transform(
rmm::exec_policy(stream),
thrust::make_counting_iterator<size_type>(0),
thrust::make_counting_iterator<size_type>(strings_count),
d_indices,
findall_fn<RX_STACK_SMALL>{*d_strings, *d_prog, column_index, d_find_counts});
else if (regex_insts <= RX_MEDIUM_INSTS)
thrust::transform(
rmm::exec_policy(stream),
thrust::make_counting_iterator<size_type>(0),
thrust::make_counting_iterator<size_type>(strings_count),
d_indices,
findall_fn<RX_STACK_MEDIUM>{d_strings, d_prog, column_index, d_find_counts});
findall_fn<RX_STACK_MEDIUM>{*d_strings, *d_prog, column_index, d_find_counts});
else
thrust::transform(rmm::exec_policy(stream),
thrust::make_counting_iterator<size_type>(0),
thrust::make_counting_iterator<size_type>(strings_count),
d_indices,
findall_fn<RX_STACK_LARGE>{d_strings, d_prog, column_index, d_find_counts});
thrust::transform(
rmm::exec_policy(stream),
thrust::make_counting_iterator<size_type>(0),
thrust::make_counting_iterator<size_type>(strings_count),
d_indices,
findall_fn<RX_STACK_LARGE>{*d_strings, *d_prog, column_index, d_find_counts});
//
results.emplace_back(make_strings_column(indices, stream, mr));
results.emplace_back(make_strings_column(indices.begin(), indices.end(), stream, mr));
}
return std::make_unique<table>(std::move(results));
}
Expand Down