From 190b0a9025158fd7310b91f9f8f97971f8a46338 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Mon, 24 Jan 2022 10:39:41 -0600 Subject: [PATCH 1/5] Rename benchmarks files. --- cpp/benchmarks/ast/{transform_benchmark.cpp => transform.cpp} | 0 cpp/benchmarks/binaryop/{binaryop_benchmark.cpp => binaryop.cpp} | 0 .../{compiled_binaryop_benchmark.cpp => compiled_binaryop.cpp} | 0 .../column/{concatenate_benchmark.cpp => concatenate.cpp} | 0 .../common/{generate_benchmark_input.cpp => generate_input.cpp} | 0 .../common/{generate_benchmark_input.hpp => generate_input.hpp} | 0 .../{contiguous_split_benchmark.cu => contiguous_split.cu} | 0 .../copying/{copy_if_else_benchmark.cpp => copy_if_else.cpp} | 0 cpp/benchmarks/copying/{gather_benchmark.cu => gather.cu} | 0 cpp/benchmarks/copying/{scatter_benchmark.cu => scatter.cu} | 0 cpp/benchmarks/copying/{shift_benchmark.cu => shift.cu} | 0 cpp/benchmarks/filling/{repeat_benchmark.cpp => repeat.cpp} | 0 .../{templated_benchmark_fixture.hpp => templated_fixture.hpp} | 0 .../groupby/{group_benchmark_common.hpp => group_common.hpp} | 0 .../{group_no_requests_benchmark.cu => group_no_requests.cu} | 0 cpp/benchmarks/groupby/{group_nth_benchmark.cu => group_nth.cu} | 0 cpp/benchmarks/groupby/{group_scan_benchmark.cu => group_scan.cu} | 0 .../groupby/{group_shift_benchmark.cu => group_shift.cu} | 0 .../groupby/{group_struct_benchmark.cu => group_struct.cu} | 0 cpp/benchmarks/groupby/{group_sum_benchmark.cu => group_sum.cu} | 0 cpp/benchmarks/hashing/{hash_benchmark.cpp => hash.cpp} | 0 cpp/benchmarks/hashing/{partition_benchmark.cpp => partition.cpp} | 0 cpp/benchmarks/io/{cuio_benchmark_common.cpp => cuio_common.cpp} | 0 cpp/benchmarks/io/{cuio_benchmark_common.hpp => cuio_common.hpp} | 0 cpp/benchmarks/iterator/{iterator_benchmark.cu => iterator.cu} | 0 .../join/{conditional_join_benchmark.cu => conditional_join.cu} | 0 cpp/benchmarks/join/{join_benchmark.cu => join.cu} | 0 .../join/{join_benchmark_common.hpp => join_common.hpp} | 0 cpp/benchmarks/merge/{merge_benchmark.cpp => merge.cpp} | 0 .../null_mask/{set_null_mask_benchmark.cpp => set_null_mask.cpp} | 0 .../quantiles/{quantiles_benchmark.cpp => quantiles.cpp} | 0 cpp/benchmarks/reduction/{anyall_benchmark.cpp => anyall.cpp} | 0 .../reduction/{dictionary_benchmark.cpp => dictionary.cpp} | 0 cpp/benchmarks/reduction/{minmax_benchmark.cpp => minmax.cpp} | 0 cpp/benchmarks/reduction/{reduce_benchmark.cpp => reduce.cpp} | 0 cpp/benchmarks/reduction/{scan_benchmark.cpp => scan.cpp} | 0 cpp/benchmarks/replace/{clamp_benchmark.cpp => clamp.cpp} | 0 cpp/benchmarks/replace/{nans_benchmark.cpp => nans.cpp} | 0 cpp/benchmarks/search/{search_benchmark.cpp => search.cpp} | 0 cpp/benchmarks/sort/{rank_benchmark.cpp => rank.cpp} | 0 cpp/benchmarks/sort/{sort_benchmark.cpp => sort.cpp} | 0 .../sort/{sort_strings_benchmark.cpp => sort_strings.cpp} | 0 .../{apply_boolean_mask_benchmark.cpp => apply_boolean_mask.cpp} | 0 .../{drop_duplicates_benchmark.cpp => drop_duplicates.cpp} | 0 cpp/benchmarks/string/{case_benchmark.cpp => case.cpp} | 0 cpp/benchmarks/string/{combine_benchmark.cpp => combine.cpp} | 0 cpp/benchmarks/string/{contains_benchmark.cpp => contains.cpp} | 0 .../{convert_datetime_benchmark.cpp => convert_datetime.cpp} | 0 .../{convert_durations_benchmark.cpp => convert_durations.cpp} | 0 ...{convert_fixed_point_benchmark.cpp => convert_fixed_point.cpp} | 0 .../{convert_numerics_benchmark.cpp => convert_numerics.cpp} | 0 cpp/benchmarks/string/{copy_benchmark.cpp => copy.cpp} | 0 cpp/benchmarks/string/{extract_benchmark.cpp => extract.cpp} | 0 cpp/benchmarks/string/{factory_benchmark.cu => factory.cu} | 0 cpp/benchmarks/string/{filter_benchmark.cpp => filter.cpp} | 0 cpp/benchmarks/string/{find_benchmark.cpp => find.cpp} | 0 cpp/benchmarks/string/{json_benchmark.cpp => json.cpp} | 0 .../string/{repeat_strings_benchmark.cpp => repeat_strings.cpp} | 0 cpp/benchmarks/string/{replace_benchmark.cpp => replace.cpp} | 0 .../string/{replace_re_benchmark.cpp => replace_re.cpp} | 0 cpp/benchmarks/string/{split_benchmark.cpp => split.cpp} | 0 cpp/benchmarks/string/{substring_benchmark.cpp => substring.cpp} | 0 cpp/benchmarks/string/{translate_benchmark.cpp => translate.cpp} | 0 .../string/{url_decode_benchmark.cpp => url_decode.cpp} | 0 cpp/benchmarks/text/{ngrams_benchmark.cpp => ngrams.cpp} | 0 cpp/benchmarks/text/{normalize_benchmark.cpp => normalize.cpp} | 0 .../text/{normalize_spaces_benchmark.cpp => normalize_spaces.cpp} | 0 cpp/benchmarks/text/{replace_benchmark.cpp => replace.cpp} | 0 cpp/benchmarks/text/{subword_benchmark.cpp => subword.cpp} | 0 cpp/benchmarks/text/{tokenize_benchmark.cpp => tokenize.cpp} | 0 cpp/benchmarks/transpose/{transpose_benchmark.cu => transpose.cu} | 0 .../{type_dispatcher_benchmark.cu => type_dispatcher.cu} | 0 72 files changed, 0 insertions(+), 0 deletions(-) rename cpp/benchmarks/ast/{transform_benchmark.cpp => transform.cpp} (100%) rename cpp/benchmarks/binaryop/{binaryop_benchmark.cpp => binaryop.cpp} (100%) rename cpp/benchmarks/binaryop/{compiled_binaryop_benchmark.cpp => compiled_binaryop.cpp} (100%) rename cpp/benchmarks/column/{concatenate_benchmark.cpp => concatenate.cpp} (100%) rename cpp/benchmarks/common/{generate_benchmark_input.cpp => generate_input.cpp} (100%) rename cpp/benchmarks/common/{generate_benchmark_input.hpp => generate_input.hpp} (100%) rename cpp/benchmarks/copying/{contiguous_split_benchmark.cu => contiguous_split.cu} (100%) rename cpp/benchmarks/copying/{copy_if_else_benchmark.cpp => copy_if_else.cpp} (100%) rename cpp/benchmarks/copying/{gather_benchmark.cu => gather.cu} (100%) rename cpp/benchmarks/copying/{scatter_benchmark.cu => scatter.cu} (100%) rename cpp/benchmarks/copying/{shift_benchmark.cu => shift.cu} (100%) rename cpp/benchmarks/filling/{repeat_benchmark.cpp => repeat.cpp} (100%) rename cpp/benchmarks/fixture/{templated_benchmark_fixture.hpp => templated_fixture.hpp} (100%) rename cpp/benchmarks/groupby/{group_benchmark_common.hpp => group_common.hpp} (100%) rename cpp/benchmarks/groupby/{group_no_requests_benchmark.cu => group_no_requests.cu} (100%) rename cpp/benchmarks/groupby/{group_nth_benchmark.cu => group_nth.cu} (100%) rename cpp/benchmarks/groupby/{group_scan_benchmark.cu => group_scan.cu} (100%) rename cpp/benchmarks/groupby/{group_shift_benchmark.cu => group_shift.cu} (100%) rename cpp/benchmarks/groupby/{group_struct_benchmark.cu => group_struct.cu} (100%) rename cpp/benchmarks/groupby/{group_sum_benchmark.cu => group_sum.cu} (100%) rename cpp/benchmarks/hashing/{hash_benchmark.cpp => hash.cpp} (100%) rename cpp/benchmarks/hashing/{partition_benchmark.cpp => partition.cpp} (100%) rename cpp/benchmarks/io/{cuio_benchmark_common.cpp => cuio_common.cpp} (100%) rename cpp/benchmarks/io/{cuio_benchmark_common.hpp => cuio_common.hpp} (100%) rename cpp/benchmarks/iterator/{iterator_benchmark.cu => iterator.cu} (100%) rename cpp/benchmarks/join/{conditional_join_benchmark.cu => conditional_join.cu} (100%) rename cpp/benchmarks/join/{join_benchmark.cu => join.cu} (100%) rename cpp/benchmarks/join/{join_benchmark_common.hpp => join_common.hpp} (100%) rename cpp/benchmarks/merge/{merge_benchmark.cpp => merge.cpp} (100%) rename cpp/benchmarks/null_mask/{set_null_mask_benchmark.cpp => set_null_mask.cpp} (100%) rename cpp/benchmarks/quantiles/{quantiles_benchmark.cpp => quantiles.cpp} (100%) rename cpp/benchmarks/reduction/{anyall_benchmark.cpp => anyall.cpp} (100%) rename cpp/benchmarks/reduction/{dictionary_benchmark.cpp => dictionary.cpp} (100%) rename cpp/benchmarks/reduction/{minmax_benchmark.cpp => minmax.cpp} (100%) rename cpp/benchmarks/reduction/{reduce_benchmark.cpp => reduce.cpp} (100%) rename cpp/benchmarks/reduction/{scan_benchmark.cpp => scan.cpp} (100%) rename cpp/benchmarks/replace/{clamp_benchmark.cpp => clamp.cpp} (100%) rename cpp/benchmarks/replace/{nans_benchmark.cpp => nans.cpp} (100%) rename cpp/benchmarks/search/{search_benchmark.cpp => search.cpp} (100%) rename cpp/benchmarks/sort/{rank_benchmark.cpp => rank.cpp} (100%) rename cpp/benchmarks/sort/{sort_benchmark.cpp => sort.cpp} (100%) rename cpp/benchmarks/sort/{sort_strings_benchmark.cpp => sort_strings.cpp} (100%) rename cpp/benchmarks/stream_compaction/{apply_boolean_mask_benchmark.cpp => apply_boolean_mask.cpp} (100%) rename cpp/benchmarks/stream_compaction/{drop_duplicates_benchmark.cpp => drop_duplicates.cpp} (100%) rename cpp/benchmarks/string/{case_benchmark.cpp => case.cpp} (100%) rename cpp/benchmarks/string/{combine_benchmark.cpp => combine.cpp} (100%) rename cpp/benchmarks/string/{contains_benchmark.cpp => contains.cpp} (100%) rename cpp/benchmarks/string/{convert_datetime_benchmark.cpp => convert_datetime.cpp} (100%) rename cpp/benchmarks/string/{convert_durations_benchmark.cpp => convert_durations.cpp} (100%) rename cpp/benchmarks/string/{convert_fixed_point_benchmark.cpp => convert_fixed_point.cpp} (100%) rename cpp/benchmarks/string/{convert_numerics_benchmark.cpp => convert_numerics.cpp} (100%) rename cpp/benchmarks/string/{copy_benchmark.cpp => copy.cpp} (100%) rename cpp/benchmarks/string/{extract_benchmark.cpp => extract.cpp} (100%) rename cpp/benchmarks/string/{factory_benchmark.cu => factory.cu} (100%) rename cpp/benchmarks/string/{filter_benchmark.cpp => filter.cpp} (100%) rename cpp/benchmarks/string/{find_benchmark.cpp => find.cpp} (100%) rename cpp/benchmarks/string/{json_benchmark.cpp => json.cpp} (100%) rename cpp/benchmarks/string/{repeat_strings_benchmark.cpp => repeat_strings.cpp} (100%) rename cpp/benchmarks/string/{replace_benchmark.cpp => replace.cpp} (100%) rename cpp/benchmarks/string/{replace_re_benchmark.cpp => replace_re.cpp} (100%) rename cpp/benchmarks/string/{split_benchmark.cpp => split.cpp} (100%) rename cpp/benchmarks/string/{substring_benchmark.cpp => substring.cpp} (100%) rename cpp/benchmarks/string/{translate_benchmark.cpp => translate.cpp} (100%) rename cpp/benchmarks/string/{url_decode_benchmark.cpp => url_decode.cpp} (100%) rename cpp/benchmarks/text/{ngrams_benchmark.cpp => ngrams.cpp} (100%) rename cpp/benchmarks/text/{normalize_benchmark.cpp => normalize.cpp} (100%) rename cpp/benchmarks/text/{normalize_spaces_benchmark.cpp => normalize_spaces.cpp} (100%) rename cpp/benchmarks/text/{replace_benchmark.cpp => replace.cpp} (100%) rename cpp/benchmarks/text/{subword_benchmark.cpp => subword.cpp} (100%) rename cpp/benchmarks/text/{tokenize_benchmark.cpp => tokenize.cpp} (100%) rename cpp/benchmarks/transpose/{transpose_benchmark.cu => transpose.cu} (100%) rename cpp/benchmarks/type_dispatcher/{type_dispatcher_benchmark.cu => type_dispatcher.cu} (100%) diff --git a/cpp/benchmarks/ast/transform_benchmark.cpp b/cpp/benchmarks/ast/transform.cpp similarity index 100% rename from cpp/benchmarks/ast/transform_benchmark.cpp rename to cpp/benchmarks/ast/transform.cpp diff --git a/cpp/benchmarks/binaryop/binaryop_benchmark.cpp b/cpp/benchmarks/binaryop/binaryop.cpp similarity index 100% rename from cpp/benchmarks/binaryop/binaryop_benchmark.cpp rename to cpp/benchmarks/binaryop/binaryop.cpp diff --git a/cpp/benchmarks/binaryop/compiled_binaryop_benchmark.cpp b/cpp/benchmarks/binaryop/compiled_binaryop.cpp similarity index 100% rename from cpp/benchmarks/binaryop/compiled_binaryop_benchmark.cpp rename to cpp/benchmarks/binaryop/compiled_binaryop.cpp diff --git a/cpp/benchmarks/column/concatenate_benchmark.cpp b/cpp/benchmarks/column/concatenate.cpp similarity index 100% rename from cpp/benchmarks/column/concatenate_benchmark.cpp rename to cpp/benchmarks/column/concatenate.cpp diff --git a/cpp/benchmarks/common/generate_benchmark_input.cpp b/cpp/benchmarks/common/generate_input.cpp similarity index 100% rename from cpp/benchmarks/common/generate_benchmark_input.cpp rename to cpp/benchmarks/common/generate_input.cpp diff --git a/cpp/benchmarks/common/generate_benchmark_input.hpp b/cpp/benchmarks/common/generate_input.hpp similarity index 100% rename from cpp/benchmarks/common/generate_benchmark_input.hpp rename to cpp/benchmarks/common/generate_input.hpp diff --git a/cpp/benchmarks/copying/contiguous_split_benchmark.cu b/cpp/benchmarks/copying/contiguous_split.cu similarity index 100% rename from cpp/benchmarks/copying/contiguous_split_benchmark.cu rename to cpp/benchmarks/copying/contiguous_split.cu diff --git a/cpp/benchmarks/copying/copy_if_else_benchmark.cpp b/cpp/benchmarks/copying/copy_if_else.cpp similarity index 100% rename from cpp/benchmarks/copying/copy_if_else_benchmark.cpp rename to cpp/benchmarks/copying/copy_if_else.cpp diff --git a/cpp/benchmarks/copying/gather_benchmark.cu b/cpp/benchmarks/copying/gather.cu similarity index 100% rename from cpp/benchmarks/copying/gather_benchmark.cu rename to cpp/benchmarks/copying/gather.cu diff --git a/cpp/benchmarks/copying/scatter_benchmark.cu b/cpp/benchmarks/copying/scatter.cu similarity index 100% rename from cpp/benchmarks/copying/scatter_benchmark.cu rename to cpp/benchmarks/copying/scatter.cu diff --git a/cpp/benchmarks/copying/shift_benchmark.cu b/cpp/benchmarks/copying/shift.cu similarity index 100% rename from cpp/benchmarks/copying/shift_benchmark.cu rename to cpp/benchmarks/copying/shift.cu diff --git a/cpp/benchmarks/filling/repeat_benchmark.cpp b/cpp/benchmarks/filling/repeat.cpp similarity index 100% rename from cpp/benchmarks/filling/repeat_benchmark.cpp rename to cpp/benchmarks/filling/repeat.cpp diff --git a/cpp/benchmarks/fixture/templated_benchmark_fixture.hpp b/cpp/benchmarks/fixture/templated_fixture.hpp similarity index 100% rename from cpp/benchmarks/fixture/templated_benchmark_fixture.hpp rename to cpp/benchmarks/fixture/templated_fixture.hpp diff --git a/cpp/benchmarks/groupby/group_benchmark_common.hpp b/cpp/benchmarks/groupby/group_common.hpp similarity index 100% rename from cpp/benchmarks/groupby/group_benchmark_common.hpp rename to cpp/benchmarks/groupby/group_common.hpp diff --git a/cpp/benchmarks/groupby/group_no_requests_benchmark.cu b/cpp/benchmarks/groupby/group_no_requests.cu similarity index 100% rename from cpp/benchmarks/groupby/group_no_requests_benchmark.cu rename to cpp/benchmarks/groupby/group_no_requests.cu diff --git a/cpp/benchmarks/groupby/group_nth_benchmark.cu b/cpp/benchmarks/groupby/group_nth.cu similarity index 100% rename from cpp/benchmarks/groupby/group_nth_benchmark.cu rename to cpp/benchmarks/groupby/group_nth.cu diff --git a/cpp/benchmarks/groupby/group_scan_benchmark.cu b/cpp/benchmarks/groupby/group_scan.cu similarity index 100% rename from cpp/benchmarks/groupby/group_scan_benchmark.cu rename to cpp/benchmarks/groupby/group_scan.cu diff --git a/cpp/benchmarks/groupby/group_shift_benchmark.cu b/cpp/benchmarks/groupby/group_shift.cu similarity index 100% rename from cpp/benchmarks/groupby/group_shift_benchmark.cu rename to cpp/benchmarks/groupby/group_shift.cu diff --git a/cpp/benchmarks/groupby/group_struct_benchmark.cu b/cpp/benchmarks/groupby/group_struct.cu similarity index 100% rename from cpp/benchmarks/groupby/group_struct_benchmark.cu rename to cpp/benchmarks/groupby/group_struct.cu diff --git a/cpp/benchmarks/groupby/group_sum_benchmark.cu b/cpp/benchmarks/groupby/group_sum.cu similarity index 100% rename from cpp/benchmarks/groupby/group_sum_benchmark.cu rename to cpp/benchmarks/groupby/group_sum.cu diff --git a/cpp/benchmarks/hashing/hash_benchmark.cpp b/cpp/benchmarks/hashing/hash.cpp similarity index 100% rename from cpp/benchmarks/hashing/hash_benchmark.cpp rename to cpp/benchmarks/hashing/hash.cpp diff --git a/cpp/benchmarks/hashing/partition_benchmark.cpp b/cpp/benchmarks/hashing/partition.cpp similarity index 100% rename from cpp/benchmarks/hashing/partition_benchmark.cpp rename to cpp/benchmarks/hashing/partition.cpp diff --git a/cpp/benchmarks/io/cuio_benchmark_common.cpp b/cpp/benchmarks/io/cuio_common.cpp similarity index 100% rename from cpp/benchmarks/io/cuio_benchmark_common.cpp rename to cpp/benchmarks/io/cuio_common.cpp diff --git a/cpp/benchmarks/io/cuio_benchmark_common.hpp b/cpp/benchmarks/io/cuio_common.hpp similarity index 100% rename from cpp/benchmarks/io/cuio_benchmark_common.hpp rename to cpp/benchmarks/io/cuio_common.hpp diff --git a/cpp/benchmarks/iterator/iterator_benchmark.cu b/cpp/benchmarks/iterator/iterator.cu similarity index 100% rename from cpp/benchmarks/iterator/iterator_benchmark.cu rename to cpp/benchmarks/iterator/iterator.cu diff --git a/cpp/benchmarks/join/conditional_join_benchmark.cu b/cpp/benchmarks/join/conditional_join.cu similarity index 100% rename from cpp/benchmarks/join/conditional_join_benchmark.cu rename to cpp/benchmarks/join/conditional_join.cu diff --git a/cpp/benchmarks/join/join_benchmark.cu b/cpp/benchmarks/join/join.cu similarity index 100% rename from cpp/benchmarks/join/join_benchmark.cu rename to cpp/benchmarks/join/join.cu diff --git a/cpp/benchmarks/join/join_benchmark_common.hpp b/cpp/benchmarks/join/join_common.hpp similarity index 100% rename from cpp/benchmarks/join/join_benchmark_common.hpp rename to cpp/benchmarks/join/join_common.hpp diff --git a/cpp/benchmarks/merge/merge_benchmark.cpp b/cpp/benchmarks/merge/merge.cpp similarity index 100% rename from cpp/benchmarks/merge/merge_benchmark.cpp rename to cpp/benchmarks/merge/merge.cpp diff --git a/cpp/benchmarks/null_mask/set_null_mask_benchmark.cpp b/cpp/benchmarks/null_mask/set_null_mask.cpp similarity index 100% rename from cpp/benchmarks/null_mask/set_null_mask_benchmark.cpp rename to cpp/benchmarks/null_mask/set_null_mask.cpp diff --git a/cpp/benchmarks/quantiles/quantiles_benchmark.cpp b/cpp/benchmarks/quantiles/quantiles.cpp similarity index 100% rename from cpp/benchmarks/quantiles/quantiles_benchmark.cpp rename to cpp/benchmarks/quantiles/quantiles.cpp diff --git a/cpp/benchmarks/reduction/anyall_benchmark.cpp b/cpp/benchmarks/reduction/anyall.cpp similarity index 100% rename from cpp/benchmarks/reduction/anyall_benchmark.cpp rename to cpp/benchmarks/reduction/anyall.cpp diff --git a/cpp/benchmarks/reduction/dictionary_benchmark.cpp b/cpp/benchmarks/reduction/dictionary.cpp similarity index 100% rename from cpp/benchmarks/reduction/dictionary_benchmark.cpp rename to cpp/benchmarks/reduction/dictionary.cpp diff --git a/cpp/benchmarks/reduction/minmax_benchmark.cpp b/cpp/benchmarks/reduction/minmax.cpp similarity index 100% rename from cpp/benchmarks/reduction/minmax_benchmark.cpp rename to cpp/benchmarks/reduction/minmax.cpp diff --git a/cpp/benchmarks/reduction/reduce_benchmark.cpp b/cpp/benchmarks/reduction/reduce.cpp similarity index 100% rename from cpp/benchmarks/reduction/reduce_benchmark.cpp rename to cpp/benchmarks/reduction/reduce.cpp diff --git a/cpp/benchmarks/reduction/scan_benchmark.cpp b/cpp/benchmarks/reduction/scan.cpp similarity index 100% rename from cpp/benchmarks/reduction/scan_benchmark.cpp rename to cpp/benchmarks/reduction/scan.cpp diff --git a/cpp/benchmarks/replace/clamp_benchmark.cpp b/cpp/benchmarks/replace/clamp.cpp similarity index 100% rename from cpp/benchmarks/replace/clamp_benchmark.cpp rename to cpp/benchmarks/replace/clamp.cpp diff --git a/cpp/benchmarks/replace/nans_benchmark.cpp b/cpp/benchmarks/replace/nans.cpp similarity index 100% rename from cpp/benchmarks/replace/nans_benchmark.cpp rename to cpp/benchmarks/replace/nans.cpp diff --git a/cpp/benchmarks/search/search_benchmark.cpp b/cpp/benchmarks/search/search.cpp similarity index 100% rename from cpp/benchmarks/search/search_benchmark.cpp rename to cpp/benchmarks/search/search.cpp diff --git a/cpp/benchmarks/sort/rank_benchmark.cpp b/cpp/benchmarks/sort/rank.cpp similarity index 100% rename from cpp/benchmarks/sort/rank_benchmark.cpp rename to cpp/benchmarks/sort/rank.cpp diff --git a/cpp/benchmarks/sort/sort_benchmark.cpp b/cpp/benchmarks/sort/sort.cpp similarity index 100% rename from cpp/benchmarks/sort/sort_benchmark.cpp rename to cpp/benchmarks/sort/sort.cpp diff --git a/cpp/benchmarks/sort/sort_strings_benchmark.cpp b/cpp/benchmarks/sort/sort_strings.cpp similarity index 100% rename from cpp/benchmarks/sort/sort_strings_benchmark.cpp rename to cpp/benchmarks/sort/sort_strings.cpp diff --git a/cpp/benchmarks/stream_compaction/apply_boolean_mask_benchmark.cpp b/cpp/benchmarks/stream_compaction/apply_boolean_mask.cpp similarity index 100% rename from cpp/benchmarks/stream_compaction/apply_boolean_mask_benchmark.cpp rename to cpp/benchmarks/stream_compaction/apply_boolean_mask.cpp diff --git a/cpp/benchmarks/stream_compaction/drop_duplicates_benchmark.cpp b/cpp/benchmarks/stream_compaction/drop_duplicates.cpp similarity index 100% rename from cpp/benchmarks/stream_compaction/drop_duplicates_benchmark.cpp rename to cpp/benchmarks/stream_compaction/drop_duplicates.cpp diff --git a/cpp/benchmarks/string/case_benchmark.cpp b/cpp/benchmarks/string/case.cpp similarity index 100% rename from cpp/benchmarks/string/case_benchmark.cpp rename to cpp/benchmarks/string/case.cpp diff --git a/cpp/benchmarks/string/combine_benchmark.cpp b/cpp/benchmarks/string/combine.cpp similarity index 100% rename from cpp/benchmarks/string/combine_benchmark.cpp rename to cpp/benchmarks/string/combine.cpp diff --git a/cpp/benchmarks/string/contains_benchmark.cpp b/cpp/benchmarks/string/contains.cpp similarity index 100% rename from cpp/benchmarks/string/contains_benchmark.cpp rename to cpp/benchmarks/string/contains.cpp diff --git a/cpp/benchmarks/string/convert_datetime_benchmark.cpp b/cpp/benchmarks/string/convert_datetime.cpp similarity index 100% rename from cpp/benchmarks/string/convert_datetime_benchmark.cpp rename to cpp/benchmarks/string/convert_datetime.cpp diff --git a/cpp/benchmarks/string/convert_durations_benchmark.cpp b/cpp/benchmarks/string/convert_durations.cpp similarity index 100% rename from cpp/benchmarks/string/convert_durations_benchmark.cpp rename to cpp/benchmarks/string/convert_durations.cpp diff --git a/cpp/benchmarks/string/convert_fixed_point_benchmark.cpp b/cpp/benchmarks/string/convert_fixed_point.cpp similarity index 100% rename from cpp/benchmarks/string/convert_fixed_point_benchmark.cpp rename to cpp/benchmarks/string/convert_fixed_point.cpp diff --git a/cpp/benchmarks/string/convert_numerics_benchmark.cpp b/cpp/benchmarks/string/convert_numerics.cpp similarity index 100% rename from cpp/benchmarks/string/convert_numerics_benchmark.cpp rename to cpp/benchmarks/string/convert_numerics.cpp diff --git a/cpp/benchmarks/string/copy_benchmark.cpp b/cpp/benchmarks/string/copy.cpp similarity index 100% rename from cpp/benchmarks/string/copy_benchmark.cpp rename to cpp/benchmarks/string/copy.cpp diff --git a/cpp/benchmarks/string/extract_benchmark.cpp b/cpp/benchmarks/string/extract.cpp similarity index 100% rename from cpp/benchmarks/string/extract_benchmark.cpp rename to cpp/benchmarks/string/extract.cpp diff --git a/cpp/benchmarks/string/factory_benchmark.cu b/cpp/benchmarks/string/factory.cu similarity index 100% rename from cpp/benchmarks/string/factory_benchmark.cu rename to cpp/benchmarks/string/factory.cu diff --git a/cpp/benchmarks/string/filter_benchmark.cpp b/cpp/benchmarks/string/filter.cpp similarity index 100% rename from cpp/benchmarks/string/filter_benchmark.cpp rename to cpp/benchmarks/string/filter.cpp diff --git a/cpp/benchmarks/string/find_benchmark.cpp b/cpp/benchmarks/string/find.cpp similarity index 100% rename from cpp/benchmarks/string/find_benchmark.cpp rename to cpp/benchmarks/string/find.cpp diff --git a/cpp/benchmarks/string/json_benchmark.cpp b/cpp/benchmarks/string/json.cpp similarity index 100% rename from cpp/benchmarks/string/json_benchmark.cpp rename to cpp/benchmarks/string/json.cpp diff --git a/cpp/benchmarks/string/repeat_strings_benchmark.cpp b/cpp/benchmarks/string/repeat_strings.cpp similarity index 100% rename from cpp/benchmarks/string/repeat_strings_benchmark.cpp rename to cpp/benchmarks/string/repeat_strings.cpp diff --git a/cpp/benchmarks/string/replace_benchmark.cpp b/cpp/benchmarks/string/replace.cpp similarity index 100% rename from cpp/benchmarks/string/replace_benchmark.cpp rename to cpp/benchmarks/string/replace.cpp diff --git a/cpp/benchmarks/string/replace_re_benchmark.cpp b/cpp/benchmarks/string/replace_re.cpp similarity index 100% rename from cpp/benchmarks/string/replace_re_benchmark.cpp rename to cpp/benchmarks/string/replace_re.cpp diff --git a/cpp/benchmarks/string/split_benchmark.cpp b/cpp/benchmarks/string/split.cpp similarity index 100% rename from cpp/benchmarks/string/split_benchmark.cpp rename to cpp/benchmarks/string/split.cpp diff --git a/cpp/benchmarks/string/substring_benchmark.cpp b/cpp/benchmarks/string/substring.cpp similarity index 100% rename from cpp/benchmarks/string/substring_benchmark.cpp rename to cpp/benchmarks/string/substring.cpp diff --git a/cpp/benchmarks/string/translate_benchmark.cpp b/cpp/benchmarks/string/translate.cpp similarity index 100% rename from cpp/benchmarks/string/translate_benchmark.cpp rename to cpp/benchmarks/string/translate.cpp diff --git a/cpp/benchmarks/string/url_decode_benchmark.cpp b/cpp/benchmarks/string/url_decode.cpp similarity index 100% rename from cpp/benchmarks/string/url_decode_benchmark.cpp rename to cpp/benchmarks/string/url_decode.cpp diff --git a/cpp/benchmarks/text/ngrams_benchmark.cpp b/cpp/benchmarks/text/ngrams.cpp similarity index 100% rename from cpp/benchmarks/text/ngrams_benchmark.cpp rename to cpp/benchmarks/text/ngrams.cpp diff --git a/cpp/benchmarks/text/normalize_benchmark.cpp b/cpp/benchmarks/text/normalize.cpp similarity index 100% rename from cpp/benchmarks/text/normalize_benchmark.cpp rename to cpp/benchmarks/text/normalize.cpp diff --git a/cpp/benchmarks/text/normalize_spaces_benchmark.cpp b/cpp/benchmarks/text/normalize_spaces.cpp similarity index 100% rename from cpp/benchmarks/text/normalize_spaces_benchmark.cpp rename to cpp/benchmarks/text/normalize_spaces.cpp diff --git a/cpp/benchmarks/text/replace_benchmark.cpp b/cpp/benchmarks/text/replace.cpp similarity index 100% rename from cpp/benchmarks/text/replace_benchmark.cpp rename to cpp/benchmarks/text/replace.cpp diff --git a/cpp/benchmarks/text/subword_benchmark.cpp b/cpp/benchmarks/text/subword.cpp similarity index 100% rename from cpp/benchmarks/text/subword_benchmark.cpp rename to cpp/benchmarks/text/subword.cpp diff --git a/cpp/benchmarks/text/tokenize_benchmark.cpp b/cpp/benchmarks/text/tokenize.cpp similarity index 100% rename from cpp/benchmarks/text/tokenize_benchmark.cpp rename to cpp/benchmarks/text/tokenize.cpp diff --git a/cpp/benchmarks/transpose/transpose_benchmark.cu b/cpp/benchmarks/transpose/transpose.cu similarity index 100% rename from cpp/benchmarks/transpose/transpose_benchmark.cu rename to cpp/benchmarks/transpose/transpose.cu diff --git a/cpp/benchmarks/type_dispatcher/type_dispatcher_benchmark.cu b/cpp/benchmarks/type_dispatcher/type_dispatcher.cu similarity index 100% rename from cpp/benchmarks/type_dispatcher/type_dispatcher_benchmark.cu rename to cpp/benchmarks/type_dispatcher/type_dispatcher.cu From 2d60f1f7432c06da904da1304d770e88329412b0 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Mon, 24 Jan 2022 10:39:47 -0600 Subject: [PATCH 2/5] Update CMake. --- cpp/benchmarks/CMakeLists.txt | 134 +++++++++++++++++----------------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/cpp/benchmarks/CMakeLists.txt b/cpp/benchmarks/CMakeLists.txt index 370f84fc14a..3e88141b42f 100644 --- a/cpp/benchmarks/CMakeLists.txt +++ b/cpp/benchmarks/CMakeLists.txt @@ -14,7 +14,7 @@ find_package(Threads REQUIRED) -add_library(cudf_datagen STATIC common/generate_benchmark_input.cpp) +add_library(cudf_datagen STATIC common/generate_input.cpp) target_compile_features(cudf_datagen PUBLIC cxx_std_17 cuda_std_17) target_compile_options( @@ -39,7 +39,7 @@ target_include_directories( # Use an OBJECT library so we only compile these helper source files only once add_library( cudf_benchmark_common OBJECT "${CUDF_SOURCE_DIR}/tests/utilities/base_fixture.cpp" - synchronization/synchronization.cpp io/cuio_benchmark_common.cpp + synchronization/synchronization.cpp io/cuio_common.cpp ) target_link_libraries(cudf_benchmark_common PRIVATE cudf_datagen) add_custom_command( @@ -86,194 +86,194 @@ endfunction() # ################################################################################################## # * column benchmarks ----------------------------------------------------------------------------- -ConfigureBench(COLUMN_CONCAT_BENCH column/concatenate_benchmark.cpp) +ConfigureBench(COLUMN_CONCAT_BENCH column/concatenate.cpp) # ################################################################################################## # * gather benchmark ------------------------------------------------------------------------------ -ConfigureBench(GATHER_BENCH copying/gather_benchmark.cu) +ConfigureBench(GATHER_BENCH copying/gather.cu) # ################################################################################################## # * scatter benchmark ----------------------------------------------------------------------------- -ConfigureBench(SCATTER_BENCH copying/scatter_benchmark.cu) +ConfigureBench(SCATTER_BENCH copying/scatter.cu) # ################################################################################################## # * lists scatter benchmark ----------------------------------------------------------------------- -ConfigureBench(SCATTER_LISTS_BENCH lists/copying/scatter_lists_benchmark.cu) +ConfigureBench(SCATTER_LISTS_BENCH lists/copying/scatter_lists.cu) # ################################################################################################## # * contiguous_split benchmark ------------------------------------------------------------------- -ConfigureBench(CONTIGUOUS_SPLIT_BENCH copying/contiguous_split_benchmark.cu) +ConfigureBench(CONTIGUOUS_SPLIT_BENCH copying/contiguous_split.cu) # ################################################################################################## # * shift benchmark ------------------------------------------------------------------------------- -ConfigureBench(SHIFT_BENCH copying/shift_benchmark.cu) +ConfigureBench(SHIFT_BENCH copying/shift.cu) # ################################################################################################## # * copy-if-else benchmark # ----------------------------------------------------------------------------- -ConfigureBench(COPY_IF_ELSE_BENCH copying/copy_if_else_benchmark.cpp) +ConfigureBench(COPY_IF_ELSE_BENCH copying/copy_if_else.cpp) # ################################################################################################## # * transpose benchmark --------------------------------------------------------------------------- -ConfigureBench(TRANSPOSE_BENCH transpose/transpose_benchmark.cu) +ConfigureBench(TRANSPOSE_BENCH transpose/transpose.cu) # ################################################################################################## # * apply_boolean_mask benchmark ------------------------------------------------------------------ -ConfigureBench(APPLY_BOOLEAN_MASK_BENCH stream_compaction/apply_boolean_mask_benchmark.cpp) +ConfigureBench(APPLY_BOOLEAN_MASK_BENCH stream_compaction/apply_boolean_mask.cpp) # ################################################################################################## # * stream_compaction benchmark ------------------------------------------------------------------- -ConfigureBench(STREAM_COMPACTION_BENCH stream_compaction/drop_duplicates_benchmark.cpp) +ConfigureBench(STREAM_COMPACTION_BENCH stream_compaction/drop_duplicates.cpp) # ################################################################################################## # * join benchmark -------------------------------------------------------------------------------- -ConfigureBench(JOIN_BENCH join/join_benchmark.cu join/conditional_join_benchmark.cu) +ConfigureBench(JOIN_BENCH join/join.cu join/conditional_join.cu) ConfigureNVBench(JOIN_NVBENCH join/join_nvbench.cu) # ################################################################################################## # * iterator benchmark ---------------------------------------------------------------------------- -ConfigureBench(ITERATOR_BENCH iterator/iterator_benchmark.cu) +ConfigureBench(ITERATOR_BENCH iterator/iterator.cu) # ################################################################################################## # * search benchmark ------------------------------------------------------------------------------ -ConfigureBench(SEARCH_BENCH search/search_benchmark.cpp) +ConfigureBench(SEARCH_BENCH search/search.cpp) # ################################################################################################## # * sort benchmark -------------------------------------------------------------------------------- ConfigureBench( - SORT_BENCH sort/rank_benchmark.cpp sort/sort_benchmark.cpp sort/sort_strings_benchmark.cpp + SORT_BENCH sort/rank.cpp sort/sort.cpp sort/sort_strings.cpp ) # ################################################################################################## # * quantiles benchmark # -------------------------------------------------------------------------------- -ConfigureBench(QUANTILES_BENCH quantiles/quantiles_benchmark.cpp) +ConfigureBench(QUANTILES_BENCH quantiles/quantiles.cpp) # ################################################################################################## # * type_dispatcher benchmark --------------------------------------------------------------------- -ConfigureBench(TYPE_DISPATCHER_BENCH type_dispatcher/type_dispatcher_benchmark.cu) +ConfigureBench(TYPE_DISPATCHER_BENCH type_dispatcher/type_dispatcher.cu) # ################################################################################################## # * reduction benchmark --------------------------------------------------------------------------- ConfigureBench( - REDUCTION_BENCH reduction/anyall_benchmark.cpp reduction/dictionary_benchmark.cpp - reduction/reduce_benchmark.cpp reduction/scan_benchmark.cpp reduction/minmax_benchmark.cpp + REDUCTION_BENCH reduction/anyall.cpp reduction/dictionary.cpp + reduction/reduce.cpp reduction/scan.cpp reduction/minmax.cpp ) # ################################################################################################## # * reduction benchmark --------------------------------------------------------------------------- -ConfigureBench(REPLACE_BENCH replace/clamp_benchmark.cpp replace/nans_benchmark.cpp) +ConfigureBench(REPLACE_BENCH replace/clamp.cpp replace/nans.cpp) # ################################################################################################## # * filling benchmark ----------------------------------------------------------------------------- -ConfigureBench(FILL_BENCH filling/repeat_benchmark.cpp) +ConfigureBench(FILL_BENCH filling/repeat.cpp) # ################################################################################################## # * groupby benchmark ----------------------------------------------------------------------------- ConfigureBench( GROUPBY_BENCH - groupby/group_sum_benchmark.cu - groupby/group_nth_benchmark.cu - groupby/group_shift_benchmark.cu - groupby/group_struct_benchmark.cu - groupby/group_no_requests_benchmark.cu - groupby/group_scan_benchmark.cu + groupby/group_sum.cu + groupby/group_nth.cu + groupby/group_shift.cu + groupby/group_struct.cu + groupby/group_no_requests.cu + groupby/group_scan.cu ) # ################################################################################################## # * hashing benchmark ----------------------------------------------------------------------------- -ConfigureBench(HASHING_BENCH hashing/hash_benchmark.cpp hashing/partition_benchmark.cpp) +ConfigureBench(HASHING_BENCH hashing/hash.cpp hashing/partition.cpp) # ################################################################################################## # * merge benchmark ------------------------------------------------------------------------------- -ConfigureBench(MERGE_BENCH merge/merge_benchmark.cpp) +ConfigureBench(MERGE_BENCH merge/merge.cpp) # ################################################################################################## # * null_mask benchmark --------------------------------------------------------------------------- -ConfigureBench(NULLMASK_BENCH null_mask/set_null_mask_benchmark.cpp) +ConfigureBench(NULLMASK_BENCH null_mask/set_null_mask.cpp) # ################################################################################################## # * parquet writer chunks benchmark --------------------------------------------------------------- -ConfigureBench(PARQUET_WRITER_CHUNKS_BENCH io/parquet/parquet_writer_chunks_benchmark.cpp) +ConfigureBench(PARQUET_WRITER_CHUNKS_BENCH io/parquet/parquet_writer_chunks.cpp) # ################################################################################################## # * parquet reader benchmark ---------------------------------------------------------------------- -ConfigureBench(PARQUET_READER_BENCH io/parquet/parquet_reader_benchmark.cpp) +ConfigureBench(PARQUET_READER_BENCH io/parquet/parquet_reader.cpp) # ################################################################################################## # * orc reader benchmark -------------------------------------------------------------------------- -ConfigureBench(ORC_READER_BENCH io/orc/orc_reader_benchmark.cpp) +ConfigureBench(ORC_READER_BENCH io/orc/orc_reader.cpp) # ################################################################################################## # * csv reader benchmark -------------------------------------------------------------------------- -ConfigureBench(CSV_READER_BENCH io/csv/csv_reader_benchmark.cpp) +ConfigureBench(CSV_READER_BENCH io/csv/csv_reader.cpp) # ################################################################################################## # * parquet writer benchmark ---------------------------------------------------------------------- -ConfigureBench(PARQUET_WRITER_BENCH io/parquet/parquet_writer_benchmark.cpp) +ConfigureBench(PARQUET_WRITER_BENCH io/parquet/parquet_writer.cpp) # ################################################################################################## # * orc writer benchmark -------------------------------------------------------------------------- -ConfigureBench(ORC_WRITER_BENCH io/orc/orc_writer_benchmark.cpp) +ConfigureBench(ORC_WRITER_BENCH io/orc/orc_writer.cpp) # ################################################################################################## # * csv writer benchmark -------------------------------------------------------------------------- -ConfigureBench(CSV_WRITER_BENCH io/csv/csv_writer_benchmark.cpp) +ConfigureBench(CSV_WRITER_BENCH io/csv/csv_writer.cpp) # ################################################################################################## # * ast benchmark --------------------------------------------------------------------------------- -ConfigureBench(AST_BENCH ast/transform_benchmark.cpp) +ConfigureBench(AST_BENCH ast/transform.cpp) # ################################################################################################## # * binaryop benchmark ---------------------------------------------------------------------------- ConfigureBench( - BINARYOP_BENCH binaryop/binaryop_benchmark.cpp binaryop/compiled_binaryop_benchmark.cpp + BINARYOP_BENCH binaryop/binaryop.cpp binaryop/compiled_binaryop.cpp ) # ################################################################################################## # * nvtext benchmark ------------------------------------------------------------------- ConfigureBench( TEXT_BENCH - text/ngrams_benchmark.cpp - text/normalize_benchmark.cpp - text/normalize_spaces_benchmark.cpp - text/replace_benchmark.cpp - text/subword_benchmark.cpp - text/tokenize_benchmark.cpp + text/ngrams.cpp + text/normalize.cpp + text/normalize_spaces.cpp + text/replace.cpp + text/subword.cpp + text/tokenize.cpp ) # ################################################################################################## # * strings benchmark ------------------------------------------------------------------- ConfigureBench( STRINGS_BENCH - string/case_benchmark.cpp - string/combine_benchmark.cpp - string/contains_benchmark.cpp - string/convert_datetime_benchmark.cpp - string/convert_durations_benchmark.cpp - string/convert_fixed_point_benchmark.cpp - string/convert_numerics_benchmark.cpp - string/copy_benchmark.cpp - string/extract_benchmark.cpp - string/factory_benchmark.cu - string/filter_benchmark.cpp - string/find_benchmark.cpp - string/repeat_strings_benchmark.cpp - string/replace_benchmark.cpp - string/replace_re_benchmark.cpp - string/split_benchmark.cpp - string/substring_benchmark.cpp - string/translate_benchmark.cpp - string/url_decode_benchmark.cpp + string/case.cpp + string/combine.cpp + string/contains.cpp + string/convert_datetime.cpp + string/convert_durations.cpp + string/convert_fixed_point.cpp + string/convert_numerics.cpp + string/copy.cpp + string/extract.cpp + string/factory.cu + string/filter.cpp + string/find.cpp + string/repeat_strings.cpp + string/replace.cpp + string/replace_re.cpp + string/split.cpp + string/substring.cpp + string/translate.cpp + string/url_decode.cpp ) # ################################################################################################## # * json benchmark ------------------------------------------------------------------- -ConfigureBench(JSON_BENCH string/json_benchmark.cpp) +ConfigureBench(JSON_BENCH string/json.cpp) # ################################################################################################## # * io benchmark --------------------------------------------------------------------- -ConfigureBench(MULTIBYTE_SPLIT_BENCHMARK io/text/multibyte_split_benchmark.cpp) +ConfigureBench(MULTIBYTE_SPLIT_BENCHMARK io/text/multibyte_split.cpp) add_custom_target( run_benchmarks From e0b2c008ed9df0ff9d2726c381c914e1c80e94e3 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Mon, 24 Jan 2022 12:45:15 -0600 Subject: [PATCH 3/5] Fix build. --- cpp/benchmarks/common/generate_input.cpp | 2 +- cpp/benchmarks/common/generate_input.hpp | 2 +- cpp/benchmarks/common/random_distribution_factory.hpp | 2 +- cpp/benchmarks/copying/copy_if_else.cpp | 2 +- ...{templated_fixture.hpp => templated_benchmark_fixture.hpp} | 0 cpp/benchmarks/groupby/group_no_requests.cu | 2 +- cpp/benchmarks/groupby/group_nth.cu | 2 +- cpp/benchmarks/groupby/group_scan.cu | 2 +- cpp/benchmarks/groupby/group_shift.cu | 2 +- cpp/benchmarks/groupby/group_struct.cu | 2 +- cpp/benchmarks/groupby/group_sum.cu | 2 +- cpp/benchmarks/hashing/hash.cpp | 2 +- .../io/csv/{csv_reader_benchmark.cpp => csv_reader.cpp} | 4 ++-- .../io/csv/{csv_writer_benchmark.cpp => csv_writer.cpp} | 4 ++-- cpp/benchmarks/io/cuio_common.cpp | 2 +- .../io/orc/{orc_reader_benchmark.cpp => orc_reader.cpp} | 4 ++-- .../io/orc/{orc_writer_benchmark.cpp => orc_writer.cpp} | 4 ++-- .../{parquet_reader_benchmark.cpp => parquet_reader.cpp} | 4 ++-- .../{parquet_writer_benchmark.cpp => parquet_writer.cpp} | 4 ++-- ..._writer_chunks_benchmark.cpp => parquet_writer_chunks.cpp} | 2 +- .../{multibyte_split_benchmark.cpp => multibyte_split.cpp} | 4 ++-- cpp/benchmarks/join/conditional_join.cu | 2 +- cpp/benchmarks/join/join.cu | 2 +- cpp/benchmarks/join/join_nvbench.cu | 2 +- .../copying/{scatter_lists_benchmark.cu => scatter_lists.cu} | 0 cpp/benchmarks/quantiles/quantiles.cpp | 2 +- cpp/benchmarks/reduction/scan.cpp | 2 +- cpp/benchmarks/replace/clamp.cpp | 2 +- cpp/benchmarks/replace/nans.cpp | 2 +- cpp/benchmarks/sort/rank.cpp | 2 +- cpp/benchmarks/sort/sort.cpp | 2 +- cpp/benchmarks/sort/sort_strings.cpp | 2 +- cpp/benchmarks/string/case.cpp | 2 +- cpp/benchmarks/string/combine.cpp | 2 +- cpp/benchmarks/string/contains.cpp | 2 +- cpp/benchmarks/string/convert_datetime.cpp | 2 +- cpp/benchmarks/string/convert_fixed_point.cpp | 2 +- cpp/benchmarks/string/convert_numerics.cpp | 2 +- cpp/benchmarks/string/copy.cpp | 2 +- cpp/benchmarks/string/extract.cpp | 2 +- cpp/benchmarks/string/factory.cu | 2 +- cpp/benchmarks/string/filter.cpp | 2 +- cpp/benchmarks/string/find.cpp | 2 +- cpp/benchmarks/string/json.cpp | 2 +- cpp/benchmarks/string/repeat_strings.cpp | 2 +- cpp/benchmarks/string/replace.cpp | 2 +- cpp/benchmarks/string/replace_re.cpp | 2 +- cpp/benchmarks/string/split.cpp | 2 +- cpp/benchmarks/string/substring.cpp | 2 +- cpp/benchmarks/string/translate.cpp | 2 +- cpp/benchmarks/text/ngrams.cpp | 2 +- cpp/benchmarks/text/normalize.cpp | 2 +- cpp/benchmarks/text/normalize_spaces.cpp | 2 +- cpp/benchmarks/text/tokenize.cpp | 2 +- cpp/docs/BENCHMARKING.md | 4 ++-- 55 files changed, 61 insertions(+), 61 deletions(-) rename cpp/benchmarks/fixture/{templated_fixture.hpp => templated_benchmark_fixture.hpp} (100%) rename cpp/benchmarks/io/csv/{csv_reader_benchmark.cpp => csv_reader.cpp} (98%) rename cpp/benchmarks/io/csv/{csv_writer_benchmark.cpp => csv_writer.cpp} (97%) rename cpp/benchmarks/io/orc/{orc_reader_benchmark.cpp => orc_reader.cpp} (98%) rename cpp/benchmarks/io/orc/{orc_writer_benchmark.cpp => orc_writer.cpp} (98%) rename cpp/benchmarks/io/parquet/{parquet_reader_benchmark.cpp => parquet_reader.cpp} (98%) rename cpp/benchmarks/io/parquet/{parquet_writer_benchmark.cpp => parquet_writer.cpp} (98%) rename cpp/benchmarks/io/parquet/{parquet_writer_chunks_benchmark.cpp => parquet_writer_chunks.cpp} (98%) rename cpp/benchmarks/io/text/{multibyte_split_benchmark.cpp => multibyte_split.cpp} (98%) rename cpp/benchmarks/lists/copying/{scatter_lists_benchmark.cu => scatter_lists.cu} (100%) diff --git a/cpp/benchmarks/common/generate_input.cpp b/cpp/benchmarks/common/generate_input.cpp index dcd8e32fc9d..3147b21e0d7 100644 --- a/cpp/benchmarks/common/generate_input.cpp +++ b/cpp/benchmarks/common/generate_input.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "generate_benchmark_input.hpp" +#include "generate_input.hpp" #include "random_distribution_factory.hpp" #include diff --git a/cpp/benchmarks/common/generate_input.hpp b/cpp/benchmarks/common/generate_input.hpp index 893c8a61543..8261341ccfb 100644 --- a/cpp/benchmarks/common/generate_input.hpp +++ b/cpp/benchmarks/common/generate_input.hpp @@ -22,7 +22,7 @@ #include /** - * @file generate_benchmark_input.hpp + * @file generate_input.hpp * @brief Contains declarations of functions that generate columns filled with random data. * * Also includes the data profile descriptor classes. diff --git a/cpp/benchmarks/common/random_distribution_factory.hpp b/cpp/benchmarks/common/random_distribution_factory.hpp index 65dc8b4dd4d..48e6855c39a 100644 --- a/cpp/benchmarks/common/random_distribution_factory.hpp +++ b/cpp/benchmarks/common/random_distribution_factory.hpp @@ -16,7 +16,7 @@ #pragma once -#include "generate_benchmark_input.hpp" +#include "generate_input.hpp" #include #include diff --git a/cpp/benchmarks/copying/copy_if_else.cpp b/cpp/benchmarks/copying/copy_if_else.cpp index 513e4f4c179..6f3ba34e373 100644 --- a/cpp/benchmarks/copying/copy_if_else.cpp +++ b/cpp/benchmarks/copying/copy_if_else.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include diff --git a/cpp/benchmarks/fixture/templated_fixture.hpp b/cpp/benchmarks/fixture/templated_benchmark_fixture.hpp similarity index 100% rename from cpp/benchmarks/fixture/templated_fixture.hpp rename to cpp/benchmarks/fixture/templated_benchmark_fixture.hpp diff --git a/cpp/benchmarks/groupby/group_no_requests.cu b/cpp/benchmarks/groupby/group_no_requests.cu index 209155862bd..750e0c6d3b3 100644 --- a/cpp/benchmarks/groupby/group_no_requests.cu +++ b/cpp/benchmarks/groupby/group_no_requests.cu @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include diff --git a/cpp/benchmarks/groupby/group_nth.cu b/cpp/benchmarks/groupby/group_nth.cu index 107b3839c4c..daeb88f6dee 100644 --- a/cpp/benchmarks/groupby/group_nth.cu +++ b/cpp/benchmarks/groupby/group_nth.cu @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include diff --git a/cpp/benchmarks/groupby/group_scan.cu b/cpp/benchmarks/groupby/group_scan.cu index d9849e53498..9a6d7b51429 100644 --- a/cpp/benchmarks/groupby/group_scan.cu +++ b/cpp/benchmarks/groupby/group_scan.cu @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include diff --git a/cpp/benchmarks/groupby/group_shift.cu b/cpp/benchmarks/groupby/group_shift.cu index 6b0710f4044..29bc99f6b61 100644 --- a/cpp/benchmarks/groupby/group_shift.cu +++ b/cpp/benchmarks/groupby/group_shift.cu @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include diff --git a/cpp/benchmarks/groupby/group_struct.cu b/cpp/benchmarks/groupby/group_struct.cu index 702983a63bf..355c7cbab6c 100644 --- a/cpp/benchmarks/groupby/group_struct.cu +++ b/cpp/benchmarks/groupby/group_struct.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include #include diff --git a/cpp/benchmarks/groupby/group_sum.cu b/cpp/benchmarks/groupby/group_sum.cu index 63f9aa02070..4a33ddeacd4 100644 --- a/cpp/benchmarks/groupby/group_sum.cu +++ b/cpp/benchmarks/groupby/group_sum.cu @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include diff --git a/cpp/benchmarks/hashing/hash.cpp b/cpp/benchmarks/hashing/hash.cpp index 4ccb0bfad9d..e2ad38230a2 100644 --- a/cpp/benchmarks/hashing/hash.cpp +++ b/cpp/benchmarks/hashing/hash.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include diff --git a/cpp/benchmarks/io/csv/csv_reader_benchmark.cpp b/cpp/benchmarks/io/csv/csv_reader.cpp similarity index 98% rename from cpp/benchmarks/io/csv/csv_reader_benchmark.cpp rename to cpp/benchmarks/io/csv/csv_reader.cpp index 7de10f9f4c1..7cbdb8261b8 100644 --- a/cpp/benchmarks/io/csv/csv_reader_benchmark.cpp +++ b/cpp/benchmarks/io/csv/csv_reader.cpp @@ -16,9 +16,9 @@ #include -#include +#include #include -#include +#include #include #include diff --git a/cpp/benchmarks/io/csv/csv_writer_benchmark.cpp b/cpp/benchmarks/io/csv/csv_writer.cpp similarity index 97% rename from cpp/benchmarks/io/csv/csv_writer_benchmark.cpp rename to cpp/benchmarks/io/csv/csv_writer.cpp index 1e757da6f33..ad1fafb7f0d 100644 --- a/cpp/benchmarks/io/csv/csv_writer_benchmark.cpp +++ b/cpp/benchmarks/io/csv/csv_writer.cpp @@ -16,9 +16,9 @@ #include -#include +#include #include -#include +#include #include #include diff --git a/cpp/benchmarks/io/cuio_common.cpp b/cpp/benchmarks/io/cuio_common.cpp index 627ac9ccc04..e035cc10dc1 100644 --- a/cpp/benchmarks/io/cuio_common.cpp +++ b/cpp/benchmarks/io/cuio_common.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include #include diff --git a/cpp/benchmarks/io/orc/orc_reader_benchmark.cpp b/cpp/benchmarks/io/orc/orc_reader.cpp similarity index 98% rename from cpp/benchmarks/io/orc/orc_reader_benchmark.cpp rename to cpp/benchmarks/io/orc/orc_reader.cpp index 0c54136226a..56cca8d80a4 100644 --- a/cpp/benchmarks/io/orc/orc_reader_benchmark.cpp +++ b/cpp/benchmarks/io/orc/orc_reader.cpp @@ -16,9 +16,9 @@ #include -#include +#include #include -#include +#include #include #include diff --git a/cpp/benchmarks/io/orc/orc_writer_benchmark.cpp b/cpp/benchmarks/io/orc/orc_writer.cpp similarity index 98% rename from cpp/benchmarks/io/orc/orc_writer_benchmark.cpp rename to cpp/benchmarks/io/orc/orc_writer.cpp index b0eba17359f..594feac41b1 100644 --- a/cpp/benchmarks/io/orc/orc_writer_benchmark.cpp +++ b/cpp/benchmarks/io/orc/orc_writer.cpp @@ -17,9 +17,9 @@ #include "cudf/io/types.hpp" #include -#include +#include #include -#include +#include #include #include diff --git a/cpp/benchmarks/io/parquet/parquet_reader_benchmark.cpp b/cpp/benchmarks/io/parquet/parquet_reader.cpp similarity index 98% rename from cpp/benchmarks/io/parquet/parquet_reader_benchmark.cpp rename to cpp/benchmarks/io/parquet/parquet_reader.cpp index d9e37d84036..b4f8dc8c450 100644 --- a/cpp/benchmarks/io/parquet/parquet_reader_benchmark.cpp +++ b/cpp/benchmarks/io/parquet/parquet_reader.cpp @@ -16,9 +16,9 @@ #include -#include +#include #include -#include +#include #include #include diff --git a/cpp/benchmarks/io/parquet/parquet_writer_benchmark.cpp b/cpp/benchmarks/io/parquet/parquet_writer.cpp similarity index 98% rename from cpp/benchmarks/io/parquet/parquet_writer_benchmark.cpp rename to cpp/benchmarks/io/parquet/parquet_writer.cpp index 74289fd414a..937198d9048 100644 --- a/cpp/benchmarks/io/parquet/parquet_writer_benchmark.cpp +++ b/cpp/benchmarks/io/parquet/parquet_writer.cpp @@ -16,9 +16,9 @@ #include -#include +#include #include -#include +#include #include #include diff --git a/cpp/benchmarks/io/parquet/parquet_writer_chunks_benchmark.cpp b/cpp/benchmarks/io/parquet/parquet_writer_chunks.cpp similarity index 98% rename from cpp/benchmarks/io/parquet/parquet_writer_chunks_benchmark.cpp rename to cpp/benchmarks/io/parquet/parquet_writer_chunks.cpp index 0041af80a15..cc41c0237c2 100644 --- a/cpp/benchmarks/io/parquet/parquet_writer_chunks_benchmark.cpp +++ b/cpp/benchmarks/io/parquet/parquet_writer_chunks.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/cpp/benchmarks/io/text/multibyte_split_benchmark.cpp b/cpp/benchmarks/io/text/multibyte_split.cpp similarity index 98% rename from cpp/benchmarks/io/text/multibyte_split_benchmark.cpp rename to cpp/benchmarks/io/text/multibyte_split.cpp index cb8a61caa57..09c011cada1 100644 --- a/cpp/benchmarks/io/text/multibyte_split_benchmark.cpp +++ b/cpp/benchmarks/io/text/multibyte_split.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include +#include #include -#include +#include #include #include diff --git a/cpp/benchmarks/join/conditional_join.cu b/cpp/benchmarks/join/conditional_join.cu index bf078ff51eb..69fb28d29b2 100644 --- a/cpp/benchmarks/join/conditional_join.cu +++ b/cpp/benchmarks/join/conditional_join.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include template class ConditionalJoin : public cudf::benchmark { diff --git a/cpp/benchmarks/join/join.cu b/cpp/benchmarks/join/join.cu index 72d9b541232..e332b70e30a 100644 --- a/cpp/benchmarks/join/join.cu +++ b/cpp/benchmarks/join/join.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include template class Join : public cudf::benchmark { diff --git a/cpp/benchmarks/join/join_nvbench.cu b/cpp/benchmarks/join/join_nvbench.cu index ffb21d8594d..55a1e524479 100644 --- a/cpp/benchmarks/join/join_nvbench.cu +++ b/cpp/benchmarks/join/join_nvbench.cu @@ -15,7 +15,7 @@ */ #include -#include +#include void skip_helper(nvbench::state& state) { diff --git a/cpp/benchmarks/lists/copying/scatter_lists_benchmark.cu b/cpp/benchmarks/lists/copying/scatter_lists.cu similarity index 100% rename from cpp/benchmarks/lists/copying/scatter_lists_benchmark.cu rename to cpp/benchmarks/lists/copying/scatter_lists.cu diff --git a/cpp/benchmarks/quantiles/quantiles.cpp b/cpp/benchmarks/quantiles/quantiles.cpp index fa602304dec..3ecb436d7fa 100644 --- a/cpp/benchmarks/quantiles/quantiles.cpp +++ b/cpp/benchmarks/quantiles/quantiles.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/cpp/benchmarks/reduction/scan.cpp b/cpp/benchmarks/reduction/scan.cpp index b2d8fcfc004..05c15a4fcb5 100644 --- a/cpp/benchmarks/reduction/scan.cpp +++ b/cpp/benchmarks/reduction/scan.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include diff --git a/cpp/benchmarks/replace/clamp.cpp b/cpp/benchmarks/replace/clamp.cpp index 4d9da4aca6d..dd8b06227bc 100644 --- a/cpp/benchmarks/replace/clamp.cpp +++ b/cpp/benchmarks/replace/clamp.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include diff --git a/cpp/benchmarks/replace/nans.cpp b/cpp/benchmarks/replace/nans.cpp index a337ae5e7ad..3faf217956b 100644 --- a/cpp/benchmarks/replace/nans.cpp +++ b/cpp/benchmarks/replace/nans.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include diff --git a/cpp/benchmarks/sort/rank.cpp b/cpp/benchmarks/sort/rank.cpp index 60be95b9112..826740dae55 100644 --- a/cpp/benchmarks/sort/rank.cpp +++ b/cpp/benchmarks/sort/rank.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/cpp/benchmarks/sort/sort.cpp b/cpp/benchmarks/sort/sort.cpp index fe68ddd0051..e4c1af159aa 100644 --- a/cpp/benchmarks/sort/sort.cpp +++ b/cpp/benchmarks/sort/sort.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/cpp/benchmarks/sort/sort_strings.cpp b/cpp/benchmarks/sort/sort_strings.cpp index f5effcafcfb..8adeef21a79 100644 --- a/cpp/benchmarks/sort/sort_strings.cpp +++ b/cpp/benchmarks/sort/sort_strings.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include diff --git a/cpp/benchmarks/string/case.cpp b/cpp/benchmarks/string/case.cpp index 508ae49e093..0f1653af2c6 100644 --- a/cpp/benchmarks/string/case.cpp +++ b/cpp/benchmarks/string/case.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include diff --git a/cpp/benchmarks/string/combine.cpp b/cpp/benchmarks/string/combine.cpp index 7dabd32e874..8983646b6f1 100644 --- a/cpp/benchmarks/string/combine.cpp +++ b/cpp/benchmarks/string/combine.cpp @@ -17,7 +17,7 @@ #include "string_bench_args.hpp" #include -#include +#include #include #include diff --git a/cpp/benchmarks/string/contains.cpp b/cpp/benchmarks/string/contains.cpp index 79bdda77634..980b353406a 100644 --- a/cpp/benchmarks/string/contains.cpp +++ b/cpp/benchmarks/string/contains.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include diff --git a/cpp/benchmarks/string/convert_datetime.cpp b/cpp/benchmarks/string/convert_datetime.cpp index dc7e891286a..af51b504ee8 100644 --- a/cpp/benchmarks/string/convert_datetime.cpp +++ b/cpp/benchmarks/string/convert_datetime.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include diff --git a/cpp/benchmarks/string/convert_fixed_point.cpp b/cpp/benchmarks/string/convert_fixed_point.cpp index 482104be436..5c050592c7b 100644 --- a/cpp/benchmarks/string/convert_fixed_point.cpp +++ b/cpp/benchmarks/string/convert_fixed_point.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include diff --git a/cpp/benchmarks/string/convert_numerics.cpp b/cpp/benchmarks/string/convert_numerics.cpp index 86f4d413974..02ccb17e74a 100644 --- a/cpp/benchmarks/string/convert_numerics.cpp +++ b/cpp/benchmarks/string/convert_numerics.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include diff --git a/cpp/benchmarks/string/copy.cpp b/cpp/benchmarks/string/copy.cpp index 23a70215015..d40b0e069bc 100644 --- a/cpp/benchmarks/string/copy.cpp +++ b/cpp/benchmarks/string/copy.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include diff --git a/cpp/benchmarks/string/extract.cpp b/cpp/benchmarks/string/extract.cpp index 7ed083d9571..b4034ff054a 100644 --- a/cpp/benchmarks/string/extract.cpp +++ b/cpp/benchmarks/string/extract.cpp @@ -17,7 +17,7 @@ #include "string_bench_args.hpp" #include -#include +#include #include #include diff --git a/cpp/benchmarks/string/factory.cu b/cpp/benchmarks/string/factory.cu index bae08431b51..2a88def1871 100644 --- a/cpp/benchmarks/string/factory.cu +++ b/cpp/benchmarks/string/factory.cu @@ -17,7 +17,7 @@ #include "string_bench_args.hpp" #include -#include +#include #include #include diff --git a/cpp/benchmarks/string/filter.cpp b/cpp/benchmarks/string/filter.cpp index 97228122c42..fb030c2ccc2 100644 --- a/cpp/benchmarks/string/filter.cpp +++ b/cpp/benchmarks/string/filter.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include diff --git a/cpp/benchmarks/string/find.cpp b/cpp/benchmarks/string/find.cpp index 8e570a55440..167e9bc1348 100644 --- a/cpp/benchmarks/string/find.cpp +++ b/cpp/benchmarks/string/find.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include diff --git a/cpp/benchmarks/string/json.cpp b/cpp/benchmarks/string/json.cpp index c6a6b757951..1ade4d01e1e 100644 --- a/cpp/benchmarks/string/json.cpp +++ b/cpp/benchmarks/string/json.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include diff --git a/cpp/benchmarks/string/repeat_strings.cpp b/cpp/benchmarks/string/repeat_strings.cpp index 56f342f6824..86b8525023f 100644 --- a/cpp/benchmarks/string/repeat_strings.cpp +++ b/cpp/benchmarks/string/repeat_strings.cpp @@ -17,7 +17,7 @@ #include "string_bench_args.hpp" #include -#include +#include #include #include diff --git a/cpp/benchmarks/string/replace.cpp b/cpp/benchmarks/string/replace.cpp index 0d785fd25aa..9be2e3a8627 100644 --- a/cpp/benchmarks/string/replace.cpp +++ b/cpp/benchmarks/string/replace.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include diff --git a/cpp/benchmarks/string/replace_re.cpp b/cpp/benchmarks/string/replace_re.cpp index 18ec28371e3..c106953bf69 100644 --- a/cpp/benchmarks/string/replace_re.cpp +++ b/cpp/benchmarks/string/replace_re.cpp @@ -17,7 +17,7 @@ #include "string_bench_args.hpp" #include -#include +#include #include #include diff --git a/cpp/benchmarks/string/split.cpp b/cpp/benchmarks/string/split.cpp index cab477754a6..fc879d1d0eb 100644 --- a/cpp/benchmarks/string/split.cpp +++ b/cpp/benchmarks/string/split.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include diff --git a/cpp/benchmarks/string/substring.cpp b/cpp/benchmarks/string/substring.cpp index e8a66f7b323..8864fffc40b 100644 --- a/cpp/benchmarks/string/substring.cpp +++ b/cpp/benchmarks/string/substring.cpp @@ -17,7 +17,7 @@ #include "string_bench_args.hpp" #include -#include +#include #include #include diff --git a/cpp/benchmarks/string/translate.cpp b/cpp/benchmarks/string/translate.cpp index 49396b0ce71..98688fa14fc 100644 --- a/cpp/benchmarks/string/translate.cpp +++ b/cpp/benchmarks/string/translate.cpp @@ -17,7 +17,7 @@ #include "string_bench_args.hpp" #include -#include +#include #include #include diff --git a/cpp/benchmarks/text/ngrams.cpp b/cpp/benchmarks/text/ngrams.cpp index 52f55249631..7c39ebbb1bb 100644 --- a/cpp/benchmarks/text/ngrams.cpp +++ b/cpp/benchmarks/text/ngrams.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include #include diff --git a/cpp/benchmarks/text/normalize.cpp b/cpp/benchmarks/text/normalize.cpp index f041547d021..ac8e92b3376 100644 --- a/cpp/benchmarks/text/normalize.cpp +++ b/cpp/benchmarks/text/normalize.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include diff --git a/cpp/benchmarks/text/normalize_spaces.cpp b/cpp/benchmarks/text/normalize_spaces.cpp index 6260bb02c55..34749b579b9 100644 --- a/cpp/benchmarks/text/normalize_spaces.cpp +++ b/cpp/benchmarks/text/normalize_spaces.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include #include diff --git a/cpp/benchmarks/text/tokenize.cpp b/cpp/benchmarks/text/tokenize.cpp index cd6428a9406..fa3f816db59 100644 --- a/cpp/benchmarks/text/tokenize.cpp +++ b/cpp/benchmarks/text/tokenize.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include #include diff --git a/cpp/docs/BENCHMARKING.md b/cpp/docs/BENCHMARKING.md index ed99ff5f1be..44a4341a091 100644 --- a/cpp/docs/BENCHMARKING.md +++ b/cpp/docs/BENCHMARKING.md @@ -11,9 +11,9 @@ other benchmarks in `cpp/benchmarks` to understand the options. The naming of unit benchmark directories and source files should be consistent with the feature being benchmarked. For example, the benchmarks for APIs in `copying.hpp` should live in `cudf/cpp/benchmarks/copying`. Each feature (or set of related features) should have its own -benchmark source file named `_benchmark.cu/cpp`. For example, +benchmark source file named `.cu/cpp`. For example, `cudf/cpp/src/copying/scatter.cu` has benchmarks in -`cudf/cpp/benchmarks/copying/scatter_benchmark.cu`. +`cudf/cpp/benchmarks/copying/scatter.cu`. In the interest of improving compile time, whenever possible, test source files should be `.cpp` files because `nvcc` is slower than `gcc` in compiling host code. Note that `thrust::device_vector` From a9a49aa5e14a54b385b187751d0988e9f0a3f87b Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Mon, 24 Jan 2022 14:22:33 -0600 Subject: [PATCH 4/5] Rename join benchmarks. --- cpp/benchmarks/CMakeLists.txt | 4 +- cpp/benchmarks/join/join.cu | 306 ++++++++++++++++++---------- cpp/benchmarks/join/join_nvbench.cu | 217 -------------------- cpp/benchmarks/join/left_join.cu | 133 ++++++++++++ 4 files changed, 330 insertions(+), 330 deletions(-) delete mode 100644 cpp/benchmarks/join/join_nvbench.cu create mode 100644 cpp/benchmarks/join/left_join.cu diff --git a/cpp/benchmarks/CMakeLists.txt b/cpp/benchmarks/CMakeLists.txt index 3e88141b42f..e07fca40cb5 100644 --- a/cpp/benchmarks/CMakeLists.txt +++ b/cpp/benchmarks/CMakeLists.txt @@ -127,8 +127,8 @@ ConfigureBench(STREAM_COMPACTION_BENCH stream_compaction/drop_duplicates.cpp) # ################################################################################################## # * join benchmark -------------------------------------------------------------------------------- -ConfigureBench(JOIN_BENCH join/join.cu join/conditional_join.cu) -ConfigureNVBench(JOIN_NVBENCH join/join_nvbench.cu) +ConfigureBench(JOIN_BENCH join/left_join.cu join/conditional_join.cu) +ConfigureNVBench(JOIN_NVBENCH join/join.cu) # ################################################################################################## # * iterator benchmark ---------------------------------------------------------------------------- diff --git a/cpp/benchmarks/join/join.cu b/cpp/benchmarks/join/join.cu index e332b70e30a..55a1e524479 100644 --- a/cpp/benchmarks/join/join.cu +++ b/cpp/benchmarks/join/join.cu @@ -14,120 +14,204 @@ * limitations under the License. */ +#include #include -template -class Join : public cudf::benchmark { -}; - -#define LEFT_ANTI_JOIN_BENCHMARK_DEFINE(name, key_type, payload_type, nullable) \ - BENCHMARK_TEMPLATE_DEFINE_F(Join, name, key_type, payload_type) \ - (::benchmark::State & st) \ - { \ - auto join = [](cudf::table_view const& left, \ - cudf::table_view const& right, \ - std::vector const& left_on, \ - std::vector const& right_on, \ - cudf::null_equality compare_nulls) { \ - return cudf::left_anti_join(left, right, left_on, right_on, compare_nulls); \ - }; \ - BM_join(st, join); \ +void skip_helper(nvbench::state& state) +{ + auto const build_table_size = state.get_int64("Build Table Size"); + auto const probe_table_size = state.get_int64("Probe Table Size"); + + if (build_table_size > probe_table_size) { + state.skip("Large build tables are skipped."); + return; } -LEFT_ANTI_JOIN_BENCHMARK_DEFINE(left_anti_join_32bit, int32_t, int32_t, false); -LEFT_ANTI_JOIN_BENCHMARK_DEFINE(left_anti_join_64bit, int64_t, int64_t, false); -LEFT_ANTI_JOIN_BENCHMARK_DEFINE(left_anti_join_32bit_nulls, int32_t, int32_t, true); -LEFT_ANTI_JOIN_BENCHMARK_DEFINE(left_anti_join_64bit_nulls, int64_t, int64_t, true); - -#define LEFT_SEMI_JOIN_BENCHMARK_DEFINE(name, key_type, payload_type, nullable) \ - BENCHMARK_TEMPLATE_DEFINE_F(Join, name, key_type, payload_type) \ - (::benchmark::State & st) \ - { \ - auto join = [](cudf::table_view const& left, \ - cudf::table_view const& right, \ - std::vector const& left_on, \ - std::vector const& right_on, \ - cudf::null_equality compare_nulls) { \ - return cudf::left_semi_join(left, right, left_on, right_on, compare_nulls); \ - }; \ - BM_join(st, join); \ + if (build_table_size * 100 <= probe_table_size) { + state.skip("Large probe tables are skipped."); + return; } +} + +template +void nvbench_inner_join(nvbench::state& state, + nvbench::type_list>) +{ + skip_helper(state); + + // TODO: to be replaced by nvbench fixture once it's ready + cudf::rmm_pool_raii pool_raii; + + auto join = [](cudf::table_view const& left_input, + cudf::table_view const& right_input, + std::vector const& left_on, + std::vector const& right_on, + cudf::null_equality compare_nulls, + rmm::cuda_stream_view stream) { + cudf::hash_join hj_obj(left_input.select(left_on), compare_nulls, stream); + return hj_obj.inner_join(right_input.select(right_on), compare_nulls, std::nullopt, stream); + }; + + BM_join(state, join); +} + +template +void nvbench_left_join(nvbench::state& state, + nvbench::type_list>) +{ + skip_helper(state); + + // TODO: to be replaced by nvbench fixture once it's ready + cudf::rmm_pool_raii pool_raii; + + auto join = [](cudf::table_view const& left_input, + cudf::table_view const& right_input, + std::vector const& left_on, + std::vector const& right_on, + cudf::null_equality compare_nulls, + rmm::cuda_stream_view stream) { + cudf::hash_join hj_obj(left_input.select(left_on), compare_nulls, stream); + return hj_obj.left_join(right_input.select(right_on), compare_nulls, std::nullopt, stream); + }; + + BM_join(state, join); +} + +template +void nvbench_full_join(nvbench::state& state, + nvbench::type_list>) +{ + skip_helper(state); + + // TODO: to be replaced by nvbench fixture once it's ready + cudf::rmm_pool_raii pool_raii; + + auto join = [](cudf::table_view const& left_input, + cudf::table_view const& right_input, + std::vector const& left_on, + std::vector const& right_on, + cudf::null_equality compare_nulls, + rmm::cuda_stream_view stream) { + cudf::hash_join hj_obj(left_input.select(left_on), compare_nulls, stream); + return hj_obj.full_join(right_input.select(right_on), compare_nulls, std::nullopt, stream); + }; + + BM_join(state, join); +} + +// inner join ----------------------------------------------------------------------- +NVBENCH_BENCH_TYPES(nvbench_inner_join, + NVBENCH_TYPE_AXES(nvbench::type_list, + nvbench::type_list, + nvbench::enum_type_list)) + .set_name("inner_join_32bit") + .set_type_axes_names({"Key Type", "Payload Type", "Nullable"}) + .add_int64_axis("Build Table Size", {100'000, 10'000'000, 80'000'000, 100'000'000}) + .add_int64_axis("Probe Table Size", + {100'000, 400'000, 10'000'000, 40'000'000, 100'000'000, 240'000'000}); + +NVBENCH_BENCH_TYPES(nvbench_inner_join, + NVBENCH_TYPE_AXES(nvbench::type_list, + nvbench::type_list, + nvbench::enum_type_list)) + .set_name("inner_join_64bit") + .set_type_axes_names({"Key Type", "Payload Type", "Nullable"}) + .add_int64_axis("Build Table Size", {40'000'000, 50'000'000}) + .add_int64_axis("Probe Table Size", {50'000'000, 120'000'000}); + +NVBENCH_BENCH_TYPES(nvbench_inner_join, + NVBENCH_TYPE_AXES(nvbench::type_list, + nvbench::type_list, + nvbench::enum_type_list)) + .set_name("inner_join_32bit_nulls") + .set_type_axes_names({"Key Type", "Payload Type", "Nullable"}) + .add_int64_axis("Build Table Size", {100'000, 10'000'000, 80'000'000, 100'000'000}) + .add_int64_axis("Probe Table Size", + {100'000, 400'000, 10'000'000, 40'000'000, 100'000'000, 240'000'000}); + +NVBENCH_BENCH_TYPES(nvbench_inner_join, + NVBENCH_TYPE_AXES(nvbench::type_list, + nvbench::type_list, + nvbench::enum_type_list)) + .set_name("inner_join_64bit_nulls") + .set_type_axes_names({"Key Type", "Payload Type", "Nullable"}) + .add_int64_axis("Build Table Size", {40'000'000, 50'000'000}) + .add_int64_axis("Probe Table Size", {50'000'000, 120'000'000}); + +// left join ------------------------------------------------------------------------ +NVBENCH_BENCH_TYPES(nvbench_left_join, + NVBENCH_TYPE_AXES(nvbench::type_list, + nvbench::type_list, + nvbench::enum_type_list)) + .set_name("left_join_32bit") + .set_type_axes_names({"Key Type", "Payload Type", "Nullable"}) + .add_int64_axis("Build Table Size", {100'000, 10'000'000, 80'000'000, 100'000'000}) + .add_int64_axis("Probe Table Size", + {100'000, 400'000, 10'000'000, 40'000'000, 100'000'000, 240'000'000}); + +NVBENCH_BENCH_TYPES(nvbench_left_join, + NVBENCH_TYPE_AXES(nvbench::type_list, + nvbench::type_list, + nvbench::enum_type_list)) + .set_name("left_join_64bit") + .set_type_axes_names({"Key Type", "Payload Type", "Nullable"}) + .add_int64_axis("Build Table Size", {40'000'000, 50'000'000}) + .add_int64_axis("Probe Table Size", {50'000'000, 120'000'000}); + +NVBENCH_BENCH_TYPES(nvbench_left_join, + NVBENCH_TYPE_AXES(nvbench::type_list, + nvbench::type_list, + nvbench::enum_type_list)) + .set_name("left_join_32bit_nulls") + .set_type_axes_names({"Key Type", "Payload Type", "Nullable"}) + .add_int64_axis("Build Table Size", {100'000, 10'000'000, 80'000'000, 100'000'000}) + .add_int64_axis("Probe Table Size", + {100'000, 400'000, 10'000'000, 40'000'000, 100'000'000, 240'000'000}); + +NVBENCH_BENCH_TYPES(nvbench_left_join, + NVBENCH_TYPE_AXES(nvbench::type_list, + nvbench::type_list, + nvbench::enum_type_list)) + .set_name("left_join_64bit_nulls") + .set_type_axes_names({"Key Type", "Payload Type", "Nullable"}) + .add_int64_axis("Build Table Size", {40'000'000, 50'000'000}) + .add_int64_axis("Probe Table Size", {50'000'000, 120'000'000}); + +// full join ------------------------------------------------------------------------ +NVBENCH_BENCH_TYPES(nvbench_full_join, + NVBENCH_TYPE_AXES(nvbench::type_list, + nvbench::type_list, + nvbench::enum_type_list)) + .set_name("full_join_32bit") + .set_type_axes_names({"Key Type", "Payload Type", "Nullable"}) + .add_int64_axis("Build Table Size", {100'000, 10'000'000, 80'000'000, 100'000'000}) + .add_int64_axis("Probe Table Size", + {100'000, 400'000, 10'000'000, 40'000'000, 100'000'000, 240'000'000}); + +NVBENCH_BENCH_TYPES(nvbench_full_join, + NVBENCH_TYPE_AXES(nvbench::type_list, + nvbench::type_list, + nvbench::enum_type_list)) + .set_name("full_join_64bit") + .set_type_axes_names({"Key Type", "Payload Type", "Nullable"}) + .add_int64_axis("Build Table Size", {40'000'000, 50'000'000}) + .add_int64_axis("Probe Table Size", {50'000'000, 120'000'000}); + +NVBENCH_BENCH_TYPES(nvbench_full_join, + NVBENCH_TYPE_AXES(nvbench::type_list, + nvbench::type_list, + nvbench::enum_type_list)) + .set_name("full_join_32bit_nulls") + .set_type_axes_names({"Key Type", "Payload Type", "Nullable"}) + .add_int64_axis("Build Table Size", {100'000, 10'000'000, 80'000'000, 100'000'000}) + .add_int64_axis("Probe Table Size", + {100'000, 400'000, 10'000'000, 40'000'000, 100'000'000, 240'000'000}); -LEFT_SEMI_JOIN_BENCHMARK_DEFINE(left_semi_join_32bit, int32_t, int32_t, false); -LEFT_SEMI_JOIN_BENCHMARK_DEFINE(left_semi_join_64bit, int64_t, int64_t, false); -LEFT_SEMI_JOIN_BENCHMARK_DEFINE(left_semi_join_32bit_nulls, int32_t, int32_t, true); -LEFT_SEMI_JOIN_BENCHMARK_DEFINE(left_semi_join_64bit_nulls, int64_t, int64_t, true); - -// left anti-join ------------------------------------------------------------- -BENCHMARK_REGISTER_F(Join, left_anti_join_32bit) - ->Unit(benchmark::kMillisecond) - ->Args({100'000, 100'000}) - ->Args({100'000, 400'000}) - ->Args({100'000, 1'000'000}) - ->Args({10'000'000, 10'000'000}) - ->Args({10'000'000, 40'000'000}) - ->Args({10'000'000, 100'000'000}) - ->Args({100'000'000, 100'000'000}) - ->Args({80'000'000, 240'000'000}) - ->UseManualTime(); - -BENCHMARK_REGISTER_F(Join, left_anti_join_64bit) - ->Unit(benchmark::kMillisecond) - ->Args({50'000'000, 50'000'000}) - ->Args({40'000'000, 120'000'000}) - ->UseManualTime(); - -BENCHMARK_REGISTER_F(Join, left_anti_join_32bit_nulls) - ->Unit(benchmark::kMillisecond) - ->Args({100'000, 100'000}) - ->Args({100'000, 400'000}) - ->Args({100'000, 1'000'000}) - ->Args({10'000'000, 10'000'000}) - ->Args({10'000'000, 40'000'000}) - ->Args({10'000'000, 100'000'000}) - ->Args({100'000'000, 100'000'000}) - ->Args({80'000'000, 240'000'000}) - ->UseManualTime(); - -BENCHMARK_REGISTER_F(Join, left_anti_join_64bit_nulls) - ->Unit(benchmark::kMillisecond) - ->Args({50'000'000, 50'000'000}) - ->Args({40'000'000, 120'000'000}) - ->UseManualTime(); - -// left semi-join ------------------------------------------------------------- -BENCHMARK_REGISTER_F(Join, left_semi_join_32bit) - ->Unit(benchmark::kMillisecond) - ->Args({100'000, 100'000}) - ->Args({100'000, 400'000}) - ->Args({100'000, 1'000'000}) - ->Args({10'000'000, 10'000'000}) - ->Args({10'000'000, 40'000'000}) - ->Args({10'000'000, 100'000'000}) - ->Args({100'000'000, 100'000'000}) - ->Args({80'000'000, 240'000'000}) - ->UseManualTime(); - -BENCHMARK_REGISTER_F(Join, left_semi_join_64bit) - ->Unit(benchmark::kMillisecond) - ->Args({50'000'000, 50'000'000}) - ->Args({40'000'000, 120'000'000}) - ->UseManualTime(); - -BENCHMARK_REGISTER_F(Join, left_semi_join_32bit_nulls) - ->Unit(benchmark::kMillisecond) - ->Args({100'000, 100'000}) - ->Args({100'000, 400'000}) - ->Args({100'000, 1'000'000}) - ->Args({10'000'000, 10'000'000}) - ->Args({10'000'000, 40'000'000}) - ->Args({10'000'000, 100'000'000}) - ->Args({100'000'000, 100'000'000}) - ->Args({80'000'000, 240'000'000}) - ->UseManualTime(); - -BENCHMARK_REGISTER_F(Join, left_semi_join_64bit_nulls) - ->Unit(benchmark::kMillisecond) - ->Args({50'000'000, 50'000'000}) - ->Args({40'000'000, 120'000'000}) - ->UseManualTime(); +NVBENCH_BENCH_TYPES(nvbench_full_join, + NVBENCH_TYPE_AXES(nvbench::type_list, + nvbench::type_list, + nvbench::enum_type_list)) + .set_name("full_join_64bit_nulls") + .set_type_axes_names({"Key Type", "Payload Type", "Nullable"}) + .add_int64_axis("Build Table Size", {40'000'000, 50'000'000}) + .add_int64_axis("Probe Table Size", {50'000'000, 120'000'000}); diff --git a/cpp/benchmarks/join/join_nvbench.cu b/cpp/benchmarks/join/join_nvbench.cu deleted file mode 100644 index 55a1e524479..00000000000 --- a/cpp/benchmarks/join/join_nvbench.cu +++ /dev/null @@ -1,217 +0,0 @@ -/* - * Copyright (c) 2019-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 -#include - -void skip_helper(nvbench::state& state) -{ - auto const build_table_size = state.get_int64("Build Table Size"); - auto const probe_table_size = state.get_int64("Probe Table Size"); - - if (build_table_size > probe_table_size) { - state.skip("Large build tables are skipped."); - return; - } - - if (build_table_size * 100 <= probe_table_size) { - state.skip("Large probe tables are skipped."); - return; - } -} - -template -void nvbench_inner_join(nvbench::state& state, - nvbench::type_list>) -{ - skip_helper(state); - - // TODO: to be replaced by nvbench fixture once it's ready - cudf::rmm_pool_raii pool_raii; - - auto join = [](cudf::table_view const& left_input, - cudf::table_view const& right_input, - std::vector const& left_on, - std::vector const& right_on, - cudf::null_equality compare_nulls, - rmm::cuda_stream_view stream) { - cudf::hash_join hj_obj(left_input.select(left_on), compare_nulls, stream); - return hj_obj.inner_join(right_input.select(right_on), compare_nulls, std::nullopt, stream); - }; - - BM_join(state, join); -} - -template -void nvbench_left_join(nvbench::state& state, - nvbench::type_list>) -{ - skip_helper(state); - - // TODO: to be replaced by nvbench fixture once it's ready - cudf::rmm_pool_raii pool_raii; - - auto join = [](cudf::table_view const& left_input, - cudf::table_view const& right_input, - std::vector const& left_on, - std::vector const& right_on, - cudf::null_equality compare_nulls, - rmm::cuda_stream_view stream) { - cudf::hash_join hj_obj(left_input.select(left_on), compare_nulls, stream); - return hj_obj.left_join(right_input.select(right_on), compare_nulls, std::nullopt, stream); - }; - - BM_join(state, join); -} - -template -void nvbench_full_join(nvbench::state& state, - nvbench::type_list>) -{ - skip_helper(state); - - // TODO: to be replaced by nvbench fixture once it's ready - cudf::rmm_pool_raii pool_raii; - - auto join = [](cudf::table_view const& left_input, - cudf::table_view const& right_input, - std::vector const& left_on, - std::vector const& right_on, - cudf::null_equality compare_nulls, - rmm::cuda_stream_view stream) { - cudf::hash_join hj_obj(left_input.select(left_on), compare_nulls, stream); - return hj_obj.full_join(right_input.select(right_on), compare_nulls, std::nullopt, stream); - }; - - BM_join(state, join); -} - -// inner join ----------------------------------------------------------------------- -NVBENCH_BENCH_TYPES(nvbench_inner_join, - NVBENCH_TYPE_AXES(nvbench::type_list, - nvbench::type_list, - nvbench::enum_type_list)) - .set_name("inner_join_32bit") - .set_type_axes_names({"Key Type", "Payload Type", "Nullable"}) - .add_int64_axis("Build Table Size", {100'000, 10'000'000, 80'000'000, 100'000'000}) - .add_int64_axis("Probe Table Size", - {100'000, 400'000, 10'000'000, 40'000'000, 100'000'000, 240'000'000}); - -NVBENCH_BENCH_TYPES(nvbench_inner_join, - NVBENCH_TYPE_AXES(nvbench::type_list, - nvbench::type_list, - nvbench::enum_type_list)) - .set_name("inner_join_64bit") - .set_type_axes_names({"Key Type", "Payload Type", "Nullable"}) - .add_int64_axis("Build Table Size", {40'000'000, 50'000'000}) - .add_int64_axis("Probe Table Size", {50'000'000, 120'000'000}); - -NVBENCH_BENCH_TYPES(nvbench_inner_join, - NVBENCH_TYPE_AXES(nvbench::type_list, - nvbench::type_list, - nvbench::enum_type_list)) - .set_name("inner_join_32bit_nulls") - .set_type_axes_names({"Key Type", "Payload Type", "Nullable"}) - .add_int64_axis("Build Table Size", {100'000, 10'000'000, 80'000'000, 100'000'000}) - .add_int64_axis("Probe Table Size", - {100'000, 400'000, 10'000'000, 40'000'000, 100'000'000, 240'000'000}); - -NVBENCH_BENCH_TYPES(nvbench_inner_join, - NVBENCH_TYPE_AXES(nvbench::type_list, - nvbench::type_list, - nvbench::enum_type_list)) - .set_name("inner_join_64bit_nulls") - .set_type_axes_names({"Key Type", "Payload Type", "Nullable"}) - .add_int64_axis("Build Table Size", {40'000'000, 50'000'000}) - .add_int64_axis("Probe Table Size", {50'000'000, 120'000'000}); - -// left join ------------------------------------------------------------------------ -NVBENCH_BENCH_TYPES(nvbench_left_join, - NVBENCH_TYPE_AXES(nvbench::type_list, - nvbench::type_list, - nvbench::enum_type_list)) - .set_name("left_join_32bit") - .set_type_axes_names({"Key Type", "Payload Type", "Nullable"}) - .add_int64_axis("Build Table Size", {100'000, 10'000'000, 80'000'000, 100'000'000}) - .add_int64_axis("Probe Table Size", - {100'000, 400'000, 10'000'000, 40'000'000, 100'000'000, 240'000'000}); - -NVBENCH_BENCH_TYPES(nvbench_left_join, - NVBENCH_TYPE_AXES(nvbench::type_list, - nvbench::type_list, - nvbench::enum_type_list)) - .set_name("left_join_64bit") - .set_type_axes_names({"Key Type", "Payload Type", "Nullable"}) - .add_int64_axis("Build Table Size", {40'000'000, 50'000'000}) - .add_int64_axis("Probe Table Size", {50'000'000, 120'000'000}); - -NVBENCH_BENCH_TYPES(nvbench_left_join, - NVBENCH_TYPE_AXES(nvbench::type_list, - nvbench::type_list, - nvbench::enum_type_list)) - .set_name("left_join_32bit_nulls") - .set_type_axes_names({"Key Type", "Payload Type", "Nullable"}) - .add_int64_axis("Build Table Size", {100'000, 10'000'000, 80'000'000, 100'000'000}) - .add_int64_axis("Probe Table Size", - {100'000, 400'000, 10'000'000, 40'000'000, 100'000'000, 240'000'000}); - -NVBENCH_BENCH_TYPES(nvbench_left_join, - NVBENCH_TYPE_AXES(nvbench::type_list, - nvbench::type_list, - nvbench::enum_type_list)) - .set_name("left_join_64bit_nulls") - .set_type_axes_names({"Key Type", "Payload Type", "Nullable"}) - .add_int64_axis("Build Table Size", {40'000'000, 50'000'000}) - .add_int64_axis("Probe Table Size", {50'000'000, 120'000'000}); - -// full join ------------------------------------------------------------------------ -NVBENCH_BENCH_TYPES(nvbench_full_join, - NVBENCH_TYPE_AXES(nvbench::type_list, - nvbench::type_list, - nvbench::enum_type_list)) - .set_name("full_join_32bit") - .set_type_axes_names({"Key Type", "Payload Type", "Nullable"}) - .add_int64_axis("Build Table Size", {100'000, 10'000'000, 80'000'000, 100'000'000}) - .add_int64_axis("Probe Table Size", - {100'000, 400'000, 10'000'000, 40'000'000, 100'000'000, 240'000'000}); - -NVBENCH_BENCH_TYPES(nvbench_full_join, - NVBENCH_TYPE_AXES(nvbench::type_list, - nvbench::type_list, - nvbench::enum_type_list)) - .set_name("full_join_64bit") - .set_type_axes_names({"Key Type", "Payload Type", "Nullable"}) - .add_int64_axis("Build Table Size", {40'000'000, 50'000'000}) - .add_int64_axis("Probe Table Size", {50'000'000, 120'000'000}); - -NVBENCH_BENCH_TYPES(nvbench_full_join, - NVBENCH_TYPE_AXES(nvbench::type_list, - nvbench::type_list, - nvbench::enum_type_list)) - .set_name("full_join_32bit_nulls") - .set_type_axes_names({"Key Type", "Payload Type", "Nullable"}) - .add_int64_axis("Build Table Size", {100'000, 10'000'000, 80'000'000, 100'000'000}) - .add_int64_axis("Probe Table Size", - {100'000, 400'000, 10'000'000, 40'000'000, 100'000'000, 240'000'000}); - -NVBENCH_BENCH_TYPES(nvbench_full_join, - NVBENCH_TYPE_AXES(nvbench::type_list, - nvbench::type_list, - nvbench::enum_type_list)) - .set_name("full_join_64bit_nulls") - .set_type_axes_names({"Key Type", "Payload Type", "Nullable"}) - .add_int64_axis("Build Table Size", {40'000'000, 50'000'000}) - .add_int64_axis("Probe Table Size", {50'000'000, 120'000'000}); diff --git a/cpp/benchmarks/join/left_join.cu b/cpp/benchmarks/join/left_join.cu new file mode 100644 index 00000000000..e332b70e30a --- /dev/null +++ b/cpp/benchmarks/join/left_join.cu @@ -0,0 +1,133 @@ +/* + * Copyright (c) 2019-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 + +template +class Join : public cudf::benchmark { +}; + +#define LEFT_ANTI_JOIN_BENCHMARK_DEFINE(name, key_type, payload_type, nullable) \ + BENCHMARK_TEMPLATE_DEFINE_F(Join, name, key_type, payload_type) \ + (::benchmark::State & st) \ + { \ + auto join = [](cudf::table_view const& left, \ + cudf::table_view const& right, \ + std::vector const& left_on, \ + std::vector const& right_on, \ + cudf::null_equality compare_nulls) { \ + return cudf::left_anti_join(left, right, left_on, right_on, compare_nulls); \ + }; \ + BM_join(st, join); \ + } + +LEFT_ANTI_JOIN_BENCHMARK_DEFINE(left_anti_join_32bit, int32_t, int32_t, false); +LEFT_ANTI_JOIN_BENCHMARK_DEFINE(left_anti_join_64bit, int64_t, int64_t, false); +LEFT_ANTI_JOIN_BENCHMARK_DEFINE(left_anti_join_32bit_nulls, int32_t, int32_t, true); +LEFT_ANTI_JOIN_BENCHMARK_DEFINE(left_anti_join_64bit_nulls, int64_t, int64_t, true); + +#define LEFT_SEMI_JOIN_BENCHMARK_DEFINE(name, key_type, payload_type, nullable) \ + BENCHMARK_TEMPLATE_DEFINE_F(Join, name, key_type, payload_type) \ + (::benchmark::State & st) \ + { \ + auto join = [](cudf::table_view const& left, \ + cudf::table_view const& right, \ + std::vector const& left_on, \ + std::vector const& right_on, \ + cudf::null_equality compare_nulls) { \ + return cudf::left_semi_join(left, right, left_on, right_on, compare_nulls); \ + }; \ + BM_join(st, join); \ + } + +LEFT_SEMI_JOIN_BENCHMARK_DEFINE(left_semi_join_32bit, int32_t, int32_t, false); +LEFT_SEMI_JOIN_BENCHMARK_DEFINE(left_semi_join_64bit, int64_t, int64_t, false); +LEFT_SEMI_JOIN_BENCHMARK_DEFINE(left_semi_join_32bit_nulls, int32_t, int32_t, true); +LEFT_SEMI_JOIN_BENCHMARK_DEFINE(left_semi_join_64bit_nulls, int64_t, int64_t, true); + +// left anti-join ------------------------------------------------------------- +BENCHMARK_REGISTER_F(Join, left_anti_join_32bit) + ->Unit(benchmark::kMillisecond) + ->Args({100'000, 100'000}) + ->Args({100'000, 400'000}) + ->Args({100'000, 1'000'000}) + ->Args({10'000'000, 10'000'000}) + ->Args({10'000'000, 40'000'000}) + ->Args({10'000'000, 100'000'000}) + ->Args({100'000'000, 100'000'000}) + ->Args({80'000'000, 240'000'000}) + ->UseManualTime(); + +BENCHMARK_REGISTER_F(Join, left_anti_join_64bit) + ->Unit(benchmark::kMillisecond) + ->Args({50'000'000, 50'000'000}) + ->Args({40'000'000, 120'000'000}) + ->UseManualTime(); + +BENCHMARK_REGISTER_F(Join, left_anti_join_32bit_nulls) + ->Unit(benchmark::kMillisecond) + ->Args({100'000, 100'000}) + ->Args({100'000, 400'000}) + ->Args({100'000, 1'000'000}) + ->Args({10'000'000, 10'000'000}) + ->Args({10'000'000, 40'000'000}) + ->Args({10'000'000, 100'000'000}) + ->Args({100'000'000, 100'000'000}) + ->Args({80'000'000, 240'000'000}) + ->UseManualTime(); + +BENCHMARK_REGISTER_F(Join, left_anti_join_64bit_nulls) + ->Unit(benchmark::kMillisecond) + ->Args({50'000'000, 50'000'000}) + ->Args({40'000'000, 120'000'000}) + ->UseManualTime(); + +// left semi-join ------------------------------------------------------------- +BENCHMARK_REGISTER_F(Join, left_semi_join_32bit) + ->Unit(benchmark::kMillisecond) + ->Args({100'000, 100'000}) + ->Args({100'000, 400'000}) + ->Args({100'000, 1'000'000}) + ->Args({10'000'000, 10'000'000}) + ->Args({10'000'000, 40'000'000}) + ->Args({10'000'000, 100'000'000}) + ->Args({100'000'000, 100'000'000}) + ->Args({80'000'000, 240'000'000}) + ->UseManualTime(); + +BENCHMARK_REGISTER_F(Join, left_semi_join_64bit) + ->Unit(benchmark::kMillisecond) + ->Args({50'000'000, 50'000'000}) + ->Args({40'000'000, 120'000'000}) + ->UseManualTime(); + +BENCHMARK_REGISTER_F(Join, left_semi_join_32bit_nulls) + ->Unit(benchmark::kMillisecond) + ->Args({100'000, 100'000}) + ->Args({100'000, 400'000}) + ->Args({100'000, 1'000'000}) + ->Args({10'000'000, 10'000'000}) + ->Args({10'000'000, 40'000'000}) + ->Args({10'000'000, 100'000'000}) + ->Args({100'000'000, 100'000'000}) + ->Args({80'000'000, 240'000'000}) + ->UseManualTime(); + +BENCHMARK_REGISTER_F(Join, left_semi_join_64bit_nulls) + ->Unit(benchmark::kMillisecond) + ->Args({50'000'000, 50'000'000}) + ->Args({40'000'000, 120'000'000}) + ->UseManualTime(); From 3d5863d55717996234675adaa89ba72938c20dd8 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Mon, 24 Jan 2022 14:31:07 -0600 Subject: [PATCH 5/5] Format CMake. --- cpp/benchmarks/CMakeLists.txt | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/cpp/benchmarks/CMakeLists.txt b/cpp/benchmarks/CMakeLists.txt index e07fca40cb5..57592de59af 100644 --- a/cpp/benchmarks/CMakeLists.txt +++ b/cpp/benchmarks/CMakeLists.txt @@ -140,9 +140,7 @@ ConfigureBench(SEARCH_BENCH search/search.cpp) # ################################################################################################## # * sort benchmark -------------------------------------------------------------------------------- -ConfigureBench( - SORT_BENCH sort/rank.cpp sort/sort.cpp sort/sort_strings.cpp -) +ConfigureBench(SORT_BENCH sort/rank.cpp sort/sort.cpp sort/sort_strings.cpp) # ################################################################################################## # * quantiles benchmark @@ -156,8 +154,8 @@ ConfigureBench(TYPE_DISPATCHER_BENCH type_dispatcher/type_dispatcher.cu) # ################################################################################################## # * reduction benchmark --------------------------------------------------------------------------- ConfigureBench( - REDUCTION_BENCH reduction/anyall.cpp reduction/dictionary.cpp - reduction/reduce.cpp reduction/scan.cpp reduction/minmax.cpp + REDUCTION_BENCH reduction/anyall.cpp reduction/dictionary.cpp reduction/reduce.cpp + reduction/scan.cpp reduction/minmax.cpp ) # ################################################################################################## @@ -171,13 +169,8 @@ ConfigureBench(FILL_BENCH filling/repeat.cpp) # ################################################################################################## # * groupby benchmark ----------------------------------------------------------------------------- ConfigureBench( - GROUPBY_BENCH - groupby/group_sum.cu - groupby/group_nth.cu - groupby/group_shift.cu - groupby/group_struct.cu - groupby/group_no_requests.cu - groupby/group_scan.cu + GROUPBY_BENCH groupby/group_sum.cu groupby/group_nth.cu groupby/group_shift.cu + groupby/group_struct.cu groupby/group_no_requests.cu groupby/group_scan.cu ) # ################################################################################################## @@ -226,20 +219,13 @@ ConfigureBench(AST_BENCH ast/transform.cpp) # ################################################################################################## # * binaryop benchmark ---------------------------------------------------------------------------- -ConfigureBench( - BINARYOP_BENCH binaryop/binaryop.cpp binaryop/compiled_binaryop.cpp -) +ConfigureBench(BINARYOP_BENCH binaryop/binaryop.cpp binaryop/compiled_binaryop.cpp) # ################################################################################################## # * nvtext benchmark ------------------------------------------------------------------- ConfigureBench( - TEXT_BENCH - text/ngrams.cpp - text/normalize.cpp - text/normalize_spaces.cpp - text/replace.cpp - text/subword.cpp - text/tokenize.cpp + TEXT_BENCH text/ngrams.cpp text/normalize.cpp text/normalize_spaces.cpp text/replace.cpp + text/subword.cpp text/tokenize.cpp ) # ##################################################################################################