-
Notifications
You must be signed in to change notification settings - Fork 915
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'branch-0.19' into fix-spark-hash
- Loading branch information
Showing
113 changed files
with
4,963 additions
and
856 deletions.
There are no files selected for viewing
Validating CODEOWNERS rules …
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /* | ||
| * Copyright (c) 2021, NVIDIA CORPORATION. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| #include "string_bench_args.hpp" | ||
|
|
||
| #include <benchmark/benchmark.h> | ||
| #include <benchmarks/common/generate_benchmark_input.hpp> | ||
| #include <benchmarks/fixture/benchmark_fixture.hpp> | ||
| #include <benchmarks/synchronization/synchronization.hpp> | ||
|
|
||
| #include <cudf/strings/replace_re.hpp> | ||
| #include <cudf/strings/strings_column_view.hpp> | ||
| #include <cudf_test/column_wrapper.hpp> | ||
|
|
||
| class StringReplace : public cudf::benchmark { | ||
| }; | ||
|
|
||
| enum replace_type { replace_re, replace_re_multi, replace_backref }; | ||
|
|
||
| static void BM_replace(benchmark::State& state, replace_type rt) | ||
| { | ||
| cudf::size_type const n_rows{static_cast<cudf::size_type>(state.range(0))}; | ||
| cudf::size_type const max_str_length{static_cast<cudf::size_type>(state.range(1))}; | ||
| data_profile table_profile; | ||
| table_profile.set_distribution_params( | ||
| cudf::type_id::STRING, distribution_id::NORMAL, 0, max_str_length); | ||
| auto const table = | ||
| create_random_table({cudf::type_id::STRING}, 1, row_count{n_rows}, table_profile); | ||
| cudf::strings_column_view input(table->view().column(0)); | ||
| cudf::test::strings_column_wrapper repls({"#", ""}); | ||
|
|
||
| for (auto _ : state) { | ||
| cuda_event_timer raii(state, true, 0); | ||
| switch (rt) { | ||
| case replace_type::replace_re: // contains_re and matches_re use the same main logic | ||
| cudf::strings::replace_re(input, "\\d+"); | ||
| break; | ||
| case replace_type::replace_re_multi: // counts occurrences of pattern | ||
| cudf::strings::replace_re(input, {"\\d+", "\\s+"}, cudf::strings_column_view(repls)); | ||
| break; | ||
| case replace_type::replace_backref: // returns occurrences of matches | ||
| cudf::strings::replace_with_backrefs(input, "(\\d+)", "#\\1X"); | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| state.SetBytesProcessed(state.iterations() * input.chars_size()); | ||
| } | ||
|
|
||
| static void generate_bench_args(benchmark::internal::Benchmark* b) | ||
| { | ||
| int const min_rows = 1 << 12; | ||
| int const max_rows = 1 << 24; | ||
| int const row_mult = 8; | ||
| int const min_rowlen = 1 << 5; | ||
| int const max_rowlen = 1 << 13; | ||
| int const len_mult = 4; | ||
| generate_string_bench_args(b, min_rows, max_rows, row_mult, min_rowlen, max_rowlen, len_mult); | ||
| } | ||
|
|
||
| #define STRINGS_BENCHMARK_DEFINE(name) \ | ||
| BENCHMARK_DEFINE_F(StringReplace, name) \ | ||
| (::benchmark::State & st) { BM_replace(st, name); } \ | ||
| BENCHMARK_REGISTER_F(StringReplace, name) \ | ||
| ->Apply(generate_bench_args) \ | ||
| ->UseManualTime() \ | ||
| ->Unit(benchmark::kMillisecond); | ||
|
|
||
| STRINGS_BENCHMARK_DEFINE(replace_re) | ||
| STRINGS_BENCHMARK_DEFINE(replace_re_multi) | ||
| STRINGS_BENCHMARK_DEFINE(replace_backref) |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| /* | ||
| * Copyright (c) 2021, NVIDIA CORPORATION. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| #include "string_bench_args.hpp" | ||
|
|
||
| #include <benchmark/benchmark.h> | ||
| #include <benchmarks/common/generate_benchmark_input.hpp> | ||
| #include <benchmarks/fixture/benchmark_fixture.hpp> | ||
| #include <benchmarks/synchronization/synchronization.hpp> | ||
|
|
||
| #include <cudf/strings/strings_column_view.hpp> | ||
| #include <cudf/strings/translate.hpp> | ||
| #include <cudf_test/column_wrapper.hpp> | ||
|
|
||
| #include <algorithm> | ||
|
|
||
| #include <thrust/iterator/counting_iterator.h> | ||
|
|
||
| class StringTranslate : public cudf::benchmark { | ||
| }; | ||
|
|
||
| using entry_type = std::pair<cudf::char_utf8, cudf::char_utf8>; | ||
|
|
||
| static void BM_translate(benchmark::State& state, int entry_count) | ||
| { | ||
| cudf::size_type const n_rows{static_cast<cudf::size_type>(state.range(0))}; | ||
| cudf::size_type const max_str_length{static_cast<cudf::size_type>(state.range(1))}; | ||
| data_profile table_profile; | ||
| table_profile.set_distribution_params( | ||
| cudf::type_id::STRING, distribution_id::NORMAL, 0, max_str_length); | ||
| auto const table = | ||
| create_random_table({cudf::type_id::STRING}, 1, row_count{n_rows}, table_profile); | ||
| cudf::strings_column_view input(table->view().column(0)); | ||
|
|
||
| std::vector<entry_type> entries(entry_count); | ||
| std::transform(thrust::counting_iterator<int>(0), | ||
| thrust::counting_iterator<int>(entry_count), | ||
| entries.begin(), | ||
| [](auto idx) -> entry_type { | ||
| return entry_type{'!' + idx, '~' - idx}; | ||
| }); | ||
|
|
||
| for (auto _ : state) { | ||
| cuda_event_timer raii(state, true, 0); | ||
| cudf::strings::translate(input, entries); | ||
| } | ||
|
|
||
| state.SetBytesProcessed(state.iterations() * input.chars_size()); | ||
| } | ||
|
|
||
| static void generate_bench_args(benchmark::internal::Benchmark* b) | ||
| { | ||
| int const min_rows = 1 << 12; | ||
| int const max_rows = 1 << 24; | ||
| int const row_mult = 8; | ||
| int const min_rowlen = 1 << 5; | ||
| int const max_rowlen = 1 << 13; | ||
| int const len_mult = 4; | ||
| generate_string_bench_args(b, min_rows, max_rows, row_mult, min_rowlen, max_rowlen, len_mult); | ||
| } | ||
|
|
||
| #define STRINGS_BENCHMARK_DEFINE(name, entries) \ | ||
| BENCHMARK_DEFINE_F(StringTranslate, name) \ | ||
| (::benchmark::State & st) { BM_translate(st, entries); } \ | ||
| BENCHMARK_REGISTER_F(StringTranslate, name) \ | ||
| ->Apply(generate_bench_args) \ | ||
| ->UseManualTime() \ | ||
| ->Unit(benchmark::kMillisecond); | ||
|
|
||
| STRINGS_BENCHMARK_DEFINE(translate_small, 5) | ||
| STRINGS_BENCHMARK_DEFINE(translate_medium, 25) | ||
| STRINGS_BENCHMARK_DEFINE(translate_large, 50) |
Oops, something went wrong.