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

Clean up more literal zero cuda_stream_view arguments #7968

Merged
merged 2 commits into from
Apr 15, 2021
Merged

Clean up more literal zero cuda_stream_view arguments #7968

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4736b2d
Clean up more literal zero cuda_stream_view arguments
davidwendt Apr 15, 2021
5bf0b9f
use rmm::exec_policy instead of thrust::device
davidwendt Apr 15, 2021
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
2 changes: 1 addition & 1 deletion cpp/benchmarks/string/json_benchmark.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ static void BM_case(benchmark::State& state, QueryArg&&... query_arg)
std::string json_path(query_arg...);

for (auto _ : state) {
cuda_event_timer raii(state, true, 0);
cuda_event_timer raii(state, true);
auto result = cudf::strings::get_json_object(scv, json_path);
cudaStreamSynchronize(0);
}
Expand Down
2 changes: 1 addition & 1 deletion cpp/benchmarks/text/ngrams_benchmark.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ static void BM_ngrams(benchmark::State& state, ngrams_type nt)
cudf::strings_column_view input(table->view().column(0));

for (auto _ : state) {
cuda_event_timer raii(state, true, 0);
cuda_event_timer raii(state, true);
switch (nt) {
case ngrams_type::tokens: nvtext::generate_ngrams(input); break;
case ngrams_type::characters: nvtext::generate_character_ngrams(input); break;
Expand Down
2 changes: 1 addition & 1 deletion cpp/benchmarks/text/replace_benchmark.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ static void BM_replace(benchmark::State& state)
cudf::test::strings_column_wrapper replacements({"1", "2", "7", "0"});

for (auto _ : state) {
cuda_event_timer raii(state, true, 0);
cuda_event_timer raii(state, true);
nvtext::replace_tokens(
view, cudf::strings_column_view(targets), cudf::strings_column_view(replacements));
}
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/strings/json/json_path.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -945,7 +945,7 @@ std::unique_ptr<cudf::column> get_json_object(cudf::strings_column_view const& c
rmm::mr::device_memory_resource* mr)
{
CUDF_FUNC_RANGE();
return detail::get_json_object(col, json_path, 0, mr);
return detail::get_json_object(col, json_path, rmm::cuda_stream_default, mr);
}

} // namespace strings
Expand Down
10 changes: 5 additions & 5 deletions cpp/tests/transform/row_bit_count_test.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <cudf_test/column_wrapper.hpp>
#include <cudf_test/type_lists.hpp>

#include <rmm/exec_policy.hpp>
#include <thrust/execution_policy.h>

using namespace cudf;

Expand All @@ -47,7 +47,7 @@ TYPED_TEST(RowBitCountTyped, SimpleTypes)
// expect size of the type per row
auto expected = make_fixed_width_column(data_type{type_id::INT32}, 16);
cudf::mutable_column_view mcv(*expected);
thrust::fill(rmm::exec_policy(0),
thrust::fill(thrust::device,
davidwendt marked this conversation as resolved.
Show resolved Hide resolved
mcv.begin<size_type>(),
mcv.end<size_type>(),
sizeof(device_storage_type_t<T>) * CHAR_BIT);
Expand All @@ -70,7 +70,7 @@ TYPED_TEST(RowBitCountTyped, SimpleTypesWithNulls)
// expect size of the type + 1 bit per row
auto expected = make_fixed_width_column(data_type{type_id::INT32}, 16);
cudf::mutable_column_view mcv(*expected);
thrust::fill(rmm::exec_policy(0),
thrust::fill(thrust::device,
mcv.begin<size_type>(),
mcv.end<size_type>(),
(sizeof(device_storage_type_t<T>) * CHAR_BIT) + 1);
Expand Down Expand Up @@ -490,7 +490,7 @@ TEST_F(RowBitCount, Table)
auto expected = cudf::make_fixed_width_column(data_type{type_id::INT32}, t.num_rows());
cudf::mutable_column_view mcv(*expected);
thrust::transform(
rmm::exec_policy(0),
thrust::device,
thrust::make_counting_iterator(0),
thrust::make_counting_iterator(0) + t.num_rows(),
mcv.begin<size_type>(),
Expand Down Expand Up @@ -586,7 +586,7 @@ TEST_F(RowBitCount, EmptyTable)
}

{
auto strings = cudf::strings::detail::make_empty_strings_column(0);
auto strings = cudf::make_empty_column(data_type{type_id::STRING});
auto ints = cudf::make_empty_column(data_type{type_id::INT32});
cudf::table_view empty({*strings, *ints});

Expand Down