From 5e44e4685f7bdfc01679fb287eae90c511913b8b Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 13 Apr 2023 11:21:11 -0500 Subject: [PATCH 1/4] Update clang-format version. --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8b46eb25950..08cc6ec4a14 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -72,7 +72,7 @@ repos: # Explicitly specify the pyproject.toml at the repo root, not per-project. args: ["--config=pyproject.toml"] - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v11.1.0 + rev: v16.0.1 hooks: - id: clang-format types_or: [c, c++, cuda] From e1be7e374b1e0bdfea0b8bd527bccc4489c7972d Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 13 Apr 2023 11:35:51 -0500 Subject: [PATCH 2/4] Run pre-commit. --- cpp/benchmarks/ast/transform.cpp | 3 +- cpp/benchmarks/binaryop/binaryop.cpp | 3 +- cpp/benchmarks/binaryop/compiled_binaryop.cpp | 3 +- cpp/benchmarks/column/concatenate.cpp | 6 +- cpp/benchmarks/common/generate_input.hpp | 3 +- cpp/benchmarks/copying/contiguous_split.cu | 9 +- cpp/benchmarks/copying/copy_if_else.cpp | 3 +- cpp/benchmarks/copying/gather.cu | 3 +- cpp/benchmarks/copying/scatter.cu | 3 +- cpp/benchmarks/copying/shift.cu | 3 +- cpp/benchmarks/filling/repeat.cpp | 3 +- cpp/benchmarks/groupby/group_no_requests.cpp | 3 +- cpp/benchmarks/groupby/group_nth.cpp | 3 +- cpp/benchmarks/groupby/group_scan.cpp | 3 +- cpp/benchmarks/groupby/group_shift.cpp | 3 +- .../groupby/group_struct_values.cpp | 3 +- cpp/benchmarks/groupby/group_sum.cpp | 3 +- cpp/benchmarks/hashing/hash.cpp | 3 +- cpp/benchmarks/hashing/partition.cpp | 3 +- cpp/benchmarks/io/csv/csv_reader_input.cpp | 10 +- cpp/benchmarks/iterator/iterator.cu | 5 +- cpp/benchmarks/join/conditional_join.cu | 3 +- cpp/benchmarks/join/left_join.cu | 3 +- cpp/benchmarks/lists/copying/scatter_lists.cu | 3 +- cpp/benchmarks/merge/merge.cpp | 3 +- cpp/benchmarks/null_mask/set_null_mask.cpp | 3 +- cpp/benchmarks/quantiles/quantiles.cpp | 3 +- cpp/benchmarks/reduction/anyall.cpp | 3 +- cpp/benchmarks/reduction/dictionary.cpp | 3 +- cpp/benchmarks/reduction/minmax.cpp | 3 +- cpp/benchmarks/reduction/reduce.cpp | 3 +- cpp/benchmarks/reduction/scan.cpp | 3 +- cpp/benchmarks/replace/clamp.cpp | 3 +- cpp/benchmarks/replace/nans.cpp | 3 +- cpp/benchmarks/search/search.cpp | 3 +- cpp/benchmarks/sort/rank.cpp | 3 +- cpp/benchmarks/sort/sort.cpp | 3 +- cpp/benchmarks/sort/sort_strings.cpp | 3 +- .../stream_compaction/apply_boolean_mask.cpp | 4 +- cpp/benchmarks/string/case.cpp | 3 +- cpp/benchmarks/string/combine.cpp | 3 +- cpp/benchmarks/string/contains.cpp | 3 +- cpp/benchmarks/string/convert_datetime.cpp | 3 +- cpp/benchmarks/string/convert_durations.cpp | 6 +- cpp/benchmarks/string/convert_fixed_point.cpp | 6 +- cpp/benchmarks/string/convert_numerics.cpp | 6 +- cpp/benchmarks/string/copy.cu | 3 +- cpp/benchmarks/string/extract.cpp | 5 +- cpp/benchmarks/string/factory.cu | 3 +- cpp/benchmarks/string/filter.cpp | 3 +- cpp/benchmarks/string/find.cpp | 3 +- cpp/benchmarks/string/json.cu | 3 +- cpp/benchmarks/string/repeat_strings.cpp | 3 +- cpp/benchmarks/string/replace.cpp | 3 +- cpp/benchmarks/string/replace_re.cpp | 3 +- cpp/benchmarks/string/slice.cpp | 3 +- cpp/benchmarks/string/split.cpp | 3 +- cpp/benchmarks/string/translate.cpp | 3 +- cpp/benchmarks/string/url_decode.cu | 3 +- cpp/benchmarks/text/ngrams.cpp | 3 +- cpp/benchmarks/text/normalize.cpp | 3 +- cpp/benchmarks/text/normalize_spaces.cpp | 3 +- cpp/benchmarks/text/replace.cpp | 3 +- cpp/benchmarks/text/subword.cpp | 3 +- cpp/benchmarks/text/tokenize.cpp | 3 +- cpp/benchmarks/transpose/transpose.cpp | 3 +- .../type_dispatcher/type_dispatcher.cu | 3 +- cpp/include/cudf/ast/detail/operators.hpp | 21 +- cpp/include/cudf/column/column.hpp | 6 +- .../cudf/column/column_device_view.cuh | 14 +- .../cudf/detail/aggregation/result_cache.hpp | 6 +- cpp/include/cudf/detail/copy_if.cuh | 2 +- .../cudf/detail/groupby/sort_helper.hpp | 6 +- cpp/include/cudf/detail/indexalator.cuh | 28 +-- cpp/include/cudf/detail/iterator.cuh | 6 +- cpp/include/cudf/detail/join.hpp | 14 +- cpp/include/cudf/detail/nvtx/nvtx3.hpp | 43 ++-- .../cudf/detail/sizes_to_offsets_iterator.cuh | 8 +- .../cudf/detail/utilities/linked_column.hpp | 2 +- cpp/include/cudf/fixed_point/fixed_point.hpp | 2 +- cpp/include/cudf/groupby.hpp | 10 +- cpp/include/cudf/io/csv.hpp | 2 +- cpp/include/cudf/io/json.hpp | 2 +- cpp/include/cudf/io/orc_metadata.hpp | 12 +- cpp/include/cudf/join.hpp | 6 +- .../cudf/lists/detail/scatter_helper.cuh | 8 +- cpp/include/cudf/lists/list_view.hpp | 3 +- cpp/include/cudf/scalar/scalar.hpp | 20 +- .../cudf/strings/detail/split_utils.cuh | 2 +- cpp/include/cudf/strings/detail/utf8.hpp | 36 ++-- cpp/include/cudf/strings/string_view.hpp | 6 +- cpp/include/cudf/structs/struct_view.hpp | 3 +- cpp/include/cudf/table/row_operators.cuh | 4 +- cpp/include/cudf/table/table.hpp | 8 +- cpp/include/cudf/table/table_view.hpp | 2 +- cpp/include/cudf/utilities/span.hpp | 24 +-- cpp/include/cudf/utilities/traits.hpp | 24 +-- cpp/include/cudf/wrappers/dictionary.hpp | 2 +- cpp/include/cudf_test/base_fixture.hpp | 7 +- cpp/include/cudf_test/cudf_gtest.hpp | 3 +- .../stream_checking_resource_adaptor.hpp | 6 +- cpp/include/cudf_test/tdigest_utilities.cuh | 12 +- cpp/include/cudf_test/type_list_utilities.hpp | 30 +-- cpp/include/nvtext/subword_tokenize.hpp | 2 +- .../tests/kafka_consumer_tests.cpp | 3 +- cpp/src/copying/concatenate.cu | 4 +- cpp/src/copying/contiguous_split.cu | 4 +- cpp/src/groupby/sort/functors.hpp | 10 +- cpp/src/groupby/sort/scan.cpp | 4 +- cpp/src/hash/concurrent_unordered_map.cuh | 10 +- cpp/src/hash/md5_hash.cu | 4 +- cpp/src/io/avro/avro_gpu.cu | 2 +- cpp/src/io/avro/reader_impl.cu | 2 +- cpp/src/io/comp/cpu_unbz2.cpp | 2 +- cpp/src/io/comp/debrotli.cu | 4 +- cpp/src/io/comp/gpuinflate.cu | 18 +- cpp/src/io/comp/uncomp.cpp | 10 +- cpp/src/io/comp/unsnap.cu | 2 +- cpp/src/io/fst/agent_dfa.cuh | 3 +- cpp/src/io/fst/logical_stack.cuh | 2 +- cpp/src/io/json/json_column.cu | 2 +- cpp/src/io/json/nested_json.hpp | 8 +- cpp/src/io/json/nested_json_gpu.cu | 188 +++++++++--------- cpp/src/io/orc/orc_gpu.hpp | 8 +- cpp/src/io/orc/reader_impl.hpp | 6 +- cpp/src/io/orc/stripe_data.cu | 4 +- cpp/src/io/orc/writer_impl.hpp | 2 +- .../io/parquet/compact_protocol_reader.cpp | 2 +- .../io/parquet/compact_protocol_writer.cpp | 2 +- cpp/src/io/parquet/parquet.hpp | 37 ++-- cpp/src/io/parquet/parquet_gpu.cuh | 3 +- cpp/src/io/parquet/parquet_gpu.hpp | 22 +- cpp/src/io/parquet/reader_impl.cpp | 2 +- cpp/src/io/parquet/reader_impl_preprocess.cu | 2 +- .../statistics_type_identification.cuh | 3 +- .../io/statistics/typed_statistics_chunk.cuh | 3 +- cpp/src/io/utilities/column_buffer.hpp | 4 +- cpp/src/io/utilities/file_io_utilities.cpp | 2 +- cpp/src/io/utilities/output_builder.cuh | 6 +- cpp/src/join/join.cu | 4 +- cpp/src/partitioning/round_robin.cu | 2 +- .../quantiles/tdigest/tdigest_aggregation.cu | 2 +- .../rolling/detail/rolling_collect_list.cuh | 2 +- cpp/src/strings/char_types/char_types.cu | 4 +- cpp/src/strings/convert/convert_datetime.cu | 6 +- cpp/src/strings/convert/convert_durations.cu | 2 +- cpp/src/strings/convert/convert_floats.cu | 6 +- cpp/src/strings/convert/convert_integers.cu | 2 +- cpp/src/strings/convert/convert_ipv4.cu | 2 +- cpp/src/strings/convert/convert_urls.cu | 4 +- cpp/src/strings/json/json_path.cu | 2 +- cpp/src/strings/like.cu | 2 +- cpp/src/strings/regex/regcomp.cpp | 14 +- cpp/src/strings/regex/regcomp.h | 16 +- cpp/src/strings/regex/regex.cuh | 28 +-- cpp/src/strings/regex/regex.inl | 10 +- cpp/src/strings/regex/regex_program.cpp | 4 +- cpp/src/strings/replace/backref_re.cuh | 12 +- cpp/src/strings/replace/multi_re.cu | 2 +- cpp/src/strings/replace/replace_re.cu | 18 +- cpp/src/strings/split/partition.cu | 2 +- cpp/src/strings/split/split.cuh | 2 +- cpp/src/strings/split/split_re.cu | 2 +- cpp/src/text/normalize.cu | 2 +- cpp/src/text/replace.cu | 2 +- cpp/src/text/subword/bpe_tokenizer.cu | 2 +- cpp/src/text/subword/load_merges_file.cu | 2 +- cpp/src/text/utilities/tokenize_ops.cuh | 2 +- cpp/tests/ast/transform_tests.cpp | 11 +- .../binop-compiled-fixed_point-test.cpp | 6 +- cpp/tests/binaryop/binop-compiled-test.cpp | 39 ++-- .../binaryop/binop-verify-input-test.cpp | 3 +- cpp/tests/bitmask/bitmask_tests.cpp | 9 +- cpp/tests/bitmask/is_element_valid_tests.cpp | 3 +- cpp/tests/bitmask/valid_if_tests.cu | 3 +- cpp/tests/column/bit_cast_test.cpp | 3 +- cpp/tests/column/column_device_view_test.cu | 3 +- cpp/tests/column/column_test.cu | 3 +- .../column/column_view_device_span_test.cpp | 6 +- cpp/tests/column/column_view_shallow_test.cpp | 3 +- cpp/tests/column/compound_test.cu | 3 +- cpp/tests/column/factories_test.cpp | 24 +-- cpp/tests/copying/concatenate_tests.cu | 27 +-- .../copying/copy_if_else_nested_tests.cpp | 6 +- cpp/tests/copying/copy_range_tests.cpp | 9 +- cpp/tests/copying/copy_tests.cpp | 24 +-- cpp/tests/copying/detail_gather_tests.cu | 3 +- cpp/tests/copying/gather_list_tests.cpp | 6 +- cpp/tests/copying/gather_str_tests.cpp | 3 +- cpp/tests/copying/gather_struct_tests.cpp | 6 +- cpp/tests/copying/gather_tests.cpp | 3 +- cpp/tests/copying/get_value_tests.cpp | 15 +- .../copying/purge_nonempty_nulls_tests.cpp | 4 +- cpp/tests/copying/reverse_tests.cpp | 6 +- cpp/tests/copying/sample_tests.cpp | 6 +- .../copying/scatter_list_scalar_tests.cpp | 12 +- cpp/tests/copying/scatter_list_tests.cpp | 6 +- .../copying/scatter_struct_scalar_tests.cpp | 3 +- cpp/tests/copying/scatter_struct_tests.cpp | 5 +- cpp/tests/copying/scatter_tests.cpp | 33 +-- .../copying/segmented_gather_list_tests.cpp | 19 +- cpp/tests/copying/shift_tests.cpp | 6 +- cpp/tests/copying/slice_tests.cpp | 21 +- cpp/tests/copying/split_tests.cpp | 39 ++-- cpp/tests/copying/utility_tests.cpp | 24 +-- cpp/tests/datetime/datetime_ops_test.cpp | 6 +- cpp/tests/dictionary/add_keys_test.cpp | 3 +- cpp/tests/dictionary/decode_test.cpp | 3 +- cpp/tests/dictionary/encode_test.cpp | 3 +- cpp/tests/dictionary/factories_test.cpp | 3 +- cpp/tests/dictionary/fill_test.cpp | 3 +- cpp/tests/dictionary/gather_test.cpp | 3 +- cpp/tests/dictionary/remove_keys_test.cpp | 3 +- cpp/tests/dictionary/scatter_test.cpp | 3 +- cpp/tests/dictionary/search_test.cpp | 3 +- cpp/tests/dictionary/set_keys_test.cpp | 3 +- cpp/tests/dictionary/slice_test.cpp | 3 +- cpp/tests/encode/encode_tests.cpp | 6 +- cpp/tests/filling/fill_tests.cpp | 6 +- cpp/tests/filling/repeat_tests.cpp | 3 +- cpp/tests/filling/sequence_tests.cpp | 6 +- cpp/tests/fixed_point/fixed_point_tests.cpp | 6 +- cpp/tests/fixed_point/fixed_point_tests.cu | 6 +- cpp/tests/groupby/argmax_tests.cpp | 12 +- cpp/tests/groupby/argmin_tests.cpp | 12 +- cpp/tests/groupby/collect_list_tests.cpp | 3 +- cpp/tests/groupby/collect_set_tests.cpp | 9 +- cpp/tests/groupby/correlation_tests.cpp | 6 +- cpp/tests/groupby/count_scan_tests.cpp | 9 +- cpp/tests/groupby/count_tests.cpp | 12 +- cpp/tests/groupby/covariance_tests.cpp | 6 +- cpp/tests/groupby/groups_tests.cpp | 6 +- cpp/tests/groupby/keys_tests.cpp | 12 +- cpp/tests/groupby/lists_tests.cpp | 3 +- cpp/tests/groupby/m2_tests.cpp | 3 +- cpp/tests/groupby/max_scan_tests.cpp | 9 +- cpp/tests/groupby/max_tests.cpp | 18 +- cpp/tests/groupby/mean_tests.cpp | 9 +- cpp/tests/groupby/median_tests.cpp | 3 +- cpp/tests/groupby/merge_lists_tests.cpp | 8 +- cpp/tests/groupby/merge_m2_tests.cpp | 3 +- cpp/tests/groupby/merge_sets_tests.cpp | 18 +- cpp/tests/groupby/min_scan_tests.cpp | 9 +- cpp/tests/groupby/min_tests.cpp | 18 +- cpp/tests/groupby/nth_element_tests.cpp | 9 +- cpp/tests/groupby/nunique_tests.cpp | 3 +- cpp/tests/groupby/product_tests.cpp | 3 +- cpp/tests/groupby/quantile_tests.cpp | 3 +- cpp/tests/groupby/rank_scan_tests.cpp | 9 +- cpp/tests/groupby/replace_nulls_tests.cpp | 9 +- cpp/tests/groupby/shift_tests.cpp | 12 +- cpp/tests/groupby/std_tests.cpp | 3 +- cpp/tests/groupby/structs_tests.cpp | 3 +- cpp/tests/groupby/sum_of_squares_tests.cpp | 3 +- cpp/tests/groupby/sum_scan_tests.cpp | 3 +- cpp/tests/groupby/sum_tests.cpp | 9 +- cpp/tests/groupby/tdigest_tests.cu | 9 +- cpp/tests/groupby/var_tests.cpp | 3 +- cpp/tests/hashing/hash_test.cpp | 24 +-- cpp/tests/interop/dlpack_test.cpp | 9 +- cpp/tests/interop/from_arrow_test.cpp | 9 +- cpp/tests/interop/to_arrow_test.cpp | 9 +- cpp/tests/io/arrow_io_source_test.cpp | 3 +- cpp/tests/io/comp/decomp_test.cpp | 3 +- cpp/tests/io/csv_test.cpp | 30 ++- cpp/tests/io/file_io_test.cpp | 3 +- cpp/tests/io/fst/fst_test.cu | 3 +- cpp/tests/io/fst/logical_stack_test.cu | 3 +- cpp/tests/io/json_chunked_reader.cpp | 3 +- cpp/tests/io/json_test.cpp | 60 +++--- cpp/tests/io/json_tree.cpp | 6 +- cpp/tests/io/json_type_cast_test.cu | 3 +- cpp/tests/io/json_writer.cpp | 3 +- cpp/tests/io/nested_json_test.cpp | 6 +- cpp/tests/io/orc_test.cpp | 21 +- cpp/tests/io/parquet_chunked_reader_test.cpp | 3 +- cpp/tests/io/parquet_test.cpp | 20 +- cpp/tests/io/text/data_chunk_source_test.cpp | 3 +- cpp/tests/io/text/multibyte_split_test.cpp | 3 +- cpp/tests/io/type_inference_test.cu | 3 +- cpp/tests/iterator/indexalator_test.cu | 3 +- .../iterator/optional_iterator_test_chrono.cu | 3 +- .../optional_iterator_test_numeric.cu | 3 +- .../iterator/pair_iterator_test_chrono.cu | 3 +- .../iterator/pair_iterator_test_numeric.cu | 3 +- .../sizes_to_offsets_iterator_test.cu | 6 +- .../iterator/value_iterator_test_chrono.cu | 3 +- .../iterator/value_iterator_test_numeric.cu | 3 +- .../iterator/value_iterator_test_strings.cu | 3 +- .../iterator/value_iterator_test_transform.cu | 3 +- cpp/tests/join/cross_join_tests.cpp | 9 +- cpp/tests/join/join_tests.cpp | 7 +- cpp/tests/join/semi_anti_join_tests.cpp | 3 +- cpp/tests/labeling/label_bins_tests.cpp | 12 +- .../concatenate_list_elements_tests.cpp | 14 +- .../lists/combine/concatenate_rows_tests.cpp | 15 +- cpp/tests/lists/contains_tests.cpp | 21 +- cpp/tests/lists/count_elements_tests.cpp | 6 +- cpp/tests/lists/explode_tests.cpp | 12 +- cpp/tests/lists/extract_tests.cpp | 12 +- cpp/tests/lists/reverse_tests.cpp | 14 +- cpp/tests/lists/sequences_tests.cpp | 9 +- .../difference_distinct_tests.cpp | 8 +- .../set_operations/have_overlap_tests.cpp | 6 +- .../intersect_distinct_tests.cpp | 10 +- .../set_operations/union_distinct_tests.cpp | 16 +- cpp/tests/lists/sort_lists_tests.cpp | 3 +- .../apply_boolean_mask_tests.cpp | 6 +- .../stream_compaction/distinct_tests.cpp | 16 +- cpp/tests/merge/merge_dictionary_test.cpp | 3 +- cpp/tests/merge/merge_string_test.cpp | 3 +- cpp/tests/merge/merge_test.cpp | 9 +- .../partitioning/hash_partition_test.cpp | 6 +- cpp/tests/partitioning/partition_test.cpp | 6 +- cpp/tests/partitioning/round_robin_test.cpp | 3 +- .../quantiles/percentile_approx_test.cpp | 6 +- cpp/tests/quantiles/quantile_test.cpp | 9 +- cpp/tests/quantiles/quantiles_test.cpp | 3 +- cpp/tests/reductions/collect_ops_tests.cpp | 6 +- cpp/tests/reductions/rank_tests.cpp | 3 +- cpp/tests/reductions/reduction_tests.cpp | 33 +-- cpp/tests/reductions/scan_tests.cpp | 12 +- .../reductions/segmented_reduction_tests.cpp | 9 +- cpp/tests/reductions/tdigest_tests.cu | 6 +- cpp/tests/replace/clamp_test.cpp | 18 +- cpp/tests/replace/normalize_replace_tests.cpp | 3 +- cpp/tests/replace/replace_nans_tests.cpp | 6 +- cpp/tests/replace/replace_nulls_tests.cpp | 27 +-- cpp/tests/replace/replace_tests.cpp | 12 +- cpp/tests/reshape/byte_cast_tests.cpp | 3 +- .../reshape/interleave_columns_tests.cpp | 23 +-- cpp/tests/reshape/tile_tests.cpp | 3 +- cpp/tests/rolling/collect_ops_test.cpp | 12 +- cpp/tests/rolling/empty_input_test.cpp | 6 +- cpp/tests/rolling/grouped_rolling_test.cpp | 15 +- cpp/tests/rolling/lead_lag_test.cpp | 34 ++-- cpp/tests/rolling/nth_element_test.cpp | 6 +- .../rolling/range_rolling_window_test.cpp | 14 +- .../rolling/range_window_bounds_test.cpp | 12 +- cpp/tests/rolling/rolling_test.cpp | 21 +- cpp/tests/round/round_tests.cpp | 12 +- cpp/tests/scalar/factories_test.cpp | 9 +- cpp/tests/scalar/scalar_device_view_test.cu | 6 +- cpp/tests/scalar/scalar_test.cpp | 15 +- cpp/tests/search/search_dictionary_test.cpp | 3 +- cpp/tests/search/search_list_test.cpp | 9 +- cpp/tests/search/search_struct_test.cpp | 9 +- cpp/tests/search/search_test.cpp | 6 +- cpp/tests/sort/is_sorted_tests.cpp | 6 +- cpp/tests/sort/rank_test.cpp | 3 +- cpp/tests/sort/segmented_sort_tests.cpp | 5 +- cpp/tests/sort/sort_nested_types_tests.cpp | 3 +- cpp/tests/sort/sort_test.cpp | 12 +- cpp/tests/sort/stable_sort_tests.cpp | 9 +- .../apply_boolean_mask_tests.cpp | 3 +- .../distinct_count_tests.cpp | 12 +- .../stream_compaction/distinct_tests.cpp | 12 +- .../stream_compaction/drop_nans_tests.cpp | 3 +- .../stream_compaction/drop_nulls_tests.cpp | 6 +- .../stream_compaction/unique_count_tests.cpp | 12 +- cpp/tests/stream_compaction/unique_tests.cpp | 7 +- cpp/tests/strings/array_tests.cpp | 6 +- cpp/tests/strings/attrs_tests.cpp | 3 +- cpp/tests/strings/booleans_tests.cpp | 3 +- cpp/tests/strings/case_tests.cpp | 3 +- cpp/tests/strings/chars_types_tests.cpp | 18 +- .../strings/combine/concatenate_tests.cpp | 6 +- .../combine/join_list_elements_tests.cpp | 3 +- .../strings/combine/join_strings_tests.cpp | 3 +- cpp/tests/strings/concatenate_tests.cpp | 3 +- cpp/tests/strings/contains_tests.cpp | 5 +- cpp/tests/strings/datetime_tests.cpp | 3 +- cpp/tests/strings/durations_tests.cpp | 11 +- cpp/tests/strings/extract_tests.cpp | 3 +- cpp/tests/strings/factories_test.cu | 3 +- cpp/tests/strings/fill_tests.cpp | 3 +- cpp/tests/strings/find_multiple_tests.cpp | 3 +- cpp/tests/strings/find_tests.cpp | 7 +- cpp/tests/strings/findall_tests.cpp | 3 +- cpp/tests/strings/fixed_point_tests.cpp | 6 +- cpp/tests/strings/floats_tests.cpp | 3 +- cpp/tests/strings/format_lists_tests.cpp | 3 +- cpp/tests/strings/integers_tests.cpp | 9 +- cpp/tests/strings/ipv4_tests.cpp | 3 +- cpp/tests/strings/json_tests.cpp | 3 +- cpp/tests/strings/like_tests.cpp | 3 +- cpp/tests/strings/pad_tests.cpp | 6 +- cpp/tests/strings/repeat_strings_tests.cpp | 44 ++-- cpp/tests/strings/replace_regex_tests.cpp | 3 +- cpp/tests/strings/reverse_tests.cpp | 3 +- cpp/tests/strings/slice_tests.cpp | 8 +- cpp/tests/strings/split_tests.cpp | 3 +- cpp/tests/strings/strip_tests.cpp | 3 +- cpp/tests/strings/translate_tests.cpp | 3 +- cpp/tests/strings/urls_tests.cpp | 3 +- cpp/tests/structs/structs_column_tests.cpp | 6 +- cpp/tests/structs/utilities_tests.cpp | 16 +- .../table/experimental_row_operator_tests.cu | 6 +- cpp/tests/table/row_operators_tests.cpp | 3 +- cpp/tests/table/table_tests.cpp | 3 +- cpp/tests/table/table_view_tests.cu | 3 +- cpp/tests/text/bpe_tests.cpp | 3 +- cpp/tests/text/edit_distance_tests.cpp | 3 +- cpp/tests/text/ngrams_tests.cpp | 3 +- cpp/tests/text/ngrams_tokenize_tests.cpp | 3 +- cpp/tests/text/normalize_tests.cpp | 3 +- cpp/tests/text/replace_tests.cpp | 3 +- cpp/tests/text/stemmer_tests.cpp | 3 +- cpp/tests/text/subword_tests.cpp | 3 +- cpp/tests/text/tokenize_tests.cpp | 3 +- .../integration/unary_transform_test.cpp | 3 +- cpp/tests/transform/mask_to_bools_test.cpp | 6 +- cpp/tests/transform/nans_to_null_test.cpp | 3 +- cpp/tests/transform/one_hot_encode_tests.cpp | 6 +- cpp/tests/transform/row_bit_count_test.cu | 6 +- cpp/tests/transpose/transpose_test.cpp | 6 +- cpp/tests/types/traits_test.cpp | 12 +- cpp/tests/types/type_dispatcher_test.cu | 19 +- cpp/tests/unary/cast_tests.cpp | 27 +-- cpp/tests/unary/math_ops_test.cpp | 12 +- cpp/tests/unary/unary_ops_test.cpp | 15 +- cpp/tests/utilities/column_utilities.cu | 2 +- .../column_utilities_tests.cpp | 21 +- .../lists_column_wrapper_tests.cpp | 3 +- cpp/tests/utilities_tests/span_tests.cu | 6 +- .../utilities_tests/type_check_tests.cpp | 6 +- 426 files changed, 1274 insertions(+), 2013 deletions(-) diff --git a/cpp/benchmarks/ast/transform.cpp b/cpp/benchmarks/ast/transform.cpp index 20e64e0a90d..56cb6d72e28 100644 --- a/cpp/benchmarks/ast/transform.cpp +++ b/cpp/benchmarks/ast/transform.cpp @@ -35,8 +35,7 @@ enum class TreeType { }; template -class AST : public cudf::benchmark { -}; +class AST : public cudf::benchmark {}; template static void BM_ast_transform(benchmark::State& state) diff --git a/cpp/benchmarks/binaryop/binaryop.cpp b/cpp/benchmarks/binaryop/binaryop.cpp index e5bde94f1f9..e36d4ca4c04 100644 --- a/cpp/benchmarks/binaryop/binaryop.cpp +++ b/cpp/benchmarks/binaryop/binaryop.cpp @@ -33,8 +33,7 @@ enum class TreeType { }; template -class BINARYOP : public cudf::benchmark { -}; +class BINARYOP : public cudf::benchmark {}; template static void BM_binaryop_transform(benchmark::State& state) diff --git a/cpp/benchmarks/binaryop/compiled_binaryop.cpp b/cpp/benchmarks/binaryop/compiled_binaryop.cpp index d32664cde4a..fbba38431dd 100644 --- a/cpp/benchmarks/binaryop/compiled_binaryop.cpp +++ b/cpp/benchmarks/binaryop/compiled_binaryop.cpp @@ -20,8 +20,7 @@ #include -class COMPILED_BINARYOP : public cudf::benchmark { -}; +class COMPILED_BINARYOP : public cudf::benchmark {}; template void BM_compiled_binaryop(benchmark::State& state, cudf::binary_operator binop) diff --git a/cpp/benchmarks/column/concatenate.cpp b/cpp/benchmarks/column/concatenate.cpp index 3260159b409..670601ab30d 100644 --- a/cpp/benchmarks/column/concatenate.cpp +++ b/cpp/benchmarks/column/concatenate.cpp @@ -31,8 +31,7 @@ #include #include -class Concatenate : public cudf::benchmark { -}; +class Concatenate : public cudf::benchmark {}; template static void BM_concatenate(benchmark::State& state) @@ -110,8 +109,7 @@ static void BM_concatenate_tables(benchmark::State& state) CONCAT_TABLES_BENCHMARK_DEFINE(int64_t, false) CONCAT_TABLES_BENCHMARK_DEFINE(int64_t, true) -class ConcatenateStrings : public cudf::benchmark { -}; +class ConcatenateStrings : public cudf::benchmark {}; template static void BM_concatenate_strings(benchmark::State& state) diff --git a/cpp/benchmarks/common/generate_input.hpp b/cpp/benchmarks/common/generate_input.hpp index e65aa69763b..8a5811218d0 100644 --- a/cpp/benchmarks/common/generate_input.hpp +++ b/cpp/benchmarks/common/generate_input.hpp @@ -184,8 +184,7 @@ struct distribution_params -struct distribution_params()>> { -}; +struct distribution_params()>> {}; /** * @brief Returns a vector of types, corresponding to the input type or a type group. diff --git a/cpp/benchmarks/copying/contiguous_split.cu b/cpp/benchmarks/copying/contiguous_split.cu index 40c0beff6d3..e9b46ce9ee3 100644 --- a/cpp/benchmarks/copying/contiguous_split.cu +++ b/cpp/benchmarks/copying/contiguous_split.cu @@ -50,7 +50,8 @@ void BM_contiguous_split_common(benchmark::State& state, for (auto const& col : src_cols) // computing the null count is not a part of the benchmark's target code path, and we want the // property to be pre-computed so that we measure the performance of only the intended code path - [[maybe_unused]] auto const nulls = col->null_count(); + [[maybe_unused]] + auto const nulls = col->null_count(); auto const src_table = cudf::table(std::move(src_cols)); @@ -63,8 +64,7 @@ void BM_contiguous_split_common(benchmark::State& state, state.SetBytesProcessed(static_cast(state.iterations()) * bytes_total * 2); } -class ContiguousSplit : public cudf::benchmark { -}; +class ContiguousSplit : public cudf::benchmark {}; void BM_contiguous_split(benchmark::State& state) { @@ -94,8 +94,7 @@ void BM_contiguous_split(benchmark::State& state) BM_contiguous_split_common(state, src_cols, num_rows, num_splits, total_bytes); } -class ContiguousSplitStrings : public cudf::benchmark { -}; +class ContiguousSplitStrings : public cudf::benchmark {}; void BM_contiguous_split_strings(benchmark::State& state) { diff --git a/cpp/benchmarks/copying/copy_if_else.cpp b/cpp/benchmarks/copying/copy_if_else.cpp index 9a153a7094c..6160c17d539 100644 --- a/cpp/benchmarks/copying/copy_if_else.cpp +++ b/cpp/benchmarks/copying/copy_if_else.cpp @@ -23,8 +23,7 @@ #include -class CopyIfElse : public cudf::benchmark { -}; +class CopyIfElse : public cudf::benchmark {}; template static void BM_copy_if_else(benchmark::State& state, bool nulls) diff --git a/cpp/benchmarks/copying/gather.cu b/cpp/benchmarks/copying/gather.cu index 29d625ae9d3..20fbcee1b7b 100644 --- a/cpp/benchmarks/copying/gather.cu +++ b/cpp/benchmarks/copying/gather.cu @@ -26,8 +26,7 @@ #include #include -class Gather : public cudf::benchmark { -}; +class Gather : public cudf::benchmark {}; template void BM_gather(benchmark::State& state) diff --git a/cpp/benchmarks/copying/scatter.cu b/cpp/benchmarks/copying/scatter.cu index d4bd852cbb3..00a627673d7 100644 --- a/cpp/benchmarks/copying/scatter.cu +++ b/cpp/benchmarks/copying/scatter.cu @@ -26,8 +26,7 @@ #include #include -class Scatter : public cudf::benchmark { -}; +class Scatter : public cudf::benchmark {}; template void BM_scatter(benchmark::State& state) diff --git a/cpp/benchmarks/copying/shift.cu b/cpp/benchmarks/copying/shift.cu index 957313134b3..b11cc2f24dd 100644 --- a/cpp/benchmarks/copying/shift.cu +++ b/cpp/benchmarks/copying/shift.cu @@ -70,8 +70,7 @@ static void BM_shift(benchmark::State& state) } } -class Shift : public cudf::benchmark { -}; +class Shift : public cudf::benchmark {}; #define SHIFT_BM_BENCHMARK_DEFINE(name, use_validity, shift_factor) \ BENCHMARK_DEFINE_F(Shift, name)(::benchmark::State & state) \ diff --git a/cpp/benchmarks/filling/repeat.cpp b/cpp/benchmarks/filling/repeat.cpp index 179cdba718c..bef8737d4ed 100644 --- a/cpp/benchmarks/filling/repeat.cpp +++ b/cpp/benchmarks/filling/repeat.cpp @@ -20,8 +20,7 @@ #include -class Repeat : public cudf::benchmark { -}; +class Repeat : public cudf::benchmark {}; template void BM_repeat(benchmark::State& state) diff --git a/cpp/benchmarks/groupby/group_no_requests.cpp b/cpp/benchmarks/groupby/group_no_requests.cpp index a819db5240d..0b2cf52706d 100644 --- a/cpp/benchmarks/groupby/group_no_requests.cpp +++ b/cpp/benchmarks/groupby/group_no_requests.cpp @@ -24,8 +24,7 @@ #include #include -class Groupby : public cudf::benchmark { -}; +class Groupby : public cudf::benchmark {}; void BM_basic_no_requests(benchmark::State& state) { diff --git a/cpp/benchmarks/groupby/group_nth.cpp b/cpp/benchmarks/groupby/group_nth.cpp index af2b9adc6b0..ace0f95ba89 100644 --- a/cpp/benchmarks/groupby/group_nth.cpp +++ b/cpp/benchmarks/groupby/group_nth.cpp @@ -24,8 +24,7 @@ #include #include -class Groupby : public cudf::benchmark { -}; +class Groupby : public cudf::benchmark {}; void BM_pre_sorted_nth(benchmark::State& state) { diff --git a/cpp/benchmarks/groupby/group_scan.cpp b/cpp/benchmarks/groupby/group_scan.cpp index 345519f881e..f0ee2ab2758 100644 --- a/cpp/benchmarks/groupby/group_scan.cpp +++ b/cpp/benchmarks/groupby/group_scan.cpp @@ -25,8 +25,7 @@ #include #include -class Groupby : public cudf::benchmark { -}; +class Groupby : public cudf::benchmark {}; void BM_basic_sum_scan(benchmark::State& state) { diff --git a/cpp/benchmarks/groupby/group_shift.cpp b/cpp/benchmarks/groupby/group_shift.cpp index ef3a5e94eee..c746d695b22 100644 --- a/cpp/benchmarks/groupby/group_shift.cpp +++ b/cpp/benchmarks/groupby/group_shift.cpp @@ -24,8 +24,7 @@ #include #include -class Groupby : public cudf::benchmark { -}; +class Groupby : public cudf::benchmark {}; void BM_group_shift(benchmark::State& state) { diff --git a/cpp/benchmarks/groupby/group_struct_values.cpp b/cpp/benchmarks/groupby/group_struct_values.cpp index a110efeacd5..4764564768a 100644 --- a/cpp/benchmarks/groupby/group_struct_values.cpp +++ b/cpp/benchmarks/groupby/group_struct_values.cpp @@ -74,8 +74,7 @@ void BM_groupby_min_struct(benchmark::State& state) } } -class Groupby : public cudf::benchmark { -}; +class Groupby : public cudf::benchmark {}; #define MIN_RANGE 10'000 #define MAX_RANGE 10'000'000 diff --git a/cpp/benchmarks/groupby/group_sum.cpp b/cpp/benchmarks/groupby/group_sum.cpp index 4d56af0bca1..295452a1259 100644 --- a/cpp/benchmarks/groupby/group_sum.cpp +++ b/cpp/benchmarks/groupby/group_sum.cpp @@ -24,8 +24,7 @@ #include #include -class Groupby : public cudf::benchmark { -}; +class Groupby : public cudf::benchmark {}; void BM_basic_sum(benchmark::State& state) { diff --git a/cpp/benchmarks/hashing/hash.cpp b/cpp/benchmarks/hashing/hash.cpp index 1053c2e4694..3580da18b50 100644 --- a/cpp/benchmarks/hashing/hash.cpp +++ b/cpp/benchmarks/hashing/hash.cpp @@ -22,8 +22,7 @@ #include #include -class HashBenchmark : public cudf::benchmark { -}; +class HashBenchmark : public cudf::benchmark {}; enum contains_nulls { no_nulls, nulls }; diff --git a/cpp/benchmarks/hashing/partition.cpp b/cpp/benchmarks/hashing/partition.cpp index a15cc2d0f5b..5c085750902 100644 --- a/cpp/benchmarks/hashing/partition.cpp +++ b/cpp/benchmarks/hashing/partition.cpp @@ -22,8 +22,7 @@ #include -class Hashing : public cudf::benchmark { -}; +class Hashing : public cudf::benchmark {}; template void BM_hash_partition(benchmark::State& state) diff --git a/cpp/benchmarks/io/csv/csv_reader_input.cpp b/cpp/benchmarks/io/csv/csv_reader_input.cpp index 026045acee7..4ae4e139b59 100644 --- a/cpp/benchmarks/io/csv/csv_reader_input.cpp +++ b/cpp/benchmarks/io/csv/csv_reader_input.cpp @@ -78,11 +78,11 @@ template void BM_csv_read_io(nvbench::state& state, nvbench::type_list>) { auto const d_type = get_type_or_group({static_cast(data_type::INTEGRAL), - static_cast(data_type::FLOAT), - static_cast(data_type::DECIMAL), - static_cast(data_type::TIMESTAMP), - static_cast(data_type::DURATION), - static_cast(data_type::STRING)}); + static_cast(data_type::FLOAT), + static_cast(data_type::DECIMAL), + static_cast(data_type::TIMESTAMP), + static_cast(data_type::DURATION), + static_cast(data_type::STRING)}); auto const source_type = IOType; csv_read_common(d_type, source_type, state); diff --git a/cpp/benchmarks/iterator/iterator.cu b/cpp/benchmarks/iterator/iterator.cu index 1b1cf9b7e9d..2ea2ec34ee8 100644 --- a/cpp/benchmarks/iterator/iterator.cu +++ b/cpp/benchmarks/iterator/iterator.cu @@ -126,8 +126,7 @@ void iterator_bench_thrust(cudf::column_view& col, rmm::device_uvector& resul } // ----------------------------------------------------------------------------- -class Iterator : public cudf::benchmark { -}; +class Iterator : public cudf::benchmark {}; template void BM_iterator(benchmark::State& state) @@ -146,7 +145,7 @@ void BM_iterator(benchmark::State& state) cuda_event_timer raii(state, true); // flush_l2_cache = true, stream = 0 if (cub_or_thrust) { if (raw_or_iterator) { - raw_stream_bench_cub(hasnull_F, dev_result); // driven by raw pointer + raw_stream_bench_cub(hasnull_F, dev_result); // driven by raw pointer } else { iterator_bench_cub(hasnull_F, dev_result); // driven by riterator without nulls } diff --git a/cpp/benchmarks/join/conditional_join.cu b/cpp/benchmarks/join/conditional_join.cu index f6c7d87c5cc..d721de0e8fd 100644 --- a/cpp/benchmarks/join/conditional_join.cu +++ b/cpp/benchmarks/join/conditional_join.cu @@ -17,8 +17,7 @@ #include template -class ConditionalJoin : public cudf::benchmark { -}; +class ConditionalJoin : public cudf::benchmark {}; // For compatibility with the shared logic for equality (hash) joins, all of // the join lambdas defined by these macros accept a null_equality parameter diff --git a/cpp/benchmarks/join/left_join.cu b/cpp/benchmarks/join/left_join.cu index 5c1e5483ad4..1375cb2cb8e 100644 --- a/cpp/benchmarks/join/left_join.cu +++ b/cpp/benchmarks/join/left_join.cu @@ -17,8 +17,7 @@ #include template -class Join : public cudf::benchmark { -}; +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) \ diff --git a/cpp/benchmarks/lists/copying/scatter_lists.cu b/cpp/benchmarks/lists/copying/scatter_lists.cu index c913a093edd..8e2ca8e677a 100644 --- a/cpp/benchmarks/lists/copying/scatter_lists.cu +++ b/cpp/benchmarks/lists/copying/scatter_lists.cu @@ -32,8 +32,7 @@ #include -class ScatterLists : public cudf::benchmark { -}; +class ScatterLists : public cudf::benchmark {}; template void BM_lists_scatter(::benchmark::State& state) diff --git a/cpp/benchmarks/merge/merge.cpp b/cpp/benchmarks/merge/merge.cpp index 82d89233a33..ddcf4b6cea2 100644 --- a/cpp/benchmarks/merge/merge.cpp +++ b/cpp/benchmarks/merge/merge.cpp @@ -30,8 +30,7 @@ // to enable, run cmake with -DBUILD_BENCHMARKS=ON // Fixture that enables RMM pool mode -class Merge : public cudf::benchmark { -}; +class Merge : public cudf::benchmark {}; using IntColWrap = cudf::test::fixed_width_column_wrapper; diff --git a/cpp/benchmarks/null_mask/set_null_mask.cpp b/cpp/benchmarks/null_mask/set_null_mask.cpp index 429a62a2bfa..22dacf3a8a2 100644 --- a/cpp/benchmarks/null_mask/set_null_mask.cpp +++ b/cpp/benchmarks/null_mask/set_null_mask.cpp @@ -19,8 +19,7 @@ #include -class SetNullmask : public cudf::benchmark { -}; +class SetNullmask : public cudf::benchmark {}; void BM_setnullmask(benchmark::State& state) { diff --git a/cpp/benchmarks/quantiles/quantiles.cpp b/cpp/benchmarks/quantiles/quantiles.cpp index 599cff2bcda..6c1280bc22b 100644 --- a/cpp/benchmarks/quantiles/quantiles.cpp +++ b/cpp/benchmarks/quantiles/quantiles.cpp @@ -24,8 +24,7 @@ #include #include -class Quantiles : public cudf::benchmark { -}; +class Quantiles : public cudf::benchmark {}; static void BM_quantiles(benchmark::State& state, bool nulls) { diff --git a/cpp/benchmarks/reduction/anyall.cpp b/cpp/benchmarks/reduction/anyall.cpp index 755fa1ca2ad..978119586d2 100644 --- a/cpp/benchmarks/reduction/anyall.cpp +++ b/cpp/benchmarks/reduction/anyall.cpp @@ -24,8 +24,7 @@ #include -class Reduction : public cudf::benchmark { -}; +class Reduction : public cudf::benchmark {}; template void BM_reduction_anyall(benchmark::State& state, diff --git a/cpp/benchmarks/reduction/dictionary.cpp b/cpp/benchmarks/reduction/dictionary.cpp index 8f2f0be33ca..a96dbc5819d 100644 --- a/cpp/benchmarks/reduction/dictionary.cpp +++ b/cpp/benchmarks/reduction/dictionary.cpp @@ -23,8 +23,7 @@ #include #include -class ReductionDictionary : public cudf::benchmark { -}; +class ReductionDictionary : public cudf::benchmark {}; template void BM_reduction_dictionary(benchmark::State& state, diff --git a/cpp/benchmarks/reduction/minmax.cpp b/cpp/benchmarks/reduction/minmax.cpp index fa3b07b603e..1712f7b24c1 100644 --- a/cpp/benchmarks/reduction/minmax.cpp +++ b/cpp/benchmarks/reduction/minmax.cpp @@ -22,8 +22,7 @@ #include #include -class Reduction : public cudf::benchmark { -}; +class Reduction : public cudf::benchmark {}; template void BM_reduction(benchmark::State& state) diff --git a/cpp/benchmarks/reduction/reduce.cpp b/cpp/benchmarks/reduction/reduce.cpp index 4dfa7f0bbdc..86c83cfbe45 100644 --- a/cpp/benchmarks/reduction/reduce.cpp +++ b/cpp/benchmarks/reduction/reduce.cpp @@ -25,8 +25,7 @@ #include -class Reduction : public cudf::benchmark { -}; +class Reduction : public cudf::benchmark {}; template void BM_reduction(benchmark::State& state, std::unique_ptr const& agg) diff --git a/cpp/benchmarks/reduction/scan.cpp b/cpp/benchmarks/reduction/scan.cpp index 592eed1210a..26bab0c6b9a 100644 --- a/cpp/benchmarks/reduction/scan.cpp +++ b/cpp/benchmarks/reduction/scan.cpp @@ -24,8 +24,7 @@ #include #include -class ReductionScan : public cudf::benchmark { -}; +class ReductionScan : public cudf::benchmark {}; template static void BM_reduction_scan(benchmark::State& state, bool include_nulls) diff --git a/cpp/benchmarks/replace/clamp.cpp b/cpp/benchmarks/replace/clamp.cpp index ccd6b7ad9a1..7df2269b264 100644 --- a/cpp/benchmarks/replace/clamp.cpp +++ b/cpp/benchmarks/replace/clamp.cpp @@ -25,8 +25,7 @@ #include #include -class ReplaceClamp : public cudf::benchmark { -}; +class ReplaceClamp : public cudf::benchmark {}; template static void BM_clamp(benchmark::State& state, bool include_nulls) diff --git a/cpp/benchmarks/replace/nans.cpp b/cpp/benchmarks/replace/nans.cpp index 0b63c8f3097..05a7778a0c5 100644 --- a/cpp/benchmarks/replace/nans.cpp +++ b/cpp/benchmarks/replace/nans.cpp @@ -25,8 +25,7 @@ #include #include -class ReplaceNans : public cudf::benchmark { -}; +class ReplaceNans : public cudf::benchmark {}; template static void BM_replace_nans(benchmark::State& state, bool include_nulls) diff --git a/cpp/benchmarks/search/search.cpp b/cpp/benchmarks/search/search.cpp index 7d63df96a25..29f804ed5a6 100644 --- a/cpp/benchmarks/search/search.cpp +++ b/cpp/benchmarks/search/search.cpp @@ -24,8 +24,7 @@ #include #include -class Search : public cudf::benchmark { -}; +class Search : public cudf::benchmark {}; void BM_column(benchmark::State& state, bool nulls) { diff --git a/cpp/benchmarks/sort/rank.cpp b/cpp/benchmarks/sort/rank.cpp index 6d0a8e5aedd..b2178f8f187 100644 --- a/cpp/benchmarks/sort/rank.cpp +++ b/cpp/benchmarks/sort/rank.cpp @@ -22,8 +22,7 @@ #include #include -class Rank : public cudf::benchmark { -}; +class Rank : public cudf::benchmark {}; static void BM_rank(benchmark::State& state, bool nulls) { diff --git a/cpp/benchmarks/sort/sort.cpp b/cpp/benchmarks/sort/sort.cpp index 304bac06632..baa6c6217b4 100644 --- a/cpp/benchmarks/sort/sort.cpp +++ b/cpp/benchmarks/sort/sort.cpp @@ -22,8 +22,7 @@ #include template -class Sort : public cudf::benchmark { -}; +class Sort : public cudf::benchmark {}; template static void BM_sort(benchmark::State& state, bool nulls) diff --git a/cpp/benchmarks/sort/sort_strings.cpp b/cpp/benchmarks/sort/sort_strings.cpp index 572c05d69cb..0fc4f1ac3f3 100644 --- a/cpp/benchmarks/sort/sort_strings.cpp +++ b/cpp/benchmarks/sort/sort_strings.cpp @@ -22,8 +22,7 @@ #include #include -class Sort : public cudf::benchmark { -}; +class Sort : public cudf::benchmark {}; static void BM_sort(benchmark::State& state) { diff --git a/cpp/benchmarks/stream_compaction/apply_boolean_mask.cpp b/cpp/benchmarks/stream_compaction/apply_boolean_mask.cpp index 6663ccb7fd8..6d64e55e6dc 100644 --- a/cpp/benchmarks/stream_compaction/apply_boolean_mask.cpp +++ b/cpp/benchmarks/stream_compaction/apply_boolean_mask.cpp @@ -59,8 +59,8 @@ void calculate_bandwidth(benchmark::State& state, cudf::size_type num_columns) int64_t const column_bytes_in = column_bytes_out; // we only read unmasked inputs int64_t const bytes_read = - (column_bytes_in + validity_bytes_in) * num_columns + // reading columns - mask_size; // reading boolean mask + (column_bytes_in + validity_bytes_in) * num_columns + // reading columns + mask_size; // reading boolean mask int64_t const bytes_written = (column_bytes_out + validity_bytes_out) * num_columns; // writing columns diff --git a/cpp/benchmarks/string/case.cpp b/cpp/benchmarks/string/case.cpp index 72b6fcaff0e..57bc3eb937f 100644 --- a/cpp/benchmarks/string/case.cpp +++ b/cpp/benchmarks/string/case.cpp @@ -22,8 +22,7 @@ #include #include -class StringCase : public cudf::benchmark { -}; +class StringCase : public cudf::benchmark {}; static void BM_case(benchmark::State& state) { diff --git a/cpp/benchmarks/string/combine.cpp b/cpp/benchmarks/string/combine.cpp index 46bcda9ae92..b1d7288de70 100644 --- a/cpp/benchmarks/string/combine.cpp +++ b/cpp/benchmarks/string/combine.cpp @@ -25,8 +25,7 @@ #include #include -class StringCombine : public cudf::benchmark { -}; +class StringCombine : public cudf::benchmark {}; static void BM_combine(benchmark::State& state) { diff --git a/cpp/benchmarks/string/contains.cpp b/cpp/benchmarks/string/contains.cpp index a04915d1df8..714d50ffce3 100644 --- a/cpp/benchmarks/string/contains.cpp +++ b/cpp/benchmarks/string/contains.cpp @@ -27,8 +27,7 @@ #include #include -class StringContains : public cudf::benchmark { -}; +class StringContains : public cudf::benchmark {}; std::unique_ptr build_input_column(cudf::size_type n_rows, int32_t hit_rate) { diff --git a/cpp/benchmarks/string/convert_datetime.cpp b/cpp/benchmarks/string/convert_datetime.cpp index 9f327a21aa8..053e671989d 100644 --- a/cpp/benchmarks/string/convert_datetime.cpp +++ b/cpp/benchmarks/string/convert_datetime.cpp @@ -23,8 +23,7 @@ #include #include -class StringDateTime : public cudf::benchmark { -}; +class StringDateTime : public cudf::benchmark {}; enum class direction { to, from }; diff --git a/cpp/benchmarks/string/convert_durations.cpp b/cpp/benchmarks/string/convert_durations.cpp index 6e3a9e8faa9..56c919903f2 100644 --- a/cpp/benchmarks/string/convert_durations.cpp +++ b/cpp/benchmarks/string/convert_durations.cpp @@ -27,8 +27,7 @@ #include #include -class DurationsToString : public cudf::benchmark { -}; +class DurationsToString : public cudf::benchmark {}; template void BM_convert_from_durations(benchmark::State& state) { @@ -48,8 +47,7 @@ void BM_convert_from_durations(benchmark::State& state) state.SetBytesProcessed(state.iterations() * source_size * sizeof(TypeParam)); } -class StringToDurations : public cudf::benchmark { -}; +class StringToDurations : public cudf::benchmark {}; template void BM_convert_to_durations(benchmark::State& state) { diff --git a/cpp/benchmarks/string/convert_fixed_point.cpp b/cpp/benchmarks/string/convert_fixed_point.cpp index 7e91edbfcc4..b45f3a93b80 100644 --- a/cpp/benchmarks/string/convert_fixed_point.cpp +++ b/cpp/benchmarks/string/convert_fixed_point.cpp @@ -33,8 +33,7 @@ std::unique_ptr get_strings_column(cudf::size_type rows) } // anonymous namespace -class StringsToFixedPoint : public cudf::benchmark { -}; +class StringsToFixedPoint : public cudf::benchmark {}; template void convert_to_fixed_point(benchmark::State& state) @@ -54,8 +53,7 @@ void convert_to_fixed_point(benchmark::State& state) (strings_view.chars_size() + rows * cudf::size_of(dtype))); } -class StringsFromFixedPoint : public cudf::benchmark { -}; +class StringsFromFixedPoint : public cudf::benchmark {}; template void convert_from_fixed_point(benchmark::State& state) diff --git a/cpp/benchmarks/string/convert_numerics.cpp b/cpp/benchmarks/string/convert_numerics.cpp index 466117918d9..585bfe882db 100644 --- a/cpp/benchmarks/string/convert_numerics.cpp +++ b/cpp/benchmarks/string/convert_numerics.cpp @@ -42,8 +42,7 @@ std::unique_ptr get_strings_column(cudf::size_type rows) } } // anonymous namespace -class StringsToNumeric : public cudf::benchmark { -}; +class StringsToNumeric : public cudf::benchmark {}; template void convert_to_number(benchmark::State& state) @@ -68,8 +67,7 @@ void convert_to_number(benchmark::State& state) (strings_view.chars_size() + rows * sizeof(NumericType))); } -class StringsFromNumeric : public cudf::benchmark { -}; +class StringsFromNumeric : public cudf::benchmark {}; template void convert_from_number(benchmark::State& state) diff --git a/cpp/benchmarks/string/copy.cu b/cpp/benchmarks/string/copy.cu index 669b12aa56b..a8a10d874b5 100644 --- a/cpp/benchmarks/string/copy.cu +++ b/cpp/benchmarks/string/copy.cu @@ -30,8 +30,7 @@ #include #include -class StringCopy : public cudf::benchmark { -}; +class StringCopy : public cudf::benchmark {}; enum copy_type { gather, scatter }; diff --git a/cpp/benchmarks/string/extract.cpp b/cpp/benchmarks/string/extract.cpp index 4760956e049..021062ee479 100644 --- a/cpp/benchmarks/string/extract.cpp +++ b/cpp/benchmarks/string/extract.cpp @@ -28,8 +28,7 @@ #include -class StringExtract : public cudf::benchmark { -}; +class StringExtract : public cudf::benchmark {}; static void BM_extract(benchmark::State& state, int groups) { @@ -41,7 +40,7 @@ static void BM_extract(benchmark::State& state, int groups) std::vector samples(100); // 100 unique rows of data to reuse std::generate(samples.begin(), samples.end(), [&]() { - std::string row; // build a row of random tokens + std::string row; // build a row of random tokens while (static_cast(row.size()) < n_length) { row += std::to_string(words_dist(generator)) + " "; } diff --git a/cpp/benchmarks/string/factory.cu b/cpp/benchmarks/string/factory.cu index b75de16e901..791f26c2ac3 100644 --- a/cpp/benchmarks/string/factory.cu +++ b/cpp/benchmarks/string/factory.cu @@ -44,8 +44,7 @@ struct string_view_to_pair { }; } // namespace -class StringsFactory : public cudf::benchmark { -}; +class StringsFactory : public cudf::benchmark {}; static void BM_factory(benchmark::State& state) { diff --git a/cpp/benchmarks/string/filter.cpp b/cpp/benchmarks/string/filter.cpp index cb805539651..a29dfe6fe77 100644 --- a/cpp/benchmarks/string/filter.cpp +++ b/cpp/benchmarks/string/filter.cpp @@ -33,8 +33,7 @@ enum FilterAPI { filter, filter_chars, strip }; -class StringFilterChars : public cudf::benchmark { -}; +class StringFilterChars : public cudf::benchmark {}; static void BM_filter_chars(benchmark::State& state, FilterAPI api) { diff --git a/cpp/benchmarks/string/find.cpp b/cpp/benchmarks/string/find.cpp index 4ff3b59a491..8c6f75b53a5 100644 --- a/cpp/benchmarks/string/find.cpp +++ b/cpp/benchmarks/string/find.cpp @@ -30,8 +30,7 @@ enum FindAPI { find, find_multi, contains, starts_with, ends_with }; -class StringFindScalar : public cudf::benchmark { -}; +class StringFindScalar : public cudf::benchmark {}; static void BM_find_scalar(benchmark::State& state, FindAPI find_api) { diff --git a/cpp/benchmarks/string/json.cu b/cpp/benchmarks/string/json.cu index 7a963ba604b..1d19e63102d 100644 --- a/cpp/benchmarks/string/json.cu +++ b/cpp/benchmarks/string/json.cu @@ -30,8 +30,7 @@ #include -class JsonPath : public cudf::benchmark { -}; +class JsonPath : public cudf::benchmark {}; const std::vector Books{ R"json({ diff --git a/cpp/benchmarks/string/repeat_strings.cpp b/cpp/benchmarks/string/repeat_strings.cpp index fe015b27f13..92645524efb 100644 --- a/cpp/benchmarks/string/repeat_strings.cpp +++ b/cpp/benchmarks/string/repeat_strings.cpp @@ -90,8 +90,7 @@ static void generate_bench_args(benchmark::internal::Benchmark* b) generate_string_bench_args(b, min_rows, max_rows, row_mult, min_strlen, max_strlen, len_mult); } -class RepeatStrings : public cudf::benchmark { -}; +class RepeatStrings : public cudf::benchmark {}; #define REPEAT_STRINGS_SCALAR_TIMES_BENCHMARK_DEFINE(name) \ BENCHMARK_DEFINE_F(RepeatStrings, name) \ diff --git a/cpp/benchmarks/string/replace.cpp b/cpp/benchmarks/string/replace.cpp index cb570020f0e..5ddf09f5cec 100644 --- a/cpp/benchmarks/string/replace.cpp +++ b/cpp/benchmarks/string/replace.cpp @@ -29,8 +29,7 @@ #include -class StringReplace : public cudf::benchmark { -}; +class StringReplace : public cudf::benchmark {}; enum replace_type { scalar, slice, multi }; diff --git a/cpp/benchmarks/string/replace_re.cpp b/cpp/benchmarks/string/replace_re.cpp index b5dcf316a0e..f719fe31bd8 100644 --- a/cpp/benchmarks/string/replace_re.cpp +++ b/cpp/benchmarks/string/replace_re.cpp @@ -27,8 +27,7 @@ #include #include -class StringReplace : public cudf::benchmark { -}; +class StringReplace : public cudf::benchmark {}; enum replace_type { replace_re, replace_re_multi, replace_backref }; diff --git a/cpp/benchmarks/string/slice.cpp b/cpp/benchmarks/string/slice.cpp index 9da36cd4430..ae6327f4ce0 100644 --- a/cpp/benchmarks/string/slice.cpp +++ b/cpp/benchmarks/string/slice.cpp @@ -31,8 +31,7 @@ #include -class StringSlice : public cudf::benchmark { -}; +class StringSlice : public cudf::benchmark {}; enum slice_type { position, multi_position, delimiter, multi_delimiter }; diff --git a/cpp/benchmarks/string/split.cpp b/cpp/benchmarks/string/split.cpp index 1b3f4190680..021a7341ddd 100644 --- a/cpp/benchmarks/string/split.cpp +++ b/cpp/benchmarks/string/split.cpp @@ -27,8 +27,7 @@ #include -class StringSplit : public cudf::benchmark { -}; +class StringSplit : public cudf::benchmark {}; enum split_type { split, split_ws, record, record_ws }; diff --git a/cpp/benchmarks/string/translate.cpp b/cpp/benchmarks/string/translate.cpp index efc2fa3154b..c71cd3db333 100644 --- a/cpp/benchmarks/string/translate.cpp +++ b/cpp/benchmarks/string/translate.cpp @@ -30,8 +30,7 @@ #include -class StringTranslate : public cudf::benchmark { -}; +class StringTranslate : public cudf::benchmark {}; using entry_type = std::pair; diff --git a/cpp/benchmarks/string/url_decode.cu b/cpp/benchmarks/string/url_decode.cu index 44681c924d0..88a7a8b1596 100644 --- a/cpp/benchmarks/string/url_decode.cu +++ b/cpp/benchmarks/string/url_decode.cu @@ -79,8 +79,7 @@ auto generate_column(cudf::size_type num_rows, cudf::size_type chars_per_row, do return result_col; } -class UrlDecode : public cudf::benchmark { -}; +class UrlDecode : public cudf::benchmark {}; void BM_url_decode(benchmark::State& state, int esc_seq_pct) { diff --git a/cpp/benchmarks/text/ngrams.cpp b/cpp/benchmarks/text/ngrams.cpp index 5556e71c31b..87d0c85f3ff 100644 --- a/cpp/benchmarks/text/ngrams.cpp +++ b/cpp/benchmarks/text/ngrams.cpp @@ -24,8 +24,7 @@ #include -class TextNGrams : public cudf::benchmark { -}; +class TextNGrams : public cudf::benchmark {}; enum class ngrams_type { tokens, characters }; diff --git a/cpp/benchmarks/text/normalize.cpp b/cpp/benchmarks/text/normalize.cpp index 91d873224d3..d534661f849 100644 --- a/cpp/benchmarks/text/normalize.cpp +++ b/cpp/benchmarks/text/normalize.cpp @@ -24,8 +24,7 @@ #include -class TextNormalize : public cudf::benchmark { -}; +class TextNormalize : public cudf::benchmark {}; static void BM_normalize(benchmark::State& state, bool to_lower) { diff --git a/cpp/benchmarks/text/normalize_spaces.cpp b/cpp/benchmarks/text/normalize_spaces.cpp index 85eaf54d4ea..4ac4de77905 100644 --- a/cpp/benchmarks/text/normalize_spaces.cpp +++ b/cpp/benchmarks/text/normalize_spaces.cpp @@ -25,8 +25,7 @@ #include -class TextNormalize : public cudf::benchmark { -}; +class TextNormalize : public cudf::benchmark {}; static void BM_normalize(benchmark::State& state) { diff --git a/cpp/benchmarks/text/replace.cpp b/cpp/benchmarks/text/replace.cpp index a093cd767b3..f5397d33ed2 100644 --- a/cpp/benchmarks/text/replace.cpp +++ b/cpp/benchmarks/text/replace.cpp @@ -26,8 +26,7 @@ #include -class TextReplace : public cudf::benchmark { -}; +class TextReplace : public cudf::benchmark {}; static void BM_replace(benchmark::State& state) { diff --git a/cpp/benchmarks/text/subword.cpp b/cpp/benchmarks/text/subword.cpp index 2c430868341..b89111e0f3f 100644 --- a/cpp/benchmarks/text/subword.cpp +++ b/cpp/benchmarks/text/subword.cpp @@ -79,8 +79,7 @@ static void BM_subword_tokenizer(benchmark::State& state) } } -class Subword : public cudf::benchmark { -}; +class Subword : public cudf::benchmark {}; #define SUBWORD_BM_BENCHMARK_DEFINE(name) \ BENCHMARK_DEFINE_F(Subword, name)(::benchmark::State & state) { BM_subword_tokenizer(state); } \ diff --git a/cpp/benchmarks/text/tokenize.cpp b/cpp/benchmarks/text/tokenize.cpp index 4695a62f1c0..c077628c8be 100644 --- a/cpp/benchmarks/text/tokenize.cpp +++ b/cpp/benchmarks/text/tokenize.cpp @@ -28,8 +28,7 @@ #include #include -class TextTokenize : public cudf::benchmark { -}; +class TextTokenize : public cudf::benchmark {}; enum class tokenize_type { single, multi, count, count_multi, ngrams, characters }; diff --git a/cpp/benchmarks/transpose/transpose.cpp b/cpp/benchmarks/transpose/transpose.cpp index a164b04f406..51fa888a5ba 100644 --- a/cpp/benchmarks/transpose/transpose.cpp +++ b/cpp/benchmarks/transpose/transpose.cpp @@ -42,8 +42,7 @@ static void BM_transpose(benchmark::State& state) } } -class Transpose : public cudf::benchmark { -}; +class Transpose : public cudf::benchmark {}; #define TRANSPOSE_BM_BENCHMARK_DEFINE(name) \ BENCHMARK_DEFINE_F(Transpose, name)(::benchmark::State & state) { BM_transpose(state); } \ diff --git a/cpp/benchmarks/type_dispatcher/type_dispatcher.cu b/cpp/benchmarks/type_dispatcher/type_dispatcher.cu index d7ed174efa6..362d3825f81 100644 --- a/cpp/benchmarks/type_dispatcher/type_dispatcher.cu +++ b/cpp/benchmarks/type_dispatcher/type_dispatcher.cu @@ -211,8 +211,7 @@ void type_dispatcher_benchmark(::benchmark::State& state) sizeof(TypeParam)); } -class TypeDispatcher : public cudf::benchmark { -}; +class TypeDispatcher : public cudf::benchmark {}; #define TBM_BENCHMARK_DEFINE(name, TypeParam, functor_type, dispatching_type) \ BENCHMARK_DEFINE_F(TypeDispatcher, name)(::benchmark::State & state) \ diff --git a/cpp/include/cudf/ast/detail/operators.hpp b/cpp/include/cudf/ast/detail/operators.hpp index 3c6c9de055d..2fde775b1cf 100644 --- a/cpp/include/cudf/ast/detail/operators.hpp +++ b/cpp/include/cudf/ast/detail/operators.hpp @@ -224,8 +224,7 @@ CUDF_HOST_DEVICE inline constexpr void ast_operator_dispatcher(ast_operator op, * @tparam op AST operator. */ template -struct operator_functor { -}; +struct operator_functor {}; template <> struct operator_functor { @@ -402,8 +401,7 @@ struct operator_functor { // Alias NULL_EQUAL = EQUAL in the non-nullable case. template <> struct operator_functor - : public operator_functor { -}; + : public operator_functor {}; template <> struct operator_functor { @@ -507,8 +505,7 @@ struct operator_functor { // Alias NULL_LOGICAL_AND = LOGICAL_AND in the non-nullable case. template <> struct operator_functor - : public operator_functor { -}; + : public operator_functor {}; template <> struct operator_functor { @@ -524,8 +521,7 @@ struct operator_functor { // Alias NULL_LOGICAL_OR = LOGICAL_OR in the non-nullable case. template <> struct operator_functor - : public operator_functor { -}; + : public operator_functor {}; template <> struct operator_functor { @@ -798,14 +794,11 @@ struct cast { }; template <> -struct operator_functor : cast { -}; +struct operator_functor : cast {}; template <> -struct operator_functor : cast { -}; +struct operator_functor : cast {}; template <> -struct operator_functor : cast { -}; +struct operator_functor : cast {}; /* * The default specialization of nullable operators is to fall back to the non-nullable diff --git a/cpp/include/cudf/column/column.hpp b/cpp/include/cudf/column/column.hpp index 178fc92b399..c160cecbf84 100644 --- a/cpp/include/cudf/column/column.hpp +++ b/cpp/include/cudf/column/column.hpp @@ -47,10 +47,10 @@ namespace cudf { class column { public: - column() = default; - ~column() = default; + column() = default; + ~column() = default; column& operator=(column const& other) = delete; - column& operator=(column&& other) = delete; + column& operator=(column&& other) = delete; /** * @brief Construct a new column object by deep copying the contents of diff --git a/cpp/include/cudf/column/column_device_view.cuh b/cpp/include/cudf/column/column_device_view.cuh index b3e6ad0b99f..efb96cb6af6 100644 --- a/cpp/include/cudf/column/column_device_view.cuh +++ b/cpp/include/cudf/column/column_device_view.cuh @@ -53,10 +53,8 @@ namespace cudf { * */ struct nullate { - struct YES : std::bool_constant { - }; - struct NO : std::bool_constant { - }; + struct YES : std::bool_constant {}; + struct NO : std::bool_constant {}; /** * @brief `nullate::DYNAMIC` defers the determination of nullability to run time rather than * compile time. The calling code is responsible for specifying whether or not nulls are @@ -318,16 +316,14 @@ class alignas(16) column_device_view_base { } template - struct has_element_accessor_impl : std::false_type { - }; + struct has_element_accessor_impl : std::false_type {}; template struct has_element_accessor_impl< C, T, void_t().template element(std::declval()))>> - : std::true_type { - }; + : std::true_type {}; }; // @cond // Forward declaration @@ -1397,7 +1393,7 @@ struct pair_accessor { */ template struct pair_rep_accessor { - column_device_view const col; ///< column view of column in device + column_device_view const col; ///< column view of column in device using rep_type = device_storage_type_t; ///< representation type diff --git a/cpp/include/cudf/detail/aggregation/result_cache.hpp b/cpp/include/cudf/detail/aggregation/result_cache.hpp index 4409d7e0d73..c94f45f8a1d 100644 --- a/cpp/include/cudf/detail/aggregation/result_cache.hpp +++ b/cpp/include/cudf/detail/aggregation/result_cache.hpp @@ -42,9 +42,9 @@ struct pair_column_aggregation_hash { class result_cache { public: - result_cache() = delete; - ~result_cache() = default; - result_cache(result_cache const&) = delete; + result_cache() = delete; + ~result_cache() = default; + result_cache(result_cache const&) = delete; result_cache& operator=(const result_cache& other) = delete; result_cache(size_t num_columns) : _cache(num_columns) {} diff --git a/cpp/include/cudf/detail/copy_if.cuh b/cpp/include/cudf/detail/copy_if.cuh index 2870a891f87..cb3e20b36f2 100644 --- a/cpp/include/cudf/detail/copy_if.cuh +++ b/cpp/include/cudf/detail/copy_if.cuh @@ -132,7 +132,7 @@ __launch_bounds__(block_size) __global__ if (has_validity) { temp_valids[threadIdx.x] = false; // init shared memory if (threadIdx.x < cudf::detail::warp_size) temp_valids[block_size + threadIdx.x] = false; - __syncthreads(); // wait for init + __syncthreads(); // wait for init } if (mask_true) { diff --git a/cpp/include/cudf/detail/groupby/sort_helper.hpp b/cpp/include/cudf/detail/groupby/sort_helper.hpp index 663ff44ca56..7b386eb5f03 100644 --- a/cpp/include/cudf/detail/groupby/sort_helper.hpp +++ b/cpp/include/cudf/detail/groupby/sort_helper.hpp @@ -66,11 +66,11 @@ struct sort_groupby_helper { sorted keys_pre_sorted, std::vector const& null_precedence); - ~sort_groupby_helper() = default; - sort_groupby_helper(sort_groupby_helper const&) = delete; + ~sort_groupby_helper() = default; + sort_groupby_helper(sort_groupby_helper const&) = delete; sort_groupby_helper& operator=(sort_groupby_helper const&) = delete; sort_groupby_helper(sort_groupby_helper&&) = default; - sort_groupby_helper& operator=(sort_groupby_helper&&) = default; + sort_groupby_helper& operator=(sort_groupby_helper&&) = default; /** * @brief Groups a column of values according to `keys` and sorts within each diff --git a/cpp/include/cudf/detail/indexalator.cuh b/cpp/include/cudf/detail/indexalator.cuh index a6db463e084..40250f5d798 100644 --- a/cpp/include/cudf/detail/indexalator.cuh +++ b/cpp/include/cudf/detail/indexalator.cuh @@ -52,11 +52,11 @@ struct base_indexalator { using pointer = size_type*; using iterator_category = std::random_access_iterator_tag; - base_indexalator() = default; - base_indexalator(base_indexalator const&) = default; - base_indexalator(base_indexalator&&) = default; + base_indexalator() = default; + base_indexalator(base_indexalator const&) = default; + base_indexalator(base_indexalator&&) = default; base_indexalator& operator=(base_indexalator const&) = default; - base_indexalator& operator=(base_indexalator&&) = default; + base_indexalator& operator=(base_indexalator&&) = default; /** * @brief Prefix increment operator. @@ -248,13 +248,13 @@ struct input_indexalator : base_indexalator { friend struct indexalator_factory; friend struct base_indexalator; // for CRTP - using reference = size_type const; // this keeps STL and thrust happy + using reference = size_type const; // this keeps STL and thrust happy - input_indexalator() = default; - input_indexalator(input_indexalator const&) = default; - input_indexalator(input_indexalator&&) = default; + input_indexalator() = default; + input_indexalator(input_indexalator const&) = default; + input_indexalator(input_indexalator&&) = default; input_indexalator& operator=(input_indexalator const&) = default; - input_indexalator& operator=(input_indexalator&&) = default; + input_indexalator& operator=(input_indexalator&&) = default; /** * @brief Indirection operator returns the value at the current iterator position. @@ -332,13 +332,13 @@ struct output_indexalator : base_indexalator { friend struct indexalator_factory; friend struct base_indexalator; // for CRTP - using reference = output_indexalator const&; // required for output iterators + using reference = output_indexalator const&; // required for output iterators - output_indexalator() = default; - output_indexalator(output_indexalator const&) = default; - output_indexalator(output_indexalator&&) = default; + output_indexalator() = default; + output_indexalator(output_indexalator const&) = default; + output_indexalator(output_indexalator&&) = default; output_indexalator& operator=(output_indexalator const&) = default; - output_indexalator& operator=(output_indexalator&&) = default; + output_indexalator& operator=(output_indexalator&&) = default; /** * @brief Indirection operator returns this iterator instance in order diff --git a/cpp/include/cudf/detail/iterator.cuh b/cpp/include/cudf/detail/iterator.cuh index 1eaa7b1f856..cea3d7abc3d 100644 --- a/cpp/include/cudf/detail/iterator.cuh +++ b/cpp/include/cudf/detail/iterator.cuh @@ -477,12 +477,10 @@ using void_t = void; * @brief Compile-time reflection to check if `Element` type has a `rep()` member. */ template -struct has_rep_member : std::false_type { -}; +struct has_rep_member : std::false_type {}; template -struct has_rep_member().rep())>> : std::true_type { -}; +struct has_rep_member().rep())>> : std::true_type {}; /** * @brief Pair accessor for scalar's representation value and validity. diff --git a/cpp/include/cudf/detail/join.hpp b/cpp/include/cudf/detail/join.hpp index fe97eb5a806..c424c20d7c7 100644 --- a/cpp/include/cudf/detail/join.hpp +++ b/cpp/include/cudf/detail/join.hpp @@ -65,12 +65,12 @@ struct hash_join { rmm::mr::stream_allocator_adaptor>, cuco::double_hashing>; - hash_join() = delete; - ~hash_join() = default; - hash_join(hash_join const&) = delete; - hash_join(hash_join&&) = delete; + hash_join() = delete; + ~hash_join() = default; + hash_join(hash_join const&) = delete; + hash_join(hash_join&&) = delete; hash_join& operator=(hash_join const&) = delete; - hash_join& operator=(hash_join&&) = delete; + hash_join& operator=(hash_join&&) = delete; private: bool const _is_empty; ///< true if `_hash_table` is empty @@ -78,8 +78,8 @@ struct hash_join { cudf::null_equality const _nulls_equal; ///< whether to consider nulls as equal cudf::table_view _build; ///< input table to build the hash map std::shared_ptr - _preprocessed_build; ///< input table preprocssed for row operators - map_type _hash_table; ///< hash table built on `_build` + _preprocessed_build; ///< input table preprocssed for row operators + map_type _hash_table; ///< hash table built on `_build` public: /** diff --git a/cpp/include/cudf/detail/nvtx/nvtx3.hpp b/cpp/include/cudf/detail/nvtx/nvtx3.hpp index c77714181ef..ed1ba5d8727 100644 --- a/cpp/include/cudf/detail/nvtx/nvtx3.hpp +++ b/cpp/include/cudf/detail/nvtx/nvtx3.hpp @@ -585,10 +585,10 @@ constexpr auto has_name_member() noexcept -> decltype(T::name, bool()) */ class domain { public: - domain(domain const&) = delete; + domain(domain const&) = delete; domain& operator=(domain const&) = delete; domain(domain&&) = delete; - domain& operator=(domain&&) = delete; + domain& operator=(domain&&) = delete; /** * @brief Returns reference to an instance of a function local static @@ -663,8 +663,7 @@ class domain { * applications will be grouped together. * */ - struct global { - }; + struct global {}; private: /** @@ -870,12 +869,12 @@ class color { */ constexpr nvtxColorType_t get_type() const noexcept { return _type; } - color() = delete; - ~color() = default; - color(color const&) = default; + color() = delete; + ~color() = default; + color(color const&) = default; color& operator=(color const&) = default; color(color&&) = default; - color& operator=(color&&) = default; + color& operator=(color&&) = default; private: /** @@ -937,12 +936,12 @@ class category { */ constexpr id_type get_id() const noexcept { return id_; } - category() = delete; - ~category() = default; - category(category const&) = default; + category() = delete; + ~category() = default; + category(category const&) = default; category& operator=(category const&) = default; category(category&&) = default; - category& operator=(category&&) = default; + category& operator=(category&&) = default; private: id_type const id_{}; ///< category's unique identifier @@ -1226,12 +1225,12 @@ class registered_message { */ nvtxStringHandle_t get_handle() const noexcept { return handle_; } - registered_message() = delete; - ~registered_message() = default; - registered_message(registered_message const&) = default; + registered_message() = delete; + ~registered_message() = default; + registered_message(registered_message const&) = default; registered_message& operator=(registered_message const&) = default; registered_message(registered_message&&) = default; - registered_message& operator=(registered_message&&) = default; + registered_message& operator=(registered_message&&) = default; private: nvtxStringHandle_t const handle_{}; ///< The handle returned from @@ -1612,11 +1611,11 @@ class event_attributes { attributes_.messageType = m.get_type(); } - ~event_attributes() = default; - event_attributes(event_attributes const&) = default; + ~event_attributes() = default; + event_attributes(event_attributes const&) = default; event_attributes& operator=(event_attributes const&) = default; event_attributes(event_attributes&&) = default; - event_attributes& operator=(event_attributes&&) = default; + event_attributes& operator=(event_attributes&&) = default; /** * @brief Get raw pointer to underlying NVTX attributes object. @@ -1741,10 +1740,10 @@ class domain_thread_range { */ domain_thread_range() : domain_thread_range{event_attributes{}} {} - domain_thread_range(domain_thread_range const&) = delete; + domain_thread_range(domain_thread_range const&) = delete; domain_thread_range& operator=(domain_thread_range const&) = delete; domain_thread_range(domain_thread_range&&) = delete; - domain_thread_range& operator=(domain_thread_range&&) = delete; + domain_thread_range& operator=(domain_thread_range&&) = delete; /** * @brief Destroy the domain_thread_range, ending the NVTX range event. @@ -1819,7 +1818,7 @@ class domain_process_range { if (not moved_from_) { nvtxRangeEnd(range_id_); } } - domain_process_range(domain_process_range const&) = delete; + domain_process_range(domain_process_range const&) = delete; domain_process_range& operator=(domain_process_range const&) = delete; domain_process_range(domain_process_range&& other) noexcept : range_id_{other.range_id_} diff --git a/cpp/include/cudf/detail/sizes_to_offsets_iterator.cuh b/cpp/include/cudf/detail/sizes_to_offsets_iterator.cuh index eefc5718617..0017ddb305d 100644 --- a/cpp/include/cudf/detail/sizes_to_offsets_iterator.cuh +++ b/cpp/include/cudf/detail/sizes_to_offsets_iterator.cuh @@ -169,11 +169,11 @@ struct sizes_to_offsets_iterator { return *this; } - sizes_to_offsets_iterator() = default; - sizes_to_offsets_iterator(sizes_to_offsets_iterator const&) = default; - sizes_to_offsets_iterator(sizes_to_offsets_iterator&&) = default; + sizes_to_offsets_iterator() = default; + sizes_to_offsets_iterator(sizes_to_offsets_iterator const&) = default; + sizes_to_offsets_iterator(sizes_to_offsets_iterator&&) = default; sizes_to_offsets_iterator& operator=(sizes_to_offsets_iterator const&) = default; - sizes_to_offsets_iterator& operator=(sizes_to_offsets_iterator&&) = default; + sizes_to_offsets_iterator& operator=(sizes_to_offsets_iterator&&) = default; protected: template diff --git a/cpp/include/cudf/detail/utilities/linked_column.hpp b/cpp/include/cudf/detail/utilities/linked_column.hpp index 059e32730e5..9ac7299f866 100644 --- a/cpp/include/cudf/detail/utilities/linked_column.hpp +++ b/cpp/include/cudf/detail/utilities/linked_column.hpp @@ -32,7 +32,7 @@ using LinkedColVector = std::vector; * */ struct linked_column_view : public column_view_base { - linked_column_view(linked_column_view const&) = delete; + linked_column_view(linked_column_view const&) = delete; linked_column_view& operator=(linked_column_view const&) = delete; linked_column_view(column_view const& col) : linked_column_view(nullptr, col) {} diff --git a/cpp/include/cudf/fixed_point/fixed_point.hpp b/cpp/include/cudf/fixed_point/fixed_point.hpp index 763d3e89df0..1e5941538a3 100644 --- a/cpp/include/cudf/fixed_point/fixed_point.hpp +++ b/cpp/include/cudf/fixed_point/fixed_point.hpp @@ -832,5 +832,5 @@ using decimal32 = fixed_point; ///< 32-bit decima using decimal64 = fixed_point; ///< 64-bit decimal fixed point using decimal128 = fixed_point<__int128_t, Radix::BASE_10>; ///< 128-bit decimal fixed point -/** @} */ // end of group +/** @} */ // end of group } // namespace numeric diff --git a/cpp/include/cudf/groupby.hpp b/cpp/include/cudf/groupby.hpp index 407b17fe229..0395b5452a1 100644 --- a/cpp/include/cudf/groupby.hpp +++ b/cpp/include/cudf/groupby.hpp @@ -95,10 +95,10 @@ class groupby { public: groupby() = delete; ~groupby(); - groupby(groupby const&) = delete; - groupby(groupby&&) = delete; + groupby(groupby const&) = delete; + groupby(groupby&&) = delete; groupby& operator=(groupby const&) = delete; - groupby& operator=(groupby&&) = delete; + groupby& operator=(groupby&&) = delete; /** * @brief Construct a groupby object with the specified `keys` @@ -377,8 +377,8 @@ class groupby { ///< indicates null order ///< of each column std::unique_ptr - _helper; ///< Helper object - ///< used by sort based implementation + _helper; ///< Helper object + ///< used by sort based implementation /** * @brief Get the sort helper object diff --git a/cpp/include/cudf/io/csv.hpp b/cpp/include/cudf/io/csv.hpp index d91e26f94cc..b5669438b4f 100644 --- a/cpp/include/cudf/io/csv.hpp +++ b/cpp/include/cudf/io/csv.hpp @@ -213,7 +213,7 @@ class csv_reader_options { auto const max_row_bytes = 16 * 1024; // 16KB auto const column_bytes = 64; - auto const base_padding = 1024; // 1KB + auto const base_padding = 1024; // 1KB if (num_columns == 0) { // Use flat size if the number of columns is not known diff --git a/cpp/include/cudf/io/json.hpp b/cpp/include/cudf/io/json.hpp index 4d5fcb0ee9d..f94fd5adeb8 100644 --- a/cpp/include/cudf/io/json.hpp +++ b/cpp/include/cudf/io/json.hpp @@ -196,7 +196,7 @@ class json_reader_options { auto const max_row_bytes = 16 * 1024; // 16KB auto const column_bytes = 64; - auto const base_padding = 1024; // 1KB + auto const base_padding = 1024; // 1KB if (num_columns == 0) { // Use flat size if the number of columns is not known diff --git a/cpp/include/cudf/io/orc_metadata.hpp b/cpp/include/cudf/io/orc_metadata.hpp index 6ef7ea49c59..7a2186bd77f 100644 --- a/cpp/include/cudf/io/orc_metadata.hpp +++ b/cpp/include/cudf/io/orc_metadata.hpp @@ -92,14 +92,12 @@ struct sum_statistics { /** * @brief Statistics for integral columns. */ -struct integer_statistics : minmax_statistics, sum_statistics { -}; +struct integer_statistics : minmax_statistics, sum_statistics {}; /** * @brief Statistics for floating point columns. */ -struct double_statistics : minmax_statistics, sum_statistics { -}; +struct double_statistics : minmax_statistics, sum_statistics {}; /** * @brief Statistics for string columns. @@ -108,8 +106,7 @@ struct double_statistics : minmax_statistics, sum_statistics { * order. The `sum` is the total length of elements in the column. * Note: According to ORC specs, the sum should be signed, but pyarrow uses unsigned value */ -struct string_statistics : minmax_statistics, sum_statistics { -}; +struct string_statistics : minmax_statistics, sum_statistics {}; /** * @brief Statistics for boolean columns. @@ -123,8 +120,7 @@ struct bucket_statistics { /** * @brief Statistics for decimal columns. */ -struct decimal_statistics : minmax_statistics, sum_statistics { -}; +struct decimal_statistics : minmax_statistics, sum_statistics {}; /** * @brief Statistics for date(time) columns. diff --git a/cpp/include/cudf/join.hpp b/cpp/include/cudf/join.hpp index 278949aa955..11d1bbf9fc8 100644 --- a/cpp/include/cudf/join.hpp +++ b/cpp/include/cudf/join.hpp @@ -280,10 +280,10 @@ class hash_join { hash_join() = delete; ~hash_join(); - hash_join(hash_join const&) = delete; - hash_join(hash_join&&) = delete; + hash_join(hash_join const&) = delete; + hash_join(hash_join&&) = delete; hash_join& operator=(hash_join const&) = delete; - hash_join& operator=(hash_join&&) = delete; + hash_join& operator=(hash_join&&) = delete; /** * @brief Construct a hash join object for subsequent probe calls. diff --git a/cpp/include/cudf/lists/detail/scatter_helper.cuh b/cpp/include/cudf/lists/detail/scatter_helper.cuh index 34747f4a2c7..08e63895e5d 100644 --- a/cpp/include/cudf/lists/detail/scatter_helper.cuh +++ b/cpp/include/cudf/lists/detail/scatter_helper.cuh @@ -52,11 +52,11 @@ struct unbound_list_view { using lists_column_device_view = cudf::detail::lists_column_device_view; using list_device_view = cudf::list_device_view; - unbound_list_view() = default; - unbound_list_view(unbound_list_view const&) = default; - unbound_list_view(unbound_list_view&&) = default; + unbound_list_view() = default; + unbound_list_view(unbound_list_view const&) = default; + unbound_list_view(unbound_list_view&&) = default; unbound_list_view& operator=(unbound_list_view const&) = default; - unbound_list_view& operator=(unbound_list_view&&) = default; + unbound_list_view& operator=(unbound_list_view&&) = default; /** * @brief __device__ Constructor, for use from `scatter()`. diff --git a/cpp/include/cudf/lists/list_view.hpp b/cpp/include/cudf/lists/list_view.hpp index 6bba2338699..e8c21e260d3 100644 --- a/cpp/include/cudf/lists/list_view.hpp +++ b/cpp/include/cudf/lists/list_view.hpp @@ -27,7 +27,6 @@ namespace cudf { * @brief A non-owning, immutable view of device data that represents * a list of elements of arbitrary type (including further nested lists). */ -class list_view { -}; +class list_view {}; } // namespace cudf diff --git a/cpp/include/cudf/scalar/scalar.hpp b/cpp/include/cudf/scalar/scalar.hpp index c7f346ec690..a1fd3db8286 100644 --- a/cpp/include/cudf/scalar/scalar.hpp +++ b/cpp/include/cudf/scalar/scalar.hpp @@ -47,9 +47,9 @@ namespace cudf { */ class scalar { public: - virtual ~scalar() = default; + virtual ~scalar() = default; scalar& operator=(scalar const& other) = delete; - scalar& operator=(scalar&& other) = delete; + scalar& operator=(scalar&& other) = delete; /** * @brief Returns the scalar's logical value type. @@ -154,7 +154,7 @@ class fixed_width_scalar : public scalar { fixed_width_scalar(fixed_width_scalar&& other) = default; fixed_width_scalar& operator=(fixed_width_scalar const& other) = delete; - fixed_width_scalar& operator=(fixed_width_scalar&& other) = delete; + fixed_width_scalar& operator=(fixed_width_scalar&& other) = delete; /** * @brief Construct a new fixed-width scalar object by deep copying another. @@ -254,7 +254,7 @@ class numeric_scalar : public detail::fixed_width_scalar { numeric_scalar(numeric_scalar&& other) = default; numeric_scalar& operator=(numeric_scalar const& other) = delete; - numeric_scalar& operator=(numeric_scalar&& other) = delete; + numeric_scalar& operator=(numeric_scalar&& other) = delete; /** * @brief Construct a new numeric scalar object by deep copying another. @@ -317,7 +317,7 @@ class fixed_point_scalar : public scalar { fixed_point_scalar(fixed_point_scalar&& other) = default; fixed_point_scalar& operator=(fixed_point_scalar const& other) = delete; - fixed_point_scalar& operator=(fixed_point_scalar&& other) = delete; + fixed_point_scalar& operator=(fixed_point_scalar&& other) = delete; /** * @brief Construct a new fixed_point scalar object by deep copying another. @@ -441,7 +441,7 @@ class string_scalar : public scalar { // string_scalar(string_scalar const& other) = delete; string_scalar& operator=(string_scalar const& other) = delete; - string_scalar& operator=(string_scalar&& other) = delete; + string_scalar& operator=(string_scalar&& other) = delete; /** * @brief Construct a new string scalar object by deep copying another string_scalar. @@ -572,7 +572,7 @@ class chrono_scalar : public detail::fixed_width_scalar { chrono_scalar(chrono_scalar&& other) = default; chrono_scalar& operator=(chrono_scalar const& other) = delete; - chrono_scalar& operator=(chrono_scalar&& other) = delete; + chrono_scalar& operator=(chrono_scalar&& other) = delete; /** * @brief Construct a new chrono scalar object by deep copying another. @@ -734,7 +734,7 @@ class list_scalar : public scalar { list_scalar(list_scalar&& other) = default; list_scalar& operator=(list_scalar const& other) = delete; - list_scalar& operator=(list_scalar&& other) = delete; + list_scalar& operator=(list_scalar&& other) = delete; /** * @brief Construct a new list scalar object by deep copying another. @@ -797,9 +797,9 @@ class struct_scalar : public scalar { * @brief Move constructor for struct_scalar. * @param other The other struct_scalar to move from. */ - struct_scalar(struct_scalar&& other) = default; + struct_scalar(struct_scalar&& other) = default; struct_scalar& operator=(struct_scalar const& other) = delete; - struct_scalar& operator=(struct_scalar&& other) = delete; + struct_scalar& operator=(struct_scalar&& other) = delete; /** * @brief Construct a new struct scalar object by deep copying another. diff --git a/cpp/include/cudf/strings/detail/split_utils.cuh b/cpp/include/cudf/strings/detail/split_utils.cuh index 8c986db8fb9..b3d913a9f41 100644 --- a/cpp/include/cudf/strings/detail/split_utils.cuh +++ b/cpp/include/cudf/strings/detail/split_utils.cuh @@ -43,7 +43,7 @@ struct whitespace_string_tokenizer { */ __device__ bool next_token() { - if (itr != d_str.begin()) { // skip these 2 lines the first time through + if (itr != d_str.begin()) { // skip these 2 lines the first time through ++itr; start_position = itr.byte_offset(); // end_position + 1; } diff --git a/cpp/include/cudf/strings/detail/utf8.hpp b/cpp/include/cudf/strings/detail/utf8.hpp index 83b242a5271..7bd4dbc1667 100644 --- a/cpp/include/cudf/strings/detail/utf8.hpp +++ b/cpp/include/cudf/strings/detail/utf8.hpp @@ -155,18 +155,18 @@ constexpr inline size_type from_char_utf8(char_utf8 character, char* str) constexpr uint32_t utf8_to_codepoint(cudf::char_utf8 utf8_char) { uint32_t unchr = 0; - if (utf8_char < 0x0000'0080) // single-byte pass thru + if (utf8_char < 0x0000'0080) // single-byte pass thru unchr = utf8_char; - else if (utf8_char < 0x0000'E000) // two bytes + else if (utf8_char < 0x0000'E000) // two bytes { - unchr = (utf8_char & 0x1F00) >> 2; // shift and - unchr |= (utf8_char & 0x003F); // unmask - } else if (utf8_char < 0x00F0'0000) // three bytes + unchr = (utf8_char & 0x1F00) >> 2; // shift and + unchr |= (utf8_char & 0x003F); // unmask + } else if (utf8_char < 0x00F0'0000) // three bytes { - unchr = (utf8_char & 0x0F'0000) >> 4; // get upper 4 bits - unchr |= (utf8_char & 0x00'3F00) >> 2; // shift and - unchr |= (utf8_char & 0x00'003F); // unmask - } else if (utf8_char <= 0xF800'0000u) // four bytes + unchr = (utf8_char & 0x0F'0000) >> 4; // get upper 4 bits + unchr |= (utf8_char & 0x00'3F00) >> 2; // shift and + unchr |= (utf8_char & 0x00'003F); // unmask + } else if (utf8_char <= 0xF800'0000u) // four bytes { unchr = (utf8_char & 0x0300'0000) >> 6; // upper 3 bits unchr |= (utf8_char & 0x003F'0000) >> 4; // next 6 bits @@ -185,20 +185,20 @@ constexpr uint32_t utf8_to_codepoint(cudf::char_utf8 utf8_char) constexpr cudf::char_utf8 codepoint_to_utf8(uint32_t unchr) { cudf::char_utf8 utf8 = 0; - if (unchr < 0x0000'0080) // single byte utf8 + if (unchr < 0x0000'0080) // single byte utf8 utf8 = unchr; - else if (unchr < 0x0000'0800) // double byte utf8 + else if (unchr < 0x0000'0800) // double byte utf8 { - utf8 = (unchr << 2) & 0x1F00; // shift bits for - utf8 |= (unchr & 0x3F); // utf8 encoding + utf8 = (unchr << 2) & 0x1F00; // shift bits for + utf8 |= (unchr & 0x3F); // utf8 encoding utf8 |= 0x0000'C080; - } else if (unchr < 0x0001'0000) // triple byte utf8 + } else if (unchr < 0x0001'0000) // triple byte utf8 { - utf8 = (unchr << 4) & 0x0F'0000; // upper 4 bits - utf8 |= (unchr << 2) & 0x00'3F00; // next 6 bits - utf8 |= (unchr & 0x3F); // last 6 bits + utf8 = (unchr << 4) & 0x0F'0000; // upper 4 bits + utf8 |= (unchr << 2) & 0x00'3F00; // next 6 bits + utf8 |= (unchr & 0x3F); // last 6 bits utf8 |= 0x00E0'8080; - } else if (unchr < 0x0011'0000) // quadruple byte utf8 + } else if (unchr < 0x0011'0000) // quadruple byte utf8 { utf8 = (unchr << 6) & 0x0700'0000; // upper 3 bits utf8 |= (unchr << 4) & 0x003F'0000; // next 6 bits diff --git a/cpp/include/cudf/strings/string_view.hpp b/cpp/include/cudf/strings/string_view.hpp index 265adc60392..7b1c66d70a1 100644 --- a/cpp/include/cudf/strings/string_view.hpp +++ b/cpp/include/cudf/strings/string_view.hpp @@ -81,10 +81,10 @@ class string_view { using pointer = char_utf8*; using iterator_category = std::input_iterator_tag; __device__ inline const_iterator(const string_view& str, size_type pos); - const_iterator(const const_iterator& mit) = default; - const_iterator(const_iterator&& mit) = default; + const_iterator(const const_iterator& mit) = default; + const_iterator(const_iterator&& mit) = default; const_iterator& operator=(const const_iterator&) = default; - const_iterator& operator=(const_iterator&&) = default; + const_iterator& operator=(const_iterator&&) = default; __device__ inline const_iterator& operator++(); __device__ inline const_iterator operator++(int); __device__ inline const_iterator& operator+=(difference_type); diff --git a/cpp/include/cudf/structs/struct_view.hpp b/cpp/include/cudf/structs/struct_view.hpp index 18f0384118b..d443ead7bed 100644 --- a/cpp/include/cudf/structs/struct_view.hpp +++ b/cpp/include/cudf/structs/struct_view.hpp @@ -27,7 +27,6 @@ namespace cudf { * a struct with fields of arbitrary types (including primitives, lists, * and other structs) */ -class struct_view { -}; +class struct_view {}; } // namespace cudf diff --git a/cpp/include/cudf/table/row_operators.cuh b/cpp/include/cudf/table/row_operators.cuh index cdf7f0a7ef6..a7f4582a8d9 100644 --- a/cpp/include/cudf/table/row_operators.cuh +++ b/cpp/include/cudf/table/row_operators.cuh @@ -105,9 +105,9 @@ inline __device__ auto null_compare(bool lhs_is_null, bool rhs_is_null, null_ord { if (lhs_is_null and rhs_is_null) { // null -struct is_host_span_supported_container : std::false_type { -}; +struct is_host_span_supported_container : std::false_type {}; template struct is_host_span_supported_container< // - std::vector> : std::true_type { -}; + std::vector> : std::true_type {}; template struct is_host_span_supported_container< // - thrust::host_vector> : std::true_type { -}; + thrust::host_vector> : std::true_type {}; template struct is_host_span_supported_container< // - std::basic_string, Alloc>> : std::true_type { -}; + std::basic_string, Alloc>> : std::true_type {}; /** * @brief C++20 std::span with reduced feature set. @@ -259,23 +255,19 @@ struct host_span : public cudf::detail::span_base -struct is_device_span_supported_container : std::false_type { -}; +struct is_device_span_supported_container : std::false_type {}; template struct is_device_span_supported_container< // - thrust::device_vector> : std::true_type { -}; + thrust::device_vector> : std::true_type {}; template struct is_device_span_supported_container< // - rmm::device_vector> : std::true_type { -}; + rmm::device_vector> : std::true_type {}; template struct is_device_span_supported_container< // - rmm::device_uvector> : std::true_type { -}; + rmm::device_uvector> : std::true_type {}; /** * @brief Device version of C++20 std::span with reduced feature set. diff --git a/cpp/include/cudf/utilities/traits.hpp b/cpp/include/cudf/utilities/traits.hpp index 43d43ba6bb3..ba2e0b3e9c4 100644 --- a/cpp/include/cudf/utilities/traits.hpp +++ b/cpp/include/cudf/utilities/traits.hpp @@ -63,32 +63,26 @@ using equality_comparable = decltype(std::declval() == std::declval()); namespace detail { template -struct is_relationally_comparable_impl : std::false_type { -}; +struct is_relationally_comparable_impl : std::false_type {}; template struct is_relationally_comparable_impl, greater_comparable>> - : std::true_type { -}; + : std::true_type {}; template -struct is_equality_comparable_impl : std::false_type { -}; +struct is_equality_comparable_impl : std::false_type {}; template -struct is_equality_comparable_impl>> : std::true_type { -}; +struct is_equality_comparable_impl>> : std::true_type {}; // has common type template -struct has_common_type_impl : std::false_type { -}; +struct has_common_type_impl : std::false_type {}; template -struct has_common_type_impl>, Ts...> : std::true_type { -}; +struct has_common_type_impl>, Ts...> : std::true_type {}; } // namespace detail /// Checks if types have a common type @@ -590,16 +584,14 @@ bool is_nested(data_type type); bool is_bit_castable(data_type from, data_type to); template -struct is_convertible : std::is_convertible { -}; +struct is_convertible : std::is_convertible {}; // This will ensure that timestamps can be promoted to a higher precision. Presently, they can't // do that due to nvcc/gcc compiler issues template struct is_convertible, cudf::detail::timestamp> : std::is_convertible::duration, - typename cudf::detail::time_point::duration> { -}; + typename cudf::detail::time_point::duration> {}; /** @} */ diff --git a/cpp/include/cudf/wrappers/dictionary.hpp b/cpp/include/cudf/wrappers/dictionary.hpp index 75df1fd6abb..198f688c250 100644 --- a/cpp/include/cudf/wrappers/dictionary.hpp +++ b/cpp/include/cudf/wrappers/dictionary.hpp @@ -215,5 +215,5 @@ CUDF_HOST_DEVICE inline bool operator>(dictionary_wrapper const& lhs, using dictionary32 = dictionary_wrapper; ///< 32-bit integer indexed dictionary wrapper -/** @} */ // end of group +/** @} */ // end of group } // namespace cudf diff --git a/cpp/include/cudf_test/base_fixture.hpp b/cpp/include/cudf_test/base_fixture.hpp index 1477314c592..6c7c7e87a7e 100644 --- a/cpp/include/cudf_test/base_fixture.hpp +++ b/cpp/include/cudf_test/base_fixture.hpp @@ -60,8 +60,7 @@ class BaseFixture : public ::testing::Test { }; template -struct uniform_distribution_impl { -}; +struct uniform_distribution_impl {}; template struct uniform_distribution_impl>> { using type = std::uniform_int_distribution; @@ -311,9 +310,9 @@ inline auto parse_cudf_test_opts(int argc, char** argv) cxxopts::Options options(argv[0], " - cuDF tests command line options"); const char* env_rmm_mode = std::getenv("GTEST_CUDF_RMM_MODE"); // Overridden by CLI options const char* env_stream_mode = - std::getenv("GTEST_CUDF_STREAM_MODE"); // Overridden by CLI options + std::getenv("GTEST_CUDF_STREAM_MODE"); // Overridden by CLI options const char* env_stream_error_mode = - std::getenv("GTEST_CUDF_STREAM_ERROR_MODE"); // Overridden by CLI options + std::getenv("GTEST_CUDF_STREAM_ERROR_MODE"); // Overridden by CLI options auto default_rmm_mode = env_rmm_mode ? env_rmm_mode : "pool"; auto default_stream_mode = env_stream_mode ? env_stream_mode : "default"; auto default_stream_error_mode = env_stream_error_mode ? env_stream_error_mode : "error"; diff --git a/cpp/include/cudf_test/cudf_gtest.hpp b/cpp/include/cudf_test/cudf_gtest.hpp index ab45d90f2d2..1098392d23a 100644 --- a/cpp/include/cudf_test/cudf_gtest.hpp +++ b/cpp/include/cudf_test/cudf_gtest.hpp @@ -65,8 +65,7 @@ namespace internal { using Types0 = Types<>; template -struct Templates { -}; +struct Templates {}; template struct Templates { diff --git a/cpp/include/cudf_test/stream_checking_resource_adaptor.hpp b/cpp/include/cudf_test/stream_checking_resource_adaptor.hpp index e6108309ae2..946635ab241 100644 --- a/cpp/include/cudf_test/stream_checking_resource_adaptor.hpp +++ b/cpp/include/cudf_test/stream_checking_resource_adaptor.hpp @@ -45,9 +45,9 @@ class stream_checking_resource_adaptor final : public rmm::mr::device_memory_res CUDF_EXPECTS(nullptr != upstream, "Unexpected null upstream resource pointer."); } - stream_checking_resource_adaptor() = delete; - ~stream_checking_resource_adaptor() override = default; - stream_checking_resource_adaptor(stream_checking_resource_adaptor const&) = delete; + stream_checking_resource_adaptor() = delete; + ~stream_checking_resource_adaptor() override = default; + stream_checking_resource_adaptor(stream_checking_resource_adaptor const&) = delete; stream_checking_resource_adaptor& operator=(stream_checking_resource_adaptor const&) = delete; stream_checking_resource_adaptor(stream_checking_resource_adaptor&&) noexcept = default; stream_checking_resource_adaptor& operator=(stream_checking_resource_adaptor&&) noexcept = diff --git a/cpp/include/cudf_test/tdigest_utilities.cuh b/cpp/include/cudf_test/tdigest_utilities.cuh index df1900bfa0c..20be166cac6 100644 --- a/cpp/include/cudf_test/tdigest_utilities.cuh +++ b/cpp/include/cudf_test/tdigest_utilities.cuh @@ -224,9 +224,9 @@ void tdigest_simple_aggregation(Func op) double const min = 1; double const max = 126; auto expected = make_expected_tdigest_column({{*mean, - weight, - static_cast(static_cast(min)), - static_cast(static_cast(max))}}); + weight, + static_cast(static_cast(min)), + static_cast(static_cast(max))}}); CUDF_TEST_EXPECT_COLUMNS_EQUAL(*result, *expected); } @@ -249,9 +249,9 @@ void tdigest_simple_with_nulls_aggregation(Func op) double const min = 1; double const max = 122; auto expected = make_expected_tdigest_column({{*mean, - weight, - static_cast(static_cast(min)), - static_cast(static_cast(max))}}); + weight, + static_cast(static_cast(min)), + static_cast(static_cast(max))}}); CUDF_TEST_EXPECT_COLUMNS_EQUAL(*result, *expected); } diff --git a/cpp/include/cudf_test/type_list_utilities.hpp b/cpp/include/cudf_test/type_list_utilities.hpp index 0cd9f39e29d..a63453f92b3 100644 --- a/cpp/include/cudf_test/type_list_utilities.hpp +++ b/cpp/include/cudf_test/type_list_utilities.hpp @@ -244,8 +244,7 @@ struct Prepend> { // skip empty tuples template -struct Prepend, TUPLES...>> : Prepend> { -}; +struct Prepend, TUPLES...>> : Prepend> {}; } // namespace detail template @@ -269,8 +268,7 @@ struct CrossProductImpl, TAIL...> { // to make it easy for the user when there's only one element to be joined template -struct CrossProductImpl : CrossProductImpl, TAIL...> { -}; +struct CrossProductImpl : CrossProductImpl, TAIL...> {}; // @endcond /** @@ -295,25 +293,20 @@ using CrossProduct = typename CrossProductImpl::type; // @cond namespace detail { template -struct AllSame : std::false_type { -}; +struct AllSame : std::false_type {}; // degenerate case template -struct AllSame : std::true_type { -}; +struct AllSame : std::true_type {}; template -struct AllSame : std::true_type { -}; +struct AllSame : std::true_type {}; template -struct AllSame : AllSame { -}; +struct AllSame : AllSame {}; template -struct AllSame> : AllSame { -}; +struct AllSame> : AllSame {}; } // namespace detail // @endcond @@ -352,18 +345,15 @@ struct ExistsImpl; // end case, no more types to check template -struct ExistsImpl> : std::false_type { -}; +struct ExistsImpl> : std::false_type {}; // next one matches template -struct ExistsImpl> : std::true_type { -}; +struct ExistsImpl> : std::true_type {}; // next one doesn't match template -struct ExistsImpl> : ExistsImpl> { -}; +struct ExistsImpl> : ExistsImpl> {}; // @endcond /** diff --git a/cpp/include/nvtext/subword_tokenize.hpp b/cpp/include/nvtext/subword_tokenize.hpp index df2b82102d1..576e9073f46 100644 --- a/cpp/include/nvtext/subword_tokenize.hpp +++ b/cpp/include/nvtext/subword_tokenize.hpp @@ -44,7 +44,7 @@ struct hashed_vocabulary { std::unique_ptr bin_offsets; ///< uint16 column, containing the start index of each ///< bin in the flattened hash table std::unique_ptr - cp_metadata; ///< uint32 column, The code point metadata table to use for normalization + cp_metadata; ///< uint32 column, The code point metadata table to use for normalization std::unique_ptr aux_cp_table; ///< uint64 column, The auxiliary code point table to use for normalization }; diff --git a/cpp/libcudf_kafka/tests/kafka_consumer_tests.cpp b/cpp/libcudf_kafka/tests/kafka_consumer_tests.cpp index 613c2435f4d..325ae872276 100644 --- a/cpp/libcudf_kafka/tests/kafka_consumer_tests.cpp +++ b/cpp/libcudf_kafka/tests/kafka_consumer_tests.cpp @@ -25,8 +25,7 @@ namespace kafka = cudf::io::external::kafka; -struct KafkaDatasourceTest : public ::testing::Test { -}; +struct KafkaDatasourceTest : public ::testing::Test {}; TEST_F(KafkaDatasourceTest, MissingGroupID) { diff --git a/cpp/src/copying/concatenate.cu b/cpp/src/copying/concatenate.cu index 6d6ef9fd7b0..ad7068eb106 100644 --- a/cpp/src/copying/concatenate.cu +++ b/cpp/src/copying/concatenate.cu @@ -61,8 +61,8 @@ constexpr bool use_fused_kernel_heuristic(bool const has_nulls, size_t const num auto create_device_views(host_span views, rmm::cuda_stream_view stream) { // Create device views for each input view - using CDViewPtr = decltype( - column_device_view::create(std::declval(), std::declval())); + using CDViewPtr = decltype(column_device_view::create(std::declval(), + std::declval())); auto device_view_owners = std::vector(views.size()); std::transform(views.begin(), views.end(), device_view_owners.begin(), [stream](auto const& col) { return column_device_view::create(col, stream); diff --git a/cpp/src/copying/contiguous_split.cu b/cpp/src/copying/contiguous_split.cu index 643bc204bf4..0e99f10ae19 100644 --- a/cpp/src/copying/contiguous_split.cu +++ b/cpp/src/copying/contiguous_split.cu @@ -108,8 +108,8 @@ struct dst_buf_info { int bit_shift; // # of bits to shift right by (for validity buffers) size_type valid_count; // validity count for this block of work - int src_buf_index; // source buffer index - int dst_buf_index; // destination buffer index + int src_buf_index; // source buffer index + int dst_buf_index; // destination buffer index }; /** diff --git a/cpp/src/groupby/sort/functors.hpp b/cpp/src/groupby/sort/functors.hpp index be36956b929..c378ac99727 100644 --- a/cpp/src/groupby/sort/functors.hpp +++ b/cpp/src/groupby/sort/functors.hpp @@ -94,12 +94,12 @@ struct store_result_functor { }; protected: - sort::sort_groupby_helper& helper; ///< Sort helper - cudf::detail::result_cache& cache; ///< cache of results to store into - column_view const& values; ///< Column of values to group and aggregate + sort::sort_groupby_helper& helper; ///< Sort helper + cudf::detail::result_cache& cache; ///< cache of results to store into + column_view const& values; ///< Column of values to group and aggregate - rmm::cuda_stream_view stream; ///< CUDA stream on which to execute kernels - rmm::mr::device_memory_resource* mr; ///< Memory resource to allocate space for results + rmm::cuda_stream_view stream; ///< CUDA stream on which to execute kernels + rmm::mr::device_memory_resource* mr; ///< Memory resource to allocate space for results sorted keys_are_sorted; ///< Whether the keys are sorted std::unique_ptr sorted_values; ///< Memoised grouped and sorted values diff --git a/cpp/src/groupby/sort/scan.cpp b/cpp/src/groupby/sort/scan.cpp index 820dc8a3077..4f57b76c3a3 100644 --- a/cpp/src/groupby/sort/scan.cpp +++ b/cpp/src/groupby/sort/scan.cpp @@ -137,8 +137,8 @@ void scan_result_functor::operator()(aggregation const& agg) auto sort_order = (rank_agg._method == rank_method::FIRST ? cudf::detail::stable_sorted_order : cudf::detail::sorted_order); return sort_order(table_view({group_labels_view, get_grouped_values()}), - {order::ASCENDING, rank_agg._column_order}, - {null_order::AFTER, rank_agg._null_precedence}, + {order::ASCENDING, rank_agg._column_order}, + {null_order::AFTER, rank_agg._null_precedence}, stream, rmm::mr::get_current_device_resource()); } diff --git a/cpp/src/hash/concurrent_unordered_map.cuh b/cpp/src/hash/concurrent_unordered_map.cuh index 70b0e3a7e16..88686c630d0 100644 --- a/cpp/src/hash/concurrent_unordered_map.cuh +++ b/cpp/src/hash/concurrent_unordered_map.cuh @@ -480,12 +480,12 @@ class concurrent_unordered_map { delete this; } - concurrent_unordered_map() = delete; - concurrent_unordered_map(concurrent_unordered_map const&) = default; - concurrent_unordered_map(concurrent_unordered_map&&) = default; + concurrent_unordered_map() = delete; + concurrent_unordered_map(concurrent_unordered_map const&) = default; + concurrent_unordered_map(concurrent_unordered_map&&) = default; concurrent_unordered_map& operator=(concurrent_unordered_map const&) = default; - concurrent_unordered_map& operator=(concurrent_unordered_map&&) = default; - ~concurrent_unordered_map() = default; + concurrent_unordered_map& operator=(concurrent_unordered_map&&) = default; + ~concurrent_unordered_map() = default; private: hasher m_hf; diff --git a/cpp/src/hash/md5_hash.cu b/cpp/src/hash/md5_hash.cu index e7bc912a419..becc832d207 100644 --- a/cpp/src/hash/md5_hash.cu +++ b/cpp/src/hash/md5_hash.cu @@ -85,10 +85,10 @@ struct MD5Hasher { } } - MD5Hasher(const MD5Hasher&) = delete; + MD5Hasher(const MD5Hasher&) = delete; MD5Hasher& operator=(const MD5Hasher&) = delete; MD5Hasher(MD5Hasher&&) = delete; - MD5Hasher& operator=(MD5Hasher&&) = delete; + MD5Hasher& operator=(MD5Hasher&&) = delete; template void __device__ inline process(Element const& element) diff --git a/cpp/src/io/avro/avro_gpu.cu b/cpp/src/io/avro/avro_gpu.cu index 64c572424e0..a335085fa5d 100644 --- a/cpp/src/io/avro/avro_gpu.cu +++ b/cpp/src/io/avro/avro_gpu.cu @@ -254,7 +254,7 @@ avro_decode_row(schemadesc_s const* schema, // If within an array, check if we reached the last item if (array_repeat_count != 0 && array_children <= 0 && cur < end) { if (!--array_repeat_count) { - i = array_start; // Restart at the array parent + i = array_start; // Restart at the array parent } else { i = array_start + 1; // Restart after the array parent array_children = schema[array_start].count; diff --git a/cpp/src/io/avro/reader_impl.cu b/cpp/src/io/avro/reader_impl.cu index 60a1b4263b2..803e21dc521 100644 --- a/cpp/src/io/avro/reader_impl.cu +++ b/cpp/src/io/avro/reader_impl.cu @@ -210,7 +210,7 @@ rmm::device_buffer decompress_data(datasource& source, auto const src_pos = meta.block_list[i].offset - base_offset; inflate_in[i] = {static_cast(comp_block_data.data()) + src_pos, - meta.block_list[i].size}; + meta.block_list[i].size}; inflate_out[i] = {static_cast(decomp_block_data.data()) + dst_pos, initial_blk_len}; // Update blocks offsets & sizes to refer to uncompressed data diff --git a/cpp/src/io/comp/cpu_unbz2.cpp b/cpp/src/io/comp/cpu_unbz2.cpp index aa3df527c21..1d475d8dc98 100644 --- a/cpp/src/io/comp/cpu_unbz2.cpp +++ b/cpp/src/io/comp/cpu_unbz2.cpp @@ -216,7 +216,7 @@ int32_t bz2_decompress_block(unbz_state_s* s) s->currBlockNo++; - skipbits(s, 32); // block CRC + skipbits(s, 32); // block CRC if (getbits(s, 1)) return BZ_DATA_ERROR; // blockRandomized not supported (old bzip versions) diff --git a/cpp/src/io/comp/debrotli.cu b/cpp/src/io/comp/debrotli.cu index 8513d4c6847..fbe35cc777d 100644 --- a/cpp/src/io/comp/debrotli.cu +++ b/cpp/src/io/comp/debrotli.cu @@ -121,7 +121,7 @@ __inline__ __device__ int brotli_context(int p1, int p2, int lut) struct huff_scratch_s { uint16_t code_length_histo[16]; uint8_t code_length_code_lengths[brotli_code_length_codes]; - int8_t offset[6]; // offsets in sorted table for each length + int8_t offset[6]; // offsets in sorted table for each length uint16_t lenvlctab[32]; uint16_t sorted[brotli_code_length_codes]; // symbols sorted by code length int16_t next_symbol[32]; @@ -1298,7 +1298,7 @@ static __device__ void InverseMoveToFrontTransform(debrotli_state_s* s, uint8_t* // Reinitialize elements that could have been changed. uint32_t i = 1; uint32_t upper_bound = s->mtf_upper_bound; - uint32_t* mtf = &s->mtf[1]; // Make mtf[-1] addressable. + uint32_t* mtf = &s->mtf[1]; // Make mtf[-1] addressable. auto* mtf_u8 = reinterpret_cast(mtf); uint32_t pattern = 0x0302'0100; // Little-endian diff --git a/cpp/src/io/comp/gpuinflate.cu b/cpp/src/io/comp/gpuinflate.cu index dacc5a00d16..04cac670232 100644 --- a/cpp/src/io/comp/gpuinflate.cu +++ b/cpp/src/io/comp/gpuinflate.cu @@ -124,11 +124,11 @@ struct inflate_state_s { uint8_t* outbase; ///< start of output buffer uint8_t* outend; ///< end of output buffer // Input state - uint8_t const* cur; ///< input buffer - uint8_t const* end; ///< end of input buffer + uint8_t const* cur; ///< input buffer + uint8_t const* end; ///< end of input buffer - uint2 bitbuf; ///< bit buffer (64-bit) - uint32_t bitpos; ///< position in bit buffer + uint2 bitbuf; ///< bit buffer (64-bit) + uint32_t bitpos; ///< position in bit buffer int32_t err; ///< Error status int btype; ///< current block type @@ -295,7 +295,7 @@ __device__ int construct( return 0; // complete, but decode() will fail // check for an over-subscribed or incomplete set of lengths - left = 1; // one possible code of zero length + left = 1; // one possible code of zero length for (len = 1; len <= max_bits; len++) { left <<= 1; // one more bit, double codes left left -= counts[len]; // deduct count from possible codes @@ -349,8 +349,8 @@ __device__ int init_dynamic(inflate_state_s* s) index = 0; while (index < nlen + ndist) { int symbol = decode(s, s->lencnt, s->lensym); - if (symbol < 0) return symbol; // invalid symbol - if (symbol < 16) // length in 0..15 + if (symbol < 0) return symbol; // invalid symbol + if (symbol < 16) // length in 0..15 lengths[index++] = symbol; else { // repeat instruction int len = 0; // last length to repeat, assume repeating zeros @@ -358,9 +358,9 @@ __device__ int init_dynamic(inflate_state_s* s) if (index == 0) return -5; // no last length! len = lengths[index - 1]; // last length symbol = 3 + getbits(s, 2); - } else if (symbol == 17) // repeat zero 3..10 times + } else if (symbol == 17) // repeat zero 3..10 times symbol = 3 + getbits(s, 3); - else // == 18, repeat zero 11..138 times + else // == 18, repeat zero 11..138 times symbol = 11 + getbits(s, 7); if (index + symbol > nlen + ndist) return -6; // too many lengths! while (symbol--) // repeat last or zero symbol times diff --git a/cpp/src/io/comp/uncomp.cpp b/cpp/src/io/comp/uncomp.cpp index 008c7215cca..122374556a8 100644 --- a/cpp/src/io/comp/uncomp.cpp +++ b/cpp/src/io/comp/uncomp.cpp @@ -27,7 +27,7 @@ #include // memset -#include // uncompress +#include // uncompress using cudf::host_span; @@ -46,7 +46,7 @@ struct gz_file_header_s { uint8_t os; // OS id }; -struct zip_eocd_s // end of central directory +struct zip_eocd_s // end of central directory { uint32_t sig; // 0x0605'4b50 uint16_t disk_id; // number of this disk @@ -58,7 +58,7 @@ struct zip_eocd_s // end of central directory // number uint16_t comment_len; // comment length (excluded from struct) }; -struct zip64_eocdl // end of central dir locator +struct zip64_eocdl // end of central dir locator { uint32_t sig; // 0x0706'4b50 uint32_t disk_start; // number of the disk with the start of the zip64 end of central directory @@ -66,7 +66,7 @@ struct zip64_eocdl // end of central dir locator uint32_t num_disks; // total number of disks }; -struct zip_cdfh_s // central directory file header +struct zip_cdfh_s // central directory file header { uint32_t sig; // 0x0201'4b50 uint16_t ver; // version made by @@ -110,7 +110,7 @@ struct bz2_file_header_s { struct gz_archive_s { const gz_file_header_s* fhdr; - uint16_t hcrc16; // header crc16 if present + uint16_t hcrc16; // header crc16 if present uint16_t xlen; const uint8_t* fxtra; // xlen bytes (optional) const uint8_t* fname; // zero-terminated original filename if present diff --git a/cpp/src/io/comp/unsnap.cu b/cpp/src/io/comp/unsnap.cu index 8b13ddd1de4..fa4a578b010 100644 --- a/cpp/src/io/comp/unsnap.cu +++ b/cpp/src/io/comp/unsnap.cu @@ -45,7 +45,7 @@ void __device__ busy_wait(size_t cycles) struct unsnap_batch_s { int32_t len; // 1..64 = Number of bytes uint32_t - offset; // copy distance if greater than zero or negative of literal offset in byte stream + offset; // copy distance if greater than zero or negative of literal offset in byte stream }; /** diff --git a/cpp/src/io/fst/agent_dfa.cuh b/cpp/src/io/fst/agent_dfa.cuh index e02c7ff85fa..f99e8ccc7d7 100644 --- a/cpp/src/io/fst/agent_dfa.cuh +++ b/cpp/src/io/fst/agent_dfa.cuh @@ -200,8 +200,7 @@ struct AgentDFA { }; }; - struct TempStorage : cub::Uninitialized<_TempStorage> { - }; + struct TempStorage : cub::Uninitialized<_TempStorage> {}; //------------------------------------------------------------------------------ // MEMBER VARIABLES diff --git a/cpp/src/io/fst/logical_stack.cuh b/cpp/src/io/fst/logical_stack.cuh index b23a3d756df..34c37097f81 100644 --- a/cpp/src/io/fst/logical_stack.cuh +++ b/cpp/src/io/fst/logical_stack.cuh @@ -416,7 +416,7 @@ void sparse_stack_op_to_top_of_stack(StackSymbolItT d_symbols, // TransformInputIterator that remaps all operations on stack level 0 to the empty stack symbol kv_ops_scan_in = {reinterpret_cast(d_kv_operations_unsigned.Current()), - detail::RemapEmptyStack{empty_stack}}; + detail::RemapEmptyStack{empty_stack}}; kv_ops_scan_out = reinterpret_cast(d_kv_operations_unsigned.Alternate()); // Inclusive scan to match pop operations with the latest push operation of that level diff --git a/cpp/src/io/json/json_column.cu b/cpp/src/io/json/json_column.cu index c937315969c..d7b76b17644 100644 --- a/cpp/src/io/json/json_column.cu +++ b/cpp/src/io/json/json_column.cu @@ -169,7 +169,7 @@ reduce_to_column_tree(tree_meta_t& tree, }); // 4. unique_copy parent_node_ids, ranges - rmm::device_uvector column_levels(0, stream); // not required + rmm::device_uvector column_levels(0, stream); // not required rmm::device_uvector parent_col_ids(num_columns, stream); rmm::device_uvector col_range_begin(num_columns, stream); // Field names rmm::device_uvector col_range_end(num_columns, stream); diff --git a/cpp/src/io/json/nested_json.hpp b/cpp/src/io/json/nested_json.hpp index f44b7d1ddcc..7a49f0cfd88 100644 --- a/cpp/src/io/json/nested_json.hpp +++ b/cpp/src/io/json/nested_json.hpp @@ -76,10 +76,10 @@ struct json_column { // Counting the current number of items in this column row_offset_t current_offset = 0; - json_column() = default; - json_column(json_column&& other) = default; - json_column& operator=(json_column&&) = default; - json_column(const json_column&) = delete; + json_column() = default; + json_column(json_column&& other) = default; + json_column& operator=(json_column&&) = default; + json_column(const json_column&) = delete; json_column& operator=(const json_column&) = delete; /** diff --git a/cpp/src/io/json/nested_json_gpu.cu b/cpp/src/io/json/nested_json_gpu.cu index 8f122c6260b..c6eef20f16b 100644 --- a/cpp/src/io/json/nested_json_gpu.cu +++ b/cpp/src/io/json/nested_json_gpu.cu @@ -47,7 +47,7 @@ // Debug print flag #ifndef NJP_DEBUG_PRINT -//#define NJP_DEBUG_PRINT +// #define NJP_DEBUG_PRINT #endif namespace { @@ -545,18 +545,18 @@ auto get_translation_table() {}, // LINE_BREAK {ValueBegin}}}; // OTHER pda_tlt[static_cast(pda_state_t::PD_BOA)] = { - { /*ROOT*/ - {ErrorBegin}, // OPENING_BRACE - {ErrorBegin}, // OPENING_BRACKET - {ErrorBegin}, // CLOSING_BRACE - {ErrorBegin}, // CLOSING_BRACKET - {ErrorBegin}, // QUOTE - {ErrorBegin}, // ESCAPE - {ErrorBegin}, // COMMA - {ErrorBegin}, // COLON - {ErrorBegin}, // WHITE_SPACE - {ErrorBegin}, // LINE_BREAK - {ErrorBegin}, // OTHER + { /*ROOT*/ + {ErrorBegin}, // OPENING_BRACE + {ErrorBegin}, // OPENING_BRACKET + {ErrorBegin}, // CLOSING_BRACE + {ErrorBegin}, // CLOSING_BRACKET + {ErrorBegin}, // QUOTE + {ErrorBegin}, // ESCAPE + {ErrorBegin}, // COMMA + {ErrorBegin}, // COLON + {ErrorBegin}, // WHITE_SPACE + {ErrorBegin}, // LINE_BREAK + {ErrorBegin}, // OTHER /*LIST*/ {StructBegin}, // OPENING_BRACE {ListBegin}, // OPENING_BRACKET @@ -582,18 +582,18 @@ auto get_translation_table() {}, // LINE_BREAK {ErrorBegin}}}; // OTHER pda_tlt[static_cast(pda_state_t::PD_LON)] = { - { /*ROOT*/ - {ErrorBegin}, // OPENING_BRACE - {ErrorBegin}, // OPENING_BRACKET - {ErrorBegin}, // CLOSING_BRACE - {ErrorBegin}, // CLOSING_BRACKET - {ErrorBegin}, // QUOTE - {ErrorBegin}, // ESCAPE - {ErrorBegin}, // COMMA - {ErrorBegin}, // COLON - {ValueEnd}, // WHITE_SPACE - {ValueEnd}, // LINE_BREAK - {}, // OTHER + { /*ROOT*/ + {ErrorBegin}, // OPENING_BRACE + {ErrorBegin}, // OPENING_BRACKET + {ErrorBegin}, // CLOSING_BRACE + {ErrorBegin}, // CLOSING_BRACKET + {ErrorBegin}, // QUOTE + {ErrorBegin}, // ESCAPE + {ErrorBegin}, // COMMA + {ErrorBegin}, // COLON + {ValueEnd}, // WHITE_SPACE + {ValueEnd}, // LINE_BREAK + {}, // OTHER /*LIST*/ {ErrorBegin}, // OPENING_BRACE {ErrorBegin}, // OPENING_BRACKET @@ -607,17 +607,17 @@ auto get_translation_table() {ValueEnd}, // LINE_BREAK {}, // OTHER /*STRUCT*/ - {ErrorBegin}, // OPENING_BRACE - {ErrorBegin}, // OPENING_BRACKET - {ValueEnd, StructMemberEnd, StructEnd}, // CLOSING_BRACE - {ErrorBegin}, // CLOSING_BRACKET - {ErrorBegin}, // QUOTE - {ErrorBegin}, // ESCAPE - {ValueEnd, StructMemberEnd}, // COMMA - {ErrorBegin}, // COLON - {ValueEnd}, // WHITE_SPACE - {ValueEnd}, // LINE_BREAK - {}}}; // OTHER + {ErrorBegin}, // OPENING_BRACE + {ErrorBegin}, // OPENING_BRACKET + {ValueEnd, StructMemberEnd, StructEnd}, // CLOSING_BRACE + {ErrorBegin}, // CLOSING_BRACKET + {ErrorBegin}, // QUOTE + {ErrorBegin}, // ESCAPE + {ValueEnd, StructMemberEnd}, // COMMA + {ErrorBegin}, // COLON + {ValueEnd}, // WHITE_SPACE + {ValueEnd}, // LINE_BREAK + {}}}; // OTHER pda_tlt[static_cast(pda_state_t::PD_STR)] = {{ /*ROOT*/ {}, // OPENING_BRACE @@ -656,18 +656,18 @@ auto get_translation_table() {}, // LINE_BREAK {}}}; // OTHER - pda_tlt[static_cast(pda_state_t::PD_SCE)] = {{ /*ROOT*/ - {}, // OPENING_BRACE - {}, // OPENING_BRACKET - {}, // CLOSING_BRACE - {}, // CLOSING_BRACKET - {}, // QUOTE - {}, // ESCAPE - {}, // COMMA - {}, // COLON - {}, // WHITE_SPACE - {}, // LINE_BREAK - {}, // OTHER + pda_tlt[static_cast(pda_state_t::PD_SCE)] = {{ /*ROOT*/ + {}, // OPENING_BRACE + {}, // OPENING_BRACKET + {}, // CLOSING_BRACE + {}, // CLOSING_BRACKET + {}, // QUOTE + {}, // ESCAPE + {}, // COMMA + {}, // COLON + {}, // WHITE_SPACE + {}, // LINE_BREAK + {}, // OTHER /*LIST*/ {}, // OPENING_BRACE {}, // OPENING_BRACKET @@ -757,17 +757,17 @@ auto get_translation_table() {ErrorBegin}, // LINE_BREAK {ErrorBegin}, // OTHER /*STRUCT*/ - {ErrorBegin}, // OPENING_BRACE - {ErrorBegin}, // OPENING_BRACKET - {StructEnd}, // CLOSING_BRACE - {ErrorBegin}, // CLOSING_BRACKET - {StructMemberBegin, FieldNameBegin}, // QUOTE - {ErrorBegin}, // ESCAPE - {ErrorBegin}, // COMMA - {ErrorBegin}, // COLON - {}, // WHITE_SPACE - {}, // LINE_BREAK - {ErrorBegin}}}; // OTHER + {ErrorBegin}, // OPENING_BRACE + {ErrorBegin}, // OPENING_BRACKET + {StructEnd}, // CLOSING_BRACE + {ErrorBegin}, // CLOSING_BRACKET + {StructMemberBegin, FieldNameBegin}, // QUOTE + {ErrorBegin}, // ESCAPE + {ErrorBegin}, // COMMA + {ErrorBegin}, // COLON + {}, // WHITE_SPACE + {}, // LINE_BREAK + {ErrorBegin}}}; // OTHER pda_tlt[static_cast(pda_state_t::PD_FLN)] = {{ /*ROOT*/ {ErrorBegin}, // OPENING_BRACE @@ -806,18 +806,18 @@ auto get_translation_table() {}, // LINE_BREAK {}}}; // OTHER - pda_tlt[static_cast(pda_state_t::PD_FNE)] = {{ /*ROOT*/ - {ErrorBegin}, // OPENING_BRACE - {ErrorBegin}, // OPENING_BRACKET - {ErrorBegin}, // CLOSING_BRACE - {ErrorBegin}, // CLOSING_BRACKET - {ErrorBegin}, // QUOTE - {ErrorBegin}, // ESCAPE - {ErrorBegin}, // COMMA - {ErrorBegin}, // COLON - {ErrorBegin}, // WHITE_SPACE - {ErrorBegin}, // LINE_BREAK - {ErrorBegin}, // OTHER + pda_tlt[static_cast(pda_state_t::PD_FNE)] = {{ /*ROOT*/ + {ErrorBegin}, // OPENING_BRACE + {ErrorBegin}, // OPENING_BRACKET + {ErrorBegin}, // CLOSING_BRACE + {ErrorBegin}, // CLOSING_BRACKET + {ErrorBegin}, // QUOTE + {ErrorBegin}, // ESCAPE + {ErrorBegin}, // COMMA + {ErrorBegin}, // COLON + {ErrorBegin}, // WHITE_SPACE + {ErrorBegin}, // LINE_BREAK + {ErrorBegin}, // OTHER /*LIST*/ {ErrorBegin}, // OPENING_BRACE {ErrorBegin}, // OPENING_BRACKET @@ -831,17 +831,17 @@ auto get_translation_table() {ErrorBegin}, // LINE_BREAK {ErrorBegin}, // OTHER /*STRUCT*/ - {}, // OPENING_BRACE - {}, // OPENING_BRACKET - {}, // CLOSING_BRACE - {}, // CLOSING_BRACKET - {}, // QUOTE - {}, // ESCAPE - {}, // COMMA - {}, // COLON - {}, // WHITE_SPACE - {}, // LINE_BREAK - {}}}; // OTHER + {}, // OPENING_BRACE + {}, // OPENING_BRACKET + {}, // CLOSING_BRACE + {}, // CLOSING_BRACKET + {}, // QUOTE + {}, // ESCAPE + {}, // COMMA + {}, // COLON + {}, // WHITE_SPACE + {}, // LINE_BREAK + {}}}; // OTHER pda_tlt[static_cast(pda_state_t::PD_PFN)] = {{ /*ROOT*/ {ErrorBegin}, // OPENING_BRACE @@ -880,18 +880,18 @@ auto get_translation_table() {}, // LINE_BREAK {ErrorBegin}}}; // OTHER - pda_tlt[static_cast(pda_state_t::PD_ERR)] = {{ /*ROOT*/ - {}, // OPENING_BRACE - {}, // OPENING_BRACKET - {}, // CLOSING_BRACE - {}, // CLOSING_BRACKET - {}, // QUOTE - {}, // ESCAPE - {}, // COMMA - {}, // COLON - {}, // WHITE_SPACE - {}, // LINE_BREAK - {}, // OTHER + pda_tlt[static_cast(pda_state_t::PD_ERR)] = {{ /*ROOT*/ + {}, // OPENING_BRACE + {}, // OPENING_BRACKET + {}, // CLOSING_BRACE + {}, // CLOSING_BRACKET + {}, // QUOTE + {}, // ESCAPE + {}, // COMMA + {}, // COLON + {}, // WHITE_SPACE + {}, // LINE_BREAK + {}, // OTHER /*LIST*/ {}, // OPENING_BRACE {}, // OPENING_BRACKET diff --git a/cpp/src/io/orc/orc_gpu.hpp b/cpp/src/io/orc/orc_gpu.hpp index 0f36f264185..353affac6f2 100644 --- a/cpp/src/io/orc/orc_gpu.hpp +++ b/cpp/src/io/orc/orc_gpu.hpp @@ -141,7 +141,7 @@ struct EncChunk { uint8_t dtype_len; // data type length int32_t scale; // scale for decimals or timestamps - uint32_t* dict_index; // dictionary index from row index + uint32_t* dict_index; // dictionary index from row index uint32_t* decimal_offsets; orc_column_device_view const* column; }; @@ -180,9 +180,9 @@ struct DictionaryChunk { uint32_t num_rows; // num rows in this chunk uint32_t num_strings; // number of strings in this chunk uint32_t - string_char_count; // total size of string data (NOTE: assumes less than 4G bytes per chunk) - uint32_t num_dict_strings; // number of strings in dictionary - uint32_t dict_char_count; // size of dictionary string data for this chunk + string_char_count; // total size of string data (NOTE: assumes less than 4G bytes per chunk) + uint32_t num_dict_strings; // number of strings in dictionary + uint32_t dict_char_count; // size of dictionary string data for this chunk orc_column_device_view const* leaf_column; //!< Pointer to string column }; diff --git a/cpp/src/io/orc/reader_impl.hpp b/cpp/src/io/orc/reader_impl.hpp index 94b0fdc09d2..480ea45dc68 100644 --- a/cpp/src/io/orc/reader_impl.hpp +++ b/cpp/src/io/orc/reader_impl.hpp @@ -61,10 +61,10 @@ struct reader_column_meta { std::vector child_start_row; // start row of child columns [stripe][column] std::vector - num_child_rows_per_stripe; // number of rows of child columns [stripe][column] + num_child_rows_per_stripe; // number of rows of child columns [stripe][column] struct row_group_meta { - uint32_t num_rows; // number of rows in a column in a row group - uint32_t start_row; // start row in a column in a row group + uint32_t num_rows; // number of rows in a column in a row group + uint32_t start_row; // start row in a column in a row group }; // num_rowgroups * num_columns std::vector rwgrp_meta; // rowgroup metadata [rowgroup][column] diff --git a/cpp/src/io/orc/stripe_data.cu b/cpp/src/io/orc/stripe_data.cu index 8e698dd9dff..cb45c018185 100644 --- a/cpp/src/io/orc/stripe_data.cu +++ b/cpp/src/io/orc/stripe_data.cu @@ -367,14 +367,14 @@ inline __device__ uint32_t varint_length(volatile orc_bytestream_s* bs, int pos) if (zbit) { return 5 + (zbit >> 3); // up to 9x7 bits } else if ((sizeof(T) <= 8) || (bytestream_readbyte(bs, pos + 9) <= 0x7f)) { - return 10; // up to 70 bits + return 10; // up to 70 bits } else { uint64_t next64 = bytestream_readu64(bs, pos + 10); zbit = __ffsll((~next64) & 0x8080'8080'8080'8080ull); if (zbit) { return 10 + (zbit >> 3); // Up to 18x7 bits (126) } else { - return 19; // Up to 19x7 bits (133) + return 19; // Up to 19x7 bits (133) } } } diff --git a/cpp/src/io/orc/writer_impl.hpp b/cpp/src/io/orc/writer_impl.hpp index 1dd3b3ab280..f003de8087e 100644 --- a/cpp/src/io/orc/writer_impl.hpp +++ b/cpp/src/io/orc/writer_impl.hpp @@ -118,7 +118,7 @@ class orc_streams { auto type(int idx) const { return types[idx]; } auto size() const { return streams.size(); } - operator std::vector const &() const { return streams; } + operator std::vector const&() const { return streams; } private: std::vector streams; diff --git a/cpp/src/io/parquet/compact_protocol_reader.cpp b/cpp/src/io/parquet/compact_protocol_reader.cpp index cb94e621262..2af4ad2ff68 100644 --- a/cpp/src/io/parquet/compact_protocol_reader.cpp +++ b/cpp/src/io/parquet/compact_protocol_reader.cpp @@ -168,7 +168,7 @@ bool CompactProtocolReader::read(LogicalType* l) ParquetFieldUnion(2, l->isset.MAP, l->MAP), ParquetFieldUnion(3, l->isset.LIST, l->LIST), ParquetFieldUnion(4, l->isset.ENUM, l->ENUM), - ParquetFieldUnion(5, l->isset.DECIMAL, l->DECIMAL), // read the struct + ParquetFieldUnion(5, l->isset.DECIMAL, l->DECIMAL), // read the struct ParquetFieldUnion(6, l->isset.DATE, l->DATE), ParquetFieldUnion(7, l->isset.TIME, l->TIME), // read the struct ParquetFieldUnion(8, l->isset.TIMESTAMP, l->TIMESTAMP), // read the struct diff --git a/cpp/src/io/parquet/compact_protocol_writer.cpp b/cpp/src/io/parquet/compact_protocol_writer.cpp index f5ae262fa3f..d98790565ae 100644 --- a/cpp/src/io/parquet/compact_protocol_writer.cpp +++ b/cpp/src/io/parquet/compact_protocol_writer.cpp @@ -303,7 +303,7 @@ inline void CompactProtocolFieldWriter::field_struct(int field, const T& val) if constexpr (not std::is_empty_v) { writer.write(val); // write the struct if it's not empty } else { - put_byte(0); // otherwise, add a stop field + put_byte(0); // otherwise, add a stop field } current_field_value = field; } diff --git a/cpp/src/io/parquet/parquet.hpp b/cpp/src/io/parquet/parquet.hpp index 046ae38020c..d023182be1d 100644 --- a/cpp/src/io/parquet/parquet.hpp +++ b/cpp/src/io/parquet/parquet.hpp @@ -44,27 +44,19 @@ struct file_ender_s { }; // thrift generated code simplified. -struct StringType { -}; -struct MapType { -}; -struct ListType { -}; -struct EnumType { -}; +struct StringType {}; +struct MapType {}; +struct ListType {}; +struct EnumType {}; struct DecimalType { int32_t scale = 0; int32_t precision = 0; }; -struct DateType { -}; +struct DateType {}; -struct MilliSeconds { -}; -struct MicroSeconds { -}; -struct NanoSeconds { -}; +struct MilliSeconds {}; +struct MicroSeconds {}; +struct NanoSeconds {}; using TimeUnit_isset = struct TimeUnit_isset { bool MILLIS{false}; bool MICROS{false}; @@ -90,12 +82,9 @@ struct IntType { int8_t bitWidth = 0; bool isSigned = false; }; -struct NullType { -}; -struct JsonType { -}; -struct BsonType { -}; +struct NullType {}; +struct JsonType {}; +struct BsonType {}; // thrift generated code simplified. using LogicalType_isset = struct LogicalType_isset { @@ -358,8 +347,8 @@ struct ColumnIndex { std::vector> min_values; // lower bound for values in each page std::vector> max_values; // upper bound for values in each page BoundaryOrder boundary_order = - BoundaryOrder::UNORDERED; // Indicates if min and max values are ordered - std::vector null_counts; // Optional count of null values per page + BoundaryOrder::UNORDERED; // Indicates if min and max values are ordered + std::vector null_counts; // Optional count of null values per page }; // bit space we are reserving in column_buffer::user_data diff --git a/cpp/src/io/parquet/parquet_gpu.cuh b/cpp/src/io/parquet/parquet_gpu.cuh index 793573b465e..8e72f70a268 100644 --- a/cpp/src/io/parquet/parquet_gpu.cuh +++ b/cpp/src/io/parquet/parquet_gpu.cuh @@ -36,8 +36,7 @@ using map_type = cuco::static_map; * Declare this struct by trivial subclassing instead of type aliasing so we can have forward * declaration of this struct somewhere else. */ -struct slot_type : public map_type::pair_atomic_type { -}; +struct slot_type : public map_type::pair_atomic_type {}; /** * @brief Return the byte length of parquet dtypes that are physically represented by INT32 diff --git a/cpp/src/io/parquet/parquet_gpu.hpp b/cpp/src/io/parquet/parquet_gpu.hpp index c3d3843362a..4b577929e82 100644 --- a/cpp/src/io/parquet/parquet_gpu.hpp +++ b/cpp/src/io/parquet/parquet_gpu.hpp @@ -268,7 +268,7 @@ struct ColumnChunkDesc { int8_t converted_type; // converted type enum LogicalType logical_type; // logical type int8_t decimal_precision; // Decimal precision - int32_t ts_clock_rate; // output timestamp clock frequency (0=default, 1000=ms, 1000000000=ns) + int32_t ts_clock_rate; // output timestamp clock frequency (0=default, 1000=ms, 1000000000=ns) int32_t src_col_index; // my input column index int32_t src_col_schema; // my schema index in the file @@ -356,16 +356,16 @@ struct slot_type; struct EncColumnChunk { parquet_column_device_view const* col_desc; //!< Column description size_type col_desc_id; - PageFragment* fragments; //!< First fragment in chunk - uint8_t* uncompressed_bfr; //!< Uncompressed page data - uint8_t* compressed_bfr; //!< Compressed page data - statistics_chunk const* stats; //!< Fragment statistics - uint32_t bfr_size; //!< Uncompressed buffer size - uint32_t compressed_size; //!< Compressed buffer size - uint32_t max_page_data_size; //!< Max data size (excluding header) of any page in this chunk - uint32_t page_headers_size; //!< Sum of size of all page headers - size_type start_row; //!< First row of chunk - uint32_t num_rows; //!< Number of rows in chunk + PageFragment* fragments; //!< First fragment in chunk + uint8_t* uncompressed_bfr; //!< Uncompressed page data + uint8_t* compressed_bfr; //!< Compressed page data + statistics_chunk const* stats; //!< Fragment statistics + uint32_t bfr_size; //!< Uncompressed buffer size + uint32_t compressed_size; //!< Compressed buffer size + uint32_t max_page_data_size; //!< Max data size (excluding header) of any page in this chunk + uint32_t page_headers_size; //!< Sum of size of all page headers + size_type start_row; //!< First row of chunk + uint32_t num_rows; //!< Number of rows in chunk size_type num_values; //!< Number of values in chunk. Different from num_rows for nested types uint32_t first_fragment; //!< First fragment of chunk EncPage* pages; //!< Ptr to pages that belong to this chunk diff --git a/cpp/src/io/parquet/reader_impl.cpp b/cpp/src/io/parquet/reader_impl.cpp index b1c4dd22c0d..03b585e4943 100644 --- a/cpp/src/io/parquet/reader_impl.cpp +++ b/cpp/src/io/parquet/reader_impl.cpp @@ -323,7 +323,7 @@ table_with_metadata reader::impl::finalize_output(table_metadata& out_metadata, // Return user metadata out_metadata.per_file_user_data = _metadata->get_key_value_metadata(); out_metadata.user_data = {out_metadata.per_file_user_data[0].begin(), - out_metadata.per_file_user_data[0].end()}; + out_metadata.per_file_user_data[0].end()}; // Finally, save the output table metadata into `_output_metadata` for reuse next time. _output_metadata = std::make_unique(out_metadata); diff --git a/cpp/src/io/parquet/reader_impl_preprocess.cu b/cpp/src/io/parquet/reader_impl_preprocess.cu index 72641adb402..bcb02466a68 100644 --- a/cpp/src/io/parquet/reader_impl_preprocess.cu +++ b/cpp/src/io/parquet/reader_impl_preprocess.cu @@ -1571,7 +1571,7 @@ void reader::impl::preprocess_pages(size_t skip_rows, // - we will be doing a chunked read gpu::ComputePageSizes(pages, chunks, - 0, // 0-max size_t. process all possible rows + 0, // 0-max size_t. process all possible rows std::numeric_limits::max(), true, // compute num_rows chunk_read_limit > 0, // compute string sizes diff --git a/cpp/src/io/statistics/statistics_type_identification.cuh b/cpp/src/io/statistics/statistics_type_identification.cuh index 9fc30c625aa..5c98ba17f23 100644 --- a/cpp/src/io/statistics/statistics_type_identification.cuh +++ b/cpp/src/io/statistics/statistics_type_identification.cuh @@ -108,8 +108,7 @@ class type_conversion { }; template -struct dependent_false : std::false_type { -}; +struct dependent_false : std::false_type {}; /** * @brief Utility class to convert a leaf column element into its extrema type diff --git a/cpp/src/io/statistics/typed_statistics_chunk.cuh b/cpp/src/io/statistics/typed_statistics_chunk.cuh index 7b1a72d647e..785c4288a78 100644 --- a/cpp/src/io/statistics/typed_statistics_chunk.cuh +++ b/cpp/src/io/statistics/typed_statistics_chunk.cuh @@ -103,8 +103,7 @@ class union_member { * @tparam is_aggregation_supported Set to true if input type is meant to be aggregated */ template -struct typed_statistics_chunk { -}; +struct typed_statistics_chunk {}; template struct typed_statistics_chunk { diff --git a/cpp/src/io/utilities/column_buffer.hpp b/cpp/src/io/utilities/column_buffer.hpp index 08e2b399f25..0e1a82733d2 100644 --- a/cpp/src/io/utilities/column_buffer.hpp +++ b/cpp/src/io/utilities/column_buffer.hpp @@ -85,11 +85,11 @@ struct column_buffer { } // move constructor - column_buffer(column_buffer&& col) = default; + column_buffer(column_buffer&& col) = default; column_buffer& operator=(column_buffer&& col) = default; // copy constructor - column_buffer(column_buffer const& col) = delete; + column_buffer(column_buffer const& col) = delete; column_buffer& operator=(column_buffer const& col) = delete; // instantiate a column of known type with a specified size. Allows deferred creation for diff --git a/cpp/src/io/utilities/file_io_utilities.cpp b/cpp/src/io/utilities/file_io_utilities.cpp index f1fb50f5340..da24770661c 100644 --- a/cpp/src/io/utilities/file_io_utilities.cpp +++ b/cpp/src/io/utilities/file_io_utilities.cpp @@ -68,7 +68,7 @@ class cufile_shim { auto is_valid() const noexcept { return init_error == nullptr; } public: - cufile_shim(cufile_shim const&) = delete; + cufile_shim(cufile_shim const&) = delete; cufile_shim& operator=(cufile_shim const&) = delete; static cufile_shim const* instance(); diff --git a/cpp/src/io/utilities/output_builder.cuh b/cpp/src/io/utilities/output_builder.cuh index e45143480fc..9c858307660 100644 --- a/cpp/src/io/utilities/output_builder.cuh +++ b/cpp/src/io/utilities/output_builder.cuh @@ -214,9 +214,9 @@ class output_builder { _chunks.back().reserve(max_write_size * 2, stream); } - output_builder(output_builder&&) = delete; - output_builder(const output_builder&) = delete; - output_builder& operator=(output_builder&&) = delete; + output_builder(output_builder&&) = delete; + output_builder(const output_builder&) = delete; + output_builder& operator=(output_builder&&) = delete; output_builder& operator=(const output_builder&) = delete; /** diff --git a/cpp/src/join/join.cu b/cpp/src/join/join.cu index ae025b1a213..8210f3114d6 100644 --- a/cpp/src/join/join.cu +++ b/cpp/src/join/join.cu @@ -73,7 +73,7 @@ left_join(table_view const& left_input, // Make sure any dictionary columns have matched key sets. // This will return any new dictionary columns created as well as updated table_views. auto matched = cudf::dictionary::detail::match_dictionaries( - {left_input, right_input}, // these should match + {left_input, right_input}, // these should match stream, rmm::mr::get_current_device_resource()); // temporary objects returned // now rebuild the table views with the updated ones @@ -98,7 +98,7 @@ full_join(table_view const& left_input, // Make sure any dictionary columns have matched key sets. // This will return any new dictionary columns created as well as updated table_views. auto matched = cudf::dictionary::detail::match_dictionaries( - {left_input, right_input}, // these should match + {left_input, right_input}, // these should match stream, rmm::mr::get_current_device_resource()); // temporary objects returned // now rebuild the table views with the updated ones diff --git a/cpp/src/partitioning/round_robin.cu b/cpp/src/partitioning/round_robin.cu index 00f64b36e2d..32c72f61741 100644 --- a/cpp/src/partitioning/round_robin.cu +++ b/cpp/src/partitioning/round_robin.cu @@ -175,7 +175,7 @@ std::pair, std::vector> round_robin_part return degenerate_partitions(input, num_partitions, start_partition, stream, mr); } - auto np_max_size = nrows % num_partitions; //# partitions of max size + auto np_max_size = nrows % num_partitions; // # partitions of max size // handle case when nr `mod` np == 0; // fix for bug: https://github.com/rapidsai/cudf/issues/4043 diff --git a/cpp/src/quantiles/tdigest/tdigest_aggregation.cu b/cpp/src/quantiles/tdigest/tdigest_aggregation.cu index 094e554c3d2..d474828f9b2 100644 --- a/cpp/src/quantiles/tdigest/tdigest_aggregation.cu +++ b/cpp/src/quantiles/tdigest/tdigest_aggregation.cu @@ -459,7 +459,7 @@ __global__ void generate_cluster_limits_kernel(int delta, int adjusted_w_index = nearest_w_index; if ((last_inserted_index < 0) || // if we haven't inserted anything yet (nearest_w_index == - last_inserted_index)) { // if we land in the same bucket as the previous cap + last_inserted_index)) { // if we land in the same bucket as the previous cap // force the value into this bucket adjusted_w_index = (last_inserted_index == group_size - 1) diff --git a/cpp/src/rolling/detail/rolling_collect_list.cuh b/cpp/src/rolling/detail/rolling_collect_list.cuh index 39d15ed716f..9f74a961e12 100644 --- a/cpp/src/rolling/detail/rolling_collect_list.cuh +++ b/cpp/src/rolling/detail/rolling_collect_list.cuh @@ -116,7 +116,7 @@ std::unique_ptr create_collect_gather_map(column_view const& child_offse thrust::make_counting_iterator(per_row_mapping.size()), gather_map->mutable_view().template begin(), [d_offsets = - child_offsets.template begin(), // E.g. [0, 2, 5, 8, 11, 13] + child_offsets.template begin(), // E.g. [0, 2, 5, 8, 11, 13] d_groups = per_row_mapping.template begin(), // E.g. [0,0, 1,1,1, 2,2,2, 3,3,3, 4,4] d_prev = preceding_iter] __device__(auto i) { diff --git a/cpp/src/strings/char_types/char_types.cu b/cpp/src/strings/char_types/char_types.cu index 9d4e44f47c1..d69121a0be0 100644 --- a/cpp/src/strings/char_types/char_types.cu +++ b/cpp/src/strings/char_types/char_types.cu @@ -114,9 +114,9 @@ struct filter_chars_fn { { auto const code_point = detail::utf8_to_codepoint(ch); auto const flag = code_point <= 0x00'FFFF ? d_flags[code_point] : 0; - if (flag == 0) // all types pass unless specifically identified + if (flag == 0) // all types pass unless specifically identified return (types_to_remove == ALL_TYPES); - if (types_to_keep == ALL_TYPES) // filter case + if (types_to_keep == ALL_TYPES) // filter case return (types_to_remove & flag) != 0; return (types_to_keep & flag) == 0; // keep case } diff --git a/cpp/src/strings/convert/convert_datetime.cu b/cpp/src/strings/convert/convert_datetime.cu index 8d273eff4bb..d6ef033c2fc 100644 --- a/cpp/src/strings/convert/convert_datetime.cu +++ b/cpp/src/strings/convert/convert_datetime.cu @@ -317,8 +317,8 @@ struct parse_datetime { bytes_read -= left; break; } - case 'u': [[fallthrough]]; // day of week: Mon(1)-Sat(6),Sun(7) - case 'w': { // day of week; Sun(0),Mon(1)-Sat(6) + case 'u': [[fallthrough]]; // day of week: Mon(1)-Sat(6),Sun(7) + case 'w': { // day of week; Sun(0),Mon(1)-Sat(6) auto const [weekday, left] = parse_int(ptr, item.length); timeparts.weekday = // 0 is mapped to 7 for chrono library static_cast((item.value == 'w' && weekday == 0) ? 7 : weekday); @@ -1000,7 +1000,7 @@ struct datetime_formatter_fn { case 'S': // second copy_value = timeparts.second; break; - case 'f': // sub-second + case 'f': // sub-second { char subsecond_digits[] = "000000000"; // 9 max digits const int digits = [] { diff --git a/cpp/src/strings/convert/convert_durations.cu b/cpp/src/strings/convert/convert_durations.cu index 926e94ce1fc..6b1d741a806 100644 --- a/cpp/src/strings/convert/convert_durations.cu +++ b/cpp/src/strings/convert/convert_durations.cu @@ -576,7 +576,7 @@ struct parse_duration { item_length++; // : timeparts->second = parse_second(ptr + item_length, item_length); break; - case 'r': // hh:MM:SS AM/PM + case 'r': // hh:MM:SS AM/PM timeparts->hour = parse_hour(ptr, item_length); item_length++; // : timeparts->minute = parse_minute(ptr + item_length, item_length); diff --git a/cpp/src/strings/convert/convert_floats.cu b/cpp/src/strings/convert/convert_floats.cu index 7b079cb8265..b0f34beeafe 100644 --- a/cpp/src/strings/convert/convert_floats.cu +++ b/cpp/src/strings/convert/convert_floats.cu @@ -284,7 +284,7 @@ struct ftos_converter { while (pb != buffer) // reverses the digits *ptr++ = *--pb; // e.g. 54321 -> 12345 } else - *ptr++ = '0'; // always include at least .0 + *ptr++ = '0'; // always include at least .0 // exponent if (exp10) { *ptr++ = 'e'; @@ -310,7 +310,7 @@ struct ftos_converter { { if (std::isnan(value)) return 3; // NaN bool bneg = false; - if (signbit(value)) { // handles -0.0 too + if (signbit(value)) { // handles -0.0 too value = -value; bneg = true; } @@ -337,7 +337,7 @@ struct ftos_converter { ++count; // always include .0 // exponent if (exp10) { - count += 2; // 'e±' + count += 2; // 'e±' if (exp10 < 0) exp10 = -exp10; count += (int)(exp10 < 10); // padding while (exp10 > 0) { diff --git a/cpp/src/strings/convert/convert_integers.cu b/cpp/src/strings/convert/convert_integers.cu index 546639fdc5e..a8a084398f9 100644 --- a/cpp/src/strings/convert/convert_integers.cu +++ b/cpp/src/strings/convert/convert_integers.cu @@ -76,7 +76,7 @@ struct string_to_integer_check_fn { auto const digit = static_cast(chr - '0'); auto const bound_check = (bound_val - sign * digit) / IntegerType{10} * sign; if (value > bound_check) return false; - value = value * IntegerType{10} + digit; + value = value* IntegerType{10} + digit; } return true; diff --git a/cpp/src/strings/convert/convert_ipv4.cu b/cpp/src/strings/convert/convert_ipv4.cu index dc44a6e6432..4944813b7d3 100644 --- a/cpp/src/strings/convert/convert_ipv4.cu +++ b/cpp/src/strings/convert/convert_ipv4.cu @@ -197,7 +197,7 @@ std::unique_ptr is_ipv4(strings_column_view const& strings, if (d_str.empty()) return false; constexpr int max_ip = 255; // values must be in [0,255] int ip_vals[4] = {-1, -1, -1, -1}; - int ipv_idx = 0; // index into ip_vals + int ipv_idx = 0; // index into ip_vals for (auto const ch : d_str) { if ((ch >= '0') && (ch <= '9')) { auto const ip_val = ip_vals[ipv_idx]; diff --git a/cpp/src/strings/convert/convert_urls.cu b/cpp/src/strings/convert/convert_urls.cu index 9bbef3498df..052135ee2c8 100644 --- a/cpp/src/strings/convert/convert_urls.cu +++ b/cpp/src/strings/convert/convert_urls.cu @@ -107,9 +107,9 @@ struct url_encoder_fn { out_ptr = copy_and_increment(out_ptr, hex, 2); // add them to the output } } - } else // these are to be utf-8 url-encoded + } else // these are to be utf-8 url-encoded { - uint8_t char_bytes[4]; // holds utf-8 bytes for one character + uint8_t char_bytes[4]; // holds utf-8 bytes for one character size_type char_width = from_char_utf8(ch, reinterpret_cast(char_bytes)); nbytes += char_width * 3; // '%' plus 2 hex chars per byte (example: é is %C3%A9) // process each byte in this current character diff --git a/cpp/src/strings/json/json_path.cu b/cpp/src/strings/json/json_path.cu index 128d450cbe8..b7219196836 100644 --- a/cpp/src/strings/json/json_path.cu +++ b/cpp/src/strings/json/json_path.cu @@ -984,7 +984,7 @@ std::unique_ptr get_json_object(cudf::strings_column_view const& c col.size(), rmm::device_buffer{0, stream, mr}, // no data cudf::detail::create_null_mask(col.size(), mask_state::ALL_NULL, stream, mr), - col.size()); // null count + col.size()); // null count } constexpr int block_size = 512; diff --git a/cpp/src/strings/like.cu b/cpp/src/strings/like.cu index 1a9a098803f..33e019eb6d1 100644 --- a/cpp/src/strings/like.cu +++ b/cpp/src/strings/like.cu @@ -93,7 +93,7 @@ struct like_fn { last_pattern_itr = pattern_itr; last_target_itr = target_itr; } - } // next pattern character + } // next pattern character if (result && (target_itr == target_end)) { break; } // success diff --git a/cpp/src/strings/regex/regcomp.cpp b/cpp/src/strings/regex/regcomp.cpp index 2883c6cd54f..600e790e869 100644 --- a/cpp/src/strings/regex/regcomp.cpp +++ b/cpp/src/strings/regex/regcomp.cpp @@ -184,9 +184,9 @@ class regex_parser { int32_t _id_cclass_d{-1}; // digits [0-9] int32_t _id_cclass_D{-1}; // not digits - char32_t _chr{}; // last lex'd char - int32_t _cclass_id{}; // last lex'd class - int16_t _min_count{}; // data for counted operators + char32_t _chr{}; // last lex'd char + int32_t _cclass_id{}; // last lex'd class + int16_t _min_count{}; // data for counted operators int16_t _max_count{}; std::vector _items; @@ -361,9 +361,9 @@ class regex_parser { auto [q, n_chr] = next_char(); if (n_chr == 0) { return 0; } // malformed: '[x-' - if (!q && n_chr == ']') { // handles: '[x-]' + if (!q && n_chr == ']') { // handles: '[x-]' literals.push_back(chr); - literals.push_back(chr); // add '-' as literal + literals.push_back(chr); // add '-' as literal break; } // normal case: '[a-z]' @@ -749,7 +749,7 @@ class regex_parser { // infinite repeats if (n > 0) { // append '+' after last repetition out.push_back(regex_parser::Item{item.type == COUNTED ? PLUS : PLUS_LAZY, 0}); - } else { // copy it once then append '*' + } else { // copy it once then append '*' out.insert(out.end(), begin, end); out.push_back(regex_parser::Item{item.type == COUNTED ? STAR : STAR_LAZY, 0}); } @@ -1095,7 +1095,7 @@ void reprog::build_start_ids() ids.pop(); const reinst& inst = _insts[id]; if (inst.type == OR) { - if (inst.u2.left_id != id) // prevents infinite while-loop here + if (inst.u2.left_id != id) // prevents infinite while-loop here ids.push(inst.u2.left_id); if (inst.u1.right_id != id) // prevents infinite while-loop here ids.push(inst.u1.right_id); diff --git a/cpp/src/strings/regex/regcomp.h b/cpp/src/strings/regex/regcomp.h index b450b3f90e7..990d8835fed 100644 --- a/cpp/src/strings/regex/regcomp.h +++ b/cpp/src/strings/regex/regcomp.h @@ -77,16 +77,16 @@ constexpr int32_t NCCLASS_D{1 << 5}; // not CCLASS_D or '\n' * @brief Structure of an encoded regex instruction */ struct reinst { - int32_t type; /* operator type or instruction type */ + int32_t type; /* operator type or instruction type */ union { int32_t cls_id; /* class pointer */ char32_t c; /* character */ int32_t subid; /* sub-expression id for RBRA and LBRA */ int32_t right_id; /* right child of OR */ } u1; - union { /* regexec relies on these two being in the same union */ - int32_t left_id; /* left child of OR */ - int32_t next_id; /* next instruction for CAT & LBRA */ + union { /* regexec relies on these two being in the same union */ + int32_t left_id; /* left child of OR */ + int32_t next_id; /* next instruction for CAT & LBRA */ } u2; int32_t reserved4; }; @@ -97,11 +97,11 @@ struct reinst { */ class reprog { public: - reprog(const reprog&) = default; - reprog(reprog&&) = default; - ~reprog() = default; + reprog(const reprog&) = default; + reprog(reprog&&) = default; + ~reprog() = default; reprog& operator=(const reprog&) = default; - reprog& operator=(reprog&&) = default; + reprog& operator=(reprog&&) = default; /** * @brief Parses the given regex pattern and produces an instance diff --git a/cpp/src/strings/regex/regex.cuh b/cpp/src/strings/regex/regex.cuh index d16efb5f66e..f426a701f6c 100644 --- a/cpp/src/strings/regex/regex.cuh +++ b/cpp/src/strings/regex/regex.cuh @@ -74,12 +74,12 @@ class reprog; */ class reprog_device { public: - reprog_device() = delete; - ~reprog_device() = default; - reprog_device(const reprog_device&) = default; - reprog_device(reprog_device&&) = default; + reprog_device() = delete; + ~reprog_device() = default; + reprog_device(const reprog_device&) = default; + reprog_device(reprog_device&&) = default; reprog_device& operator=(const reprog_device&) = default; - reprog_device& operator=(reprog_device&&) = default; + reprog_device& operator=(reprog_device&&) = default; /** * @brief Create device program instance from a regex program @@ -258,21 +258,21 @@ class reprog_device { reprog_device(reprog const&); - int32_t _startinst_id; // first instruction id - int32_t _num_capturing_groups; // instruction groups - int32_t _insts_count; // number of instructions - int32_t _starts_count; // number of start-insts ids - int32_t _classes_count; // number of classes - int32_t _max_insts; // for partitioning working memory + int32_t _startinst_id; // first instruction id + int32_t _num_capturing_groups; // instruction groups + int32_t _insts_count; // number of instructions + int32_t _starts_count; // number of start-insts ids + int32_t _classes_count; // number of classes + int32_t _max_insts; // for partitioning working memory uint8_t const* _codepoint_flags{}; // table of character types reinst const* _insts{}; // array of regex instructions int32_t const* _startinst_ids{}; // array of start instruction ids reclass_device const* _classes{}; // array of regex classes - std::size_t _prog_size{}; // total size of this instance - void* _buffer{}; // working memory buffer - int32_t _thread_count{}; // threads available in working memory + std::size_t _prog_size{}; // total size of this instance + void* _buffer{}; // working memory buffer + int32_t _thread_count{}; // threads available in working memory }; /** diff --git a/cpp/src/strings/regex/regex.inl b/cpp/src/strings/regex/regex.inl index deb53a128b0..d25a0888f32 100644 --- a/cpp/src/strings/regex/regex.inl +++ b/cpp/src/strings/regex/regex.inl @@ -150,17 +150,17 @@ __device__ __forceinline__ bool reclass_device::is_match(char32_t const ch, uint32_t codept = utf8_to_codepoint(ch); if (codept > 0x00'FFFF) return false; int8_t fl = codepoint_flags[codept]; - if ((builtins & CCLASS_W) && ((ch == '_') || IS_ALPHANUM(fl))) // \w + if ((builtins & CCLASS_W) && ((ch == '_') || IS_ALPHANUM(fl))) // \w return true; - if ((builtins & CCLASS_S) && IS_SPACE(fl)) // \s + if ((builtins & CCLASS_S) && IS_SPACE(fl)) // \s return true; - if ((builtins & CCLASS_D) && IS_DIGIT(fl)) // \d + if ((builtins & CCLASS_D) && IS_DIGIT(fl)) // \d return true; if ((builtins & NCCLASS_W) && ((ch != '\n') && (ch != '_') && !IS_ALPHANUM(fl))) // \W return true; - if ((builtins & NCCLASS_S) && !IS_SPACE(fl)) // \S + if ((builtins & NCCLASS_S) && !IS_SPACE(fl)) // \S return true; - if ((builtins & NCCLASS_D) && ((ch != '\n') && !IS_DIGIT(fl))) // \D + if ((builtins & NCCLASS_D) && ((ch != '\n') && !IS_DIGIT(fl))) // \D return true; // return false; diff --git a/cpp/src/strings/regex/regex_program.cpp b/cpp/src/strings/regex/regex_program.cpp index c64da213fcf..3604fe9d34b 100644 --- a/cpp/src/strings/regex/regex_program.cpp +++ b/cpp/src/strings/regex/regex_program.cpp @@ -32,8 +32,8 @@ std::unique_ptr regex_program::create(std::string_view pattern, return std::unique_ptr(p); } -regex_program::~regex_program() = default; -regex_program::regex_program(regex_program&& other) = default; +regex_program::~regex_program() = default; +regex_program::regex_program(regex_program&& other) = default; regex_program& regex_program::operator=(regex_program&& other) = default; regex_program::regex_program(std::string_view pattern, regex_flags flags, capture_groups capture) diff --git a/cpp/src/strings/replace/backref_re.cuh b/cpp/src/strings/replace/backref_re.cuh index db5b8a1eb17..b6dfc5be030 100644 --- a/cpp/src/strings/replace/backref_re.cuh +++ b/cpp/src/strings/replace/backref_re.cuh @@ -59,16 +59,16 @@ struct backrefs_fn { auto const nchars = d_str.length(); // number of characters in input string auto nbytes = d_str.size_bytes(); // number of bytes for the output string auto out_ptr = d_chars ? (d_chars + d_offsets[idx]) : nullptr; - size_type lpos = 0; // last byte position processed in d_str - size_type begin = 0; // first character position matching regex - size_type end = nchars; // last character position (exclusive) + size_type lpos = 0; // last byte position processed in d_str + size_type begin = 0; // first character position matching regex + size_type end = nchars; // last character position (exclusive) // copy input to output replacing strings as we go while (prog.find(prog_idx, d_str, begin, end) > 0) // inits the begin/end vars { - auto spos = d_str.byte_offset(begin); // get offset for the - auto epos = d_str.byte_offset(end); // character position values; - nbytes += d_repl.size_bytes() - (epos - spos); // compute the output size + auto spos = d_str.byte_offset(begin); // get offset for the + auto epos = d_str.byte_offset(end); // character position values; + nbytes += d_repl.size_bytes() - (epos - spos); // compute the output size // copy the string data before the matched section if (out_ptr) { out_ptr = copy_and_increment(out_ptr, in_ptr + lpos, spos - lpos); } diff --git a/cpp/src/strings/replace/multi_re.cu b/cpp/src/strings/replace/multi_re.cu index 50b2dc27671..b554d0a815c 100644 --- a/cpp/src/strings/replace/multi_re.cu +++ b/cpp/src/strings/replace/multi_re.cu @@ -89,7 +89,7 @@ struct replace_multi_regex_fn { auto begin = ch_pos; auto end = nchars; if (!prog.is_empty() && prog.find(idx, d_str, begin, end) > 0) - d_ranges[ptn_idx] = found_range{begin, end}; // found a match + d_ranges[ptn_idx] = found_range{begin, end}; // found a match else d_ranges[ptn_idx] = found_range{nchars, nchars}; // this pattern is done } diff --git a/cpp/src/strings/replace/replace_re.cu b/cpp/src/strings/replace/replace_re.cu index 2a62e05d33b..c334d2b2013 100644 --- a/cpp/src/strings/replace/replace_re.cu +++ b/cpp/src/strings/replace/replace_re.cu @@ -74,15 +74,15 @@ struct replace_regex_fn { auto const end_pos = d_str.byte_offset(end); // character position values nbytes += d_repl.size_bytes() - (end_pos - start_pos); // and compute new size - if (out_ptr) { // replace: - // i:bbbbsssseeee - out_ptr = copy_and_increment(out_ptr, // ^ - in_ptr + last_pos, // o:bbbb - start_pos - last_pos); // ^ - out_ptr = copy_string(out_ptr, d_repl); // o:bbbbrrrrrr - // out_ptr ---^ - last_pos = end_pos; // i:bbbbsssseeee - } // in_ptr --^ + if (out_ptr) { // replace: + // i:bbbbsssseeee + out_ptr = copy_and_increment(out_ptr, // ^ + in_ptr + last_pos, // o:bbbb + start_pos - last_pos); // ^ + out_ptr = copy_string(out_ptr, d_repl); // o:bbbbrrrrrr + // out_ptr ---^ + last_pos = end_pos; // i:bbbbsssseeee + } // in_ptr --^ begin = end + (begin == end); end = -1; diff --git a/cpp/src/strings/split/partition.cu b/cpp/src/strings/split/partition.cu index 09aadb78554..3cf839c5411 100644 --- a/cpp/src/strings/split/partition.cu +++ b/cpp/src/strings/split/partition.cu @@ -170,7 +170,7 @@ struct rpartition_fn : public partition_fn { --itr; pos = check_delimiter(idx, d_str, itr); } - if (pos < 0) // delimiter not found + if (pos < 0) // delimiter not found { d_indices_left[idx] = string_index_pair{"", 0}; // two empty d_indices_delim[idx] = string_index_pair{"", 0}; // strings diff --git a/cpp/src/strings/split/split.cuh b/cpp/src/strings/split/split.cuh index 41213dac58b..31257a441a1 100644 --- a/cpp/src/strings/split/split.cuh +++ b/cpp/src/strings/split/split.cuh @@ -189,7 +189,7 @@ struct split_tokenizer_fn : base_split_tokenizer { device_span d_delimiters, device_span d_tokens) const { - auto const base_ptr = get_base_ptr(); // d_positions values based on this + auto const base_ptr = get_base_ptr(); // d_positions values based on this auto str_ptr = d_str.data(); auto const str_end = str_ptr + d_str.size_bytes(); // end of the string auto const token_count = static_cast(d_tokens.size()); diff --git a/cpp/src/strings/split/split_re.cu b/cpp/src/strings/split/split_re.cu index 87a0033da77..841c642368e 100644 --- a/cpp/src/strings/split/split_re.cu +++ b/cpp/src/strings/split/split_re.cu @@ -86,7 +86,7 @@ struct token_reader_fn { } else { if (direction == split_direction::FORWARD) { break; } // we are done for (auto l = 0; l < token_idx - 1; ++l) { - d_result[l] = d_result[l + 1]; // shift left + d_result[l] = d_result[l + 1]; // shift left } d_result[token_idx - 1] = token; } diff --git a/cpp/src/text/normalize.cu b/cpp/src/text/normalize.cu index 06225f2dc64..970344388de 100644 --- a/cpp/src/text/normalize.cu +++ b/cpp/src/text/normalize.cu @@ -144,7 +144,7 @@ struct codepoint_to_utf8_fn { char* out_ptr = d_chars + d_offsets[idx]; for (uint32_t jdx = 0; jdx < count; ++jdx) { uint32_t code_point = *str_cps++; - if (code_point < UTF8_1BYTE) // ASCII range + if (code_point < UTF8_1BYTE) // ASCII range *out_ptr++ = static_cast(code_point); else if (code_point < UTF8_2BYTE) { // create two-byte UTF-8 // b00001xxx:byyyyyyyy => b110xxxyy:b10yyyyyy diff --git a/cpp/src/text/replace.cu b/cpp/src/text/replace.cu index 33e007d8d09..645cc27a96d 100644 --- a/cpp/src/text/replace.cu +++ b/cpp/src/text/replace.cu @@ -114,7 +114,7 @@ using strings_iterator = cudf::column_device_view::const_iterator= end) { break; } // done checking for pairs // skip to the next adjacent pair diff --git a/cpp/src/text/subword/load_merges_file.cu b/cpp/src/text/subword/load_merges_file.cu index e5ed9287b12..12d25bec52c 100644 --- a/cpp/src/text/subword/load_merges_file.cu +++ b/cpp/src/text/subword/load_merges_file.cu @@ -109,7 +109,7 @@ std::unique_ptr initialize_merge_pairs_map( auto merge_pairs_map = std::make_unique( static_cast(input.size() * 2), // capacity is 2x; cuco::empty_key{std::numeric_limits::max()}, - cuco::empty_value{-1}, // empty value is not used + cuco::empty_value{-1}, // empty value is not used hash_table_allocator_type{default_allocator{}, stream}, stream.value()); diff --git a/cpp/src/text/utilities/tokenize_ops.cuh b/cpp/src/text/utilities/tokenize_ops.cuh index ea1f23b4a53..c7f818df075 100644 --- a/cpp/src/text/utilities/tokenize_ops.cuh +++ b/cpp/src/text/utilities/tokenize_ops.cuh @@ -223,7 +223,7 @@ struct multi_delimiter_strings_tokenizer { }); if (itr_find != delimiters_end) { // found delimiter auto token_size = static_cast((curr_ptr - data_ptr) - last_pos); - if (token_size > 0) // we only care about non-zero sized tokens + if (token_size > 0) // we only care about non-zero sized tokens { if (d_str_tokens) d_str_tokens[token_idx] = string_index_pair{data_ptr + last_pos, token_size}; diff --git a/cpp/tests/ast/transform_tests.cpp b/cpp/tests/ast/transform_tests.cpp index 769bd95c3e9..672887978f1 100644 --- a/cpp/tests/ast/transform_tests.cpp +++ b/cpp/tests/ast/transform_tests.cpp @@ -46,8 +46,7 @@ using column_wrapper = cudf::test::fixed_width_column_wrapper; constexpr cudf::test::debug_output_level verbosity{cudf::test::debug_output_level::ALL_ERRORS}; -struct TransformTest : public cudf::test::BaseFixture { -}; +struct TransformTest : public cudf::test::BaseFixture {}; TEST_F(TransformTest, ColumnReference) { @@ -603,9 +602,9 @@ TEST_F(TransformTest, BasicAdditionLargeNulls) TEST_F(TransformTest, NullLogicalAnd) { auto c_0 = column_wrapper{{false, false, true, true, false, false, true, true}, - {1, 1, 1, 1, 1, 0, 0, 0}}; + {1, 1, 1, 1, 1, 0, 0, 0}}; auto c_1 = column_wrapper{{false, true, false, true, true, true, false, true}, - {1, 1, 1, 1, 0, 1, 1, 0}}; + {1, 1, 1, 1, 0, 1, 1, 0}}; auto table = cudf::table_view{{c_0, c_1}}; auto col_ref_0 = cudf::ast::column_reference(0); @@ -623,9 +622,9 @@ TEST_F(TransformTest, NullLogicalAnd) TEST_F(TransformTest, NullLogicalOr) { auto c_0 = column_wrapper{{false, false, true, true, false, false, true, true}, - {1, 1, 1, 1, 1, 0, 1, 0}}; + {1, 1, 1, 1, 1, 0, 1, 0}}; auto c_1 = column_wrapper{{false, true, false, true, true, true, false, true}, - {1, 1, 1, 1, 0, 1, 0, 0}}; + {1, 1, 1, 1, 0, 1, 0, 0}}; auto table = cudf::table_view{{c_0, c_1}}; auto col_ref_0 = cudf::ast::column_reference(0); diff --git a/cpp/tests/binaryop/binop-compiled-fixed_point-test.cpp b/cpp/tests/binaryop/binop-compiled-fixed_point-test.cpp index bdd0003b86b..a1f8dae148b 100644 --- a/cpp/tests/binaryop/binop-compiled-fixed_point-test.cpp +++ b/cpp/tests/binaryop/binop-compiled-fixed_point-test.cpp @@ -29,8 +29,7 @@ #include template -struct FixedPointCompiledTest : public cudf::test::BaseFixture { -}; +struct FixedPointCompiledTest : public cudf::test::BaseFixture {}; template using wrapper = cudf::test::fixed_width_column_wrapper; @@ -808,8 +807,7 @@ TYPED_TEST(FixedPointCompiledTest, FixedPointBinaryOpPModAndPyMod) } template -struct FixedPointTest_64_128_Reps : public cudf::test::BaseFixture { -}; +struct FixedPointTest_64_128_Reps : public cudf::test::BaseFixture {}; using Decimal64And128Types = cudf::test::Types; TYPED_TEST_SUITE(FixedPointTest_64_128_Reps, Decimal64And128Types); diff --git a/cpp/tests/binaryop/binop-compiled-test.cpp b/cpp/tests/binaryop/binop-compiled-test.cpp index 9f594c96c32..3c5adafc894 100644 --- a/cpp/tests/binaryop/binop-compiled-test.cpp +++ b/cpp/tests/binaryop/binop-compiled-test.cpp @@ -130,8 +130,7 @@ using Add_types = cudf::test::Types>; template -struct BinaryOperationCompiledTest_Add : public BinaryOperationCompiledTest { -}; +struct BinaryOperationCompiledTest_Add : public BinaryOperationCompiledTest {}; TYPED_TEST_SUITE(BinaryOperationCompiledTest_Add, Add_types); TYPED_TEST(BinaryOperationCompiledTest_Add, Vector_Vector) @@ -159,8 +158,7 @@ using Sub_types = cudf::test::Types< cudf::test::Types>; template -struct BinaryOperationCompiledTest_Sub : public BinaryOperationCompiledTest { -}; +struct BinaryOperationCompiledTest_Sub : public BinaryOperationCompiledTest {}; TYPED_TEST_SUITE(BinaryOperationCompiledTest_Sub, Sub_types); TYPED_TEST(BinaryOperationCompiledTest_Sub, Vector_Vector) @@ -189,8 +187,7 @@ using Mul_types = cudf::test::Types>; template -struct BinaryOperationCompiledTest_Mul : public BinaryOperationCompiledTest { -}; +struct BinaryOperationCompiledTest_Mul : public BinaryOperationCompiledTest {}; TYPED_TEST_SUITE(BinaryOperationCompiledTest_Mul, Mul_types); TYPED_TEST(BinaryOperationCompiledTest_Mul, Vector_Vector) @@ -219,8 +216,7 @@ using Div_types = cudf::test::Types>; template -struct BinaryOperationCompiledTest_Div : public BinaryOperationCompiledTest { -}; +struct BinaryOperationCompiledTest_Div : public BinaryOperationCompiledTest {}; TYPED_TEST_SUITE(BinaryOperationCompiledTest_Div, Div_types); TYPED_TEST(BinaryOperationCompiledTest_Div, Vector_Vector) @@ -239,8 +235,7 @@ using TrueDiv_types = cudf::test::Types>; template -struct BinaryOperationCompiledTest_TrueDiv : public BinaryOperationCompiledTest { -}; +struct BinaryOperationCompiledTest_TrueDiv : public BinaryOperationCompiledTest {}; TYPED_TEST_SUITE(BinaryOperationCompiledTest_TrueDiv, TrueDiv_types); TYPED_TEST(BinaryOperationCompiledTest_TrueDiv, Vector_Vector) @@ -270,8 +265,7 @@ using Mod_types = cudf::test::Types, cudf::test::Types>; template -struct BinaryOperationCompiledTest_Mod : public BinaryOperationCompiledTest { -}; +struct BinaryOperationCompiledTest_Mod : public BinaryOperationCompiledTest {}; TYPED_TEST_SUITE(BinaryOperationCompiledTest_Mod, Mod_types); TYPED_TEST(BinaryOperationCompiledTest_Mod, Vector_Vector) @@ -290,8 +284,7 @@ using PyMod_types = cudf::test::Types, cudf::test::Types>; template -struct BinaryOperationCompiledTest_PyMod : public BinaryOperationCompiledTest { -}; +struct BinaryOperationCompiledTest_PyMod : public BinaryOperationCompiledTest {}; TYPED_TEST_SUITE(BinaryOperationCompiledTest_PyMod, PyMod_types); TYPED_TEST(BinaryOperationCompiledTest_PyMod, Vector_Vector) { @@ -314,8 +307,7 @@ using Pow_types = cudf::test::Types, cudf::test::Types>; template -struct BinaryOperationCompiledTest_FloatOps : public BinaryOperationCompiledTest { -}; +struct BinaryOperationCompiledTest_FloatOps : public BinaryOperationCompiledTest {}; TYPED_TEST_SUITE(BinaryOperationCompiledTest_FloatOps, Pow_types); TYPED_TEST(BinaryOperationCompiledTest_FloatOps, Pow_Vector_Vector) @@ -402,8 +394,7 @@ TYPED_TEST(BinaryOperationCompiledTest_FloatOps, PMod_Vector_Vector) using IntPow_types = cudf::test::Types, cudf::test::Types>; template -struct BinaryOperationCompiledTest_IntPow : public BinaryOperationCompiledTest { -}; +struct BinaryOperationCompiledTest_IntPow : public BinaryOperationCompiledTest {}; TYPED_TEST_SUITE(BinaryOperationCompiledTest_IntPow, IntPow_types); TYPED_TEST(BinaryOperationCompiledTest_IntPow, IntPow_SpecialCases) @@ -489,8 +480,7 @@ using Bit_types = cudf::test::Types, cudf::test::Types, cudf::test::Types>; template -struct BinaryOperationCompiledTest_Bit : public BinaryOperationCompiledTest { -}; +struct BinaryOperationCompiledTest_Bit : public BinaryOperationCompiledTest {}; TYPED_TEST_SUITE(BinaryOperationCompiledTest_Bit, Bit_types); TYPED_TEST(BinaryOperationCompiledTest_Bit, BitwiseAnd_Vector_Vector) @@ -538,8 +528,7 @@ using Logical_types = cudf::test::Types cudf::test::Types, cudf::test::Types>; template -struct BinaryOperationCompiledTest_Logical : public BinaryOperationCompiledTest { -}; +struct BinaryOperationCompiledTest_Logical : public BinaryOperationCompiledTest {}; TYPED_TEST_SUITE(BinaryOperationCompiledTest_Logical, Logical_types); TYPED_TEST(BinaryOperationCompiledTest_Logical, LogicalAnd_Vector_Vector) @@ -628,8 +617,7 @@ using Comparison_types = cudf::test::Types>; template -struct BinaryOperationCompiledTest_Comparison : public BinaryOperationCompiledTest { -}; +struct BinaryOperationCompiledTest_Comparison : public BinaryOperationCompiledTest {}; TYPED_TEST_SUITE(BinaryOperationCompiledTest_Comparison, Comparison_types); TYPED_TEST(BinaryOperationCompiledTest_Comparison, Equal_Vector_Vector) @@ -688,8 +676,7 @@ using Null_types = cudf::test::Types>; template -struct BinaryOperationCompiledTest_NullOps : public BinaryOperationCompiledTest { -}; +struct BinaryOperationCompiledTest_NullOps : public BinaryOperationCompiledTest {}; TYPED_TEST_SUITE(BinaryOperationCompiledTest_NullOps, Null_types); TYPED_TEST(BinaryOperationCompiledTest_NullOps, NullEquals_Vector_Vector) diff --git a/cpp/tests/binaryop/binop-verify-input-test.cpp b/cpp/tests/binaryop/binop-verify-input-test.cpp index 230f76d6cb3..1346dcd4666 100644 --- a/cpp/tests/binaryop/binop-verify-input-test.cpp +++ b/cpp/tests/binaryop/binop-verify-input-test.cpp @@ -22,8 +22,7 @@ #include -struct BinopVerifyInputTest : public cudf::test::BaseFixture { -}; +struct BinopVerifyInputTest : public cudf::test::BaseFixture {}; TEST_F(BinopVerifyInputTest, Vector_Scalar_ErrorOutputVectorType) { diff --git a/cpp/tests/bitmask/bitmask_tests.cpp b/cpp/tests/bitmask/bitmask_tests.cpp index 7805828ad55..ef4219c48cf 100644 --- a/cpp/tests/bitmask/bitmask_tests.cpp +++ b/cpp/tests/bitmask/bitmask_tests.cpp @@ -30,8 +30,7 @@ #include #include -struct BitmaskUtilitiesTest : public cudf::test::BaseFixture { -}; +struct BitmaskUtilitiesTest : public cudf::test::BaseFixture {}; TEST_F(BitmaskUtilitiesTest, StateNullCount) { @@ -64,8 +63,7 @@ TEST_F(BitmaskUtilitiesTest, NumBitmaskWords) EXPECT_EQ(3, cudf::num_bitmask_words(65)); } -struct CountBitmaskTest : public cudf::test::BaseFixture { -}; +struct CountBitmaskTest : public cudf::test::BaseFixture {}; TEST_F(CountBitmaskTest, NullMask) { @@ -681,8 +679,7 @@ TEST_F(CopyBitmaskTest, TestCopyColumnViewVectorDiscontiguous) concatenated_bitmask.data(), gold_mask.data(), cudf::num_bitmask_words(num_elements)); } -struct MergeBitmaskTest : public cudf::test::BaseFixture { -}; +struct MergeBitmaskTest : public cudf::test::BaseFixture {}; TEST_F(MergeBitmaskTest, TestBitmaskAnd) { diff --git a/cpp/tests/bitmask/is_element_valid_tests.cpp b/cpp/tests/bitmask/is_element_valid_tests.cpp index a369c179bd9..00041282a4e 100644 --- a/cpp/tests/bitmask/is_element_valid_tests.cpp +++ b/cpp/tests/bitmask/is_element_valid_tests.cpp @@ -23,8 +23,7 @@ #include -struct IsElementValidTest : public cudf::test::BaseFixture { -}; +struct IsElementValidTest : public cudf::test::BaseFixture {}; TEST_F(IsElementValidTest, IsElementValidBasic) { diff --git a/cpp/tests/bitmask/valid_if_tests.cu b/cpp/tests/bitmask/valid_if_tests.cu index cb086cda179..d5048e1655a 100644 --- a/cpp/tests/bitmask/valid_if_tests.cu +++ b/cpp/tests/bitmask/valid_if_tests.cu @@ -25,8 +25,7 @@ #include -struct ValidIfTest : public cudf::test::BaseFixture { -}; +struct ValidIfTest : public cudf::test::BaseFixture {}; struct odds_valid { __host__ __device__ bool operator()(cudf::size_type i) { return i % 2; } diff --git a/cpp/tests/column/bit_cast_test.cpp b/cpp/tests/column/bit_cast_test.cpp index 9e6ca26f815..0ebcf0bfd5c 100644 --- a/cpp/tests/column/bit_cast_test.cpp +++ b/cpp/tests/column/bit_cast_test.cpp @@ -52,8 +52,7 @@ template using rep_type_t = typename rep_type_impl::type; template -struct ColumnViewAllTypesTests : public cudf::test::BaseFixture { -}; +struct ColumnViewAllTypesTests : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(ColumnViewAllTypesTests, cudf::test::FixedWidthTypes); diff --git a/cpp/tests/column/column_device_view_test.cu b/cpp/tests/column/column_device_view_test.cu index 0868ad885cf..e83977a39be 100644 --- a/cpp/tests/column/column_device_view_test.cu +++ b/cpp/tests/column/column_device_view_test.cu @@ -31,8 +31,7 @@ #include -struct ColumnDeviceViewTest : public cudf::test::BaseFixture { -}; +struct ColumnDeviceViewTest : public cudf::test::BaseFixture {}; TEST_F(ColumnDeviceViewTest, Sample) { diff --git a/cpp/tests/column/column_test.cu b/cpp/tests/column/column_test.cu index ceff726d8e0..b81b47083ef 100644 --- a/cpp/tests/column/column_test.cu +++ b/cpp/tests/column/column_test.cu @@ -480,8 +480,7 @@ TYPED_TEST(TypedColumnTest, ColumnViewConstructorWithMask) } template -struct ListsColumnTest : public cudf::test::BaseFixture { -}; +struct ListsColumnTest : public cudf::test::BaseFixture {}; using NumericTypesNotBool = cudf::test::Concat; diff --git a/cpp/tests/column/column_view_device_span_test.cpp b/cpp/tests/column/column_view_device_span_test.cpp index 2b7ea3b3650..bcb00190922 100644 --- a/cpp/tests/column/column_view_device_span_test.cpp +++ b/cpp/tests/column/column_view_device_span_test.cpp @@ -39,8 +39,7 @@ std::unique_ptr example_column() } template -struct ColumnViewDeviceSpanTests : public cudf::test::BaseFixture { -}; +struct ColumnViewDeviceSpanTests : public cudf::test::BaseFixture {}; using DeviceSpanTypes = cudf::test::FixedWidthTypesWithoutFixedPoint; TYPED_TEST_SUITE(ColumnViewDeviceSpanTests, DeviceSpanTypes); @@ -56,8 +55,7 @@ TYPED_TEST(ColumnViewDeviceSpanTests, conversion_round_trip) CUDF_TEST_EXPECT_COLUMNS_EQUAL(col_view, col_view_from_device_span); } -struct ColumnViewDeviceSpanErrorTests : public cudf::test::BaseFixture { -}; +struct ColumnViewDeviceSpanErrorTests : public cudf::test::BaseFixture {}; TEST_F(ColumnViewDeviceSpanErrorTests, type_mismatch) { diff --git a/cpp/tests/column/column_view_shallow_test.cpp b/cpp/tests/column/column_view_shallow_test.cpp index 8a742b50baa..7280c0fd60f 100644 --- a/cpp/tests/column/column_view_shallow_test.cpp +++ b/cpp/tests/column/column_view_shallow_test.cpp @@ -75,8 +75,7 @@ std::unique_ptr example_column() } template -struct ColumnViewShallowTests : public cudf::test::BaseFixture { -}; +struct ColumnViewShallowTests : public cudf::test::BaseFixture {}; using AllTypes = cudf::test::Concat; TYPED_TEST_SUITE(ColumnViewShallowTests, AllTypes); diff --git a/cpp/tests/column/compound_test.cu b/cpp/tests/column/compound_test.cu index 79f746369f2..e99f71f44c4 100644 --- a/cpp/tests/column/compound_test.cu +++ b/cpp/tests/column/compound_test.cu @@ -31,8 +31,7 @@ #include -struct CompoundColumnTest : public cudf::test::BaseFixture { -}; +struct CompoundColumnTest : public cudf::test::BaseFixture {}; template struct checker_for_level1 { diff --git a/cpp/tests/column/factories_test.cpp b/cpp/tests/column/factories_test.cpp index eeeb23f4b20..ed4ef0e7041 100644 --- a/cpp/tests/column/factories_test.cpp +++ b/cpp/tests/column/factories_test.cpp @@ -41,8 +41,7 @@ class ColumnFactoryTest : public cudf::test::BaseFixture { }; template -class NumericFactoryTest : public ColumnFactoryTest { -}; +class NumericFactoryTest : public ColumnFactoryTest {}; TYPED_TEST_SUITE(NumericFactoryTest, cudf::test::NumericTypes); @@ -183,8 +182,7 @@ TYPED_TEST(NumericFactoryTest, NullMaskAsEmptyParm) } class NonNumericFactoryTest : public ColumnFactoryTest, - public testing::WithParamInterface { -}; + public testing::WithParamInterface {}; // All non-numeric types should throw TEST_P(NonNumericFactoryTest, NonNumericThrow) @@ -204,8 +202,7 @@ INSTANTIATE_TEST_CASE_P(NonNumeric, testing::ValuesIn(cudf::test::non_numeric_type_ids)); template -class FixedWidthFactoryTest : public ColumnFactoryTest { -}; +class FixedWidthFactoryTest : public ColumnFactoryTest {}; TYPED_TEST_SUITE(FixedWidthFactoryTest, cudf::test::FixedWidthTypes); @@ -220,8 +217,7 @@ TYPED_TEST(FixedWidthFactoryTest, EmptyNoMask) } template -class EmptyFactoryTest : public ColumnFactoryTest { -}; +class EmptyFactoryTest : public ColumnFactoryTest {}; TYPED_TEST_SUITE(EmptyFactoryTest, cudf::test::AllTypes); @@ -359,8 +355,7 @@ TYPED_TEST(FixedWidthFactoryTest, NullMaskAsEmptyParm) } class NonFixedWidthFactoryTest : public ColumnFactoryTest, - public testing::WithParamInterface { -}; + public testing::WithParamInterface {}; // All non-fixed types should throw TEST_P(NonFixedWidthFactoryTest, NonFixedWidthThrow) @@ -469,8 +464,7 @@ TEST_F(ColumnFactoryTest, DictionaryFromStringScalarError) } template -class ListsFixedWidthLeafTest : public ColumnFactoryTest { -}; +class ListsFixedWidthLeafTest : public ColumnFactoryTest {}; TYPED_TEST_SUITE(ListsFixedWidthLeafTest, cudf::test::FixedWidthTypes); @@ -507,8 +501,7 @@ TYPED_TEST(ListsFixedWidthLeafTest, FromNested) } template -class ListsDictionaryLeafTest : public ColumnFactoryTest { -}; +class ListsDictionaryLeafTest : public ColumnFactoryTest {}; TYPED_TEST_SUITE(ListsDictionaryLeafTest, cudf::test::FixedWidthTypes); @@ -562,8 +555,7 @@ TYPED_TEST(ListsDictionaryLeafTest, FromNested) CUDF_TEST_EXPECT_COLUMNS_EQUAL(*col, *expected); } -class ListsStringLeafTest : public ColumnFactoryTest { -}; +class ListsStringLeafTest : public ColumnFactoryTest {}; TEST_F(ListsStringLeafTest, FromNonNested) { diff --git a/cpp/tests/copying/concatenate_tests.cu b/cpp/tests/copying/concatenate_tests.cu index ca343b963d7..cc913a97405 100644 --- a/cpp/tests/copying/concatenate_tests.cu +++ b/cpp/tests/copying/concatenate_tests.cu @@ -121,8 +121,7 @@ TYPED_TEST(TypedColumnTest, ConcatenateColumnView) CUDF_TEST_EXPECT_COLUMNS_EQUAL(original, *concatenated_col); } -struct StringColumnTest : public cudf::test::BaseFixture { -}; +struct StringColumnTest : public cudf::test::BaseFixture {}; TEST_F(StringColumnTest, ConcatenateColumnView) { @@ -196,8 +195,7 @@ TEST_F(StringColumnTest, ConcatenateTooManyColumns) CUDF_TEST_EXPECT_COLUMNS_EQUAL(*results, expected); } -struct TableTest : public cudf::test::BaseFixture { -}; +struct TableTest : public cudf::test::BaseFixture {}; TEST_F(TableTest, ConcatenateTables) { @@ -338,8 +336,7 @@ TEST_F(TableTest, ConcatenateTablesWithOffsetsAndNulls) } } -struct OverflowTest : public cudf::test::BaseFixture { -}; +struct OverflowTest : public cudf::test::BaseFixture {}; TEST_F(OverflowTest, OverflowTest) { @@ -800,8 +797,7 @@ TEST_F(OverflowTest, BigColumnsSmallSlices) } } -struct StructsColumnTest : public cudf::test::BaseFixture { -}; +struct StructsColumnTest : public cudf::test::BaseFixture {}; TEST_F(StructsColumnTest, ConcatenateStructs) { @@ -1027,8 +1023,7 @@ TEST_F(StructsColumnTest, ConcatenateStructsNested) CUDF_TEST_EXPECT_COLUMNS_EQUIVALENT(*result, *expected); } -struct ListsColumnTest : public cudf::test::BaseFixture { -}; +struct ListsColumnTest : public cudf::test::BaseFixture {}; TEST_F(ListsColumnTest, ConcatenateLists) { @@ -1590,11 +1585,9 @@ TEST_F(ListsColumnTest, ListOfStructs) } template -struct FixedPointTestAllReps : public cudf::test::BaseFixture { -}; +struct FixedPointTestAllReps : public cudf::test::BaseFixture {}; -struct FixedPointTest : public cudf::test::BaseFixture { -}; +struct FixedPointTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(FixedPointTestAllReps, cudf::test::FixedPointTypes); @@ -1651,8 +1644,7 @@ TEST_F(FixedPointTest, FixedPointScaleMismatch) EXPECT_THROW(cudf::concatenate(std::vector{a, b, c}), cudf::logic_error); } -struct DictionaryConcatTest : public cudf::test::BaseFixture { -}; +struct DictionaryConcatTest : public cudf::test::BaseFixture {}; TEST_F(DictionaryConcatTest, StringsKeys) { @@ -1670,8 +1662,7 @@ TEST_F(DictionaryConcatTest, StringsKeys) } template -struct DictionaryConcatTestFW : public cudf::test::BaseFixture { -}; +struct DictionaryConcatTestFW : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(DictionaryConcatTestFW, cudf::test::FixedWidthTypes); diff --git a/cpp/tests/copying/copy_if_else_nested_tests.cpp b/cpp/tests/copying/copy_if_else_nested_tests.cpp index 4641d540bb4..433b81fc788 100644 --- a/cpp/tests/copying/copy_if_else_nested_tests.cpp +++ b/cpp/tests/copying/copy_if_else_nested_tests.cpp @@ -26,12 +26,10 @@ using namespace cudf::test::iterators; -struct CopyIfElseNestedTest : cudf::test::BaseFixture { -}; +struct CopyIfElseNestedTest : cudf::test::BaseFixture {}; template -struct TypedCopyIfElseNestedTest : CopyIfElseNestedTest { -}; +struct TypedCopyIfElseNestedTest : CopyIfElseNestedTest {}; TYPED_TEST_SUITE(TypedCopyIfElseNestedTest, cudf::test::FixedWidthTypes); diff --git a/cpp/tests/copying/copy_range_tests.cpp b/cpp/tests/copying/copy_range_tests.cpp index fec6276791c..75ea31f31d1 100644 --- a/cpp/tests/copying/copy_range_tests.cpp +++ b/cpp/tests/copying/copy_range_tests.cpp @@ -189,8 +189,7 @@ TYPED_TEST(CopyRangeTypedTestFixture, CopyWithNullsNonzeroOffset) this->test(source_slice, expected_slice, target_slice, source_begin, source_end, target_begin); } -class CopyRangeTestFixture : public cudf::test::BaseFixture { -}; +class CopyRangeTestFixture : public cudf::test::BaseFixture {}; TEST_F(CopyRangeTestFixture, CopyWithNullsString) { @@ -363,8 +362,7 @@ TEST_F(CopyRangeTestFixture, CopyDictionary) } } -class CopyRangeErrorTestFixture : public cudf::test::BaseFixture { -}; +class CopyRangeErrorTestFixture : public cudf::test::BaseFixture {}; TEST_F(CopyRangeErrorTestFixture, InvalidInplaceCall) { @@ -469,8 +467,7 @@ TEST_F(CopyRangeErrorTestFixture, DTypeMismatch) } template -struct FixedPointTypesCopyRange : public cudf::test::BaseFixture { -}; +struct FixedPointTypesCopyRange : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(FixedPointTypesCopyRange, cudf::test::FixedPointTypes); diff --git a/cpp/tests/copying/copy_tests.cpp b/cpp/tests/copying/copy_tests.cpp index c6dc49cd583..f896e6dd428 100644 --- a/cpp/tests/copying/copy_tests.cpp +++ b/cpp/tests/copying/copy_tests.cpp @@ -31,8 +31,7 @@ #include template -struct CopyTest : public cudf::test::BaseFixture { -}; +struct CopyTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(CopyTest, cudf::test::FixedWidthTypesWithoutFixedPoint); @@ -230,8 +229,7 @@ TYPED_TEST(CopyTest, CopyIfElseBadInputLength) } } -struct CopyEmptyNested : public cudf::test::BaseFixture { -}; +struct CopyEmptyNested : public cudf::test::BaseFixture {}; TEST_F(CopyEmptyNested, CopyIfElseTestEmptyNestedColumns) { @@ -310,8 +308,7 @@ TEST_F(CopyEmptyNested, CopyIfElseTestEmptyNestedScalars) } template -struct CopyTestNumeric : public cudf::test::BaseFixture { -}; +struct CopyTestNumeric : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(CopyTestNumeric, cudf::test::NumericTypes); TYPED_TEST(CopyTestNumeric, CopyIfElseTestScalarColumn) @@ -398,8 +395,7 @@ struct create_chrono_scalar { }; template -struct CopyTestChrono : public cudf::test::BaseFixture { -}; +struct CopyTestChrono : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(CopyTestChrono, cudf::test::ChronoTypes); TYPED_TEST(CopyTestChrono, CopyIfElseTestScalarColumn) @@ -460,8 +456,7 @@ TYPED_TEST(CopyTestChrono, CopyIfElseTestScalarScalar) CUDF_TEST_EXPECT_COLUMNS_EQUAL(out->view(), expected_w); } -struct CopyTestUntyped : public cudf::test::BaseFixture { -}; +struct CopyTestUntyped : public cudf::test::BaseFixture {}; TEST_F(CopyTestUntyped, CopyIfElseTypeMismatch) { @@ -473,8 +468,7 @@ TEST_F(CopyTestUntyped, CopyIfElseTypeMismatch) EXPECT_THROW(cudf::copy_if_else(lhs_w, rhs_w, mask_w), cudf::logic_error); } -struct StringsCopyIfElseTest : public cudf::test::BaseFixture { -}; +struct StringsCopyIfElseTest : public cudf::test::BaseFixture {}; TEST_F(StringsCopyIfElseTest, CopyIfElse) { @@ -587,8 +581,7 @@ TEST_F(StringsCopyIfElseTest, CopyIfElseScalarScalar) } template -struct FixedPointTypes : public cudf::test::BaseFixture { -}; +struct FixedPointTypes : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(FixedPointTypes, cudf::test::FixedPointTypes); @@ -644,8 +637,7 @@ TYPED_TEST(FixedPointTypes, FixedPointScaleMismatch) EXPECT_THROW(cudf::copy_if_else(a, b, mask), cudf::logic_error); } -struct DictionaryCopyIfElseTest : public cudf::test::BaseFixture { -}; +struct DictionaryCopyIfElseTest : public cudf::test::BaseFixture {}; TEST_F(DictionaryCopyIfElseTest, ColumnColumn) { diff --git a/cpp/tests/copying/detail_gather_tests.cu b/cpp/tests/copying/detail_gather_tests.cu index aae511413ef..17ced5ccd34 100644 --- a/cpp/tests/copying/detail_gather_tests.cu +++ b/cpp/tests/copying/detail_gather_tests.cu @@ -36,8 +36,7 @@ #include template -class GatherTest : public cudf::test::BaseFixture { -}; +class GatherTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(GatherTest, cudf::test::NumericTypes); diff --git a/cpp/tests/copying/gather_list_tests.cpp b/cpp/tests/copying/gather_list_tests.cpp index 6f25c0cb85f..f776d9f69f3 100644 --- a/cpp/tests/copying/gather_list_tests.cpp +++ b/cpp/tests/copying/gather_list_tests.cpp @@ -29,8 +29,7 @@ #include template -class GatherTestListTyped : public cudf::test::BaseFixture { -}; +class GatherTestListTyped : public cudf::test::BaseFixture {}; using FixedWidthTypesNotBool = cudf::test::Concat; TYPED_TEST_SUITE(GatherTestListTyped, FixedWidthTypesNotBool); -class GatherTestList : public cudf::test::BaseFixture { -}; +class GatherTestList : public cudf::test::BaseFixture {}; // to disambiguate between {} == 0 and {} == List{0} // Also, see note about compiler issues when declaring nested diff --git a/cpp/tests/copying/gather_str_tests.cpp b/cpp/tests/copying/gather_str_tests.cpp index 7810566fbf1..a046052883d 100644 --- a/cpp/tests/copying/gather_str_tests.cpp +++ b/cpp/tests/copying/gather_str_tests.cpp @@ -27,8 +27,7 @@ #include -class GatherTestStr : public cudf::test::BaseFixture { -}; +class GatherTestStr : public cudf::test::BaseFixture {}; TEST_F(GatherTestStr, StringColumn) { diff --git a/cpp/tests/copying/gather_struct_tests.cpp b/cpp/tests/copying/gather_struct_tests.cpp index f6fc640c957..ebfd950df4d 100644 --- a/cpp/tests/copying/gather_struct_tests.cpp +++ b/cpp/tests/copying/gather_struct_tests.cpp @@ -56,12 +56,10 @@ using lists = cudf::test::lists_column_wrapper; auto constexpr null_index = std::numeric_limits::max(); -struct StructGatherTest : public cudf::test::BaseFixture { -}; +struct StructGatherTest : public cudf::test::BaseFixture {}; template -struct TypedStructGatherTest : public cudf::test::BaseFixture { -}; +struct TypedStructGatherTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(TypedStructGatherTest, cudf::test::FixedWidthTypes); diff --git a/cpp/tests/copying/gather_tests.cpp b/cpp/tests/copying/gather_tests.cpp index 9c8d6102000..831d932b48d 100644 --- a/cpp/tests/copying/gather_tests.cpp +++ b/cpp/tests/copying/gather_tests.cpp @@ -28,8 +28,7 @@ #include template -class GatherTest : public cudf::test::BaseFixture { -}; +class GatherTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(GatherTest, cudf::test::NumericTypes); diff --git a/cpp/tests/copying/get_value_tests.cpp b/cpp/tests/copying/get_value_tests.cpp index a35bbab0176..a18ed6a1ccf 100644 --- a/cpp/tests/copying/get_value_tests.cpp +++ b/cpp/tests/copying/get_value_tests.cpp @@ -36,8 +36,7 @@ using namespace cudf::test::iterators; template -struct FixedWidthGetValueTest : public cudf::test::BaseFixture { -}; +struct FixedWidthGetValueTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(FixedWidthGetValueTest, cudf::test::FixedWidthTypesWithoutFixedPoint); @@ -82,8 +81,7 @@ TYPED_TEST(FixedWidthGetValueTest, IndexOutOfBounds) EXPECT_THROW(cudf::get_element(col, 4), cudf::logic_error); } -struct StringGetValueTest : public cudf::test::BaseFixture { -}; +struct StringGetValueTest : public cudf::test::BaseFixture {}; TEST_F(StringGetValueTest, BasicGet) { @@ -127,8 +125,7 @@ TEST_F(StringGetValueTest, GetNull) } template -struct DictionaryGetValueTest : public cudf::test::BaseFixture { -}; +struct DictionaryGetValueTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(DictionaryGetValueTest, cudf::test::FixedWidthTypesWithoutFixedPoint); @@ -797,11 +794,9 @@ TYPED_TEST(ListGetStructValueTest, NestedGetNull) CUDF_TEST_EXPECT_COLUMNS_EQUIVALENT(*expected_data, typed_s->view()); } -struct StructGetValueTest : public cudf::test::BaseFixture { -}; +struct StructGetValueTest : public cudf::test::BaseFixture {}; template -struct StructGetValueTestTyped : public cudf::test::BaseFixture { -}; +struct StructGetValueTestTyped : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(StructGetValueTestTyped, cudf::test::FixedWidthTypes); diff --git a/cpp/tests/copying/purge_nonempty_nulls_tests.cpp b/cpp/tests/copying/purge_nonempty_nulls_tests.cpp index 76a36f1489d..085b01e0239 100644 --- a/cpp/tests/copying/purge_nonempty_nulls_tests.cpp +++ b/cpp/tests/copying/purge_nonempty_nulls_tests.cpp @@ -131,7 +131,7 @@ TEST_F(PurgeNonEmptyNullsTest, SingleLevelList) auto const expected = LCW{{ LCW{} // NULL. }, - null_at(0)}; + null_at(0)}; CUDF_TEST_EXPECT_COLUMNS_EQUAL(results->view(), expected); CUDF_TEST_EXPECT_COLUMNS_EQUAL(results_lists_view.offsets(), offsets_col_t{0, 0}); CUDF_TEST_EXPECT_COLUMNS_EQUAL(results_lists_view.child(), values_col_t{}); @@ -306,7 +306,7 @@ TEST_F(PurgeNonEmptyNullsTest, ListOfStrings) {"55555"}, {"11", "22", "33", "44"}, }, - null_at(0)}; + null_at(0)}; CUDF_TEST_EXPECT_COLUMNS_EQUAL(*results, expected); CUDF_TEST_EXPECT_COLUMNS_EQUAL(results_list_view.offsets(), offsets_col_t{0, 0, 3, 4, 8}); CUDF_TEST_EXPECT_COLUMNS_EQUAL( diff --git a/cpp/tests/copying/reverse_tests.cpp b/cpp/tests/copying/reverse_tests.cpp index e7195f0a91d..871c37151ab 100644 --- a/cpp/tests/copying/reverse_tests.cpp +++ b/cpp/tests/copying/reverse_tests.cpp @@ -35,8 +35,7 @@ constexpr cudf::test::debug_output_level verbosity{cudf::test::debug_output_level::ALL_ERRORS}; template -class ReverseTypedTestFixture : public cudf::test::BaseFixture { -}; +class ReverseTypedTestFixture : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(ReverseTypedTestFixture, cudf::test::AllTypes); TYPED_TEST(ReverseTypedTestFixture, ReverseTable) @@ -131,8 +130,7 @@ TYPED_TEST(ReverseTypedTestFixture, ZeroSizeInput) CUDF_TEST_EXPECT_COLUMNS_EQUAL(p_ret->view().column(0), expected); } -class ReverseStringTestFixture : public cudf::test::BaseFixture { -}; +class ReverseStringTestFixture : public cudf::test::BaseFixture {}; TEST_F(ReverseStringTestFixture, ReverseNullable) { diff --git a/cpp/tests/copying/sample_tests.cpp b/cpp/tests/copying/sample_tests.cpp index 8cb2b9ce74e..98103a4c011 100644 --- a/cpp/tests/copying/sample_tests.cpp +++ b/cpp/tests/copying/sample_tests.cpp @@ -27,8 +27,7 @@ #include #include -struct SampleTest : public cudf::test::BaseFixture { -}; +struct SampleTest : public cudf::test::BaseFixture {}; TEST_F(SampleTest, FailCaseRowMultipleSampling) { @@ -84,8 +83,7 @@ TEST_F(SampleTest, TestReproducibilityWithSeed) struct SampleBasicTest : public SampleTest, public ::testing::WithParamInterface< - std::tuple> { -}; + std::tuple> {}; TEST_P(SampleBasicTest, CombinationOfParameters) { diff --git a/cpp/tests/copying/scatter_list_scalar_tests.cpp b/cpp/tests/copying/scatter_list_scalar_tests.cpp index 4d843f74527..b5ebb2a37a3 100644 --- a/cpp/tests/copying/scatter_list_scalar_tests.cpp +++ b/cpp/tests/copying/scatter_list_scalar_tests.cpp @@ -26,8 +26,7 @@ using mask_vector = std::vector; using size_column = cudf::test::fixed_width_column_wrapper; -class ScatterListScalarTests : public cudf::test::BaseFixture { -}; +class ScatterListScalarTests : public cudf::test::BaseFixture {}; std::unique_ptr single_scalar_scatter(cudf::column_view const& target, cudf::scalar const& slr, @@ -40,8 +39,7 @@ std::unique_ptr single_scalar_scatter(cudf::column_view const& tar } template -class ScatterListOfFixedWidthScalarTest : public ScatterListScalarTests { -}; +class ScatterListOfFixedWidthScalarTest : public ScatterListScalarTests {}; TYPED_TEST_SUITE(ScatterListOfFixedWidthScalarTest, cudf::test::FixedWidthTypesWithoutFixedPoint); @@ -117,8 +115,7 @@ TYPED_TEST(ScatterListOfFixedWidthScalarTest, NullableTargetRow) CUDF_TEST_EXPECT_COLUMNS_EQUIVALENT(*result, expected); } -class ScatterListOfStringScalarTest : public ScatterListScalarTests { -}; +class ScatterListOfStringScalarTest : public ScatterListScalarTests {}; TEST_F(ScatterListOfStringScalarTest, Basic) { @@ -205,8 +202,7 @@ TEST_F(ScatterListOfStringScalarTest, NullableTargetRow) } template -class ScatterListOfListScalarTest : public ScatterListScalarTests { -}; +class ScatterListOfListScalarTest : public ScatterListScalarTests {}; TYPED_TEST_SUITE(ScatterListOfListScalarTest, cudf::test::FixedWidthTypesWithoutFixedPoint); diff --git a/cpp/tests/copying/scatter_list_tests.cpp b/cpp/tests/copying/scatter_list_tests.cpp index 53f3da7458b..431ea1a25ae 100644 --- a/cpp/tests/copying/scatter_list_tests.cpp +++ b/cpp/tests/copying/scatter_list_tests.cpp @@ -26,13 +26,11 @@ #include template -class TypedScatterListsTest : public cudf::test::BaseFixture { -}; +class TypedScatterListsTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(TypedScatterListsTest, cudf::test::FixedWidthTypes); -class ScatterListsTest : public cudf::test::BaseFixture { -}; +class ScatterListsTest : public cudf::test::BaseFixture {}; TYPED_TEST(TypedScatterListsTest, ListsOfFixedWidth) { diff --git a/cpp/tests/copying/scatter_struct_scalar_tests.cpp b/cpp/tests/copying/scatter_struct_scalar_tests.cpp index 3df73ec41ad..01127b9c535 100644 --- a/cpp/tests/copying/scatter_struct_scalar_tests.cpp +++ b/cpp/tests/copying/scatter_struct_scalar_tests.cpp @@ -31,8 +31,7 @@ constexpr int32_t XXX{0}; // Mark for null struct elements using structs_col = cudf::test::structs_column_wrapper; template -struct TypedStructScalarScatterTest : public cudf::test::BaseFixture { -}; +struct TypedStructScalarScatterTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(TypedStructScalarScatterTest, cudf::test::FixedWidthTypes); diff --git a/cpp/tests/copying/scatter_struct_tests.cpp b/cpp/tests/copying/scatter_struct_tests.cpp index bcd57259b8d..2d92cdf09b7 100644 --- a/cpp/tests/copying/scatter_struct_tests.cpp +++ b/cpp/tests/copying/scatter_struct_tests.cpp @@ -36,8 +36,7 @@ constexpr int32_t null{0}; // Mark for null child elements constexpr int32_t XXX{0}; // Mark for null struct elements template -struct TypedStructScatterTest : public cudf::test::BaseFixture { -}; +struct TypedStructScatterTest : public cudf::test::BaseFixture {}; using TestTypes = cudf::test::Concat{0, 1, 1, 0, 0, 1, 1, 0, 0}; auto lists_col_expected = lists_col{ - {{1}, {2, 3}, {80}, {70, 75}, {55, 60, 65}, {35, 40, 45, 50}, {5}, {10, 15}, {20, 25, 30}}, + {{1}, {2, 3}, {80}, {70, 75}, {55, 60, 65}, {35, 40, 45, 50}, {5}, {10, 15}, {20, 25, 30}}, validity_expected.begin()}; auto const structs_expected = structs_col{{lists_col_expected}}.release(); diff --git a/cpp/tests/copying/scatter_tests.cpp b/cpp/tests/copying/scatter_tests.cpp index 2035d9a4b53..3a622620c01 100644 --- a/cpp/tests/copying/scatter_tests.cpp +++ b/cpp/tests/copying/scatter_tests.cpp @@ -25,8 +25,7 @@ #include #include -class ScatterUntypedTests : public cudf::test::BaseFixture { -}; +class ScatterUntypedTests : public cudf::test::BaseFixture {}; // Throw logic error if scatter map is longer than source TEST_F(ScatterUntypedTests, ScatterMapTooLong) @@ -126,8 +125,7 @@ TEST_F(ScatterUntypedTests, ScatterScalarDataTypeMismatch) } template -class ScatterIndexTypeTests : public cudf::test::BaseFixture { -}; +class ScatterIndexTypeTests : public cudf::test::BaseFixture {}; using IndexTypes = cudf::test::Types; TYPED_TEST_SUITE(ScatterIndexTypeTests, IndexTypes); @@ -169,8 +167,7 @@ TYPED_TEST(ScatterIndexTypeTests, ScatterScalarIndexType) } template -class ScatterInvalidIndexTypeTests : public cudf::test::BaseFixture { -}; +class ScatterInvalidIndexTypeTests : public cudf::test::BaseFixture {}; // NOTE string types hit static assert in fixed_width_column_wrapper using InvalidIndexTypes = cudf::test::Concat, @@ -207,8 +204,7 @@ TYPED_TEST(ScatterInvalidIndexTypeTests, ScatterScalarInvalidIndexType) } template -class ScatterDataTypeTests : public cudf::test::BaseFixture { -}; +class ScatterDataTypeTests : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(ScatterDataTypeTests, cudf::test::FixedWidthTypes); @@ -437,8 +433,7 @@ TYPED_TEST(ScatterDataTypeTests, ScatterSourceNullsLarge) CUDF_TEST_EXPECT_TABLES_EQUAL(result->view(), expected_table); } -class ScatterStringsTests : public cudf::test::BaseFixture { -}; +class ScatterStringsTests : public cudf::test::BaseFixture {}; TEST_F(ScatterStringsTests, ScatterNoNulls) { @@ -500,8 +495,7 @@ TEST_F(ScatterStringsTests, EmptyStrings) } template -class BooleanMaskScatter : public cudf::test::BaseFixture { -}; +class BooleanMaskScatter : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(BooleanMaskScatter, cudf::test::FixedWidthTypes); @@ -550,8 +544,7 @@ TYPED_TEST(BooleanMaskScatter, WithNull) CUDF_TEST_EXPECT_TABLES_EQUAL(expected_table, got->view()); } -class BooleanMaskScatterString : public cudf::test::BaseFixture { -}; +class BooleanMaskScatterString : public cudf::test::BaseFixture {}; TEST_F(BooleanMaskScatterString, NoNUll) { @@ -585,8 +578,7 @@ TEST_F(BooleanMaskScatterString, WithNUll) CUDF_TEST_EXPECT_TABLES_EQUAL(expected_table, got->view()); } -class BooleanMaskScatterFails : public cudf::test::BaseFixture { -}; +class BooleanMaskScatterFails : public cudf::test::BaseFixture {}; TEST_F(BooleanMaskScatterFails, SourceAndTargetTypeMismatch) { @@ -724,8 +716,7 @@ TYPED_TEST(BooleanMaskScalarScatter, WithNull) CUDF_TEST_EXPECT_TABLES_EQUAL(expected_table, got->view()); } -class BooleanMaskScatterScalarString : public cudf::test::BaseFixture { -}; +class BooleanMaskScatterScalarString : public cudf::test::BaseFixture {}; TEST_F(BooleanMaskScatterScalarString, NoNUll) { @@ -764,8 +755,7 @@ TEST_F(BooleanMaskScatterScalarString, WithNUll) CUDF_TEST_EXPECT_TABLES_EQUAL(expected_table, got->view()); } -class BooleanMaskScatterScalarFails : public cudf::test::BaseFixture { -}; +class BooleanMaskScatterScalarFails : public cudf::test::BaseFixture {}; TEST_F(BooleanMaskScatterScalarFails, SourceAndTargetTypeMismatch) { @@ -825,8 +815,7 @@ TEST_F(BooleanMaskScatterScalarFails, NumberOfColumnAndScalarMismatch) } template -struct FixedPointTestAllReps : public cudf::test::BaseFixture { -}; +struct FixedPointTestAllReps : public cudf::test::BaseFixture {}; template using wrapper = cudf::test::fixed_width_column_wrapper; diff --git a/cpp/tests/copying/segmented_gather_list_tests.cpp b/cpp/tests/copying/segmented_gather_list_tests.cpp index fc21af2087b..dda54cb5289 100644 --- a/cpp/tests/copying/segmented_gather_list_tests.cpp +++ b/cpp/tests/copying/segmented_gather_list_tests.cpp @@ -29,8 +29,7 @@ #include template -class SegmentedGatherTest : public cudf::test::BaseFixture { -}; +class SegmentedGatherTest : public cudf::test::BaseFixture {}; using FixedWidthTypesNotBool = cudf::test::Concat>>, with out-of-bounds gather indices. { auto const list = LCW{{{{2, 3}, {4, 5}}, {{6, 7, 8}, {9, 10, 11}, {12, 13, 14}}}, - {{{15, 16}, {17, 18}, {17, 18}, {17, 18}, {17, 18}}}, - {{LCW{0}}}, - {{{10}, {20, 30, 40, 50}, {60, 70, 80}}, - {{0, 1, 3}, {5}}, - {{11, 12, 13, 14, 15}, {16, 17}, {0}}}, - {{{10, 20}}, {LCW{30}}, {{40, 50}, {60, 70, 80}}}}; + {{{15, 16}, {17, 18}, {17, 18}, {17, 18}, {17, 18}}}, + {{LCW{0}}}, + {{{10}, {20, 30, 40, 50}, {60, 70, 80}}, + {{0, 1, 3}, {5}}, + {{11, 12, 13, 14, 15}, {16, 17}, {0}}}, + {{{10, 20}}, {LCW{30}}, {{40, 50}, {60, 70, 80}}}}; auto const gather_map = LCW{{1}, LCW{}, {0}, {1}, {0, -1, 3, -4}}; auto const results = cudf::lists::segmented_gather( cudf::lists_column_view{list}, cudf::lists_column_view{gather_map}, NULLIFY); @@ -517,8 +516,8 @@ TEST_F(SegmentedGatherTestString, StringGather) auto const list = LCW{{"a", "b", "c", "d"}, {"1", "22", "333", "4"}, {"x", "y", "z"}}; auto const gather_map = LCW{{0, 1, 3, 4}, {1, -5, 3, 2}, LCW{}}; auto const expected = LCW{{{"a", "b", "d", "c"}, cudf::test::iterators::null_at(3)}, - {{"22", "1", "4", "333"}, cudf::test::iterators::null_at(1)}, - LCW{}}; + {{"22", "1", "4", "333"}, cudf::test::iterators::null_at(1)}, + LCW{}}; auto result = cudf::lists::segmented_gather( cudf::lists_column_view{list}, cudf::lists_column_view{gather_map}, NULLIFY); CUDF_TEST_EXPECT_COLUMNS_EQUAL(expected, result->view()); diff --git a/cpp/tests/copying/shift_tests.cpp b/cpp/tests/copying/shift_tests.cpp index aa0a618c4ec..2a4238b24ab 100644 --- a/cpp/tests/copying/shift_tests.cpp +++ b/cpp/tests/copying/shift_tests.cpp @@ -70,8 +70,7 @@ constexpr auto lowest() } template -struct ShiftTestsTyped : public cudf::test::BaseFixture { -}; +struct ShiftTestsTyped : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(ShiftTestsTyped, cudf::test::FixedWidthTypes); @@ -196,8 +195,7 @@ TYPED_TEST(ShiftTestsTyped, MismatchFillValueDtypes) EXPECT_THROW(cudf::shift(input, 5, fill), cudf::logic_error); } -struct ShiftTests : public cudf::test::BaseFixture { -}; +struct ShiftTests : public cudf::test::BaseFixture {}; TEST_F(ShiftTests, StringsShiftTest) { diff --git a/cpp/tests/copying/slice_tests.cpp b/cpp/tests/copying/slice_tests.cpp index b46fce90df5..afc148f5612 100644 --- a/cpp/tests/copying/slice_tests.cpp +++ b/cpp/tests/copying/slice_tests.cpp @@ -33,8 +33,7 @@ #include template -struct SliceTest : public cudf::test::BaseFixture { -}; +struct SliceTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(SliceTest, cudf::test::NumericTypes); @@ -85,8 +84,7 @@ TYPED_TEST(SliceTest, NumericColumnsWithNullsAsColumn) } } -struct SliceStringTest : public SliceTest { -}; +struct SliceStringTest : public SliceTest {}; TEST_F(SliceStringTest, StringWithNulls) { @@ -132,8 +130,7 @@ TEST_F(SliceStringTest, StringWithNullsAsColumn) } } -struct SliceListTest : public SliceTest { -}; +struct SliceListTest : public SliceTest {}; TEST_F(SliceListTest, Lists) { @@ -258,8 +255,7 @@ TEST_F(SliceListTest, ListsWithNulls) } } -struct SliceCornerCases : public SliceTest { -}; +struct SliceCornerCases : public SliceTest {}; TEST_F(SliceCornerCases, EmptyColumn) { @@ -338,8 +334,7 @@ TEST_F(SliceCornerCases, NegativeOffset) } template -struct SliceTableTest : public cudf::test::BaseFixture { -}; +struct SliceTableTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(SliceTableTest, cudf::test::NumericTypes); @@ -367,8 +362,7 @@ TYPED_TEST(SliceTableTest, NumericColumnsWithNulls) } } -struct SliceStringTableTest : public SliceTableTest { -}; +struct SliceStringTableTest : public SliceTableTest {}; TEST_F(SliceStringTableTest, StringWithNulls) { @@ -399,8 +393,7 @@ TEST_F(SliceStringTableTest, StringWithNulls) } } -struct SliceTableCornerCases : public SliceTableTest { -}; +struct SliceTableCornerCases : public SliceTableTest {}; TEST_F(SliceTableCornerCases, EmptyTable) { diff --git a/cpp/tests/copying/split_tests.cpp b/cpp/tests/copying/split_tests.cpp index 6324fe2bab5..f316da0484b 100644 --- a/cpp/tests/copying/split_tests.cpp +++ b/cpp/tests/copying/split_tests.cpp @@ -162,8 +162,7 @@ std::vector create_expected_string_tables_for_splits( } template -struct SplitTest : public cudf::test::BaseFixture { -}; +struct SplitTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(SplitTest, cudf::test::NumericTypes); @@ -304,8 +303,7 @@ TYPED_TEST(SplitTest, LongColumn) false); } -struct SplitStringTest : public SplitTest { -}; +struct SplitStringTest : public SplitTest {}; TEST_F(SplitStringTest, StringWithInvalids) { @@ -328,8 +326,7 @@ TEST_F(SplitStringTest, StringWithInvalids) } } -struct SplitCornerCases : public SplitTest { -}; +struct SplitCornerCases : public SplitTest {}; TEST_F(SplitCornerCases, EmptyColumn) { @@ -552,8 +549,7 @@ void split_empty_output_column_value(SplitFunc Split, CompareFunc Compare) // regular splits template -struct SplitTableTest : public cudf::test::BaseFixture { -}; +struct SplitTableTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(SplitTableTest, cudf::test::NumericTypes); TYPED_TEST(SplitTableTest, SplitEndLessThanSize) @@ -578,8 +574,7 @@ TYPED_TEST(SplitTableTest, SplitEndToSize) }); } -struct SplitTableCornerCases : public SplitTest { -}; +struct SplitTableCornerCases : public SplitTest {}; TEST_F(SplitTableCornerCases, EmptyTable) { @@ -726,8 +721,7 @@ void split_null_input_strings_column_value(SplitFunc Split, CompareFunc Compare) } // split with strings -struct SplitStringTableTest : public SplitTest { -}; +struct SplitStringTableTest : public SplitTest {}; TEST_F(SplitStringTableTest, StringWithInvalids) { @@ -760,8 +754,7 @@ TEST_F(SplitStringTableTest, NullStringColumn) }); } -struct SplitNestedTypesTest : public cudf::test::BaseFixture { -}; +struct SplitNestedTypesTest : public cudf::test::BaseFixture {}; // common functions for testing split/contiguous_split template @@ -1171,8 +1164,7 @@ TEST_F(SplitNestedTypesTest, StructsOfList) } template -struct ContiguousSplitTest : public cudf::test::BaseFixture { -}; +struct ContiguousSplitTest : public cudf::test::BaseFixture {}; // the various utility functions in slice_tests.cuh don't like the chrono types using FixedWidthTypesWithoutChrono = @@ -1276,8 +1268,7 @@ thrust::make_counting_iterator(10000)); ); } */ -struct ContiguousSplitUntypedTest : public cudf::test::BaseFixture { -}; +struct ContiguousSplitUntypedTest : public cudf::test::BaseFixture {}; TEST_F(ContiguousSplitUntypedTest, ProgressiveSizes) { @@ -1371,8 +1362,7 @@ TEST_F(ContiguousSplitUntypedTest, DISABLED_VeryLargeColumnTest) } // contiguous split with strings -struct ContiguousSplitStringTableTest : public SplitTest { -}; +struct ContiguousSplitStringTableTest : public SplitTest {}; TEST_F(ContiguousSplitStringTableTest, StringWithInvalids) { @@ -1440,8 +1430,7 @@ TEST_F(ContiguousSplitStringTableTest, NullStringColumn) // contiguous splits template -struct ContiguousSplitTableTest : public cudf::test::BaseFixture { -}; +struct ContiguousSplitTableTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(ContiguousSplitTableTest, FixedWidthTypesWithoutChrono); TYPED_TEST(ContiguousSplitTableTest, SplitEndLessThanSize) @@ -1466,8 +1455,7 @@ TYPED_TEST(ContiguousSplitTableTest, SplitEndToSize) }); } -struct ContiguousSplitTableCornerCases : public SplitTest { -}; +struct ContiguousSplitTableCornerCases : public SplitTest {}; TEST_F(ContiguousSplitTableCornerCases, EmptyTable) { @@ -1890,8 +1878,7 @@ TEST_F(ContiguousSplitTableCornerCases, SplitEmpty) } } -struct ContiguousSplitNestedTypesTest : public cudf::test::BaseFixture { -}; +struct ContiguousSplitNestedTypesTest : public cudf::test::BaseFixture {}; TEST_F(ContiguousSplitNestedTypesTest, Lists) { diff --git a/cpp/tests/copying/utility_tests.cpp b/cpp/tests/copying/utility_tests.cpp index 94ea759b96d..e97d0057ed6 100644 --- a/cpp/tests/copying/utility_tests.cpp +++ b/cpp/tests/copying/utility_tests.cpp @@ -30,8 +30,7 @@ #include template -struct EmptyLikeTest : public cudf::test::BaseFixture { -}; +struct EmptyLikeTest : public cudf::test::BaseFixture {}; using numeric_types = cudf::test::NumericTypes; @@ -47,8 +46,7 @@ TYPED_TEST(EmptyLikeTest, ColumnNumericTests) CUDF_TEST_EXPECT_COLUMNS_EQUAL(*expected, *got); } -struct EmptyLikeStringTest : public EmptyLikeTest { -}; +struct EmptyLikeStringTest : public EmptyLikeTest {}; void check_empty_string_columns(cudf::column_view lhs, cudf::column_view rhs) { @@ -77,8 +75,7 @@ TEST_F(EmptyLikeStringTest, ColumnStringTest) } template -struct EmptyLikeScalarTest : public cudf::test::BaseFixture { -}; +struct EmptyLikeScalarTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(EmptyLikeScalarTest, cudf::test::FixedWidthTypes); @@ -97,8 +94,7 @@ TYPED_TEST(EmptyLikeScalarTest, FixedWidth) CUDF_TEST_EXPECT_COLUMNS_EQUIVALENT(*expected, *result); } -struct EmptyLikeScalarStringTest : public EmptyLikeScalarTest { -}; +struct EmptyLikeScalarStringTest : public EmptyLikeScalarTest {}; TEST_F(EmptyLikeScalarStringTest, String) { @@ -115,8 +111,7 @@ TEST_F(EmptyLikeScalarStringTest, String) CUDF_TEST_EXPECT_COLUMNS_EQUIVALENT(*expected, *result); } -struct EmptyLikeScalarListTest : public EmptyLikeScalarTest { -}; +struct EmptyLikeScalarListTest : public EmptyLikeScalarTest {}; TEST_F(EmptyLikeScalarListTest, List) { @@ -133,8 +128,7 @@ TEST_F(EmptyLikeScalarListTest, List) CUDF_TEST_EXPECT_COLUMNS_EQUIVALENT(*expected, *result); } -struct EmptyLikeScalarStructTest : public EmptyLikeScalarTest { -}; +struct EmptyLikeScalarStructTest : public EmptyLikeScalarTest {}; TEST_F(EmptyLikeScalarStructTest, Struct) { @@ -169,8 +163,7 @@ std::unique_ptr create_table(cudf::size_type size, cudf::mask_state return std::make_unique(std::move(columns)); } -struct EmptyLikeTableTest : public cudf::test::BaseFixture { -}; +struct EmptyLikeTableTest : public cudf::test::BaseFixture {}; TEST_F(EmptyLikeTableTest, TableTest) { @@ -184,8 +177,7 @@ TEST_F(EmptyLikeTableTest, TableTest) } template -struct AllocateLikeTest : public cudf::test::BaseFixture { -}; +struct AllocateLikeTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(AllocateLikeTest, numeric_types); diff --git a/cpp/tests/datetime/datetime_ops_test.cpp b/cpp/tests/datetime/datetime_ops_test.cpp index c6d36b2aa6e..0627dab37ed 100644 --- a/cpp/tests/datetime/datetime_ops_test.cpp +++ b/cpp/tests/datetime/datetime_ops_test.cpp @@ -70,8 +70,7 @@ TYPED_TEST(NonTimestampTest, TestThrowsOnNonTimestamp) cudf::logic_error); } -struct BasicDatetimeOpsTest : public cudf::test::BaseFixture { -}; +struct BasicDatetimeOpsTest : public cudf::test::BaseFixture {}; TEST_F(BasicDatetimeOpsTest, TestExtractingDatetimeComponents) { @@ -529,8 +528,7 @@ TEST_F(BasicDatetimeOpsTest, TestAddMonthsWithIncorrectColSizes) using ValidMonthIntegerType = cudf::test::Types; template -struct TypedAddMonthsTest : public cudf::test::BaseFixture { -}; +struct TypedAddMonthsTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(TypedAddMonthsTest, ValidMonthIntegerType); diff --git a/cpp/tests/dictionary/add_keys_test.cpp b/cpp/tests/dictionary/add_keys_test.cpp index 42dc2ccf66d..8d466bd29ce 100644 --- a/cpp/tests/dictionary/add_keys_test.cpp +++ b/cpp/tests/dictionary/add_keys_test.cpp @@ -23,8 +23,7 @@ #include -struct DictionaryAddKeysTest : public cudf::test::BaseFixture { -}; +struct DictionaryAddKeysTest : public cudf::test::BaseFixture {}; TEST_F(DictionaryAddKeysTest, StringsColumn) { diff --git a/cpp/tests/dictionary/decode_test.cpp b/cpp/tests/dictionary/decode_test.cpp index 4fdd2b54366..3f3cb35f2b9 100644 --- a/cpp/tests/dictionary/decode_test.cpp +++ b/cpp/tests/dictionary/decode_test.cpp @@ -22,8 +22,7 @@ #include -struct DictionaryDecodeTest : public cudf::test::BaseFixture { -}; +struct DictionaryDecodeTest : public cudf::test::BaseFixture {}; TEST_F(DictionaryDecodeTest, StringColumn) { diff --git a/cpp/tests/dictionary/encode_test.cpp b/cpp/tests/dictionary/encode_test.cpp index 913d0a91684..dfff3138ead 100644 --- a/cpp/tests/dictionary/encode_test.cpp +++ b/cpp/tests/dictionary/encode_test.cpp @@ -22,8 +22,7 @@ #include -struct DictionaryEncodeTest : public cudf::test::BaseFixture { -}; +struct DictionaryEncodeTest : public cudf::test::BaseFixture {}; TEST_F(DictionaryEncodeTest, EncodeStringColumn) { diff --git a/cpp/tests/dictionary/factories_test.cpp b/cpp/tests/dictionary/factories_test.cpp index 195c9794d21..b94a6ac5ef7 100644 --- a/cpp/tests/dictionary/factories_test.cpp +++ b/cpp/tests/dictionary/factories_test.cpp @@ -23,8 +23,7 @@ #include -struct DictionaryFactoriesTest : public cudf::test::BaseFixture { -}; +struct DictionaryFactoriesTest : public cudf::test::BaseFixture {}; TEST_F(DictionaryFactoriesTest, CreateFromColumnViews) { diff --git a/cpp/tests/dictionary/fill_test.cpp b/cpp/tests/dictionary/fill_test.cpp index 085d76485fc..2481290f0c7 100644 --- a/cpp/tests/dictionary/fill_test.cpp +++ b/cpp/tests/dictionary/fill_test.cpp @@ -24,8 +24,7 @@ #include -struct DictionaryFillTest : public cudf::test::BaseFixture { -}; +struct DictionaryFillTest : public cudf::test::BaseFixture {}; TEST_F(DictionaryFillTest, StringsColumn) { diff --git a/cpp/tests/dictionary/gather_test.cpp b/cpp/tests/dictionary/gather_test.cpp index bb76b143408..fa040eb771d 100644 --- a/cpp/tests/dictionary/gather_test.cpp +++ b/cpp/tests/dictionary/gather_test.cpp @@ -24,8 +24,7 @@ #include -struct DictionaryGatherTest : public cudf::test::BaseFixture { -}; +struct DictionaryGatherTest : public cudf::test::BaseFixture {}; TEST_F(DictionaryGatherTest, Gather) { diff --git a/cpp/tests/dictionary/remove_keys_test.cpp b/cpp/tests/dictionary/remove_keys_test.cpp index 6481f2ea9d9..c5d51f5892f 100644 --- a/cpp/tests/dictionary/remove_keys_test.cpp +++ b/cpp/tests/dictionary/remove_keys_test.cpp @@ -26,8 +26,7 @@ #include -struct DictionaryRemoveKeysTest : public cudf::test::BaseFixture { -}; +struct DictionaryRemoveKeysTest : public cudf::test::BaseFixture {}; TEST_F(DictionaryRemoveKeysTest, StringsColumn) { diff --git a/cpp/tests/dictionary/scatter_test.cpp b/cpp/tests/dictionary/scatter_test.cpp index 078f8b482b3..d54111b6bbf 100644 --- a/cpp/tests/dictionary/scatter_test.cpp +++ b/cpp/tests/dictionary/scatter_test.cpp @@ -24,8 +24,7 @@ #include -struct DictionaryScatterTest : public cudf::test::BaseFixture { -}; +struct DictionaryScatterTest : public cudf::test::BaseFixture {}; TEST_F(DictionaryScatterTest, Scatter) { diff --git a/cpp/tests/dictionary/search_test.cpp b/cpp/tests/dictionary/search_test.cpp index 11cafa7dd8e..b3114144535 100644 --- a/cpp/tests/dictionary/search_test.cpp +++ b/cpp/tests/dictionary/search_test.cpp @@ -20,8 +20,7 @@ #include #include -struct DictionarySearchTest : public cudf::test::BaseFixture { -}; +struct DictionarySearchTest : public cudf::test::BaseFixture {}; TEST_F(DictionarySearchTest, StringsColumn) { diff --git a/cpp/tests/dictionary/set_keys_test.cpp b/cpp/tests/dictionary/set_keys_test.cpp index ec8f6a0cdbf..86eb1bae603 100644 --- a/cpp/tests/dictionary/set_keys_test.cpp +++ b/cpp/tests/dictionary/set_keys_test.cpp @@ -25,8 +25,7 @@ #include -struct DictionarySetKeysTest : public cudf::test::BaseFixture { -}; +struct DictionarySetKeysTest : public cudf::test::BaseFixture {}; TEST_F(DictionarySetKeysTest, StringsKeys) { diff --git a/cpp/tests/dictionary/slice_test.cpp b/cpp/tests/dictionary/slice_test.cpp index 23a72776388..541b3ac1503 100644 --- a/cpp/tests/dictionary/slice_test.cpp +++ b/cpp/tests/dictionary/slice_test.cpp @@ -25,8 +25,7 @@ #include -struct DictionarySliceTest : public cudf::test::BaseFixture { -}; +struct DictionarySliceTest : public cudf::test::BaseFixture {}; TEST_F(DictionarySliceTest, SliceColumn) { diff --git a/cpp/tests/encode/encode_tests.cpp b/cpp/tests/encode/encode_tests.cpp index 21953dfdb98..a521493640e 100644 --- a/cpp/tests/encode/encode_tests.cpp +++ b/cpp/tests/encode/encode_tests.cpp @@ -22,8 +22,7 @@ #include template -class EncodeNumericTests : public cudf::test::BaseFixture { -}; +class EncodeNumericTests : public cudf::test::BaseFixture {}; using NumericTypesNotBool = cudf::test::Concat; @@ -83,8 +82,7 @@ TYPED_TEST(EncodeNumericTests, UnorderedWithNulls) CUDF_TEST_EXPECT_COLUMNS_EQUAL(result.second->view(), expect); } -struct EncodeStringTest : public cudf::test::BaseFixture { -}; +struct EncodeStringTest : public cudf::test::BaseFixture {}; TEST_F(EncodeStringTest, SimpleNoNulls) { diff --git a/cpp/tests/filling/fill_tests.cpp b/cpp/tests/filling/fill_tests.cpp index f411386e5a6..33693c28dde 100644 --- a/cpp/tests/filling/fill_tests.cpp +++ b/cpp/tests/filling/fill_tests.cpp @@ -276,8 +276,7 @@ TEST_F(FillStringTestFixture, SetRangeNullCount) this->test(0, size, value, true, odd_valid); } -class FillErrorTestFixture : public cudf::test::BaseFixture { -}; +class FillErrorTestFixture : public cudf::test::BaseFixture {}; TEST_F(FillErrorTestFixture, InvalidInplaceCall) { @@ -364,8 +363,7 @@ TEST_F(FillErrorTestFixture, DTypeMismatch) } template -class FixedPointAllReps : public cudf::test::BaseFixture { -}; +class FixedPointAllReps : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(FixedPointAllReps, cudf::test::FixedPointTypes); diff --git a/cpp/tests/filling/repeat_tests.cpp b/cpp/tests/filling/repeat_tests.cpp index 20d0ce6e9b4..b1974e4cafe 100644 --- a/cpp/tests/filling/repeat_tests.cpp +++ b/cpp/tests/filling/repeat_tests.cpp @@ -240,8 +240,7 @@ TEST_F(RepeatStringTestFixture, ZeroSizeInput) CUDF_TEST_EXPECT_COLUMNS_EQUAL(p_ret->view().column(0), expected); } -class RepeatErrorTestFixture : public cudf::test::BaseFixture { -}; +class RepeatErrorTestFixture : public cudf::test::BaseFixture {}; TEST_F(RepeatErrorTestFixture, LengthMismatch) { diff --git a/cpp/tests/filling/sequence_tests.cpp b/cpp/tests/filling/sequence_tests.cpp index 1f55cdf3df0..cf619aace5a 100644 --- a/cpp/tests/filling/sequence_tests.cpp +++ b/cpp/tests/filling/sequence_tests.cpp @@ -24,11 +24,9 @@ #include template -class SequenceTypedTestFixture : public cudf::test::BaseFixture { -}; +class SequenceTypedTestFixture : public cudf::test::BaseFixture {}; -class SequenceTestFixture : public cudf::test::BaseFixture { -}; +class SequenceTestFixture : public cudf::test::BaseFixture {}; using NumericTypesNoBool = cudf::test::Types; diff --git a/cpp/tests/fixed_point/fixed_point_tests.cpp b/cpp/tests/fixed_point/fixed_point_tests.cpp index d01fec3e173..e935eca70aa 100644 --- a/cpp/tests/fixed_point/fixed_point_tests.cpp +++ b/cpp/tests/fixed_point/fixed_point_tests.cpp @@ -31,12 +31,10 @@ using namespace numeric; -struct FixedPointTest : public cudf::test::BaseFixture { -}; +struct FixedPointTest : public cudf::test::BaseFixture {}; template -struct FixedPointTestAllReps : public cudf::test::BaseFixture { -}; +struct FixedPointTestAllReps : public cudf::test::BaseFixture {}; using RepresentationTypes = ::testing::Types; diff --git a/cpp/tests/fixed_point/fixed_point_tests.cu b/cpp/tests/fixed_point/fixed_point_tests.cu index 9631e433a5e..24b4e335840 100644 --- a/cpp/tests/fixed_point/fixed_point_tests.cu +++ b/cpp/tests/fixed_point/fixed_point_tests.cu @@ -36,12 +36,10 @@ using namespace numeric; -struct FixedPointTest : public cudf::test::BaseFixture { -}; +struct FixedPointTest : public cudf::test::BaseFixture {}; template -struct FixedPointTestAllReps : public cudf::test::BaseFixture { -}; +struct FixedPointTestAllReps : public cudf::test::BaseFixture {}; using RepresentationTypes = ::testing::Types; diff --git a/cpp/tests/groupby/argmax_tests.cpp b/cpp/tests/groupby/argmax_tests.cpp index 4796482e7c0..e0c5f37d1b8 100644 --- a/cpp/tests/groupby/argmax_tests.cpp +++ b/cpp/tests/groupby/argmax_tests.cpp @@ -24,8 +24,7 @@ #include template -struct groupby_argmax_test : public cudf::test::BaseFixture { -}; +struct groupby_argmax_test : public cudf::test::BaseFixture {}; using K = int32_t; TYPED_TEST_SUITE(groupby_argmax_test, cudf::test::FixedWidthTypes); @@ -115,8 +114,7 @@ TYPED_TEST(groupby_argmax_test, null_keys_and_values) test_single_agg(keys, vals, expect_keys, expect_vals, std::move(agg2), force_use_sort_impl::YES); } -struct groupby_argmax_string_test : public cudf::test::BaseFixture { -}; +struct groupby_argmax_string_test : public cudf::test::BaseFixture {}; TEST_F(groupby_argmax_string_test, basic) { @@ -153,8 +151,7 @@ TEST_F(groupby_argmax_string_test, zero_valid_values) test_single_agg(keys, vals, expect_keys, expect_vals, std::move(agg2), force_use_sort_impl::YES); } -struct groupby_dictionary_argmax_test : public cudf::test::BaseFixture { -}; +struct groupby_dictionary_argmax_test : public cudf::test::BaseFixture {}; TEST_F(groupby_dictionary_argmax_test, basic) { @@ -181,8 +178,7 @@ TEST_F(groupby_dictionary_argmax_test, basic) force_use_sort_impl::YES); } -struct groupby_argmax_struct_test : public cudf::test::BaseFixture { -}; +struct groupby_argmax_struct_test : public cudf::test::BaseFixture {}; TEST_F(groupby_argmax_struct_test, basic) { diff --git a/cpp/tests/groupby/argmin_tests.cpp b/cpp/tests/groupby/argmin_tests.cpp index 3476e764d6a..0211bc5fb43 100644 --- a/cpp/tests/groupby/argmin_tests.cpp +++ b/cpp/tests/groupby/argmin_tests.cpp @@ -26,8 +26,7 @@ using namespace cudf::test::iterators; template -struct groupby_argmin_test : public cudf::test::BaseFixture { -}; +struct groupby_argmin_test : public cudf::test::BaseFixture {}; using K = int32_t; TYPED_TEST_SUITE(groupby_argmin_test, cudf::test::FixedWidthTypes); @@ -117,8 +116,7 @@ TYPED_TEST(groupby_argmin_test, null_keys_and_values) test_single_agg(keys, vals, expect_keys, expect_vals, std::move(agg2), force_use_sort_impl::YES); } -struct groupby_argmin_string_test : public cudf::test::BaseFixture { -}; +struct groupby_argmin_string_test : public cudf::test::BaseFixture {}; TEST_F(groupby_argmin_string_test, basic) { @@ -155,8 +153,7 @@ TEST_F(groupby_argmin_string_test, zero_valid_values) test_single_agg(keys, vals, expect_keys, expect_vals, std::move(agg2), force_use_sort_impl::YES); } -struct groupby_dictionary_argmin_test : public cudf::test::BaseFixture { -}; +struct groupby_dictionary_argmin_test : public cudf::test::BaseFixture {}; TEST_F(groupby_dictionary_argmin_test, basic) { @@ -183,8 +180,7 @@ TEST_F(groupby_dictionary_argmin_test, basic) force_use_sort_impl::YES); } -struct groupby_argmin_struct_test : public cudf::test::BaseFixture { -}; +struct groupby_argmin_struct_test : public cudf::test::BaseFixture {}; TEST_F(groupby_argmin_struct_test, basic) { diff --git a/cpp/tests/groupby/collect_list_tests.cpp b/cpp/tests/groupby/collect_list_tests.cpp index 4e4e6dab250..883ccd98447 100644 --- a/cpp/tests/groupby/collect_list_tests.cpp +++ b/cpp/tests/groupby/collect_list_tests.cpp @@ -23,8 +23,7 @@ #include template -struct groupby_collect_list_test : public cudf::test::BaseFixture { -}; +struct groupby_collect_list_test : public cudf::test::BaseFixture {}; using FixedWidthTypesNotBool = cudf::test::Concat -struct CollectSetTypedTest : public cudf::test::BaseFixture { -}; +struct CollectSetTypedTest : public cudf::test::BaseFixture {}; using FixedWidthTypesNotBool = cudf::test::Concat -struct groupby_correlation_test : public cudf::test::BaseFixture { -}; +struct groupby_correlation_test : public cudf::test::BaseFixture {}; using supported_types = cudf::test::RemoveIf>, cudf::test::NumericTypes>; @@ -219,8 +218,7 @@ TYPED_TEST(groupby_correlation_test, min_periods) test_single_agg(keys, vals, expect_keys, expect_vals3, std::move(agg3), force_use_sort_impl::YES); } -struct groupby_dictionary_correlation_test : public cudf::test::BaseFixture { -}; +struct groupby_dictionary_correlation_test : public cudf::test::BaseFixture {}; TEST_F(groupby_dictionary_correlation_test, basic) { diff --git a/cpp/tests/groupby/count_scan_tests.cpp b/cpp/tests/groupby/count_scan_tests.cpp index e17d2466657..fb80989e8ed 100644 --- a/cpp/tests/groupby/count_scan_tests.cpp +++ b/cpp/tests/groupby/count_scan_tests.cpp @@ -126,8 +126,7 @@ TYPED_TEST(groupby_count_scan_test, null_keys_and_values) test_single_scan(keys, vals, expect_keys, expect_vals, std::move(agg2)); } -struct groupby_count_scan_string_test : public cudf::test::BaseFixture { -}; +struct groupby_count_scan_string_test : public cudf::test::BaseFixture {}; TEST_F(groupby_count_scan_string_test, basic) { @@ -148,8 +147,7 @@ TEST_F(groupby_count_scan_string_test, basic) } template -struct GroupByCountScanFixedPointTest : public cudf::test::BaseFixture { -}; +struct GroupByCountScanFixedPointTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(GroupByCountScanFixedPointTest, cudf::test::FixedPointTypes); @@ -183,8 +181,7 @@ TYPED_TEST(GroupByCountScanFixedPointTest, GroupByCountScan) test_single_scan(keys, vals, expect_keys, expect_vals, std::move(agg2)); } -struct groupby_dictionary_count_scan_test : public cudf::test::BaseFixture { -}; +struct groupby_dictionary_count_scan_test : public cudf::test::BaseFixture {}; TEST_F(groupby_dictionary_count_scan_test, basic) { diff --git a/cpp/tests/groupby/count_tests.cpp b/cpp/tests/groupby/count_tests.cpp index d98c3735e66..4f0fdd53a4d 100644 --- a/cpp/tests/groupby/count_tests.cpp +++ b/cpp/tests/groupby/count_tests.cpp @@ -24,8 +24,7 @@ #include template -struct groupby_count_test : public cudf::test::BaseFixture { -}; +struct groupby_count_test : public cudf::test::BaseFixture {}; using K = int32_t; TYPED_TEST_SUITE(groupby_count_test, cudf::test::AllTypes); @@ -140,8 +139,7 @@ TYPED_TEST(groupby_count_test, null_keys_and_values) test_single_agg(keys, vals, expect_keys, expect_vals2, std::move(agg2)); } -struct groupby_count_string_test : public cudf::test::BaseFixture { -}; +struct groupby_count_string_test : public cudf::test::BaseFixture {}; TEST_F(groupby_count_string_test, basic) { @@ -165,8 +163,7 @@ TEST_F(groupby_count_string_test, basic) // clang-format on template -struct GroupByCountFixedPointTest : public cudf::test::BaseFixture { -}; +struct GroupByCountFixedPointTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(GroupByCountFixedPointTest, cudf::test::FixedPointTypes); @@ -197,8 +194,7 @@ TYPED_TEST(GroupByCountFixedPointTest, GroupByCount) test_single_agg(keys, vals, expect_keys, expect_vals, std::move(agg2)); } -struct groupby_dictionary_count_test : public cudf::test::BaseFixture { -}; +struct groupby_dictionary_count_test : public cudf::test::BaseFixture {}; TEST_F(groupby_dictionary_count_test, basic) { diff --git a/cpp/tests/groupby/covariance_tests.cpp b/cpp/tests/groupby/covariance_tests.cpp index 1f65bce4d4e..96001172e00 100644 --- a/cpp/tests/groupby/covariance_tests.cpp +++ b/cpp/tests/groupby/covariance_tests.cpp @@ -31,8 +31,7 @@ using namespace cudf::test::iterators; template -struct groupby_covariance_test : public cudf::test::BaseFixture { -}; +struct groupby_covariance_test : public cudf::test::BaseFixture {}; using supported_types = cudf::test::RemoveIf>, cudf::test::NumericTypes>; @@ -236,8 +235,7 @@ TYPED_TEST(groupby_covariance_test, ddof) test_single_agg(keys, vals, expect_keys, expect_vals2, std::move(agg2), force_use_sort_impl::YES); } -struct groupby_dictionary_covariance_test : public cudf::test::BaseFixture { -}; +struct groupby_dictionary_covariance_test : public cudf::test::BaseFixture {}; TEST_F(groupby_dictionary_covariance_test, basic) { diff --git a/cpp/tests/groupby/groups_tests.cpp b/cpp/tests/groupby/groups_tests.cpp index 0681e23e10b..fb471e3a03e 100644 --- a/cpp/tests/groupby/groups_tests.cpp +++ b/cpp/tests/groupby/groups_tests.cpp @@ -52,12 +52,10 @@ void test_groups(cudf::column_view const& keys, } } -struct groupby_group_keys_test : public cudf::test::BaseFixture { -}; +struct groupby_group_keys_test : public cudf::test::BaseFixture {}; template -struct groupby_group_keys_and_values_test : public cudf::test::BaseFixture { -}; +struct groupby_group_keys_and_values_test : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(groupby_group_keys_and_values_test, cudf::test::NumericTypes); diff --git a/cpp/tests/groupby/keys_tests.cpp b/cpp/tests/groupby/keys_tests.cpp index d11b3786471..7064abc459d 100644 --- a/cpp/tests/groupby/keys_tests.cpp +++ b/cpp/tests/groupby/keys_tests.cpp @@ -27,8 +27,7 @@ using namespace cudf::test::iterators; template -struct groupby_keys_test : public cudf::test::BaseFixture { -}; +struct groupby_keys_test : public cudf::test::BaseFixture {}; using supported_types = cudf::test:: Types; @@ -314,8 +313,7 @@ TYPED_TEST(groupby_keys_test, lists) test_single_agg(keys, values, expected_keys, expected_values, std::move(agg)); } -struct groupby_string_keys_test : public cudf::test::BaseFixture { -}; +struct groupby_string_keys_test : public cudf::test::BaseFixture {}; TEST_F(groupby_string_keys_test, basic) { @@ -335,8 +333,7 @@ TEST_F(groupby_string_keys_test, basic) } // clang-format on -struct groupby_dictionary_keys_test : public cudf::test::BaseFixture { -}; +struct groupby_dictionary_keys_test : public cudf::test::BaseFixture {}; TEST_F(groupby_dictionary_keys_test, basic) { @@ -361,8 +358,7 @@ TEST_F(groupby_dictionary_keys_test, basic) force_use_sort_impl::YES); } -struct groupby_cache_test : public cudf::test::BaseFixture { -}; +struct groupby_cache_test : public cudf::test::BaseFixture {}; // To check if the cache doesn't insert multiple times to cache for the same aggregation on a // column in the same request. If this test fails, then insert happened and the key stored in the diff --git a/cpp/tests/groupby/lists_tests.cpp b/cpp/tests/groupby/lists_tests.cpp index 3a57fdab58d..1fe0b7de052 100644 --- a/cpp/tests/groupby/lists_tests.cpp +++ b/cpp/tests/groupby/lists_tests.cpp @@ -24,8 +24,7 @@ #include template -struct groupby_lists_test : public cudf::test::BaseFixture { -}; +struct groupby_lists_test : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(groupby_lists_test, cudf::test::FixedWidthTypes); diff --git a/cpp/tests/groupby/m2_tests.cpp b/cpp/tests/groupby/m2_tests.cpp index 6f5a04e3752..b3978cf15f7 100644 --- a/cpp/tests/groupby/m2_tests.cpp +++ b/cpp/tests/groupby/m2_tests.cpp @@ -53,8 +53,7 @@ auto compute_M2(cudf::column_view const& keys, cudf::column_view const& values) } // namespace template -struct GroupbyM2TypedTest : public cudf::test::BaseFixture { -}; +struct GroupbyM2TypedTest : public cudf::test::BaseFixture {}; using TestTypes = cudf::test::Concat, cudf::test::FloatingPointTypes>; diff --git a/cpp/tests/groupby/max_scan_tests.cpp b/cpp/tests/groupby/max_scan_tests.cpp index 522396e3591..2d8400e02b7 100644 --- a/cpp/tests/groupby/max_scan_tests.cpp +++ b/cpp/tests/groupby/max_scan_tests.cpp @@ -141,8 +141,7 @@ TYPED_TEST(groupby_max_scan_test, null_keys_and_values) test_single_scan(keys, vals, expect_keys, expect_vals, std::move(agg)); } -struct groupby_max_scan_string_test : public cudf::test::BaseFixture { -}; +struct groupby_max_scan_string_test : public cudf::test::BaseFixture {}; TEST_F(groupby_max_scan_string_test, basic) { @@ -159,8 +158,7 @@ TEST_F(groupby_max_scan_string_test, basic) } template -struct GroupByMaxScanFixedPointTest : public cudf::test::BaseFixture { -}; +struct GroupByMaxScanFixedPointTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(GroupByMaxScanFixedPointTest, cudf::test::FixedPointTypes); @@ -187,8 +185,7 @@ TYPED_TEST(GroupByMaxScanFixedPointTest, GroupBySortMaxScanDecimalAsValue) } } -struct groupby_max_scan_struct_test : public cudf::test::BaseFixture { -}; +struct groupby_max_scan_struct_test : public cudf::test::BaseFixture {}; TEST_F(groupby_max_scan_struct_test, basic) { diff --git a/cpp/tests/groupby/max_tests.cpp b/cpp/tests/groupby/max_tests.cpp index bf5891226ca..42bc2d3e442 100644 --- a/cpp/tests/groupby/max_tests.cpp +++ b/cpp/tests/groupby/max_tests.cpp @@ -29,8 +29,7 @@ using namespace cudf::test::iterators; template -struct groupby_max_test : public cudf::test::BaseFixture { -}; +struct groupby_max_test : public cudf::test::BaseFixture {}; using K = int32_t; TYPED_TEST_SUITE(groupby_max_test, cudf::test::FixedWidthTypesWithoutFixedPoint); @@ -129,8 +128,7 @@ TYPED_TEST(groupby_max_test, null_keys_and_values) test_single_agg(keys, vals, expect_keys, expect_vals, std::move(agg2), force_use_sort_impl::YES); } -struct groupby_max_string_test : public cudf::test::BaseFixture { -}; +struct groupby_max_string_test : public cudf::test::BaseFixture {}; TEST_F(groupby_max_string_test, basic) { @@ -199,8 +197,7 @@ TEST_F(groupby_max_string_test, max_sorted_strings) cudf::sorted::YES); } -struct groupby_dictionary_max_test : public cudf::test::BaseFixture { -}; +struct groupby_dictionary_max_test : public cudf::test::BaseFixture {}; TEST_F(groupby_dictionary_max_test, basic) { @@ -253,8 +250,7 @@ TEST_F(groupby_dictionary_max_test, fixed_width) } template -struct GroupByMaxFixedPointTest : public cudf::test::BaseFixture { -}; +struct GroupByMaxFixedPointTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(GroupByMaxFixedPointTest, cudf::test::FixedPointTypes); @@ -305,8 +301,7 @@ TYPED_TEST(GroupByMaxFixedPointTest, GroupByHashMaxDecimalAsValue) } } -struct groupby_max_struct_test : public cudf::test::BaseFixture { -}; +struct groupby_max_struct_test : public cudf::test::BaseFixture {}; TEST_F(groupby_max_struct_test, basic) { @@ -434,8 +429,7 @@ TEST_F(groupby_max_struct_test, values_with_null_child) } template -struct groupby_max_floating_point_test : public cudf::test::BaseFixture { -}; +struct groupby_max_floating_point_test : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(groupby_max_floating_point_test, cudf::test::FloatingPointTypes); diff --git a/cpp/tests/groupby/mean_tests.cpp b/cpp/tests/groupby/mean_tests.cpp index 16909dce96d..2d6ad24a096 100644 --- a/cpp/tests/groupby/mean_tests.cpp +++ b/cpp/tests/groupby/mean_tests.cpp @@ -30,8 +30,7 @@ using namespace cudf::test::iterators; template -struct groupby_mean_test : public cudf::test::BaseFixture { -}; +struct groupby_mean_test : public cudf::test::BaseFixture {}; template std::vector convert(std::initializer_list in) @@ -136,8 +135,7 @@ TYPED_TEST(groupby_mean_test, null_keys_and_values) } // clang-format on -struct groupby_dictionary_mean_test : public cudf::test::BaseFixture { -}; +struct groupby_dictionary_mean_test : public cudf::test::BaseFixture {}; TEST_F(groupby_dictionary_mean_test, basic) { @@ -157,8 +155,7 @@ TEST_F(groupby_dictionary_mean_test, basic) } template -struct FixedPointTestBothReps : public cudf::test::BaseFixture { -}; +struct FixedPointTestBothReps : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(FixedPointTestBothReps, cudf::test::FixedPointTypes); diff --git a/cpp/tests/groupby/median_tests.cpp b/cpp/tests/groupby/median_tests.cpp index 3ba9e1afc1b..4b037c08ac3 100644 --- a/cpp/tests/groupby/median_tests.cpp +++ b/cpp/tests/groupby/median_tests.cpp @@ -26,8 +26,7 @@ using namespace cudf::test::iterators; template -struct groupby_median_test : public cudf::test::BaseFixture { -}; +struct groupby_median_test : public cudf::test::BaseFixture {}; using supported_types = cudf::test::Types; diff --git a/cpp/tests/groupby/merge_lists_tests.cpp b/cpp/tests/groupby/merge_lists_tests.cpp index 593bb7c50af..393f3a7c014 100644 --- a/cpp/tests/groupby/merge_lists_tests.cpp +++ b/cpp/tests/groupby/merge_lists_tests.cpp @@ -53,8 +53,7 @@ auto merge_lists(vcol_views const& keys_cols, vcol_views const& values_cols) } // namespace template -struct GroupbyMergeListsTypedTest : public cudf::test::BaseFixture { -}; +struct GroupbyMergeListsTypedTest : public cudf::test::BaseFixture {}; using FixedWidthTypesNotBool = cudf::test::Concat -struct GroupbyMergeM2TypedTest : public cudf::test::BaseFixture { -}; +struct GroupbyMergeM2TypedTest : public cudf::test::BaseFixture {}; using TestTypes = cudf::test::Concat, cudf::test::FloatingPointTypes>; diff --git a/cpp/tests/groupby/merge_sets_tests.cpp b/cpp/tests/groupby/merge_sets_tests.cpp index 55a25e40b53..140ad0e3622 100644 --- a/cpp/tests/groupby/merge_sets_tests.cpp +++ b/cpp/tests/groupby/merge_sets_tests.cpp @@ -72,8 +72,7 @@ auto merge_sets(vcol_views const& keys_cols, vcol_views const& values_cols) } // namespace template -struct GroupbyMergeSetsTypedTest : public cudf::test::BaseFixture { -}; +struct GroupbyMergeSetsTypedTest : public cudf::test::BaseFixture {}; using FixedWidthTypesNotBool = cudf::test::Concat -struct GroupByMinScanFixedPointTest : public cudf::test::BaseFixture { -}; +struct GroupByMinScanFixedPointTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(GroupByMinScanFixedPointTest, cudf::test::FixedPointTypes); @@ -184,8 +182,7 @@ TYPED_TEST(GroupByMinScanFixedPointTest, GroupBySortMinScanDecimalAsValue) } } -struct groupby_min_scan_struct_test : public cudf::test::BaseFixture { -}; +struct groupby_min_scan_struct_test : public cudf::test::BaseFixture {}; TEST_F(groupby_min_scan_struct_test, basic) { diff --git a/cpp/tests/groupby/min_tests.cpp b/cpp/tests/groupby/min_tests.cpp index c3a4f965c91..8877189dbf3 100644 --- a/cpp/tests/groupby/min_tests.cpp +++ b/cpp/tests/groupby/min_tests.cpp @@ -29,8 +29,7 @@ using namespace cudf::test::iterators; template -struct groupby_min_test : public cudf::test::BaseFixture { -}; +struct groupby_min_test : public cudf::test::BaseFixture {}; using K = int32_t; TYPED_TEST_SUITE(groupby_min_test, cudf::test::FixedWidthTypesWithoutFixedPoint); @@ -129,8 +128,7 @@ TYPED_TEST(groupby_min_test, null_keys_and_values) test_single_agg(keys, vals, expect_keys, expect_vals, std::move(agg2), force_use_sort_impl::YES); } -struct groupby_min_string_test : public cudf::test::BaseFixture { -}; +struct groupby_min_string_test : public cudf::test::BaseFixture {}; TEST_F(groupby_min_string_test, basic) { @@ -196,8 +194,7 @@ TEST_F(groupby_min_string_test, min_sorted_strings) cudf::sorted::YES); } -struct groupby_dictionary_min_test : public cudf::test::BaseFixture { -}; +struct groupby_dictionary_min_test : public cudf::test::BaseFixture {}; TEST_F(groupby_dictionary_min_test, basic) { @@ -250,8 +247,7 @@ TEST_F(groupby_dictionary_min_test, fixed_width) } template -struct GroupByMinFixedPointTest : public cudf::test::BaseFixture { -}; +struct GroupByMinFixedPointTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(GroupByMinFixedPointTest, cudf::test::FixedPointTypes); @@ -301,8 +297,7 @@ TYPED_TEST(GroupByMinFixedPointTest, GroupByHashMinDecimalAsValue) } } -struct groupby_min_struct_test : public cudf::test::BaseFixture { -}; +struct groupby_min_struct_test : public cudf::test::BaseFixture {}; TEST_F(groupby_min_struct_test, basic) { @@ -430,8 +425,7 @@ TEST_F(groupby_min_struct_test, values_with_null_child) } template -struct groupby_min_floating_point_test : public cudf::test::BaseFixture { -}; +struct groupby_min_floating_point_test : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(groupby_min_floating_point_test, cudf::test::FloatingPointTypes); diff --git a/cpp/tests/groupby/nth_element_tests.cpp b/cpp/tests/groupby/nth_element_tests.cpp index 8c721f0b795..5fb911ea0f1 100644 --- a/cpp/tests/groupby/nth_element_tests.cpp +++ b/cpp/tests/groupby/nth_element_tests.cpp @@ -27,8 +27,7 @@ using namespace cudf::test::iterators; template -struct groupby_nth_element_test : public cudf::test::BaseFixture { -}; +struct groupby_nth_element_test : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(groupby_nth_element_test, cudf::test::AllTypes); @@ -364,8 +363,7 @@ TEST_F(groupby_nth_element_string_test, dictionary) } template -struct groupby_nth_element_lists_test : cudf::test::BaseFixture { -}; +struct groupby_nth_element_lists_test : cudf::test::BaseFixture {}; TYPED_TEST_SUITE(groupby_nth_element_lists_test, cudf::test::FixedWidthTypesWithoutFixedPoint); @@ -409,8 +407,7 @@ TYPED_TEST(groupby_nth_element_lists_test, EmptyInput) cudf::make_nth_element_aggregation(2)); } -struct groupby_nth_element_structs_test : cudf::test::BaseFixture { -}; +struct groupby_nth_element_structs_test : cudf::test::BaseFixture {}; TEST_F(groupby_nth_element_structs_test, Basics) { diff --git a/cpp/tests/groupby/nunique_tests.cpp b/cpp/tests/groupby/nunique_tests.cpp index 2923aa2d8bf..c9156d837f7 100644 --- a/cpp/tests/groupby/nunique_tests.cpp +++ b/cpp/tests/groupby/nunique_tests.cpp @@ -24,8 +24,7 @@ #include template -struct groupby_nunique_test : public cudf::test::BaseFixture { -}; +struct groupby_nunique_test : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(groupby_nunique_test, cudf::test::AllTypes); diff --git a/cpp/tests/groupby/product_tests.cpp b/cpp/tests/groupby/product_tests.cpp index a4173abde32..0145293682b 100644 --- a/cpp/tests/groupby/product_tests.cpp +++ b/cpp/tests/groupby/product_tests.cpp @@ -26,8 +26,7 @@ using namespace cudf::test::iterators; template -struct groupby_product_test : public cudf::test::BaseFixture { -}; +struct groupby_product_test : public cudf::test::BaseFixture {}; using supported_types = cudf::test::Types; diff --git a/cpp/tests/groupby/quantile_tests.cpp b/cpp/tests/groupby/quantile_tests.cpp index d707b60ea05..8d134f340a0 100644 --- a/cpp/tests/groupby/quantile_tests.cpp +++ b/cpp/tests/groupby/quantile_tests.cpp @@ -26,8 +26,7 @@ using namespace cudf::test::iterators; template -struct groupby_quantile_test : public cudf::test::BaseFixture { -}; +struct groupby_quantile_test : public cudf::test::BaseFixture {}; using supported_types = cudf::test::Types; diff --git a/cpp/tests/groupby/rank_scan_tests.cpp b/cpp/tests/groupby/rank_scan_tests.cpp index 1b1b4fbd371..c24cfce67a7 100644 --- a/cpp/tests/groupby/rank_scan_tests.cpp +++ b/cpp/tests/groupby/rank_scan_tests.cpp @@ -71,15 +71,12 @@ void test_rank_scans(cudf::column_view const& keys, cudf::sorted::YES); } -struct groupby_rank_scan_test : public cudf::test::BaseFixture { -}; +struct groupby_rank_scan_test : public cudf::test::BaseFixture {}; -struct groupby_rank_scan_test_failures : public cudf::test::BaseFixture { -}; +struct groupby_rank_scan_test_failures : public cudf::test::BaseFixture {}; template -struct typed_groupby_rank_scan_test : public cudf::test::BaseFixture { -}; +struct typed_groupby_rank_scan_test : public cudf::test::BaseFixture {}; using testing_type_set = cudf::test::Concat -struct GroupbyReplaceNullsFixedWidthTest : public cudf::test::BaseFixture { -}; +struct GroupbyReplaceNullsFixedWidthTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(GroupbyReplaceNullsFixedWidthTest, cudf::test::FixedWidthTypes); @@ -110,8 +109,7 @@ TYPED_TEST(GroupbyReplaceNullsFixedWidthTest, FollowingFillTrailingNulls) TestReplaceNullsGroupbySingle(key, val, expect_key, expect_val, cudf::replace_policy::FOLLOWING); } -struct GroupbyReplaceNullsStringsTest : public cudf::test::BaseFixture { -}; +struct GroupbyReplaceNullsStringsTest : public cudf::test::BaseFixture {}; TEST_F(GroupbyReplaceNullsStringsTest, PrecedingFill) { @@ -174,8 +172,7 @@ TEST_F(GroupbyReplaceNullsStringsTest, FollowingFillTrailingNull) } template -struct GroupbyReplaceNullsListsTest : public cudf::test::BaseFixture { -}; +struct GroupbyReplaceNullsListsTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(GroupbyReplaceNullsListsTest, cudf::test::FixedWidthTypes); diff --git a/cpp/tests/groupby/shift_tests.cpp b/cpp/tests/groupby/shift_tests.cpp index 6e0f425db0f..d2ecb667eca 100644 --- a/cpp/tests/groupby/shift_tests.cpp +++ b/cpp/tests/groupby/shift_tests.cpp @@ -25,8 +25,7 @@ #include template -struct groupby_shift_fixed_width_test : public cudf::test::BaseFixture { -}; +struct groupby_shift_fixed_width_test : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(groupby_shift_fixed_width_test, cudf::test::FixedWidthTypes); @@ -228,8 +227,7 @@ TYPED_TEST(groupby_shift_fixed_width_test, VeryLargeBackwardOffset) test_groupby_shift_fixed_width_single(key, val, offset, *slr, expected); } -struct groupby_shift_string_test : public cudf::test::BaseFixture { -}; +struct groupby_shift_string_test : public cudf::test::BaseFixture {}; template void test_groupby_shift_string_single(cudf::test::fixed_width_column_wrapper const& key, @@ -409,8 +407,7 @@ TEST_F(groupby_shift_string_test, VeryLargeBackwardOffset) } template -struct groupby_shift_mixed_test : public cudf::test::BaseFixture { -}; +struct groupby_shift_mixed_test : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(groupby_shift_mixed_test, cudf::test::FixedWidthTypes); @@ -469,8 +466,7 @@ TYPED_TEST(groupby_shift_mixed_test, Fill) test_groupby_shift_multi(key, value, offset, fill_values, expected); } -struct groupby_shift_fixed_point_type_test : public cudf::test::BaseFixture { -}; +struct groupby_shift_fixed_point_type_test : public cudf::test::BaseFixture {}; TEST_F(groupby_shift_fixed_point_type_test, Matching) { diff --git a/cpp/tests/groupby/std_tests.cpp b/cpp/tests/groupby/std_tests.cpp index 56ddce1554f..4c07e2e8ddc 100644 --- a/cpp/tests/groupby/std_tests.cpp +++ b/cpp/tests/groupby/std_tests.cpp @@ -26,8 +26,7 @@ using namespace cudf::test::iterators; template -struct groupby_std_test : public cudf::test::BaseFixture { -}; +struct groupby_std_test : public cudf::test::BaseFixture {}; using supported_types = cudf::test::Types; diff --git a/cpp/tests/groupby/structs_tests.cpp b/cpp/tests/groupby/structs_tests.cpp index 57c93db50b5..f85fc6335f6 100644 --- a/cpp/tests/groupby/structs_tests.cpp +++ b/cpp/tests/groupby/structs_tests.cpp @@ -26,8 +26,7 @@ using namespace cudf::test::iterators; template -struct groupby_structs_test : public cudf::test::BaseFixture { -}; +struct groupby_structs_test : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(groupby_structs_test, cudf::test::FixedWidthTypes); diff --git a/cpp/tests/groupby/sum_of_squares_tests.cpp b/cpp/tests/groupby/sum_of_squares_tests.cpp index 4a784539798..23724113d50 100644 --- a/cpp/tests/groupby/sum_of_squares_tests.cpp +++ b/cpp/tests/groupby/sum_of_squares_tests.cpp @@ -26,8 +26,7 @@ using namespace cudf::test::iterators; template -struct groupby_sum_of_squares_test : public cudf::test::BaseFixture { -}; +struct groupby_sum_of_squares_test : public cudf::test::BaseFixture {}; using supported_types = cudf::test::Types; diff --git a/cpp/tests/groupby/sum_scan_tests.cpp b/cpp/tests/groupby/sum_scan_tests.cpp index 32cba668467..b03212f3197 100644 --- a/cpp/tests/groupby/sum_scan_tests.cpp +++ b/cpp/tests/groupby/sum_scan_tests.cpp @@ -145,8 +145,7 @@ TYPED_TEST(groupby_sum_scan_test, null_keys_and_values) } template -struct GroupBySumScanFixedPointTest : public cudf::test::BaseFixture { -}; +struct GroupBySumScanFixedPointTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(GroupBySumScanFixedPointTest, cudf::test::FixedPointTypes); diff --git a/cpp/tests/groupby/sum_tests.cpp b/cpp/tests/groupby/sum_tests.cpp index 2369e6c1128..35e8fd18a4d 100644 --- a/cpp/tests/groupby/sum_tests.cpp +++ b/cpp/tests/groupby/sum_tests.cpp @@ -26,8 +26,7 @@ using namespace cudf::test::iterators; template -struct groupby_sum_test : public cudf::test::BaseFixture { -}; +struct groupby_sum_test : public cudf::test::BaseFixture {}; using K = int32_t; using supported_types = @@ -151,8 +150,7 @@ TYPED_TEST(groupby_sum_test, dictionary) force_use_sort_impl::YES); } -struct overflow_test : public cudf::test::BaseFixture { -}; +struct overflow_test : public cudf::test::BaseFixture {}; TEST_F(overflow_test, overflow_integer) { using int32_col = cudf::test::fixed_width_column_wrapper; @@ -173,8 +171,7 @@ TEST_F(overflow_test, overflow_integer) } template -struct GroupBySumFixedPointTest : public cudf::test::BaseFixture { -}; +struct GroupBySumFixedPointTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(GroupBySumFixedPointTest, cudf::test::FixedPointTypes); diff --git a/cpp/tests/groupby/tdigest_tests.cu b/cpp/tests/groupby/tdigest_tests.cu index 4052201b064..1d2835675f9 100644 --- a/cpp/tests/groupby/tdigest_tests.cu +++ b/cpp/tests/groupby/tdigest_tests.cu @@ -117,8 +117,7 @@ struct tdigest_groupby_simple_merge_op { }; template -struct TDigestAllTypes : public cudf::test::BaseFixture { -}; +struct TDigestAllTypes : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(TDigestAllTypes, cudf::test::NumericTypes); TYPED_TEST(TDigestAllTypes, Simple) @@ -206,8 +205,7 @@ TYPED_TEST(TDigestAllTypes, LargeGroups) CUDF_TEST_EXPECT_COLUMNS_EQUIVALENT(*result.second[0].results[0], *merged_parts); } -struct TDigestTest : public cudf::test::BaseFixture { -}; +struct TDigestTest : public cudf::test::BaseFixture {}; TEST_F(TDigestTest, EmptyMixed) { @@ -251,8 +249,7 @@ TEST_F(TDigestTest, LargeInputDecimal) cudf::test::tdigest_simple_large_input_decimal_aggregation(tdigest_groupby_simple_op{}); } -struct TDigestMergeTest : public cudf::test::BaseFixture { -}; +struct TDigestMergeTest : public cudf::test::BaseFixture {}; // Note: there is no need to test different types here as the internals of a tdigest are always // the same regardless of input. diff --git a/cpp/tests/groupby/var_tests.cpp b/cpp/tests/groupby/var_tests.cpp index 1827fd287f9..739fc30af6d 100644 --- a/cpp/tests/groupby/var_tests.cpp +++ b/cpp/tests/groupby/var_tests.cpp @@ -26,8 +26,7 @@ using namespace cudf::test::iterators; template -struct groupby_var_test : public cudf::test::BaseFixture { -}; +struct groupby_var_test : public cudf::test::BaseFixture {}; using supported_types = cudf::test::Types; diff --git a/cpp/tests/hashing/hash_test.cpp b/cpp/tests/hashing/hash_test.cpp index bb96b50c624..8e3c93245ef 100644 --- a/cpp/tests/hashing/hash_test.cpp +++ b/cpp/tests/hashing/hash_test.cpp @@ -26,8 +26,7 @@ constexpr cudf::test::debug_output_level verbosity{cudf::test::debug_output_level::ALL_ERRORS}; -class HashTest : public cudf::test::BaseFixture { -}; +class HashTest : public cudf::test::BaseFixture {}; TEST_F(HashTest, MultiValue) { @@ -350,8 +349,7 @@ TEST_F(HashTest, EmptyDeepList) } template -class HashTestTyped : public cudf::test::BaseFixture { -}; +class HashTestTyped : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(HashTestTyped, cudf::test::FixedWidthTypes); @@ -399,8 +397,7 @@ TYPED_TEST(HashTestTyped, EqualityNulls) } template -class HashTestFloatTyped : public cudf::test::BaseFixture { -}; +class HashTestFloatTyped : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(HashTestFloatTyped, cudf::test::FloatingPointTypes); @@ -438,8 +435,7 @@ TYPED_TEST(HashTestFloatTyped, TestExtremes) CUDF_TEST_EXPECT_COLUMNS_EQUAL(*spark_col, *spark_col_neg_nan); } -class SparkMurmurHash3Test : public cudf::test::BaseFixture { -}; +class SparkMurmurHash3Test : public cudf::test::BaseFixture {}; TEST_F(SparkMurmurHash3Test, MultiValueWithSeeds) { @@ -858,8 +854,7 @@ TEST_F(SparkMurmurHash3Test, ListOfStructValues) */ } -class MD5HashTest : public cudf::test::BaseFixture { -}; +class MD5HashTest : public cudf::test::BaseFixture {}; TEST_F(MD5HashTest, MultiValue) { @@ -983,8 +978,7 @@ TEST_F(MD5HashTest, StringListsNulls) } template -class MD5HashTestTyped : public cudf::test::BaseFixture { -}; +class MD5HashTestTyped : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(MD5HashTestTyped, cudf::test::NumericTypes); @@ -1043,8 +1037,7 @@ TEST_F(MD5HashTest, TestBoolListsWithNulls) } template -class MD5HashListTestTyped : public cudf::test::BaseFixture { -}; +class MD5HashListTestTyped : public cudf::test::BaseFixture {}; using NumericTypesNoBools = cudf::test::Concat; @@ -1077,8 +1070,7 @@ TYPED_TEST(MD5HashListTestTyped, TestListsWithNulls) } template -class MD5HashTestFloatTyped : public cudf::test::BaseFixture { -}; +class MD5HashTestFloatTyped : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(MD5HashTestFloatTyped, cudf::test::FloatingPointTypes); diff --git a/cpp/tests/interop/dlpack_test.cpp b/cpp/tests/interop/dlpack_test.cpp index 2862590d05f..0bd59b63b4c 100644 --- a/cpp/tests/interop/dlpack_test.cpp +++ b/cpp/tests/interop/dlpack_test.cpp @@ -59,8 +59,7 @@ void validate_dtype(DLDataType const& dtype) EXPECT_EQ(sizeof(T) * 8, dtype.bits); } -class DLPackUntypedTests : public cudf::test::BaseFixture { -}; +class DLPackUntypedTests : public cudf::test::BaseFixture {}; TEST_F(DLPackUntypedTests, EmptyTableToDlpack) { @@ -333,8 +332,7 @@ TEST_F(DLPackUntypedTests, UnsupportedStridedColMajor2DTensorFromDlpack) } template -class DLPackTimestampTests : public cudf::test::BaseFixture { -}; +class DLPackTimestampTests : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(DLPackTimestampTests, cudf::test::ChronoTypes); @@ -346,8 +344,7 @@ TYPED_TEST(DLPackTimestampTests, ChronoTypesToDlpack) } template -class DLPackNumericTests : public cudf::test::BaseFixture { -}; +class DLPackNumericTests : public cudf::test::BaseFixture {}; // The list of supported types comes from DLDataType_to_data_type() in cpp/src/dlpack/dlpack.cpp // TODO: Replace with `NumericTypes` when unsigned support is added. Issue #5353 diff --git a/cpp/tests/interop/from_arrow_test.cpp b/cpp/tests/interop/from_arrow_test.cpp index 3f4d5bcf20f..57582334d30 100644 --- a/cpp/tests/interop/from_arrow_test.cpp +++ b/cpp/tests/interop/from_arrow_test.cpp @@ -55,12 +55,10 @@ std::unique_ptr get_cudf_table() return std::make_unique(std::move(columns)); } -struct FromArrowTest : public cudf::test::BaseFixture { -}; +struct FromArrowTest : public cudf::test::BaseFixture {}; template -struct FromArrowTestDurationsTest : public cudf::test::BaseFixture { -}; +struct FromArrowTestDurationsTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(FromArrowTestDurationsTest, cudf::test::DurationTypes); @@ -329,8 +327,7 @@ TEST_F(FromArrowTest, ChunkedArray) struct FromArrowTestSlice : public FromArrowTest, - public ::testing::WithParamInterface> { -}; + public ::testing::WithParamInterface> {}; TEST_P(FromArrowTestSlice, SliceTest) { diff --git a/cpp/tests/interop/to_arrow_test.cpp b/cpp/tests/interop/to_arrow_test.cpp index 4b481ade83f..9ed3c50be40 100644 --- a/cpp/tests/interop/to_arrow_test.cpp +++ b/cpp/tests/interop/to_arrow_test.cpp @@ -154,12 +154,10 @@ std::pair, std::shared_ptr> get_table schema, {int64array, string_array, dict_array, boolarray, list_array, struct_array})); } -struct ToArrowTest : public cudf::test::BaseFixture { -}; +struct ToArrowTest : public cudf::test::BaseFixture {}; template -struct ToArrowTestDurationsTest : public cudf::test::BaseFixture { -}; +struct ToArrowTestDurationsTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(ToArrowTestDurationsTest, cudf::test::DurationTypes); @@ -556,8 +554,7 @@ TEST_F(ToArrowTest, FixedPoint128TableNulls) struct ToArrowTestSlice : public ToArrowTest, - public ::testing::WithParamInterface> { -}; + public ::testing::WithParamInterface> {}; TEST_P(ToArrowTestSlice, SliceTest) { diff --git a/cpp/tests/io/arrow_io_source_test.cpp b/cpp/tests/io/arrow_io_source_test.cpp index eae0a705763..2961deec384 100644 --- a/cpp/tests/io/arrow_io_source_test.cpp +++ b/cpp/tests/io/arrow_io_source_test.cpp @@ -37,8 +37,7 @@ auto const temp_env = static_cast( ::testing::AddGlobalTestEnvironment(new cudf::test::TempDirTestEnvironment)); // Base test fixture for tests -struct ArrowIOTest : public cudf::test::BaseFixture { -}; +struct ArrowIOTest : public cudf::test::BaseFixture {}; TEST_F(ArrowIOTest, URIFileSystem) { diff --git a/cpp/tests/io/comp/decomp_test.cpp b/cpp/tests/io/comp/decomp_test.cpp index 5c75e399062..d1b5928b5f1 100644 --- a/cpp/tests/io/comp/decomp_test.cpp +++ b/cpp/tests/io/comp/decomp_test.cpp @@ -119,8 +119,7 @@ struct BrotliDecompressTest : public DecompressTest { } }; -struct NvcompConfigTest : public cudf::test::BaseFixture { -}; +struct NvcompConfigTest : public cudf::test::BaseFixture {}; TEST_F(GzipDecompressTest, HelloWorld) { diff --git a/cpp/tests/io/csv_test.cpp b/cpp/tests/io/csv_test.cpp index 193d1092cab..7c357e777a3 100644 --- a/cpp/tests/io/csv_test.cpp +++ b/cpp/tests/io/csv_test.cpp @@ -73,23 +73,19 @@ auto const temp_env = static_cast( ::testing::AddGlobalTestEnvironment(new cudf::test::TempDirTestEnvironment)); // Base test fixture for tests -struct CsvWriterTest : public cudf::test::BaseFixture { -}; +struct CsvWriterTest : public cudf::test::BaseFixture {}; template -struct CsvFixedPointWriterTest : public CsvWriterTest { -}; +struct CsvFixedPointWriterTest : public CsvWriterTest {}; TYPED_TEST_SUITE(CsvFixedPointWriterTest, cudf::test::FixedPointTypes); // Base test fixture for tests -struct CsvReaderTest : public cudf::test::BaseFixture { -}; +struct CsvReaderTest : public cudf::test::BaseFixture {}; // Typed test fixture for timestamp type tests template -struct CsvReaderNumericTypeTest : public CsvReaderTest { -}; +struct CsvReaderNumericTypeTest : public CsvReaderTest {}; // Declare typed test cases using SupportedNumericTypes = cudf::test::Types; @@ -2027,21 +2023,21 @@ TEST_F(CsvReaderTest, ParseInRangeIntegers) { std::vector small_int = {0, -10, 20, -30}; std::vector less_equal_int64_max = {std::numeric_limits::max() - 3, - std::numeric_limits::max() - 2, - std::numeric_limits::max() - 1, - std::numeric_limits::max()}; + std::numeric_limits::max() - 2, + std::numeric_limits::max() - 1, + std::numeric_limits::max()}; std::vector greater_equal_int64_min = {std::numeric_limits::min() + 3, std::numeric_limits::min() + 2, std::numeric_limits::min() + 1, std::numeric_limits::min()}; std::vector greater_int64_max = {uint64_t{std::numeric_limits::max()} - 1, - uint64_t{std::numeric_limits::max()}, - uint64_t{std::numeric_limits::max()} + 1, - uint64_t{std::numeric_limits::max()} + 2}; + uint64_t{std::numeric_limits::max()}, + uint64_t{std::numeric_limits::max()} + 1, + uint64_t{std::numeric_limits::max()} + 2}; std::vector less_equal_uint64_max = {std::numeric_limits::max() - 3, - std::numeric_limits::max() - 2, - std::numeric_limits::max() - 1, - std::numeric_limits::max()}; + std::numeric_limits::max() - 2, + std::numeric_limits::max() - 1, + std::numeric_limits::max()}; auto input_small_int = column_wrapper(small_int.begin(), small_int.end()); auto input_less_equal_int64_max = column_wrapper(less_equal_int64_max.begin(), less_equal_int64_max.end()); diff --git a/cpp/tests/io/file_io_test.cpp b/cpp/tests/io/file_io_test.cpp index b546239fdca..e7958258822 100644 --- a/cpp/tests/io/file_io_test.cpp +++ b/cpp/tests/io/file_io_test.cpp @@ -22,8 +22,7 @@ #include // Base test fixture for tests -struct CuFileIOTest : public cudf::test::BaseFixture { -}; +struct CuFileIOTest : public cudf::test::BaseFixture {}; TEST_F(CuFileIOTest, SliceSize) { diff --git a/cpp/tests/io/fst/fst_test.cu b/cpp/tests/io/fst/fst_test.cu index 1866719aa66..64aa81343db 100644 --- a/cpp/tests/io/fst/fst_test.cu +++ b/cpp/tests/io/fst/fst_test.cu @@ -119,8 +119,7 @@ static std::pair fst_baseline(InputItT begin, } // namespace // Base test fixture for tests -struct FstTest : public cudf::test::BaseFixture { -}; +struct FstTest : public cudf::test::BaseFixture {}; TEST_F(FstTest, GroundTruth) { diff --git a/cpp/tests/io/fst/logical_stack_test.cu b/cpp/tests/io/fst/logical_stack_test.cu index 187a041e321..7c0eef8d288 100644 --- a/cpp/tests/io/fst/logical_stack_test.cu +++ b/cpp/tests/io/fst/logical_stack_test.cu @@ -144,8 +144,7 @@ struct JSONToStackOp { } // namespace // Base test fixture for tests -struct LogicalStackTest : public cudf::test::BaseFixture { -}; +struct LogicalStackTest : public cudf::test::BaseFixture {}; TEST_F(LogicalStackTest, GroundTruth) { diff --git a/cpp/tests/io/json_chunked_reader.cpp b/cpp/tests/io/json_chunked_reader.cpp index 565ab6ef972..5b7de667f61 100644 --- a/cpp/tests/io/json_chunked_reader.cpp +++ b/cpp/tests/io/json_chunked_reader.cpp @@ -25,8 +25,7 @@ /** * @brief Base test fixture for JSON reader tests */ -struct JsonReaderTest : public cudf::test::BaseFixture { -}; +struct JsonReaderTest : public cudf::test::BaseFixture {}; // function to extract first delimiter in the string in each chunk, // collate together and form byte_range for each chunk, diff --git a/cpp/tests/io/json_test.cpp b/cpp/tests/io/json_test.cpp index 3a4e9a3773a..df42324626a 100644 --- a/cpp/tests/io/json_test.cpp +++ b/cpp/tests/io/json_test.cpp @@ -157,8 +157,7 @@ void check_float_column(cudf::column_view const& col, /** * @brief Base test fixture for JSON reader tests */ -struct JsonReaderTest : public cudf::test::BaseFixture { -}; +struct JsonReaderTest : public cudf::test::BaseFixture {}; /** * @brief Enum class to be used to specify the test case of parametrized tests @@ -190,16 +189,14 @@ constexpr bool is_row_orient_test(json_test_t test_opt) * @brief Test fixture for parametrized JSON reader tests */ struct JsonReaderParamTest : public cudf::test::BaseFixture, - public testing::WithParamInterface { -}; + public testing::WithParamInterface {}; /** * @brief Test fixture for parametrized JSON reader tests, testing record orient-only for legacy * JSON lines reader and the nested reader */ struct JsonReaderDualTest : public cudf::test::BaseFixture, - public testing::WithParamInterface { -}; + public testing::WithParamInterface {}; /** * @brief Generates a JSON lines string that uses the record orient @@ -231,8 +228,7 @@ std::string to_records_orient(std::vector> co } template -struct JsonFixedPointReaderTest : public JsonReaderTest { -}; +struct JsonFixedPointReaderTest : public JsonReaderTest {}; template struct JsonValidFixedPointReaderTest : public JsonFixedPointReaderTest { @@ -1006,21 +1002,21 @@ TEST_P(JsonReaderParamTest, ParseInRangeIntegers) constexpr auto num_rows = 4; std::vector small_int = {0, -10, 20, -30}; std::vector less_equal_int64_max = {std::numeric_limits::max() - 3, - std::numeric_limits::max() - 2, - std::numeric_limits::max() - 1, - std::numeric_limits::max()}; + std::numeric_limits::max() - 2, + std::numeric_limits::max() - 1, + std::numeric_limits::max()}; std::vector greater_equal_int64_min = {std::numeric_limits::min() + 3, std::numeric_limits::min() + 2, std::numeric_limits::min() + 1, std::numeric_limits::min()}; std::vector greater_int64_max = {uint64_t{std::numeric_limits::max()} - 1, - uint64_t{std::numeric_limits::max()}, - uint64_t{std::numeric_limits::max()} + 1, - uint64_t{std::numeric_limits::max()} + 2}; + uint64_t{std::numeric_limits::max()}, + uint64_t{std::numeric_limits::max()} + 1, + uint64_t{std::numeric_limits::max()} + 2}; std::vector less_equal_uint64_max = {std::numeric_limits::max() - 3, - std::numeric_limits::max() - 2, - std::numeric_limits::max() - 1, - std::numeric_limits::max()}; + std::numeric_limits::max() - 2, + std::numeric_limits::max() - 1, + std::numeric_limits::max()}; auto input_small_int = column_wrapper(small_int.begin(), small_int.end()); auto input_less_equal_int64_max = column_wrapper(less_equal_int64_max.begin(), less_equal_int64_max.end()); @@ -1580,21 +1576,21 @@ TEST_P(JsonReaderParamTest, JsonDtypeParsing) std::vector const validity = {1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0}; auto int_col = int_wrapper{{0, - 0, - int_ignore, - 1, - 1, - int_ignore, - int_ignore, - int_ignore, - int_ignore, - 1, - 0, - int_ignore, - 1, - 0, - int_ignore, - int_ignore}, + 0, + int_ignore, + 1, + 1, + int_ignore, + int_ignore, + int_ignore, + int_ignore, + 1, + 0, + int_ignore, + 1, + 0, + int_ignore, + int_ignore}, make_validity(validity)}; auto float_col = float_wrapper{{0.0, 0.0, diff --git a/cpp/tests/io/json_tree.cpp b/cpp/tests/io/json_tree.cpp index 0ae0360c4d9..57395a3f67b 100644 --- a/cpp/tests/io/json_tree.cpp +++ b/cpp/tests/io/json_tree.cpp @@ -556,8 +556,7 @@ records_orient_tree_traversal_cpu(cudf::host_span inpu } // namespace // Base test fixture for tests -struct JsonTest : public cudf::test::BaseFixture { -}; +struct JsonTest : public cudf::test::BaseFixture {}; TEST_F(JsonTest, TreeRepresentation) { @@ -786,8 +785,7 @@ TEST_F(JsonTest, TreeRepresentationError) * @brief Test fixture for parametrized JSON tree traversal tests */ struct JsonTreeTraversalTest : public cudf::test::BaseFixture, - public testing::WithParamInterface> { -}; + public testing::WithParamInterface> {}; // std::vector json_list = { diff --git a/cpp/tests/io/json_type_cast_test.cu b/cpp/tests/io/json_type_cast_test.cu index 2170ce4a3e2..59df914d988 100644 --- a/cpp/tests/io/json_type_cast_test.cu +++ b/cpp/tests/io/json_type_cast_test.cu @@ -34,8 +34,7 @@ using namespace cudf::test::iterators; -struct JSONTypeCastTest : public cudf::test::BaseFixture { -}; +struct JSONTypeCastTest : public cudf::test::BaseFixture {}; namespace { struct to_thrust_pair_fn { diff --git a/cpp/tests/io/json_writer.cpp b/cpp/tests/io/json_writer.cpp index 01a0081b1e2..e93047e20a5 100644 --- a/cpp/tests/io/json_writer.cpp +++ b/cpp/tests/io/json_writer.cpp @@ -26,8 +26,7 @@ #include #include -struct JsonWriterTest : public cudf::test::BaseFixture { -}; +struct JsonWriterTest : public cudf::test::BaseFixture {}; TEST_F(JsonWriterTest, EmptyInput) { diff --git a/cpp/tests/io/nested_json_test.cpp b/cpp/tests/io/nested_json_test.cpp index 5b797a00ca1..13a95b41703 100644 --- a/cpp/tests/io/nested_json_test.cpp +++ b/cpp/tests/io/nested_json_test.cpp @@ -129,8 +129,7 @@ void print_column(std::string const& input, cuio_json::json_column const& column } // namespace // Base test fixture for tests -struct JsonTest : public cudf::test::BaseFixture { -}; +struct JsonTest : public cudf::test::BaseFixture {}; TEST_F(JsonTest, StackContext) { @@ -450,8 +449,7 @@ TEST_F(JsonTest, TokenStream2) } } -struct JsonParserTest : public cudf::test::BaseFixture, public testing::WithParamInterface { -}; +struct JsonParserTest : public cudf::test::BaseFixture, public testing::WithParamInterface {}; INSTANTIATE_TEST_SUITE_P(Experimental, JsonParserTest, testing::Bool()); TEST_P(JsonParserTest, ExtractColumn) diff --git a/cpp/tests/io/orc_test.cpp b/cpp/tests/io/orc_test.cpp index 8f6ec0dc65c..e431f7b695c 100644 --- a/cpp/tests/io/orc_test.cpp +++ b/cpp/tests/io/orc_test.cpp @@ -92,8 +92,7 @@ std::unique_ptr create_random_fixed_table(cudf::size_type num_colum } // Base test fixture for tests -struct OrcWriterTest : public cudf::test::BaseFixture { -}; +struct OrcWriterTest : public cudf::test::BaseFixture {}; // Typed test fixture for numeric type tests template @@ -117,8 +116,7 @@ using SupportedTimestampTypes = TYPED_TEST_SUITE(OrcWriterTimestampTypeTest, SupportedTimestampTypes); // Base test fixture for chunked writer tests -struct OrcChunkedWriterTest : public cudf::test::BaseFixture { -}; +struct OrcChunkedWriterTest : public cudf::test::BaseFixture {}; // Typed test fixture for numeric type tests template @@ -130,16 +128,13 @@ struct OrcChunkedWriterNumericTypeTest : public OrcChunkedWriterTest { TYPED_TEST_SUITE(OrcChunkedWriterNumericTypeTest, SupportedTypes); // Test fixture for reader tests -struct OrcReaderTest : public cudf::test::BaseFixture { -}; +struct OrcReaderTest : public cudf::test::BaseFixture {}; // Test fixture for statistics tests -struct OrcStatisticsTest : public cudf::test::BaseFixture { -}; +struct OrcStatisticsTest : public cudf::test::BaseFixture {}; // Test fixture for metadata tests -struct OrcMetadataReaderTest : public cudf::test::BaseFixture { -}; +struct OrcMetadataReaderTest : public cudf::test::BaseFixture {}; namespace { // Generates a vector of uniform random values of type T @@ -1161,8 +1156,7 @@ TEST_F(OrcReaderTest, MultipleInputs) } struct OrcWriterTestDecimal : public OrcWriterTest, - public ::testing::WithParamInterface> { -}; + public ::testing::WithParamInterface> {}; TEST_P(OrcWriterTestDecimal, Decimal64) { @@ -1321,8 +1315,7 @@ TEST_F(OrcStatisticsTest, HasNull) struct OrcWriterTestStripes : public OrcWriterTest, - public ::testing::WithParamInterface> { -}; + public ::testing::WithParamInterface> {}; TEST_P(OrcWriterTestStripes, StripeSize) { diff --git a/cpp/tests/io/parquet_chunked_reader_test.cpp b/cpp/tests/io/parquet_chunked_reader_test.cpp index e13046eb90c..2a954c25482 100644 --- a/cpp/tests/io/parquet_chunked_reader_test.cpp +++ b/cpp/tests/io/parquet_chunked_reader_test.cpp @@ -130,8 +130,7 @@ auto chunked_read(std::string const& filepath, std::size_t byte_limit) } // namespace -struct ParquetChunkedReaderTest : public cudf::test::BaseFixture { -}; +struct ParquetChunkedReaderTest : public cudf::test::BaseFixture {}; TEST_F(ParquetChunkedReaderTest, TestChunkedReadNoData) { diff --git a/cpp/tests/io/parquet_test.cpp b/cpp/tests/io/parquet_test.cpp index 8a16fd9a05a..e5b917eff2a 100644 --- a/cpp/tests/io/parquet_test.cpp +++ b/cpp/tests/io/parquet_test.cpp @@ -316,16 +316,13 @@ cudf::io::parquet::PageHeader read_page_header(const std::unique_ptr @@ -358,8 +355,7 @@ struct ParquetWriterSchemaTest : public ParquetWriterTest { }; template -struct ParquetReaderSourceTest : public ParquetReaderTest { -}; +struct ParquetReaderSourceTest : public ParquetReaderTest {}; // Declare typed test cases // TODO: Replace with `NumericTypes` when unsigned support is added. Issue #5352 @@ -377,8 +373,7 @@ using ByteLikeTypes = cudf::test::Types @@ -390,8 +385,7 @@ struct ParquetChunkedWriterNumericTypeTest : public ParquetChunkedWriterTest { TYPED_TEST_SUITE(ParquetChunkedWriterNumericTypeTest, SupportedTypes); // Base test fixture for size-parameterized tests -class ParquetSizedTest : public ::testing::TestWithParam { -}; +class ParquetSizedTest : public ::testing::TestWithParam {}; // test the allowed bit widths for dictionary encoding // values chosen to trigger 1, 2, 3, 4, 5, 6, 8, 10, 12, 16, 20, and 24 bit dictionaries @@ -2150,7 +2144,7 @@ TEST_F(ParquetChunkedWriterTest, ForcedNullabilityList) cudf::io::table_input_metadata metadata(table1); metadata.column_metadata[0].set_nullability(true); // List is nullable at first (root) level metadata.column_metadata[0].child(1).set_nullability( - false); // non-nullable at second (leaf) level + false); // non-nullable at second (leaf) level metadata.column_metadata[1].set_nullability(true); auto filepath = temp_env->get_temp_filepath("ChunkedListNullable.parquet"); diff --git a/cpp/tests/io/text/data_chunk_source_test.cpp b/cpp/tests/io/text/data_chunk_source_test.cpp index acfe5a47624..29cd8e971df 100644 --- a/cpp/tests/io/text/data_chunk_source_test.cpp +++ b/cpp/tests/io/text/data_chunk_source_test.cpp @@ -28,8 +28,7 @@ auto const temp_env = static_cast( ::testing::AddGlobalTestEnvironment(new cudf::test::TempDirTestEnvironment)); -struct DataChunkSourceTest : public cudf::test::BaseFixture { -}; +struct DataChunkSourceTest : public cudf::test::BaseFixture {}; std::string chunk_to_host(const cudf::io::text::device_data_chunk& chunk) { diff --git a/cpp/tests/io/text/multibyte_split_test.cpp b/cpp/tests/io/text/multibyte_split_test.cpp index 270c825fc7f..dc69366fe26 100644 --- a/cpp/tests/io/text/multibyte_split_test.cpp +++ b/cpp/tests/io/text/multibyte_split_test.cpp @@ -34,8 +34,7 @@ using cudf::test::strings_column_wrapper; // 😀 | F0 9F 98 80 | 11110000 10011111 10011000 10000000 // 😎 | F0 9F 98 8E | 11110000 10011111 10011000 10001110 -struct MultibyteSplitTest : public cudf::test::BaseFixture { -}; +struct MultibyteSplitTest : public cudf::test::BaseFixture {}; TEST_F(MultibyteSplitTest, Simple) { diff --git a/cpp/tests/io/type_inference_test.cu b/cpp/tests/io/type_inference_test.cu index 81c6563cd2d..b2eb1b94f9c 100644 --- a/cpp/tests/io/type_inference_test.cu +++ b/cpp/tests/io/type_inference_test.cu @@ -35,8 +35,7 @@ using cudf::io::parse_options; using cudf::io::detail::infer_data_type; // Base test fixture for tests -struct TypeInference : public cudf::test::BaseFixture { -}; +struct TypeInference : public cudf::test::BaseFixture {}; TEST_F(TypeInference, Basic) { diff --git a/cpp/tests/iterator/indexalator_test.cu b/cpp/tests/iterator/indexalator_test.cu index 60e10b165c8..69d74e50f21 100644 --- a/cpp/tests/iterator/indexalator_test.cu +++ b/cpp/tests/iterator/indexalator_test.cu @@ -27,8 +27,7 @@ using TestingTypes = cudf::test::IntegralTypesNotBool; template -struct IndexalatorTest : public IteratorTest { -}; +struct IndexalatorTest : public IteratorTest {}; TYPED_TEST_SUITE(IndexalatorTest, TestingTypes); diff --git a/cpp/tests/iterator/optional_iterator_test_chrono.cu b/cpp/tests/iterator/optional_iterator_test_chrono.cu index c7b73e2aa59..6b1287ca6f8 100644 --- a/cpp/tests/iterator/optional_iterator_test_chrono.cu +++ b/cpp/tests/iterator/optional_iterator_test_chrono.cu @@ -17,8 +17,7 @@ using TestingTypes = cudf::test::ChronoTypes; template -struct ChronoOptionalIteratorTest : public IteratorTest { -}; +struct ChronoOptionalIteratorTest : public IteratorTest {}; TYPED_TEST_SUITE(ChronoOptionalIteratorTest, TestingTypes); TYPED_TEST(ChronoOptionalIteratorTest, nonull_optional_iterator) diff --git a/cpp/tests/iterator/optional_iterator_test_numeric.cu b/cpp/tests/iterator/optional_iterator_test_numeric.cu index 586c9472185..8854b25aedf 100644 --- a/cpp/tests/iterator/optional_iterator_test_numeric.cu +++ b/cpp/tests/iterator/optional_iterator_test_numeric.cu @@ -25,8 +25,7 @@ using TestingTypes = cudf::test::NumericTypes; template -struct NumericOptionalIteratorTest : public IteratorTest { -}; +struct NumericOptionalIteratorTest : public IteratorTest {}; TYPED_TEST_SUITE(NumericOptionalIteratorTest, TestingTypes); TYPED_TEST(NumericOptionalIteratorTest, nonull_optional_iterator) diff --git a/cpp/tests/iterator/pair_iterator_test_chrono.cu b/cpp/tests/iterator/pair_iterator_test_chrono.cu index 996be7b4278..3bbd6f6e2a4 100644 --- a/cpp/tests/iterator/pair_iterator_test_chrono.cu +++ b/cpp/tests/iterator/pair_iterator_test_chrono.cu @@ -17,8 +17,7 @@ using TestingTypes = cudf::test::ChronoTypes; template -struct ChronoPairIteratorTest : public IteratorTest { -}; +struct ChronoPairIteratorTest : public IteratorTest {}; TYPED_TEST_SUITE(ChronoPairIteratorTest, TestingTypes); TYPED_TEST(ChronoPairIteratorTest, nonull_pair_iterator) { nonull_pair_iterator(*this); } diff --git a/cpp/tests/iterator/pair_iterator_test_numeric.cu b/cpp/tests/iterator/pair_iterator_test_numeric.cu index 786bd3148f7..17489bcc3df 100644 --- a/cpp/tests/iterator/pair_iterator_test_numeric.cu +++ b/cpp/tests/iterator/pair_iterator_test_numeric.cu @@ -23,8 +23,7 @@ using TestingTypes = cudf::test::NumericTypes; template -struct NumericPairIteratorTest : public IteratorTest { -}; +struct NumericPairIteratorTest : public IteratorTest {}; TYPED_TEST_SUITE(NumericPairIteratorTest, TestingTypes); TYPED_TEST(NumericPairIteratorTest, nonull_pair_iterator) { nonull_pair_iterator(*this); } diff --git a/cpp/tests/iterator/sizes_to_offsets_iterator_test.cu b/cpp/tests/iterator/sizes_to_offsets_iterator_test.cu index f03d1948587..a0197c0040c 100644 --- a/cpp/tests/iterator/sizes_to_offsets_iterator_test.cu +++ b/cpp/tests/iterator/sizes_to_offsets_iterator_test.cu @@ -32,8 +32,7 @@ using TestingTypes = cudf::test::IntegralTypesNotBool; template -struct SizesToOffsetsIteratorTestTyped : public cudf::test::BaseFixture { -}; +struct SizesToOffsetsIteratorTestTyped : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(SizesToOffsetsIteratorTestTyped, TestingTypes); @@ -71,8 +70,7 @@ TYPED_TEST(SizesToOffsetsIteratorTestTyped, ExclusiveScan) EXPECT_EQ(last.value(stream), expected_reduce); } -struct SizesToOffsetsIteratorTest : public cudf::test::BaseFixture { -}; +struct SizesToOffsetsIteratorTest : public cudf::test::BaseFixture {}; TEST_F(SizesToOffsetsIteratorTest, ScanWithOverflow) { diff --git a/cpp/tests/iterator/value_iterator_test_chrono.cu b/cpp/tests/iterator/value_iterator_test_chrono.cu index 96ce2149f71..28fb13e96cb 100644 --- a/cpp/tests/iterator/value_iterator_test_chrono.cu +++ b/cpp/tests/iterator/value_iterator_test_chrono.cu @@ -20,8 +20,7 @@ using TestingTypes = cudf::test::ChronoTypes; template -struct ChronoValueIteratorTest : public IteratorTest { -}; +struct ChronoValueIteratorTest : public IteratorTest {}; TYPED_TEST_SUITE(ChronoValueIteratorTest, TestingTypes); TYPED_TEST(ChronoValueIteratorTest, non_null_iterator) { non_null_iterator(*this); } diff --git a/cpp/tests/iterator/value_iterator_test_numeric.cu b/cpp/tests/iterator/value_iterator_test_numeric.cu index 5decb437b8f..2fb6ccbcf0e 100644 --- a/cpp/tests/iterator/value_iterator_test_numeric.cu +++ b/cpp/tests/iterator/value_iterator_test_numeric.cu @@ -20,8 +20,7 @@ using TestingTypes = cudf::test::NumericTypes; template -struct NumericValueIteratorTest : public IteratorTest { -}; +struct NumericValueIteratorTest : public IteratorTest {}; TYPED_TEST_SUITE(NumericValueIteratorTest, TestingTypes); TYPED_TEST(NumericValueIteratorTest, non_null_iterator) { non_null_iterator(*this); } diff --git a/cpp/tests/iterator/value_iterator_test_strings.cu b/cpp/tests/iterator/value_iterator_test_strings.cu index d0e62c09a03..10bb3f21ee1 100644 --- a/cpp/tests/iterator/value_iterator_test_strings.cu +++ b/cpp/tests/iterator/value_iterator_test_strings.cu @@ -44,8 +44,7 @@ auto strings_to_string_views(std::vector& input_strings) return std::make_tuple(std::move(dev_chars), replaced_array); } -struct StringIteratorTest : public IteratorTest { -}; +struct StringIteratorTest : public IteratorTest {}; TEST_F(StringIteratorTest, string_view_null_iterator) { diff --git a/cpp/tests/iterator/value_iterator_test_transform.cu b/cpp/tests/iterator/value_iterator_test_transform.cu index b8bb596b821..e728f959ed2 100644 --- a/cpp/tests/iterator/value_iterator_test_transform.cu +++ b/cpp/tests/iterator/value_iterator_test_transform.cu @@ -18,8 +18,7 @@ #include #include -struct TransformedIteratorTest : public IteratorTest { -}; +struct TransformedIteratorTest : public IteratorTest {}; // Tests up cast reduction with null iterator. // The up cast iterator will be created by transform_iterator and diff --git a/cpp/tests/join/cross_join_tests.cpp b/cpp/tests/join/cross_join_tests.cpp index 75868dea972..0fce57c67d9 100644 --- a/cpp/tests/join/cross_join_tests.cpp +++ b/cpp/tests/join/cross_join_tests.cpp @@ -30,8 +30,7 @@ template using column_wrapper = cudf::test::fixed_width_column_wrapper; template -class CrossJoinTypeTests : public cudf::test::BaseFixture { -}; +class CrossJoinTypeTests : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(CrossJoinTypeTests, cudf::test::FixedWidthTypes); @@ -80,8 +79,7 @@ TYPED_TEST(CrossJoinTypeTests, CrossJoin) CUDF_TEST_EXPECT_TABLES_EQUAL(join_table->view(), table_expect); } -class CrossJoinInvalidInputs : public cudf::test::BaseFixture { -}; +class CrossJoinInvalidInputs : public cudf::test::BaseFixture {}; TEST_F(CrossJoinInvalidInputs, EmptyTable) { @@ -103,8 +101,7 @@ TEST_F(CrossJoinInvalidInputs, EmptyTable) EXPECT_THROW(cudf::cross_join(table_b, table_a), cudf::logic_error); } -class CrossJoinEmptyResult : public cudf::test::BaseFixture { -}; +class CrossJoinEmptyResult : public cudf::test::BaseFixture {}; TEST_F(CrossJoinEmptyResult, NoRows) { diff --git a/cpp/tests/join/join_tests.cpp b/cpp/tests/join/join_tests.cpp index e0b42ff9797..a712f3444b0 100644 --- a/cpp/tests/join/join_tests.cpp +++ b/cpp/tests/join/join_tests.cpp @@ -1584,8 +1584,7 @@ TEST_F(JoinTest, HashJoinLargeOutputSize) EXPECT_EQ(col_size * col_size, output_size); } -struct JoinDictionaryTest : public cudf::test::BaseFixture { -}; +struct JoinDictionaryTest : public cudf::test::BaseFixture {}; TEST_F(JoinDictionaryTest, LeftJoinNoNulls) { @@ -1880,7 +1879,7 @@ TEST_F(JoinTest, FullJoinWithStructsAndNulls) ""}, {1, 1, 1, 1, 1, 0, 0, 0, 0, 0}}; auto gold_ages0_col = column_wrapper{{48, 27, 25, 31, 351, -1, -1, -1, -1, -1}, - {1, 1, 1, 1, 1, 0, 0, 0, 0, 0}}; + {1, 1, 1, 1, 1, 0, 0, 0, 0, 0}}; auto gold_is_human0_col = column_wrapper{{true, true, false, false, false, false, false, false, false, false}, @@ -1907,7 +1906,7 @@ TEST_F(JoinTest, FullJoinWithStructsAndNulls) "Angua von Überwald"}, {0, 0, 0, 0, 0, 1, 1, 1, 1, 1}}; auto gold_ages1_col = column_wrapper{{-1, -1, -1, -1, -1, 27, 27, 48, 27, 25}, - {0, 0, 0, 0, 0, 1, 1, 1, 1, 1}}; + {0, 0, 0, 0, 0, 1, 1, 1, 1, 1}}; auto gold_is_human1_col = column_wrapper{{false, false, false, false, false, true, true, true, true, false}, diff --git a/cpp/tests/join/semi_anti_join_tests.cpp b/cpp/tests/join/semi_anti_join_tests.cpp index 1de70124b60..d725d202832 100644 --- a/cpp/tests/join/semi_anti_join_tests.cpp +++ b/cpp/tests/join/semi_anti_join_tests.cpp @@ -37,8 +37,7 @@ using strcol_wrapper = cudf::test::strings_column_wrapper; using column_vector = std::vector>; using Table = cudf::table; -struct JoinTest : public cudf::test::BaseFixture { -}; +struct JoinTest : public cudf::test::BaseFixture {}; namespace { // This function is a wrapper around cudf's join APIs that takes the gather map diff --git a/cpp/tests/labeling/label_bins_tests.cpp b/cpp/tests/labeling/label_bins_tests.cpp index c884a4ced59..dcd1ee3caf6 100644 --- a/cpp/tests/labeling/label_bins_tests.cpp +++ b/cpp/tests/labeling/label_bins_tests.cpp @@ -45,8 +45,7 @@ using NumericTypesNotBool = using SignedNumericTypesNotBool = cudf::test::Types; -struct BinTestFixture : public cudf::test::BaseFixture { -}; +struct BinTestFixture : public cudf::test::BaseFixture {}; /* * Test error cases. @@ -144,8 +143,7 @@ struct GenericExceptionCasesBinTestFixture : public BinTestFixture { }; template -struct ExceptionCasesBinTestFixture : public GenericExceptionCasesBinTestFixture { -}; +struct ExceptionCasesBinTestFixture : public GenericExceptionCasesBinTestFixture {}; TYPED_TEST_SUITE(ExceptionCasesBinTestFixture, NumericTypesNotBool); @@ -176,8 +174,7 @@ TYPED_TEST(ExceptionCasesBinTestFixture, TestInputWithNulls) // Test that nan values are assigned the NULL label. template -struct NaNBinTestFixture : public GenericExceptionCasesBinTestFixture { -}; +struct NaNBinTestFixture : public GenericExceptionCasesBinTestFixture {}; TYPED_TEST_SUITE(NaNBinTestFixture, FloatingPointTypes); @@ -328,8 +325,7 @@ TYPED_TEST(NegativeNumbersBinTestFixture, TestNegativeNumbers1024) { this->test( */ template -struct FixedPointBinTestFixture : public BinTestFixture { -}; +struct FixedPointBinTestFixture : public BinTestFixture {}; TYPED_TEST_SUITE(FixedPointBinTestFixture, FixedPointTypes); diff --git a/cpp/tests/lists/combine/concatenate_list_elements_tests.cpp b/cpp/tests/lists/combine/concatenate_list_elements_tests.cpp index 77e8f904d01..e40aae8a48e 100644 --- a/cpp/tests/lists/combine/concatenate_list_elements_tests.cpp +++ b/cpp/tests/lists/combine/concatenate_list_elements_tests.cpp @@ -41,8 +41,7 @@ auto build_lists_col(T& list, Ts&... lists) } // namespace -struct ConcatenateListElementsTest : public cudf::test::BaseFixture { -}; +struct ConcatenateListElementsTest : public cudf::test::BaseFixture {}; TEST_F(ConcatenateListElementsTest, InvalidInput) { @@ -60,8 +59,7 @@ TEST_F(ConcatenateListElementsTest, InvalidInput) } template -struct ConcatenateListElementsTypedTest : public cudf::test::BaseFixture { -}; +struct ConcatenateListElementsTypedTest : public cudf::test::BaseFixture {}; using TypesForTest = cudf::test::Concat; auto row0 = ListsCol{{ListsCol{{1, null, 3, 4}, null_at(1)}, - ListsCol{{10, 11, 12, null}, null_at(3)}, - ListsCol{} /*NULL*/}, + ListsCol{{10, 11, 12, null}, null_at(3)}, + ListsCol{} /*NULL*/}, null_at(2)}; auto row1 = ListsCol{ListsCol{{null, 2, 3, 4}, null_at(0)}, ListsCol{{13, 14, 15, 16, 17, null}, null_at(5)}, ListsCol{{20, null}, null_at(1)}}; auto row2 = ListsCol{{ListsCol{{null, 2, 3, 4}, null_at(0)}, - ListsCol{} /*NULL*/, - ListsCol{{null, 21, null, null}, nulls_at({0, 2, 3})}}, + ListsCol{} /*NULL*/, + ListsCol{{null, 21, null, null}, nulls_at({0, 2, 3})}}, null_at(1)}; auto row3 = ListsCol{{ListsCol{} /*NULL*/, ListsCol{{null, 18}, null_at(0)}}, null_at(0)}; auto row4 = ListsCol{ListsCol{{1, 2, null, 4}, null_at(2)}, diff --git a/cpp/tests/lists/combine/concatenate_rows_tests.cpp b/cpp/tests/lists/combine/concatenate_rows_tests.cpp index 49afe70ec07..f1e630d4545 100644 --- a/cpp/tests/lists/combine/concatenate_rows_tests.cpp +++ b/cpp/tests/lists/combine/concatenate_rows_tests.cpp @@ -33,8 +33,7 @@ constexpr cudf::test::debug_output_level verbosity{cudf::test::debug_output_leve constexpr int32_t null{0}; } // namespace -struct ListConcatenateRowsTest : public cudf::test::BaseFixture { -}; +struct ListConcatenateRowsTest : public cudf::test::BaseFixture {}; TEST_F(ListConcatenateRowsTest, InvalidInput) { @@ -59,8 +58,7 @@ TEST_F(ListConcatenateRowsTest, InvalidInput) } template -struct ListConcatenateRowsTypedTest : public cudf::test::BaseFixture { -}; +struct ListConcatenateRowsTypedTest : public cudf::test::BaseFixture {}; using TypesForTest = cudf::test::Concatview(), {2, 5})[0]; auto const col4 = cudf::slice(col_original->view(), {3, 6})[0]; auto const expected = ListsCol{ - {1, 2, 3, 2, 3, 3, 4, 5, 6, 5, 6}, - {2, 3, 3, 4, 5, 6, 5, 6}, - {3, 4, 5, 6, 5, 6, 7}}.release(); + {1, 2, 3, 2, 3, 3, 4, 5, 6, 5, 6}, + {2, 3, 3, 4, 5, 6, 5, 6}, + {3, 4, 5, 6, 5, 6, 7}}.release(); auto const results = cudf::lists::concatenate_rows(TView{{col1, col2, col3, col4}}); CUDF_TEST_EXPECT_COLUMNS_EQUIVALENT(*expected, *results, verbosity); } @@ -480,8 +478,7 @@ TEST_F(ListConcatenateRowsTest, StringsColumnsWithEmptyListTest) CUDF_TEST_EXPECT_COLUMNS_EQUIVALENT(*expected, *results, verbosity); } -struct ListConcatenateRowsNestedTypesTest : public cudf::test::BaseFixture { -}; +struct ListConcatenateRowsNestedTypesTest : public cudf::test::BaseFixture {}; TEST_F(ListConcatenateRowsNestedTypesTest, Identity) { diff --git a/cpp/tests/lists/contains_tests.cpp b/cpp/tests/lists/contains_tests.cpp index f592819dacb..8db1fb0c11d 100644 --- a/cpp/tests/lists/contains_tests.cpp +++ b/cpp/tests/lists/contains_tests.cpp @@ -107,12 +107,10 @@ using cudf::test::iterators::nulls_at; using ContainsTestTypes = cudf::test:: Concat; -struct ContainsTest : public cudf::test::BaseFixture { -}; +struct ContainsTest : public cudf::test::BaseFixture {}; template -struct TypedContainsTest : public ContainsTest { -}; +struct TypedContainsTest : public ContainsTest {}; TYPED_TEST_SUITE(TypedContainsTest, ContainsTestTypes); @@ -527,8 +525,7 @@ TEST_F(ContainsTest, ScalarTypeRelatedExceptions) } template -struct TypedVectorContainsTest : public ContainsTest { -}; +struct TypedVectorContainsTest : public ContainsTest {}; using VectorTestTypes = cudf::test::Concat; @@ -849,8 +846,7 @@ TEST_F(ContainsTest, VectorTypeRelatedExceptions) } template -struct TypedContainsNaNsTest : public ContainsTest { -}; +struct TypedContainsNaNsTest : public ContainsTest {}; TYPED_TEST_SUITE(TypedContainsNaNsTest, cudf::test::FloatingPointTypes); @@ -997,8 +993,7 @@ TYPED_TEST(TypedContainsNaNsTest, ListWithNaNsContainsVector) } template -struct TypedContainsDecimalsTest : public ContainsTest { -}; +struct TypedContainsDecimalsTest : public ContainsTest {}; TYPED_TEST_SUITE(TypedContainsDecimalsTest, cudf::test::FixedPointTypes); @@ -1079,8 +1074,7 @@ TYPED_TEST(TypedContainsDecimalsTest, VectorKey) } template -struct TypedStructContainsTest : public ContainsTest { -}; +struct TypedStructContainsTest : public ContainsTest {}; TYPED_TEST_SUITE(TypedStructContainsTest, ContainsTestTypes); TYPED_TEST(TypedStructContainsTest, EmptyInputTest) @@ -1554,8 +1548,7 @@ TYPED_TEST(TypedStructContainsTest, ColumnKeyWithSlicedListsHavingNulls) } template -struct TypedListContainsTest : public ContainsTest { -}; +struct TypedListContainsTest : public ContainsTest {}; TYPED_TEST_SUITE(TypedListContainsTest, ContainsTestTypes); TYPED_TEST(TypedListContainsTest, ScalarKeyLists) diff --git a/cpp/tests/lists/count_elements_tests.cpp b/cpp/tests/lists/count_elements_tests.cpp index 58c780c37f4..161f9b522f5 100644 --- a/cpp/tests/lists/count_elements_tests.cpp +++ b/cpp/tests/lists/count_elements_tests.cpp @@ -25,15 +25,13 @@ #include #include -struct ListsElementsTest : public cudf::test::BaseFixture { -}; +struct ListsElementsTest : public cudf::test::BaseFixture {}; using NumericTypesNotBool = cudf::test::Concat; template -class ListsElementsNumericsTest : public ListsElementsTest { -}; +class ListsElementsNumericsTest : public ListsElementsTest {}; TYPED_TEST_SUITE(ListsElementsNumericsTest, NumericTypesNotBool); diff --git a/cpp/tests/lists/explode_tests.cpp b/cpp/tests/lists/explode_tests.cpp index 7b2719196f9..68bc58da155 100644 --- a/cpp/tests/lists/explode_tests.cpp +++ b/cpp/tests/lists/explode_tests.cpp @@ -25,19 +25,15 @@ using FCW = cudf::test::fixed_width_column_wrapper; using LCW = cudf::test::lists_column_wrapper; -class ExplodeTest : public cudf::test::BaseFixture { -}; +class ExplodeTest : public cudf::test::BaseFixture {}; -class ExplodeOuterTest : public cudf::test::BaseFixture { -}; +class ExplodeOuterTest : public cudf::test::BaseFixture {}; template -class ExplodeTypedTest : public cudf::test::BaseFixture { -}; +class ExplodeTypedTest : public cudf::test::BaseFixture {}; template -class ExplodeOuterTypedTest : public cudf::test::BaseFixture { -}; +class ExplodeOuterTypedTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(ExplodeTypedTest, cudf::test::FixedPointTypes); diff --git a/cpp/tests/lists/extract_tests.cpp b/cpp/tests/lists/extract_tests.cpp index 4eabceae7f4..2c2b3c8b29c 100644 --- a/cpp/tests/lists/extract_tests.cpp +++ b/cpp/tests/lists/extract_tests.cpp @@ -32,15 +32,13 @@ #include -struct ListsExtractTest : public cudf::test::BaseFixture { -}; +struct ListsExtractTest : public cudf::test::BaseFixture {}; using NumericTypesNotBool = cudf::test::Concat; template -class ListsExtractNumericsTest : public ListsExtractTest { -}; +class ListsExtractNumericsTest : public ListsExtractTest {}; TYPED_TEST_SUITE(ListsExtractNumericsTest, NumericTypesNotBool); @@ -260,12 +258,10 @@ TEST_F(ListsExtractTest, ExtractElementWithNulls) } } -struct ListsExtractColumnIndicesTest : ListsExtractTest { -}; +struct ListsExtractColumnIndicesTest : ListsExtractTest {}; template -struct ListsExtractColumnIndicesTypedTest : ListsExtractColumnIndicesTest { -}; +struct ListsExtractColumnIndicesTypedTest : ListsExtractColumnIndicesTest {}; TYPED_TEST_SUITE(ListsExtractColumnIndicesTypedTest, cudf::test::FixedWidthTypes); diff --git a/cpp/tests/lists/reverse_tests.cpp b/cpp/tests/lists/reverse_tests.cpp index 8746f9140eb..88bf903253c 100644 --- a/cpp/tests/lists/reverse_tests.cpp +++ b/cpp/tests/lists/reverse_tests.cpp @@ -36,12 +36,10 @@ using ints_col = cudf::test::fixed_width_column_wrapper; using strings_col = cudf::test::strings_column_wrapper; using structs_col = cudf::test::structs_column_wrapper; -struct ListsReverseTest : public cudf::test::BaseFixture { -}; +struct ListsReverseTest : public cudf::test::BaseFixture {}; template -struct ListsReverseTypedTest : public cudf::test::BaseFixture { -}; +struct ListsReverseTypedTest : public cudf::test::BaseFixture {}; using TestTypes = cudf::test::Concat; @@ -372,8 +370,8 @@ TYPED_TEST(ListsReverseTypedTest, InputListsOfStructsWithNulls) "Kiwi", "Cherry", "Banana", - "", /*NULL*/ - "", /*NULL*/ + "", /*NULL*/ + "", /*NULL*/ "Apple", "", /*NULL*/ "Banana", // end list1 @@ -438,8 +436,8 @@ TYPED_TEST(ListsReverseTypedTest, InputListsOfStructsWithNulls) "Kiwi", "Cherry", "Banana", - "", /*NULL*/ - "", /*NULL*/ + "", /*NULL*/ + "", /*NULL*/ "Apple", "", /*NULL*/ "Banana", // end list1 diff --git a/cpp/tests/lists/sequences_tests.cpp b/cpp/tests/lists/sequences_tests.cpp index 2dafeaf5cea..72ec12444fd 100644 --- a/cpp/tests/lists/sequences_tests.cpp +++ b/cpp/tests/lists/sequences_tests.cpp @@ -37,8 +37,7 @@ using IntsCol = cudf::test::fixed_width_column_wrapper; /*-----------------------------------------------------------------------------------------------*/ template -class NumericSequencesTypedTest : public cudf::test::BaseFixture { -}; +class NumericSequencesTypedTest : public cudf::test::BaseFixture {}; using NumericTypes = cudf::test::Concat; TYPED_TEST_SUITE(NumericSequencesTypedTest, NumericTypes); @@ -136,8 +135,7 @@ TYPED_TEST(NumericSequencesTypedTest, SlicedInputTestNoNulls) /*-----------------------------------------------------------------------------------------------*/ // Data generated using https://www.epochconverter.com/ template -class DurationSequencesTypedTest : public cudf::test::BaseFixture { -}; +class DurationSequencesTypedTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(DurationSequencesTypedTest, cudf::test::DurationTypes); // Start time is 1638477473L - Thursday, December 2, 2021 8:37:53 PM. @@ -174,8 +172,7 @@ TYPED_TEST(DurationSequencesTypedTest, SequencesNoNull) } /*-----------------------------------------------------------------------------------------------*/ -class NumericSequencesTest : public cudf::test::BaseFixture { -}; +class NumericSequencesTest : public cudf::test::BaseFixture {}; TEST_F(NumericSequencesTest, EmptyInput) { diff --git a/cpp/tests/lists/set_operations/difference_distinct_tests.cpp b/cpp/tests/lists/set_operations/difference_distinct_tests.cpp index 63ce4c89c22..bf7ebc902ba 100644 --- a/cpp/tests/lists/set_operations/difference_distinct_tests.cpp +++ b/cpp/tests/lists/set_operations/difference_distinct_tests.cpp @@ -63,12 +63,10 @@ auto set_difference_sorted(cudf::column_view const& lhs, } } // namespace -struct SetDifferenceTest : public cudf::test::BaseFixture { -}; +struct SetDifferenceTest : public cudf::test::BaseFixture {}; template -struct SetDifferenceTypedTest : public cudf::test::BaseFixture { -}; +struct SetDifferenceTypedTest : public cudf::test::BaseFixture {}; using TestTypes = cudf::test::Concat; @@ -573,7 +571,7 @@ TEST_F(SetDifferenceTest, InputListsOfNestedStructsHaveNull) "" /*NULL*/, "" /*NULL*/, "" /*NULL*/, "Apple", "Banana", "Cherry", "Kiwi", // end list1 "" /*NULL*/, "Bear", "Cat", "Dog", "Duck", - "Panda", // end list2 + "Panda", // end list2 "ÁÁÁ", "ÉÉÉÉÉ", "ÁBC", "ÁÁÁ", "ÍÍÍÍÍ", "" /*NULL*/, "XYZ", "ÁBC" // end list3 diff --git a/cpp/tests/lists/set_operations/have_overlap_tests.cpp b/cpp/tests/lists/set_operations/have_overlap_tests.cpp index 440df213a6b..553460b6078 100644 --- a/cpp/tests/lists/set_operations/have_overlap_tests.cpp +++ b/cpp/tests/lists/set_operations/have_overlap_tests.cpp @@ -48,12 +48,10 @@ using strings_col = cudf::test::strings_column_wrapper; using structs_col = cudf::test::structs_column_wrapper; using lists_cv = cudf::lists_column_view; -struct ListOverlapTest : public cudf::test::BaseFixture { -}; +struct ListOverlapTest : public cudf::test::BaseFixture {}; template -struct ListOverlapTypedTest : public cudf::test::BaseFixture { -}; +struct ListOverlapTypedTest : public cudf::test::BaseFixture {}; using TestTypes = cudf::test::Concat; diff --git a/cpp/tests/lists/set_operations/intersect_distinct_tests.cpp b/cpp/tests/lists/set_operations/intersect_distinct_tests.cpp index 407d6793f40..dbccf06036b 100644 --- a/cpp/tests/lists/set_operations/intersect_distinct_tests.cpp +++ b/cpp/tests/lists/set_operations/intersect_distinct_tests.cpp @@ -64,12 +64,10 @@ auto set_intersect_sorted(cudf::column_view const& lhs, } } // namespace -struct SetIntersectTest : public cudf::test::BaseFixture { -}; +struct SetIntersectTest : public cudf::test::BaseFixture {}; template -struct SetIntersectTypedTest : public cudf::test::BaseFixture { -}; +struct SetIntersectTypedTest : public cudf::test::BaseFixture {}; using TestTypes = cudf::test::Concat; @@ -516,7 +514,7 @@ TEST_F(SetIntersectTest, InputListsOfNestedStructsHaveNull) null, // end list1 null, // end list2 null, - null // end list3 + null // end list3 }, all_nulls()}; auto grandchild2 = strings_col{{ @@ -524,7 +522,7 @@ TEST_F(SetIntersectTest, InputListsOfNestedStructsHaveNull) "Apple", // end list1 "" /*NULL*/, // end list2 "ÁÁÁ", - "ÉÉÉÉÉ" // end list3 + "ÉÉÉÉÉ" // end list3 }, nulls_at({0, 2})}; auto child1 = structs_col{{grandchild1, grandchild2}, null_at(0)}; diff --git a/cpp/tests/lists/set_operations/union_distinct_tests.cpp b/cpp/tests/lists/set_operations/union_distinct_tests.cpp index 31012013253..d919d2400a8 100644 --- a/cpp/tests/lists/set_operations/union_distinct_tests.cpp +++ b/cpp/tests/lists/set_operations/union_distinct_tests.cpp @@ -63,12 +63,10 @@ auto set_union_sorted(cudf::column_view const& lhs, } } // namespace -struct SetUnionTest : public cudf::test::BaseFixture { -}; +struct SetUnionTest : public cudf::test::BaseFixture {}; template -struct SetUnionTypedTest : public cudf::test::BaseFixture { -}; +struct SetUnionTypedTest : public cudf::test::BaseFixture {}; using TestTypes = cudf::test::Concat; @@ -156,9 +154,9 @@ TEST_F(SetUnionTest, FloatingPointTestsWithNaNs) // NaNs are unequal. { auto const expected = floats_lists{{-1, 0, 1, 2, 3, 4, NaN, neg_NaN}, - {0, 2, neg_NaN}, - {-2, 0, 1, 2, neg_NaN}, - {NaN, NaN, NaN, NaN, NaN, neg_NaN, neg_NaN}}; + {0, 2, neg_NaN}, + {-2, 0, 1, 2, neg_NaN}, + {NaN, NaN, NaN, NaN, NaN, neg_NaN, neg_NaN}}; auto const results_sorted = set_union_sorted(lhs, rhs, NULL_EQUAL, NAN_UNEQUAL); CUDF_TEST_EXPECT_COLUMNS_EQUAL(expected, *results_sorted); } @@ -562,7 +560,7 @@ TEST_F(SetUnionTest, InputListsOfNestedStructsHaveNull) auto grandchild2 = strings_col{{ "" /*NULL*/, "Apple", "Banana", "Cherry", "Kiwi", "Banana", "Cherry", - "Kiwi", // end list1 + "Kiwi", // end list1 "" /*NULL*/, "Bear", "Cat", "Dog", "Duck", "Panda", "Bear", "Cat", "Dog", "Duck", "Panda", // end list2 @@ -599,7 +597,7 @@ TEST_F(SetUnionTest, InputListsOfNestedStructsHaveNull) { "" /*NULL*/, "" /*NULL*/, "" /*NULL*/, "" /*NULL*/, "" /*NULL*/, "" /*NULL*/, "Apple", "Apple", "Banana", "Cherry", "Kiwi", "Banana", "Cherry", - "Kiwi", // end list1 + "Kiwi", // end list1 "" /*NULL*/, "" /*NULL*/, "Bear", "Cat", "Dog", "Duck", "Panda", "Bear", "Cat", "Dog", "Duck", "Panda", // end list2 "ÁÁÁ", "ÁÁÁ", "ÉÉÉÉÉ", "ÉÉÉÉÉ", "ÁBC", "ÁÁÁ", "ÍÍÍÍÍ", diff --git a/cpp/tests/lists/sort_lists_tests.cpp b/cpp/tests/lists/sort_lists_tests.cpp index 22c3ba581ea..1f95b2997a0 100644 --- a/cpp/tests/lists/sort_lists_tests.cpp +++ b/cpp/tests/lists/sort_lists_tests.cpp @@ -33,8 +33,7 @@ auto generate_sorted_lists(cudf::lists_column_view const& input, } template -struct SortLists : public cudf::test::BaseFixture { -}; +struct SortLists : public cudf::test::BaseFixture {}; using TypesForTest = cudf::test::Concat; TYPED_TEST_SUITE(SortLists, TypesForTest); diff --git a/cpp/tests/lists/stream_compaction/apply_boolean_mask_tests.cpp b/cpp/tests/lists/stream_compaction/apply_boolean_mask_tests.cpp index 17265326fde..f38dea710b8 100644 --- a/cpp/tests/lists/stream_compaction/apply_boolean_mask_tests.cpp +++ b/cpp/tests/lists/stream_compaction/apply_boolean_mask_tests.cpp @@ -41,12 +41,10 @@ using strings = strings_column_wrapper; auto constexpr X = int32_t{0}; // Placeholder for NULL. -struct ApplyBooleanMaskTest : public BaseFixture { -}; +struct ApplyBooleanMaskTest : public BaseFixture {}; template -struct ApplyBooleanMaskTypedTest : ApplyBooleanMaskTest { -}; +struct ApplyBooleanMaskTypedTest : ApplyBooleanMaskTest {}; TYPED_TEST_SUITE(ApplyBooleanMaskTypedTest, cudf::test::NumericTypes); diff --git a/cpp/tests/lists/stream_compaction/distinct_tests.cpp b/cpp/tests/lists/stream_compaction/distinct_tests.cpp index 93a72cfb9ce..3429a9acc34 100644 --- a/cpp/tests/lists/stream_compaction/distinct_tests.cpp +++ b/cpp/tests/lists/stream_compaction/distinct_tests.cpp @@ -62,12 +62,10 @@ auto distinct_sorted(cudf::column_view const& input, } // namespace -struct ListDistinctTest : public cudf::test::BaseFixture { -}; +struct ListDistinctTest : public cudf::test::BaseFixture {}; template -struct ListDistinctTypedTest : public cudf::test::BaseFixture { -}; +struct ListDistinctTypedTest : public cudf::test::BaseFixture {}; using TestTypes = cudf::test::Concat; @@ -531,7 +529,7 @@ TEST_F(ListDistinctTest, InputListsOfStructsHaveNull) 2, 3, 3, - 3}, // end list3 + 3}, // end list3 nulls_at({1, 6, 12, 13})}; auto child2 = strings_col{{ // begin list1 "XXX", /*NULL*/ @@ -553,7 +551,7 @@ TEST_F(ListDistinctTest, InputListsOfStructsHaveNull) "ÁBC", "ÁÁÁ", "ÍÍÍÍÍ", - "", /*NULL*/ + "", /*NULL*/ "XYZ", "ÁBC"}, // end list3 nulls_at({6, 17})}; @@ -672,7 +670,7 @@ TEST_F(ListDistinctTest, InputListsOfNestedStructsHaveNull) "ÁBC", "ÁÁÁ", "ÍÍÍÍÍ", - "", /*NULL*/ + "", /*NULL*/ "XYZ", "ÁBC" // end list3 }, @@ -731,8 +729,8 @@ TEST_F(ListDistinctTest, InputListsOfStructsOfLists) floats_lists{3, 4, 5}, // end list2 // begin list3 floats_lists{}, - floats_lists{}, // end list3 - // begin list4 + floats_lists{}, // end list3 + // begin list4 floats_lists{6, 7}, floats_lists{6, 7}, floats_lists{6, 7}}; diff --git a/cpp/tests/merge/merge_dictionary_test.cpp b/cpp/tests/merge/merge_dictionary_test.cpp index 978b88ec34b..b7d11cd10af 100644 --- a/cpp/tests/merge/merge_dictionary_test.cpp +++ b/cpp/tests/merge/merge_dictionary_test.cpp @@ -27,8 +27,7 @@ #include -struct MergeDictionaryTest : public cudf::test::BaseFixture { -}; +struct MergeDictionaryTest : public cudf::test::BaseFixture {}; TEST_F(MergeDictionaryTest, Merge1Column) { diff --git a/cpp/tests/merge/merge_string_test.cpp b/cpp/tests/merge/merge_string_test.cpp index b3e3907a088..7ccabc20dd0 100644 --- a/cpp/tests/merge/merge_string_test.cpp +++ b/cpp/tests/merge/merge_string_test.cpp @@ -41,8 +41,7 @@ using cudf::test::fixed_width_column_wrapper; using cudf::test::strings_column_wrapper; template -class MergeStringTest : public cudf::test::BaseFixture { -}; +class MergeStringTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(MergeStringTest, cudf::test::FixedWidthTypes); diff --git a/cpp/tests/merge/merge_test.cpp b/cpp/tests/merge/merge_test.cpp index f31729ffc4e..a981b532975 100644 --- a/cpp/tests/merge/merge_test.cpp +++ b/cpp/tests/merge/merge_test.cpp @@ -36,8 +36,7 @@ #include template -class MergeTest_ : public cudf::test::BaseFixture { -}; +class MergeTest_ : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(MergeTest_, cudf::test::FixedWidthTypes); @@ -693,8 +692,7 @@ TYPED_TEST(MergeTest_, NMerge1KeyColumns) CUDF_TEST_EXPECT_COLUMNS_EQUAL(expected_column_view2, output_column_view2); } -class MergeTest : public cudf::test::BaseFixture { -}; +class MergeTest : public cudf::test::BaseFixture {}; TEST_F(MergeTest, KeysWithNulls) { @@ -877,8 +875,7 @@ TEST_F(MergeTest, StructsNestedWithNulls) } template -struct FixedPointTestAllReps : public cudf::test::BaseFixture { -}; +struct FixedPointTestAllReps : public cudf::test::BaseFixture {}; template using fp_wrapper = cudf::test::fixed_point_column_wrapper; diff --git a/cpp/tests/partitioning/hash_partition_test.cpp b/cpp/tests/partitioning/hash_partition_test.cpp index a1508b5b973..24bef76f569 100644 --- a/cpp/tests/partitioning/hash_partition_test.cpp +++ b/cpp/tests/partitioning/hash_partition_test.cpp @@ -46,8 +46,7 @@ auto make_view_vector(std::vector const& columns) return views; } -class HashPartition : public cudf::test::BaseFixture { -}; +class HashPartition : public cudf::test::BaseFixture {}; TEST_F(HashPartition, InvalidColumnsToHash) { @@ -238,8 +237,7 @@ TEST_F(HashPartition, CustomSeedValue) } template -class HashPartitionFixedWidth : public cudf::test::BaseFixture { -}; +class HashPartitionFixedWidth : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(HashPartitionFixedWidth, cudf::test::FixedWidthTypesWithoutFixedPoint); diff --git a/cpp/tests/partitioning/partition_test.cpp b/cpp/tests/partitioning/partition_test.cpp index 98cd1b821c6..0799839370c 100644 --- a/cpp/tests/partitioning/partition_test.cpp +++ b/cpp/tests/partitioning/partition_test.cpp @@ -231,8 +231,7 @@ TYPED_TEST(PartitionTest, EmptyPartitions) } template -class PartitionTestFixedPoint : public cudf::test::BaseFixture { -}; +class PartitionTestFixedPoint : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(PartitionTestFixedPoint, cudf::test::FixedPointTypes); @@ -281,8 +280,7 @@ TYPED_TEST(PartitionTestFixedPoint, Partition2) run_partition_test(cudf::table_view{{input}}, map, 3, cudf::table_view{{expected}}, offsets); } -struct PartitionTestNotTyped : public cudf::test::BaseFixture { -}; +struct PartitionTestNotTyped : public cudf::test::BaseFixture {}; TEST_F(PartitionTestNotTyped, ListOfStringsEmpty) { diff --git a/cpp/tests/partitioning/round_robin_test.cpp b/cpp/tests/partitioning/round_robin_test.cpp index eebc65a07f0..11f02257af1 100644 --- a/cpp/tests/partitioning/round_robin_test.cpp +++ b/cpp/tests/partitioning/round_robin_test.cpp @@ -42,8 +42,7 @@ using cudf::test::fixed_width_column_wrapper; using cudf::test::strings_column_wrapper; template -class RoundRobinTest : public cudf::test::BaseFixture { -}; +class RoundRobinTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(RoundRobinTest, cudf::test::FixedWidthTypes); diff --git a/cpp/tests/quantiles/percentile_approx_test.cpp b/cpp/tests/quantiles/percentile_approx_test.cpp index 819b342ff8f..769ea9c78f1 100644 --- a/cpp/tests/quantiles/percentile_approx_test.cpp +++ b/cpp/tests/quantiles/percentile_approx_test.cpp @@ -320,8 +320,7 @@ using PercentileApproxTypes = cudf::test::Concat; template -struct PercentileApproxInputTypesTest : public cudf::test::BaseFixture { -}; +struct PercentileApproxInputTypesTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(PercentileApproxInputTypesTest, PercentileApproxTypes); TYPED_TEST(PercentileApproxInputTypesTest, Simple) @@ -368,8 +367,7 @@ TYPED_TEST(PercentileApproxInputTypesTest, GroupedWithNulls) {10, cudf::test::default_ulp * 6}}); } -struct PercentileApproxTest : public cudf::test::BaseFixture { -}; +struct PercentileApproxTest : public cudf::test::BaseFixture {}; TEST_F(PercentileApproxTest, EmptyInput) { diff --git a/cpp/tests/quantiles/quantile_test.cpp b/cpp/tests/quantiles/quantile_test.cpp index 6dfe4f5169b..ed32fbeeca4 100644 --- a/cpp/tests/quantiles/quantile_test.cpp +++ b/cpp/tests/quantiles/quantile_test.cpp @@ -384,8 +384,7 @@ void test(testdata::test_case test_case) // ----- tests ----------------------------------------------------------------- template -struct QuantileTest : public cudf::test::BaseFixture { -}; +struct QuantileTest : public cudf::test::BaseFixture {}; using TestTypes = cudf::test::NumericTypes; TYPED_TEST_SUITE(QuantileTest, TestTypes); @@ -418,8 +417,7 @@ TYPED_TEST(QuantileTest, TestEmpty) } template -struct QuantileUnsupportedTypesTest : public cudf::test::BaseFixture { -}; +struct QuantileUnsupportedTypesTest : public cudf::test::BaseFixture {}; // TODO add tests for FixedPointTypes using UnsupportedTestTypes = cudf::test::RemoveIf< @@ -448,8 +446,7 @@ TYPED_TEST(QuantileUnsupportedTypesTest, TestMultipleElements) EXPECT_THROW(cudf::quantile(input, {0}), cudf::logic_error); } -struct QuantileDictionaryTest : public cudf::test::BaseFixture { -}; +struct QuantileDictionaryTest : public cudf::test::BaseFixture {}; TEST_F(QuantileDictionaryTest, TestValid) { diff --git a/cpp/tests/quantiles/quantiles_test.cpp b/cpp/tests/quantiles/quantiles_test.cpp index f532e93c6c2..fe96b315b0b 100644 --- a/cpp/tests/quantiles/quantiles_test.cpp +++ b/cpp/tests/quantiles/quantiles_test.cpp @@ -26,8 +26,7 @@ #include template -struct QuantilesTest : public cudf::test::BaseFixture { -}; +struct QuantilesTest : public cudf::test::BaseFixture {}; using TestTypes = cudf::test::AllTypes; diff --git a/cpp/tests/reductions/collect_ops_tests.cpp b/cpp/tests/reductions/collect_ops_tests.cpp index 0445035d6c6..66d19eeb130 100644 --- a/cpp/tests/reductions/collect_ops_tests.cpp +++ b/cpp/tests/reductions/collect_ops_tests.cpp @@ -42,8 +42,7 @@ auto collect_set(cudf::column_view const& input, } // namespace template -struct CollectTestFixedWidth : public cudf::test::BaseFixture { -}; +struct CollectTestFixedWidth : public cudf::test::BaseFixture {}; using CollectFixedWidthTypes = cudf::test::Concat(ret3.get())->view()); } -struct CollectTest : public cudf::test::BaseFixture { -}; +struct CollectTest : public cudf::test::BaseFixture {}; TEST_F(CollectTest, CollectSetWithNaN) { diff --git a/cpp/tests/reductions/rank_tests.cpp b/cpp/tests/reductions/rank_tests.cpp index 8167b10dfee..2f51e248857 100644 --- a/cpp/tests/reductions/rank_tests.cpp +++ b/cpp/tests/reductions/rank_tests.cpp @@ -256,8 +256,7 @@ TYPED_TEST(TypedRankScanTest, StructsWithNullPushdown) } } -struct RankScanTest : public cudf::test::BaseFixture { -}; +struct RankScanTest : public cudf::test::BaseFixture {}; TEST(RankScanTest, BoolRank) { diff --git a/cpp/tests/reductions/reduction_tests.cpp b/cpp/tests/reductions/reduction_tests.cpp index b09392b3df5..2280f5eb537 100644 --- a/cpp/tests/reductions/reduction_tests.cpp +++ b/cpp/tests/reductions/reduction_tests.cpp @@ -120,8 +120,7 @@ struct ReductionTest : public cudf::test::BaseFixture { }; template -struct MinMaxReductionTest : public ReductionTest { -}; +struct MinMaxReductionTest : public ReductionTest {}; using MinMaxTypes = cudf::test::Types; TYPED_TEST_SUITE(MinMaxReductionTest, MinMaxTypes); @@ -250,8 +249,7 @@ TYPED_TEST(MinMaxReductionTest, MinMaxTypes) } template -struct SumReductionTest : public ReductionTest { -}; +struct SumReductionTest : public ReductionTest {}; using SumTypes = cudf::test::Types; TYPED_TEST_SUITE(SumReductionTest, SumTypes); @@ -382,8 +380,7 @@ TYPED_TEST(ReductionTest, SumOfSquare) } template -struct ReductionAnyAllTest : public ReductionTest { -}; +struct ReductionAnyAllTest : public ReductionTest {}; using AnyAllTypes = cudf::test::Types; TYPED_TEST_SUITE(ReductionAnyAllTest, AnyAllTypes); @@ -516,8 +513,7 @@ TYPED_TEST(ReductionAnyAllTest, AnyAllFalseFalse) // ---------------------------------------------------------------------------- template -struct MultiStepReductionTest : public ReductionTest { -}; +struct MultiStepReductionTest : public ReductionTest {}; using MultiStepReductionTypes = cudf::test::Types; TYPED_TEST_SUITE(MultiStepReductionTest, MultiStepReductionTypes); @@ -861,8 +857,7 @@ TEST_F(ReductionDtypeTest, different_precision) cudf::data_type(cudf::type_id::INT64)); } -struct ReductionEmptyTest : public cudf::test::BaseFixture { -}; +struct ReductionEmptyTest : public cudf::test::BaseFixture {}; // test case for empty input cases TEST_F(ReductionEmptyTest, empty_column) @@ -917,8 +912,7 @@ TEST_F(ReductionEmptyTest, empty_column) // ---------------------------------------------------------------------------- struct ReductionParamTest : public ReductionTest, - public ::testing::WithParamInterface { -}; + public ::testing::WithParamInterface {}; INSTANTIATE_TEST_CASE_P(ddofParam, ReductionParamTest, ::testing::Range(1, 5)); @@ -1361,8 +1355,7 @@ TYPED_TEST(ReductionTest, UniqueCount) } template -struct FixedPointTestAllReps : public cudf::test::BaseFixture { -}; +struct FixedPointTestAllReps : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(FixedPointTestAllReps, cudf::test::FixedPointTypes); @@ -1862,8 +1855,7 @@ TYPED_TEST(FixedPointTestAllReps, FixedPointReductionNthElement) } } -struct Decimal128Only : public cudf::test::BaseFixture { -}; +struct Decimal128Only : public cudf::test::BaseFixture {}; TEST_F(Decimal128Only, Decimal128ProductReduction) { @@ -2029,8 +2021,7 @@ TYPED_TEST(ReductionTest, NthElement) } } -struct DictionaryStringReductionTest : public StringReductionTest { -}; +struct DictionaryStringReductionTest : public StringReductionTest {}; std::vector data_list[] = { {"nine", "two", "five", "three", "five", "six", "two", "eight", "nine"}, @@ -2072,8 +2063,7 @@ TEST_P(DictionaryStringReductionTest, MinMax) } template -struct DictionaryAnyAllTest : public ReductionTest { -}; +struct DictionaryAnyAllTest : public ReductionTest {}; using DictionaryAnyAllTypes = cudf::test::Types; TYPED_TEST_SUITE(DictionaryAnyAllTest, cudf::test::NumericTypes); TYPED_TEST(DictionaryAnyAllTest, AnyAll) @@ -2173,8 +2163,7 @@ TYPED_TEST(DictionaryAnyAllTest, AnyAll) } template -struct DictionaryReductionTest : public ReductionTest { -}; +struct DictionaryReductionTest : public ReductionTest {}; using DictionaryTypes = cudf::test::Types; TYPED_TEST_SUITE(DictionaryReductionTest, DictionaryTypes); diff --git a/cpp/tests/reductions/scan_tests.cpp b/cpp/tests/reductions/scan_tests.cpp index ec5bd182049..7ad2dcf6760 100644 --- a/cpp/tests/reductions/scan_tests.cpp +++ b/cpp/tests/reductions/scan_tests.cpp @@ -404,8 +404,7 @@ TYPED_TEST(ScanTest, LeadingNulls) null_policy::INCLUDE); } -class ScanStringsTest : public ScanTest { -}; +class ScanStringsTest : public ScanTest {}; TEST_F(ScanStringsTest, MoreStringsMinMax) { @@ -456,8 +455,7 @@ TEST_F(ScanStringsTest, MoreStringsMinMax) } template -struct ScanChronoTest : public cudf::test::BaseFixture { -}; +struct ScanChronoTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(ScanChronoTest, cudf::test::ChronoTypes); @@ -499,8 +497,7 @@ TYPED_TEST(ScanChronoTest, ChronoMinMax) } template -struct ScanDurationTest : public cudf::test::BaseFixture { -}; +struct ScanDurationTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(ScanDurationTest, cudf::test::DurationTypes); @@ -526,8 +523,7 @@ TYPED_TEST(ScanDurationTest, Sum) cudf::logic_error); } -struct StructScanTest : public cudf::test::BaseFixture { -}; +struct StructScanTest : public cudf::test::BaseFixture {}; TEST_F(StructScanTest, StructScanMinMaxNoNull) { diff --git a/cpp/tests/reductions/segmented_reduction_tests.cpp b/cpp/tests/reductions/segmented_reduction_tests.cpp index 77fdad09c0b..fde587f4e4c 100644 --- a/cpp/tests/reductions/segmented_reduction_tests.cpp +++ b/cpp/tests/reductions/segmented_reduction_tests.cpp @@ -31,11 +31,9 @@ #define XXX 0 // null placeholder template -struct SegmentedReductionTest : public cudf::test::BaseFixture { -}; +struct SegmentedReductionTest : public cudf::test::BaseFixture {}; -struct SegmentedReductionTestUntyped : public cudf::test::BaseFixture { -}; +struct SegmentedReductionTestUntyped : public cudf::test::BaseFixture {}; TYPED_TEST_CASE(SegmentedReductionTest, cudf::test::NumericTypes); @@ -1120,8 +1118,7 @@ TEST_F(SegmentedReductionTestUntyped, EmptyInputWithOffsets) } template -struct SegmentedReductionFixedPointTest : public cudf::test::BaseFixture { -}; +struct SegmentedReductionFixedPointTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(SegmentedReductionFixedPointTest, cudf::test::FixedPointTypes); diff --git a/cpp/tests/reductions/tdigest_tests.cu b/cpp/tests/reductions/tdigest_tests.cu index 19112f2b713..b0087766c0c 100644 --- a/cpp/tests/reductions/tdigest_tests.cu +++ b/cpp/tests/reductions/tdigest_tests.cu @@ -22,8 +22,7 @@ #include template -struct ReductionTDigestAllTypes : public cudf::test::BaseFixture { -}; +struct ReductionTDigestAllTypes : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(ReductionTDigestAllTypes, cudf::test::NumericTypes); struct reduce_op { @@ -80,8 +79,7 @@ TYPED_TEST(ReductionTDigestAllTypes, AllNull) cudf::test::tdigest_simple_all_nulls_aggregation(reduce_op{}); } -struct ReductionTDigestMerge : public cudf::test::BaseFixture { -}; +struct ReductionTDigestMerge : public cudf::test::BaseFixture {}; TEST_F(ReductionTDigestMerge, Simple) { diff --git a/cpp/tests/replace/clamp_test.cpp b/cpp/tests/replace/clamp_test.cpp index c54ec5e8cc7..2e036c00c34 100644 --- a/cpp/tests/replace/clamp_test.cpp +++ b/cpp/tests/replace/clamp_test.cpp @@ -29,8 +29,7 @@ #include -struct ClampErrorTest : public cudf::test::BaseFixture { -}; +struct ClampErrorTest : public cudf::test::BaseFixture {}; TEST_F(ClampErrorTest, MisMatchingScalarTypes) { @@ -104,8 +103,7 @@ TEST_F(ClampErrorTest, InValidCase2) EXPECT_THROW(cudf::clamp(input, *lo, *lo_replace, *hi, *hi_replace), cudf::logic_error); } -struct ClampEmptyCaseTest : public cudf::test::BaseFixture { -}; +struct ClampEmptyCaseTest : public cudf::test::BaseFixture {}; TEST_F(ClampEmptyCaseTest, BothScalarEmptyInvalid) { @@ -291,8 +289,7 @@ TYPED_TEST(ClampTestNumeric, InputNulliWithReplace) } template -struct ClampFloatTest : public cudf::test::BaseFixture { -}; +struct ClampFloatTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(ClampFloatTest, cudf::test::FloatingPointTypes); @@ -380,8 +377,7 @@ TYPED_TEST(ClampFloatTest, SignOfAFloat) CUDF_TEST_EXPECT_COLUMNS_EQUAL(expected, got->view()); } -struct ClampStringTest : public cudf::test::BaseFixture { -}; +struct ClampStringTest : public cudf::test::BaseFixture {}; TEST_F(ClampStringTest, WithNullableColumn) { @@ -512,8 +508,7 @@ TEST_F(ClampStringTest, WithReplaceString) CUDF_TEST_EXPECT_COLUMNS_EQUAL(expected, got->view()); } -struct ClampDictionaryTest : public cudf::test::BaseFixture { -}; +struct ClampDictionaryTest : public cudf::test::BaseFixture {}; TEST_F(ClampDictionaryTest, WithNullableColumn) { @@ -590,8 +585,7 @@ TEST_F(ClampDictionaryTest, WithReplace) } template -struct FixedPointTest : public cudf::test::BaseFixture { -}; +struct FixedPointTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(FixedPointTest, cudf::test::FixedPointTypes); diff --git a/cpp/tests/replace/normalize_replace_tests.cpp b/cpp/tests/replace/normalize_replace_tests.cpp index 81ad82c41cf..e42a1c3954c 100644 --- a/cpp/tests/replace/normalize_replace_tests.cpp +++ b/cpp/tests/replace/normalize_replace_tests.cpp @@ -21,8 +21,7 @@ #include // This is the main test fixture -struct ReplaceTest : public cudf::test::BaseFixture { -}; +struct ReplaceTest : public cudf::test::BaseFixture {}; template void normalize_nans_and_zeros_test_internal( diff --git a/cpp/tests/replace/replace_nans_tests.cpp b/cpp/tests/replace/replace_nans_tests.cpp index c066931d97e..8f7c9ab901b 100644 --- a/cpp/tests/replace/replace_nans_tests.cpp +++ b/cpp/tests/replace/replace_nans_tests.cpp @@ -23,8 +23,7 @@ #include #include -struct ReplaceNaNsErrorTest : public cudf::test::BaseFixture { -}; +struct ReplaceNaNsErrorTest : public cudf::test::BaseFixture {}; // Error: old-values and new-values size mismatch TEST_F(ReplaceNaNsErrorTest, SizeMismatch) @@ -63,8 +62,7 @@ TEST_F(ReplaceNaNsErrorTest, NonFloatType) } template -struct ReplaceNaNsTest : public cudf::test::BaseFixture { -}; +struct ReplaceNaNsTest : public cudf::test::BaseFixture {}; using test_types = cudf::test::Types; diff --git a/cpp/tests/replace/replace_nulls_tests.cpp b/cpp/tests/replace/replace_nulls_tests.cpp index 0cc953d37a1..7e84a0695e3 100644 --- a/cpp/tests/replace/replace_nulls_tests.cpp +++ b/cpp/tests/replace/replace_nulls_tests.cpp @@ -37,8 +37,7 @@ using namespace cudf::test::iterators; -struct ReplaceErrorTest : public cudf::test::BaseFixture { -}; +struct ReplaceErrorTest : public cudf::test::BaseFixture {}; // Error: old-values and new-values size mismatch TEST_F(ReplaceErrorTest, SizeMismatch) @@ -73,8 +72,7 @@ TEST_F(ReplaceErrorTest, TypeMismatchScalar) EXPECT_THROW(cudf::replace_nulls(input_column, replacement, mr()), cudf::logic_error); } -struct ReplaceNullsStringsTest : public cudf::test::BaseFixture { -}; +struct ReplaceNullsStringsTest : public cudf::test::BaseFixture {}; TEST_F(ReplaceNullsStringsTest, SimpleReplace) { @@ -186,8 +184,7 @@ TEST_F(ReplaceNullsStringsTest, SimpleReplaceScalar) CUDF_TEST_EXPECT_COLUMNS_EQUAL(*result, expected_w); } -struct ReplaceNullsPolicyStringTest : public cudf::test::BaseFixture { -}; +struct ReplaceNullsPolicyStringTest : public cudf::test::BaseFixture {}; TEST_F(ReplaceNullsPolicyStringTest, PrecedingFill) { @@ -242,8 +239,7 @@ TEST_F(ReplaceNullsPolicyStringTest, FollowingFillTrailingNulls) } template -struct ReplaceNullsTest : public cudf::test::BaseFixture { -}; +struct ReplaceNullsTest : public cudf::test::BaseFixture {}; using test_types = cudf::test::NumericTypes; @@ -374,8 +370,7 @@ TYPED_TEST(ReplaceNullsTest, LargeScaleScalar) } template -struct ReplaceNullsPolicyTest : public cudf::test::BaseFixture { -}; +struct ReplaceNullsPolicyTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(ReplaceNullsPolicyTest, test_types); @@ -487,8 +482,7 @@ TYPED_TEST(ReplaceNullsPolicyTest, FollowingFillLargeArray) } template -struct ReplaceNullsFixedPointTest : public cudf::test::BaseFixture { -}; +struct ReplaceNullsFixedPointTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(ReplaceNullsFixedPointTest, cudf::test::FixedPointTypes); @@ -574,8 +568,7 @@ TYPED_TEST(ReplaceNullsFixedPointTest, ReplacementHasNulls) } template -struct ReplaceNullsPolicyFixedPointTest : public cudf::test::BaseFixture { -}; +struct ReplaceNullsPolicyFixedPointTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(ReplaceNullsPolicyFixedPointTest, cudf::test::FixedPointTypes); @@ -631,8 +624,7 @@ TYPED_TEST(ReplaceNullsPolicyFixedPointTest, FollowingFillTrailingNulls) std::move(col), std::move(expect_col), cudf::replace_policy::FOLLOWING); } -struct ReplaceDictionaryTest : public cudf::test::BaseFixture { -}; +struct ReplaceDictionaryTest : public cudf::test::BaseFixture {}; TEST_F(ReplaceDictionaryTest, ReplaceNulls) { @@ -698,8 +690,7 @@ TEST_F(ReplaceDictionaryTest, ReplaceNullsNoNulls) CUDF_TEST_EXPECT_COLUMNS_EQUAL(result->view(), input->view()); } -struct ReplaceNullsPolicyDictionaryTest : public cudf::test::BaseFixture { -}; +struct ReplaceNullsPolicyDictionaryTest : public cudf::test::BaseFixture {}; TEST_F(ReplaceNullsPolicyDictionaryTest, PrecedingFill) { diff --git a/cpp/tests/replace/replace_tests.cpp b/cpp/tests/replace/replace_tests.cpp index b6d3e4d05c8..93cfd674c2d 100644 --- a/cpp/tests/replace/replace_tests.cpp +++ b/cpp/tests/replace/replace_tests.cpp @@ -38,8 +38,7 @@ #include #include -struct ReplaceErrorTest : public cudf::test::BaseFixture { -}; +struct ReplaceErrorTest : public cudf::test::BaseFixture {}; // Error: old-values and new-values size mismatch TEST_F(ReplaceErrorTest, SizeMismatch) @@ -78,8 +77,7 @@ TEST_F(ReplaceErrorTest, NullInOldValues) cudf::logic_error); } -struct ReplaceStringsTest : public cudf::test::BaseFixture { -}; +struct ReplaceStringsTest : public cudf::test::BaseFixture {}; // Strings test TEST_F(ReplaceStringsTest, Strings) @@ -540,8 +538,7 @@ TYPED_TEST(ReplaceTest, LargeScaleReplaceTest) } template -struct FixedPointTestAllReps : public cudf::test::BaseFixture { -}; +struct FixedPointTestAllReps : public cudf::test::BaseFixture {}; template using wrapper = cudf::test::fixed_width_column_wrapper; @@ -574,8 +571,7 @@ TYPED_TEST(FixedPointTestAllReps, FixedPointReplace) CUDF_TEST_EXPECT_COLUMNS_EQUAL(*result, expected_w); } -struct ReplaceDictionaryTest : public cudf::test::BaseFixture { -}; +struct ReplaceDictionaryTest : public cudf::test::BaseFixture {}; TEST_F(ReplaceDictionaryTest, StringsKeys) { diff --git a/cpp/tests/reshape/byte_cast_tests.cpp b/cpp/tests/reshape/byte_cast_tests.cpp index 6eafc9a2759..31484e2185d 100644 --- a/cpp/tests/reshape/byte_cast_tests.cpp +++ b/cpp/tests/reshape/byte_cast_tests.cpp @@ -21,8 +21,7 @@ #include #include -class ByteCastTest : public cudf::test::BaseFixture { -}; +class ByteCastTest : public cudf::test::BaseFixture {}; TEST_F(ByteCastTest, int16ValuesWithSplit) { diff --git a/cpp/tests/reshape/interleave_columns_tests.cpp b/cpp/tests/reshape/interleave_columns_tests.cpp index 63e465f7658..deb1c759799 100644 --- a/cpp/tests/reshape/interleave_columns_tests.cpp +++ b/cpp/tests/reshape/interleave_columns_tests.cpp @@ -38,8 +38,7 @@ constexpr int32_t NOT_USE{-1}; // mark for elements that we don't care } // namespace template -struct InterleaveColumnsTest : public cudf::test::BaseFixture { -}; +struct InterleaveColumnsTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(InterleaveColumnsTest, cudf::test::FixedWidthTypes); @@ -186,8 +185,7 @@ TYPED_TEST(InterleaveColumnsTest, MismatchedDtypes) } } -struct InterleaveStringsColumnsTest : public cudf::test::BaseFixture { -}; +struct InterleaveStringsColumnsTest : public cudf::test::BaseFixture {}; TEST_F(InterleaveStringsColumnsTest, ZeroSizedColumns) { @@ -356,8 +354,7 @@ TEST_F(InterleaveStringsColumnsTest, MultiColumnStringMixNullableMix) } template -struct FixedPointTestAllReps : public cudf::test::BaseFixture { -}; +struct FixedPointTestAllReps : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(FixedPointTestAllReps, cudf::test::FixedPointTypes); @@ -383,8 +380,7 @@ TYPED_TEST(FixedPointTestAllReps, FixedPointInterleave) } } -struct ListsColumnsInterleaveTest : public cudf::test::BaseFixture { -}; +struct ListsColumnsInterleaveTest : public cudf::test::BaseFixture {}; TEST_F(ListsColumnsInterleaveTest, InvalidInput) { @@ -404,8 +400,7 @@ TEST_F(ListsColumnsInterleaveTest, InvalidInput) } template -struct ListsColumnsInterleaveTypedTest : public cudf::test::BaseFixture { -}; +struct ListsColumnsInterleaveTypedTest : public cudf::test::BaseFixture {}; using TypesForTest = cudf::test::Concat -struct StructsColumnsInterleaveTypedTest : public cudf::test::BaseFixture { -}; +struct StructsColumnsInterleaveTypedTest : public cudf::test::BaseFixture {}; using TypesForTest = cudf::test::Concat template -struct TileTest : public cudf::test::BaseFixture { -}; +struct TileTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(TileTest, cudf::test::AllTypes); diff --git a/cpp/tests/rolling/collect_ops_test.cpp b/cpp/tests/rolling/collect_ops_test.cpp index 56a9b2c45cc..eb00fc00610 100644 --- a/cpp/tests/rolling/collect_ops_test.cpp +++ b/cpp/tests/rolling/collect_ops_test.cpp @@ -31,12 +31,10 @@ #include -struct CollectListTest : public cudf::test::BaseFixture { -}; +struct CollectListTest : public cudf::test::BaseFixture {}; template -struct TypedCollectListTest : public CollectListTest { -}; +struct TypedCollectListTest : public CollectListTest {}; using TypesForTest = cudf::test::Concat -struct TypedCollectSetTest : public CollectSetTest { -}; +struct TypedCollectSetTest : public CollectSetTest {}; using TypesForSetTest = cudf::test::Concat -struct TypedRollingEmptyInputTest : RollingEmptyInputTest { -}; +struct TypedRollingEmptyInputTest : RollingEmptyInputTest {}; TYPED_TEST_SUITE(TypedRollingEmptyInputTest, cudf::test::FixedWidthTypes); diff --git a/cpp/tests/rolling/grouped_rolling_test.cpp b/cpp/tests/rolling/grouped_rolling_test.cpp index 9a9f0ce1977..68726344f07 100644 --- a/cpp/tests/rolling/grouped_rolling_test.cpp +++ b/cpp/tests/rolling/grouped_rolling_test.cpp @@ -453,8 +453,7 @@ class GroupedRollingTest : public cudf::test::BaseFixture { // // ------------- expected failures -------------------- -class GroupedRollingErrorTest : public cudf::test::BaseFixture { -}; +class GroupedRollingErrorTest : public cudf::test::BaseFixture {}; // negative sizes TEST_F(GroupedRollingErrorTest, NegativeMinPeriods) @@ -1260,11 +1259,9 @@ TYPED_TEST(GroupedTimeRangeRollingTest, SimplePartitionedStaticWindowsWithNoGrou } template -struct TypedNullTimestampTestForRangeQueries : public cudf::test::BaseFixture { -}; +struct TypedNullTimestampTestForRangeQueries : public cudf::test::BaseFixture {}; -struct NullTimestampTestForRangeQueries : public cudf::test::BaseFixture { -}; +struct NullTimestampTestForRangeQueries : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(TypedNullTimestampTestForRangeQueries, cudf::test::IntegralTypes); @@ -1569,11 +1566,9 @@ TYPED_TEST(TypedNullTimestampTestForRangeQueries, CountMultiGroupAllNullTimestam } template -struct TypedUnboundedWindowTest : public cudf::test::BaseFixture { -}; +struct TypedUnboundedWindowTest : public cudf::test::BaseFixture {}; -struct UnboundedWindowTest : public cudf::test::BaseFixture { -}; +struct UnboundedWindowTest : public cudf::test::BaseFixture {}; using FixedWidthTypes = cudf::test::Concat #include -struct LeadLagWindowTest : public cudf::test::BaseFixture { -}; +struct LeadLagWindowTest : public cudf::test::BaseFixture {}; template -struct TypedLeadLagWindowTest : public cudf::test::BaseFixture { -}; +struct TypedLeadLagWindowTest : public cudf::test::BaseFixture {}; using TypesForTest = cudf::test::Concat -struct TypedNestedLeadLagWindowTest : public cudf::test::BaseFixture { -}; +struct TypedNestedLeadLagWindowTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(TypedNestedLeadLagWindowTest, TypesForTest); @@ -778,17 +775,17 @@ TYPED_TEST(TypedNestedLeadLagWindowTest, Structs) min_periods, *cudf::make_lead_aggregation(3)); auto expected_lists_col = lcw{{{3, 3, 3}, - {{4, 4, 4, 4}, null_at_2}, - {5, 5, 5, 5, 5}, - {}, - {}, - {}, - {30, 30, 30}, - {40, 40, 40, 40}, - {{50, 50, 50, 50, 50}, null_at_2}, - {}, - {}, - {}}, + {{4, 4, 4, 4}, null_at_2}, + {5, 5, 5, 5, 5}, + {}, + {}, + {}, + {30, 30, 30}, + {40, 40, 40, 40}, + {{50, 50, 50, 50, 50}, null_at_2}, + {}, + {}, + {}}, cudf::test::iterators::nulls_at({3, 4, 5, 9, 10, 11})}; auto expected_strings_col = cudf::test::strings_column_wrapper{ {"333", "4444", "55555", "", "", "", "", "40404040", "5050505050", "", "", ""}, @@ -848,8 +845,7 @@ TYPED_TEST(TypedNestedLeadLagWindowTest, Structs) } } -struct LeadLagNonFixedWidthTest : cudf::test::BaseFixture { -}; +struct LeadLagNonFixedWidthTest : cudf::test::BaseFixture {}; TEST_F(LeadLagNonFixedWidthTest, StringsNoDefaults) { diff --git a/cpp/tests/rolling/nth_element_test.cpp b/cpp/tests/rolling/nth_element_test.cpp index aec8c382403..4edbcf0d8a6 100644 --- a/cpp/tests/rolling/nth_element_test.cpp +++ b/cpp/tests/rolling/nth_element_test.cpp @@ -108,12 +108,10 @@ class rolling_exec { } }; -struct NthElementTest : public cudf::test::BaseFixture { -}; +struct NthElementTest : public cudf::test::BaseFixture {}; template -struct NthElementTypedTest : public NthElementTest { -}; +struct NthElementTypedTest : public NthElementTest {}; using TypesForTest = cudf::test::Concat -struct TypedTimeRangeRollingTest : RangeRollingTest { -}; +struct TypedTimeRangeRollingTest : RangeRollingTest {}; TYPED_TEST_SUITE(TypedTimeRangeRollingTest, cudf::test::TimestampTypes); @@ -269,8 +267,7 @@ TYPED_TEST(TypedTimeRangeRollingTest, TimestampDESC) } template -struct TypedIntegralRangeRollingTest : RangeRollingTest { -}; +struct TypedIntegralRangeRollingTest : RangeRollingTest {}; TYPED_TEST_SUITE(TypedIntegralRangeRollingTest, cudf::test::IntegralTypesNotBool); @@ -321,8 +318,7 @@ TYPED_TEST(TypedIntegralRangeRollingTest, OrderByDesc) } template -struct TypedRangeRollingNullsTest : public RangeRollingTest { -}; +struct TypedRangeRollingNullsTest : public RangeRollingTest {}; using TypesUnderTest = cudf::test::IntegralTypesNotBool; diff --git a/cpp/tests/rolling/range_window_bounds_test.cpp b/cpp/tests/rolling/range_window_bounds_test.cpp index c70e0a78100..ceedda70075 100644 --- a/cpp/tests/rolling/range_window_bounds_test.cpp +++ b/cpp/tests/rolling/range_window_bounds_test.cpp @@ -26,12 +26,10 @@ #include -struct RangeWindowBoundsTest : public cudf::test::BaseFixture { -}; +struct RangeWindowBoundsTest : public cudf::test::BaseFixture {}; template -struct TimestampRangeWindowBoundsTest : RangeWindowBoundsTest { -}; +struct TimestampRangeWindowBoundsTest : RangeWindowBoundsTest {}; TYPED_TEST_SUITE(TimestampRangeWindowBoundsTest, cudf::test::TimestampTypes); @@ -99,8 +97,7 @@ TYPED_TEST(TimestampRangeWindowBoundsTest, WrongRangeType) } template -struct NumericRangeWindowBoundsTest : RangeWindowBoundsTest { -}; +struct NumericRangeWindowBoundsTest : RangeWindowBoundsTest {}; using TypesForTest = cudf::test::IntegralTypesNotBool; @@ -162,8 +159,7 @@ TYPED_TEST(NumericRangeWindowBoundsTest, WrongRangeType) } template -struct DecimalRangeBoundsTest : RangeWindowBoundsTest { -}; +struct DecimalRangeBoundsTest : RangeWindowBoundsTest {}; TYPED_TEST_SUITE(DecimalRangeBoundsTest, cudf::test::FixedPointTypes); diff --git a/cpp/tests/rolling/rolling_test.cpp b/cpp/tests/rolling/rolling_test.cpp index cc333e088d4..66b70ebfd79 100644 --- a/cpp/tests/rolling/rolling_test.cpp +++ b/cpp/tests/rolling/rolling_test.cpp @@ -41,8 +41,7 @@ #include #include -class RollingStringTest : public cudf::test::BaseFixture { -}; +class RollingStringTest : public cudf::test::BaseFixture {}; TEST_F(RollingStringTest, NoNullStringMinMaxCount) { @@ -164,8 +163,7 @@ TEST_F(RollingStringTest, ZeroWindowSize) } // ========================================================================================= -class RollingStructTest : public cudf::test::BaseFixture { -}; +class RollingStructTest : public cudf::test::BaseFixture {}; TEST_F(RollingStructTest, NoNullStructsMinMaxCount) { @@ -646,16 +644,13 @@ class RollingTest : public cudf::test::BaseFixture { }; template -class RollingVarStdTest : public cudf::test::BaseFixture { -}; +class RollingVarStdTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(RollingVarStdTest, cudf::test::FixedWidthTypesWithoutChrono); -class RollingtVarStdTestUntyped : public cudf::test::BaseFixture { -}; +class RollingtVarStdTestUntyped : public cudf::test::BaseFixture {}; -class RollingErrorTest : public cudf::test::BaseFixture { -}; +class RollingErrorTest : public cudf::test::BaseFixture {}; // negative sizes TEST_F(RollingErrorTest, NegativeMinPeriods) @@ -1394,8 +1389,7 @@ TEST_F(RollingTestUdf, DynamicWindow) } template -struct FixedPointTests : public cudf::test::BaseFixture { -}; +struct FixedPointTests : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(FixedPointTests, cudf::test::FixedPointTypes); @@ -1564,8 +1558,7 @@ TYPED_TEST(FixedPointTests, VarStd) } } -class RollingDictionaryTest : public cudf::test::BaseFixture { -}; +class RollingDictionaryTest : public cudf::test::BaseFixture {}; TEST_F(RollingDictionaryTest, Count) { diff --git a/cpp/tests/round/round_tests.cpp b/cpp/tests/round/round_tests.cpp index 3b211dc1453..757ada1703c 100644 --- a/cpp/tests/round/round_tests.cpp +++ b/cpp/tests/round/round_tests.cpp @@ -23,20 +23,16 @@ #include -struct RoundTests : public cudf::test::BaseFixture { -}; +struct RoundTests : public cudf::test::BaseFixture {}; template -struct RoundTestsIntegerTypes : public cudf::test::BaseFixture { -}; +struct RoundTestsIntegerTypes : public cudf::test::BaseFixture {}; template -struct RoundTestsFixedPointTypes : public cudf::test::BaseFixture { -}; +struct RoundTestsFixedPointTypes : public cudf::test::BaseFixture {}; template -struct RoundTestsFloatingPointTypes : public cudf::test::BaseFixture { -}; +struct RoundTestsFloatingPointTypes : public cudf::test::BaseFixture {}; using IntegerTypes = cudf::test::Types; diff --git a/cpp/tests/scalar/factories_test.cpp b/cpp/tests/scalar/factories_test.cpp index 73cf3479ac2..fa19fe8eef6 100644 --- a/cpp/tests/scalar/factories_test.cpp +++ b/cpp/tests/scalar/factories_test.cpp @@ -121,8 +121,7 @@ TYPED_TEST(DefaultScalarFactory, TypeCast) } template -struct FixedWidthScalarFactory : public ScalarFactoryTest { -}; +struct FixedWidthScalarFactory : public ScalarFactoryTest {}; TYPED_TEST_SUITE(FixedWidthScalarFactory, cudf::test::FixedWidthTypesWithoutFixedPoint); @@ -142,8 +141,7 @@ TYPED_TEST(FixedWidthScalarFactory, ValueProvided) } template -struct FixedPointScalarFactory : public ScalarFactoryTest { -}; +struct FixedPointScalarFactory : public ScalarFactoryTest {}; TYPED_TEST_SUITE(FixedPointScalarFactory, cudf::test::FixedPointTypes); @@ -164,8 +162,7 @@ TYPED_TEST(FixedPointScalarFactory, ValueProvided) EXPECT_TRUE(s->is_valid()); } -struct StructScalarFactory : public ScalarFactoryTest { -}; +struct StructScalarFactory : public ScalarFactoryTest {}; TEST_F(StructScalarFactory, Basic) { diff --git a/cpp/tests/scalar/scalar_device_view_test.cu b/cpp/tests/scalar/scalar_device_view_test.cu index 9e0f68573a5..ee3be2a90ff 100644 --- a/cpp/tests/scalar/scalar_device_view_test.cu +++ b/cpp/tests/scalar/scalar_device_view_test.cu @@ -30,8 +30,7 @@ #include template -struct TypedScalarDeviceViewTest : public cudf::test::BaseFixture { -}; +struct TypedScalarDeviceViewTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(TypedScalarDeviceViewTest, cudf::test::FixedWidthTypesWithoutFixedPoint); @@ -112,8 +111,7 @@ TYPED_TEST(TypedScalarDeviceViewTest, SetNull) EXPECT_FALSE(s.is_valid()); } -struct StringScalarDeviceViewTest : public cudf::test::BaseFixture { -}; +struct StringScalarDeviceViewTest : public cudf::test::BaseFixture {}; __global__ void test_string_value(cudf::string_scalar_device_view s, const char* value, diff --git a/cpp/tests/scalar/scalar_test.cpp b/cpp/tests/scalar/scalar_test.cpp index 45646259cce..db616b606e9 100644 --- a/cpp/tests/scalar/scalar_test.cpp +++ b/cpp/tests/scalar/scalar_test.cpp @@ -22,12 +22,10 @@ #include template -struct TypedScalarTest : public cudf::test::BaseFixture { -}; +struct TypedScalarTest : public cudf::test::BaseFixture {}; template -struct TypedScalarTestWithoutFixedPoint : public cudf::test::BaseFixture { -}; +struct TypedScalarTestWithoutFixedPoint : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(TypedScalarTest, cudf::test::FixedWidthTypes); TYPED_TEST_SUITE(TypedScalarTestWithoutFixedPoint, cudf::test::FixedWidthTypesWithoutFixedPoint); @@ -93,8 +91,7 @@ TYPED_TEST(TypedScalarTest, MoveConstructor) EXPECT_EQ(data_ptr, s2.data()); } -struct StringScalarTest : public cudf::test::BaseFixture { -}; +struct StringScalarTest : public cudf::test::BaseFixture {}; TEST_F(StringScalarTest, DefaultValidity) { @@ -127,8 +124,7 @@ TEST_F(StringScalarTest, MoveConstructor) EXPECT_EQ(data_ptr, s2.data()); } -struct ListScalarTest : public cudf::test::BaseFixture { -}; +struct ListScalarTest : public cudf::test::BaseFixture {}; TEST_F(ListScalarTest, DefaultValidityNonNested) { @@ -212,8 +208,7 @@ TEST_F(ListScalarTest, MoveConstructorNested) EXPECT_EQ(s.view().num_children(), 0); } -struct StructScalarTest : public cudf::test::BaseFixture { -}; +struct StructScalarTest : public cudf::test::BaseFixture {}; TEST_F(StructScalarTest, Basic) { diff --git a/cpp/tests/search/search_dictionary_test.cpp b/cpp/tests/search/search_dictionary_test.cpp index 9eba259ee39..cceb23c0a83 100644 --- a/cpp/tests/search/search_dictionary_test.cpp +++ b/cpp/tests/search/search_dictionary_test.cpp @@ -21,8 +21,7 @@ #include -struct DictionarySearchTest : public cudf::test::BaseFixture { -}; +struct DictionarySearchTest : public cudf::test::BaseFixture {}; using cudf::numeric_scalar; using cudf::size_type; diff --git a/cpp/tests/search/search_list_test.cpp b/cpp/tests/search/search_list_test.cpp index 1e97933fa4d..ca17858a273 100644 --- a/cpp/tests/search/search_list_test.cpp +++ b/cpp/tests/search/search_list_test.cpp @@ -44,8 +44,7 @@ using TestTypes = cudf::test::Concat; template -struct TypedListsContainsTestScalarNeedle : public cudf::test::BaseFixture { -}; +struct TypedListsContainsTestScalarNeedle : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(TypedListsContainsTestScalarNeedle, TestTypes); TYPED_TEST(TypedListsContainsTestScalarNeedle, EmptyInput) @@ -220,8 +219,7 @@ TYPED_TEST(TypedListsContainsTestScalarNeedle, SlicedInputHavingNulls) } template -struct TypedListContainsTestColumnNeedles : public cudf::test::BaseFixture { -}; +struct TypedListContainsTestColumnNeedles : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(TypedListContainsTestColumnNeedles, TestTypes); @@ -349,8 +347,7 @@ TYPED_TEST(TypedListContainsTestColumnNeedles, ListsOfStructs) CUDF_TEST_EXPECT_COLUMNS_EQUAL(expected, *result, verbosity); } -struct ListLowerBound : public cudf::test::BaseFixture { -}; +struct ListLowerBound : public cudf::test::BaseFixture {}; TEST_F(ListLowerBound, ListWithNulls) { diff --git a/cpp/tests/search/search_struct_test.cpp b/cpp/tests/search/search_struct_test.cpp index 5d9ef85a249..37db2d2f889 100644 --- a/cpp/tests/search/search_struct_test.cpp +++ b/cpp/tests/search/search_struct_test.cpp @@ -43,8 +43,7 @@ using TestTypes = cudf::test::Concat; template -struct TypedStructSearchTest : public cudf::test::BaseFixture { -}; +struct TypedStructSearchTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(TypedStructSearchTest, TestTypes); namespace { @@ -362,8 +361,7 @@ TYPED_TEST(TypedStructSearchTest, ComplexStructTest) } template -struct TypedStructContainsTestScalarNeedle : public cudf::test::BaseFixture { -}; +struct TypedStructContainsTestScalarNeedle : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(TypedStructContainsTestScalarNeedle, TestTypes); TYPED_TEST(TypedStructContainsTestScalarNeedle, EmptyInput) @@ -608,8 +606,7 @@ TYPED_TEST(TypedStructContainsTestScalarNeedle, SlicedInputWithNulls) } template -struct TypedStructContainsTestColumnNeedles : public cudf::test::BaseFixture { -}; +struct TypedStructContainsTestColumnNeedles : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(TypedStructContainsTestColumnNeedles, TestTypes); diff --git a/cpp/tests/search/search_test.cpp b/cpp/tests/search/search_test.cpp index 169eaffa41a..5b4b7ec5313 100644 --- a/cpp/tests/search/search_test.cpp +++ b/cpp/tests/search/search_test.cpp @@ -24,8 +24,7 @@ #include -struct SearchTest : public cudf::test::BaseFixture { -}; +struct SearchTest : public cudf::test::BaseFixture {}; using cudf::numeric_scalar; using cudf::size_type; @@ -1819,8 +1818,7 @@ TEST_F(SearchTest, multi_contains_empty_input_set_string) } template -struct FixedPointTestAllReps : public cudf::test::BaseFixture { -}; +struct FixedPointTestAllReps : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(FixedPointTestAllReps, cudf::test::FixedPointTypes); diff --git a/cpp/tests/sort/is_sorted_tests.cpp b/cpp/tests/sort/is_sorted_tests.cpp index eea8a21c67c..ba7c9d82533 100644 --- a/cpp/tests/sort/is_sorted_tests.cpp +++ b/cpp/tests/sort/is_sorted_tests.cpp @@ -282,8 +282,7 @@ auto nulls_before() // ---- tests ------------------------------------------------------------------ template -struct IsSortedTest : public cudf::test::BaseFixture { -}; +struct IsSortedTest : public cudf::test::BaseFixture {}; using SupportedTypes = cudf::test:: Concat, cudf::test::ListTypes>; @@ -494,8 +493,7 @@ TYPED_TEST(IsSortedTest, NullOrderArgsTooMany) } template -struct IsSortedFixedWidthOnly : public cudf::test::BaseFixture { -}; +struct IsSortedFixedWidthOnly : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(IsSortedFixedWidthOnly, cudf::test::FixedWidthTypes); diff --git a/cpp/tests/sort/rank_test.cpp b/cpp/tests/sort/rank_test.cpp index 2722c1dfdad..47a1ba3b294 100644 --- a/cpp/tests/sort/rank_test.cpp +++ b/cpp/tests/sort/rank_test.cpp @@ -434,8 +434,7 @@ TYPED_TEST(Rank, min_desc_bottom_pct) this->run_all_tests(cudf::rank_method::MIN, desc_bottom, col1_rank, col2_rank, col3_rank, true); } -struct RankLarge : public cudf::test::BaseFixture { -}; +struct RankLarge : public cudf::test::BaseFixture {}; TEST_F(RankLarge, average_large) { diff --git a/cpp/tests/sort/segmented_sort_tests.cpp b/cpp/tests/sort/segmented_sort_tests.cpp index 0e7a2d0af87..b3f98eb54b9 100644 --- a/cpp/tests/sort/segmented_sort_tests.cpp +++ b/cpp/tests/sort/segmented_sort_tests.cpp @@ -30,8 +30,7 @@ template using column_wrapper = cudf::test::fixed_width_column_wrapper; template -struct SegmentedSort : public cudf::test::BaseFixture { -}; +struct SegmentedSort : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(SegmentedSort, cudf::test::NumericTypes); using SegmentedSortInt = SegmentedSort; @@ -271,7 +270,7 @@ TEST_F(SegmentedSortInt, Sliced) column_wrapper expected2{{0, 1, 3, 2, 4, 5, 6}}; column_wrapper expected3{{0, 1, 2, 3, 4, 5, 6}}; // clang-format on - auto slice = cudf::slice(col1, {4, 11})[0]; // 7 elements + auto slice = cudf::slice(col1, {4, 11})[0]; // 7 elements cudf::table_view input{{slice}}; auto seg_slice = cudf::slice(segments2, {2, 4})[0]; // 2 elements diff --git a/cpp/tests/sort/sort_nested_types_tests.cpp b/cpp/tests/sort/sort_nested_types_tests.cpp index 4075a8456d8..985793a3d91 100644 --- a/cpp/tests/sort/sort_nested_types_tests.cpp +++ b/cpp/tests/sort/sort_nested_types_tests.cpp @@ -31,8 +31,7 @@ using namespace cudf::test::iterators; constexpr auto null{0}; -struct NestedStructTest : public cudf::test::BaseFixture { -}; +struct NestedStructTest : public cudf::test::BaseFixture {}; TEST_F(NestedStructTest, SimpleStructsOfListsNoNulls) { diff --git a/cpp/tests/sort/sort_test.cpp b/cpp/tests/sort/sort_test.cpp index 7c37523fae2..35670cf382f 100644 --- a/cpp/tests/sort/sort_test.cpp +++ b/cpp/tests/sort/sort_test.cpp @@ -54,8 +54,7 @@ using TestTypes = cudf::test::Concat; // include timestamps and durations template -struct Sort : public cudf::test::BaseFixture { -}; +struct Sort : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(Sort, TestTypes); @@ -988,8 +987,7 @@ TYPED_TEST(Sort, WithEmptyListColumn) CUDF_TEST_EXPECT_COLUMNS_EQUAL(expect, *result); } -struct SortByKey : public cudf::test::BaseFixture { -}; +struct SortByKey : public cudf::test::BaseFixture {}; TEST_F(SortByKey, ValueKeysSizeMismatch) { @@ -1007,8 +1005,7 @@ TEST_F(SortByKey, ValueKeysSizeMismatch) } template -struct SortFixedPointTest : public cudf::test::BaseFixture { -}; +struct SortFixedPointTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(SortFixedPointTest, cudf::test::FixedPointTypes); @@ -1044,8 +1041,7 @@ TYPED_TEST(SortFixedPointTest, SortedOrderGather) CUDF_TEST_EXPECT_TABLES_EQUAL(sorted_table, sorted->view()); } -struct SortCornerTest : public cudf::test::BaseFixture { -}; +struct SortCornerTest : public cudf::test::BaseFixture {}; TEST_F(SortCornerTest, WithEmptyStructColumn) { diff --git a/cpp/tests/sort/stable_sort_tests.cpp b/cpp/tests/sort/stable_sort_tests.cpp index 57ad6361ad6..3063252e7cd 100644 --- a/cpp/tests/sort/stable_sort_tests.cpp +++ b/cpp/tests/sort/stable_sort_tests.cpp @@ -46,8 +46,7 @@ using TestTypes = cudf::test::Concat; // include timestamps and durations template -struct StableSort : public cudf::test::BaseFixture { -}; +struct StableSort : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(StableSort, TestTypes); @@ -223,8 +222,7 @@ TYPED_TEST(StableSort, ZeroSizedColumns) run_stable_sort_test(input, expected, column_order); } -struct StableSortByKey : public cudf::test::BaseFixture { -}; +struct StableSortByKey : public cudf::test::BaseFixture {}; TEST_F(StableSortByKey, ValueKeysSizeMismatch) { @@ -242,8 +240,7 @@ TEST_F(StableSortByKey, ValueKeysSizeMismatch) } template -struct StableSortFixedPoint : public cudf::test::BaseFixture { -}; +struct StableSortFixedPoint : public cudf::test::BaseFixture {}; template using wrapper = cudf::test::fixed_width_column_wrapper; diff --git a/cpp/tests/stream_compaction/apply_boolean_mask_tests.cpp b/cpp/tests/stream_compaction/apply_boolean_mask_tests.cpp index 78e9f8d01b3..7ee090cc13f 100644 --- a/cpp/tests/stream_compaction/apply_boolean_mask_tests.cpp +++ b/cpp/tests/stream_compaction/apply_boolean_mask_tests.cpp @@ -32,8 +32,7 @@ #include #include -struct ApplyBooleanMask : public cudf::test::BaseFixture { -}; +struct ApplyBooleanMask : public cudf::test::BaseFixture {}; TEST_F(ApplyBooleanMask, NonNullBooleanMask) { diff --git a/cpp/tests/stream_compaction/distinct_count_tests.cpp b/cpp/tests/stream_compaction/distinct_count_tests.cpp index c7b6d36c538..e80244cee41 100644 --- a/cpp/tests/stream_compaction/distinct_count_tests.cpp +++ b/cpp/tests/stream_compaction/distinct_count_tests.cpp @@ -44,8 +44,7 @@ constexpr int32_t XXX{70}; // Mark for null elements constexpr int32_t YYY{3}; // Mark for null elements template -struct TypedDistinctCount : public cudf::test::BaseFixture { -}; +struct TypedDistinctCount : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(TypedDistinctCount, cudf::test::NumericTypes); @@ -89,15 +88,14 @@ TYPED_TEST(TypedDistinctCount, TableNoNull) EXPECT_EQ(expected, cudf::distinct_count(input_table, null_equality::EQUAL)); } -struct DistinctCount : public cudf::test::BaseFixture { -}; +struct DistinctCount : public cudf::test::BaseFixture {}; TEST_F(DistinctCount, WithNull) { using T = int32_t; std::vector input = {1, 3, 3, XXX, 31, 1, 8, 2, 0, XXX, XXX, - XXX, 10, 40, 31, 42, 0, 42, 8, 5, XXX}; + XXX, 10, 40, 31, 42, 0, 42, 8, 5, XXX}; std::vector valid = {1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0}; @@ -115,7 +113,7 @@ TEST_F(DistinctCount, IgnoringNull) using T = int32_t; std::vector input = {1, YYY, YYY, XXX, 31, 1, 8, 2, 0, XXX, 1, - XXX, 10, 40, 31, 42, 0, 42, 8, 5, XXX}; + XXX, 10, 40, 31, 42, 0, 42, 8, 5, XXX}; std::vector valid = {1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0}; @@ -133,7 +131,7 @@ TEST_F(DistinctCount, WithNansAndNull) using T = float; std::vector input = {1, 3, NAN, XXX, 31, 1, 8, 2, 0, XXX, 1, - XXX, 10, 40, 31, NAN, 0, NAN, 8, 5, XXX}; + XXX, 10, 40, 31, NAN, 0, NAN, 8, 5, XXX}; std::vector valid = {1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0}; diff --git a/cpp/tests/stream_compaction/distinct_tests.cpp b/cpp/tests/stream_compaction/distinct_tests.cpp index 3622f6400cb..ea58986b52d 100644 --- a/cpp/tests/stream_compaction/distinct_tests.cpp +++ b/cpp/tests/stream_compaction/distinct_tests.cpp @@ -54,11 +54,9 @@ using cudf::test::iterators::no_nulls; using cudf::test::iterators::null_at; using cudf::test::iterators::nulls_at; -struct DistinctKeepAny : public cudf::test::BaseFixture { -}; +struct DistinctKeepAny : public cudf::test::BaseFixture {}; -struct DistinctKeepFirstLastNone : public cudf::test::BaseFixture { -}; +struct DistinctKeepFirstLastNone : public cudf::test::BaseFixture {}; TEST_F(DistinctKeepAny, StringKeyColumn) { @@ -890,7 +888,7 @@ TEST_F(DistinctKeepAny, ListsOfStructs) static_cast(nullmask_buf.data()), cudf::UNKNOWN_NULL_COUNT, 0, - {offsets, structs}); + {offsets, structs}); auto const idx = int32s_col{1, 1, 2, 2, 3, 4, 4, 4, 5, 6, 7, 8, 8, 9, 9, 10, 10}; auto const input = cudf::table_view{{idx, keys}}; @@ -974,7 +972,7 @@ TEST_F(DistinctKeepFirstLastNone, ListsOfStructs) static_cast(nullmask_buf.data()), cudf::UNKNOWN_NULL_COUNT, 0, - {offsets, structs}); + {offsets, structs}); auto const idx = int32s_col{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}; auto const input = cudf::table_view{{idx, keys}}; @@ -1068,7 +1066,7 @@ TEST_F(DistinctKeepAny, SlicedListsOfStructs) static_cast(nullmask_buf.data()), cudf::UNKNOWN_NULL_COUNT, 0, - {offsets, structs}); + {offsets, structs}); auto const idx = int32s_col{1, 1, 2, 2, 3, 4, 4, 4, 5, 6, 7, 8, 8, 9, 9, 10, 10}; auto const input_original = cudf::table_view{{idx, keys}}; diff --git a/cpp/tests/stream_compaction/drop_nans_tests.cpp b/cpp/tests/stream_compaction/drop_nans_tests.cpp index bdb4fc17db1..4ce51839307 100644 --- a/cpp/tests/stream_compaction/drop_nans_tests.cpp +++ b/cpp/tests/stream_compaction/drop_nans_tests.cpp @@ -26,8 +26,7 @@ #include #include -struct DropNANsTest : public cudf::test::BaseFixture { -}; +struct DropNANsTest : public cudf::test::BaseFixture {}; TEST_F(DropNANsTest, MixedNANsAndNull) { diff --git a/cpp/tests/stream_compaction/drop_nulls_tests.cpp b/cpp/tests/stream_compaction/drop_nulls_tests.cpp index 5fee95444f3..3de43abc09c 100644 --- a/cpp/tests/stream_compaction/drop_nulls_tests.cpp +++ b/cpp/tests/stream_compaction/drop_nulls_tests.cpp @@ -28,8 +28,7 @@ #include #include -struct DropNullsTest : public cudf::test::BaseFixture { -}; +struct DropNullsTest : public cudf::test::BaseFixture {}; TEST_F(DropNullsTest, WholeRowIsNull) { @@ -206,8 +205,7 @@ TEST_F(DropNullsTest, StringColWithNull) } template -struct DropNullsTestAll : public cudf::test::BaseFixture { -}; +struct DropNullsTestAll : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(DropNullsTestAll, cudf::test::NumericTypes); diff --git a/cpp/tests/stream_compaction/unique_count_tests.cpp b/cpp/tests/stream_compaction/unique_count_tests.cpp index 26a9ca26d2a..af0b45b97e3 100644 --- a/cpp/tests/stream_compaction/unique_count_tests.cpp +++ b/cpp/tests/stream_compaction/unique_count_tests.cpp @@ -44,8 +44,7 @@ constexpr int32_t XXX{70}; // Mark for null elements constexpr int32_t YYY{3}; // Mark for null elements template -struct TypedUniqueCount : public cudf::test::BaseFixture { -}; +struct TypedUniqueCount : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(TypedUniqueCount, cudf::test::NumericTypes); @@ -89,15 +88,14 @@ TYPED_TEST(TypedUniqueCount, TableNoNull) EXPECT_EQ(gold, cudf::unique_count(input_table, null_equality::EQUAL)); } -struct UniqueCount : public cudf::test::BaseFixture { -}; +struct UniqueCount : public cudf::test::BaseFixture {}; TEST_F(UniqueCount, WithNull) { using T = int32_t; std::vector input = {1, 3, 3, XXX, 31, 1, 8, 2, 0, XXX, XXX, - XXX, 10, 40, 31, 42, 0, 42, 8, 5, XXX}; + XXX, 10, 40, 31, 42, 0, 42, 8, 5, XXX}; std::vector valid = {1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0}; @@ -113,7 +111,7 @@ TEST_F(UniqueCount, IgnoringNull) using T = int32_t; std::vector input = {1, YYY, YYY, XXX, 31, 1, 8, 2, 0, XXX, 1, - XXX, 10, 40, 31, 42, 0, 42, 8, 5, XXX}; + XXX, 10, 40, 31, 42, 0, 42, 8, 5, XXX}; std::vector valid = {1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0}; @@ -130,7 +128,7 @@ TEST_F(UniqueCount, WithNansAndNull) using T = float; std::vector input = {1, 3, NAN, XXX, 31, 1, 8, 2, 0, XXX, 1, - XXX, 10, 40, 31, NAN, 0, NAN, 8, 5, XXX}; + XXX, 10, 40, 31, NAN, 0, NAN, 8, 5, XXX}; std::vector valid = {1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0}; diff --git a/cpp/tests/stream_compaction/unique_tests.cpp b/cpp/tests/stream_compaction/unique_tests.cpp index 5191f51bbb7..55cd79411c8 100644 --- a/cpp/tests/stream_compaction/unique_tests.cpp +++ b/cpp/tests/stream_compaction/unique_tests.cpp @@ -52,8 +52,7 @@ using lists_col = cudf::test::lists_column_wrapper; using strings_col = cudf::test::strings_column_wrapper; using structs_col = cudf::test::structs_column_wrapper; -struct Unique : public cudf::test::BaseFixture { -}; +struct Unique : public cudf::test::BaseFixture {}; TEST_F(Unique, StringKeyColumn) { @@ -476,7 +475,7 @@ TEST_F(Unique, ListsOfStructsKeepAny) static_cast(nullmask_buf.data()), cudf::UNKNOWN_NULL_COUNT, 0, - {offsets, structs}); + {offsets, structs}); auto const idx = int32s_col{1, 1, 2, 2, 3, 4, 4, 4, 5, 6, 7, 8, 8, 9, 9, 10, 10}; auto const input = cudf::table_view{{idx, keys}}; @@ -558,7 +557,7 @@ TEST_F(Unique, ListsOfStructsKeepFirstLastNone) static_cast(nullmask_buf.data()), cudf::UNKNOWN_NULL_COUNT, 0, - {offsets, structs}); + {offsets, structs}); auto const idx = int32s_col{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}; auto const input = cudf::table_view{{idx, keys}}; diff --git a/cpp/tests/strings/array_tests.cpp b/cpp/tests/strings/array_tests.cpp index 11f5c9f39aa..ce158dd5f1f 100644 --- a/cpp/tests/strings/array_tests.cpp +++ b/cpp/tests/strings/array_tests.cpp @@ -30,8 +30,7 @@ #include -struct StringsColumnTest : public cudf::test::BaseFixture { -}; +struct StringsColumnTest : public cudf::test::BaseFixture {}; TEST_F(StringsColumnTest, Sort) { @@ -55,8 +54,7 @@ TEST_F(StringsColumnTest, SortZeroSizeStringsColumn) } class SliceParmsTest : public StringsColumnTest, - public testing::WithParamInterface { -}; + public testing::WithParamInterface {}; TEST_P(SliceParmsTest, Slice) { diff --git a/cpp/tests/strings/attrs_tests.cpp b/cpp/tests/strings/attrs_tests.cpp index eff992604a6..b222aefcd29 100644 --- a/cpp/tests/strings/attrs_tests.cpp +++ b/cpp/tests/strings/attrs_tests.cpp @@ -26,8 +26,7 @@ #include -struct StringsAttributesTest : public cudf::test::BaseFixture { -}; +struct StringsAttributesTest : public cudf::test::BaseFixture {}; TEST_F(StringsAttributesTest, CodePoints) { diff --git a/cpp/tests/strings/booleans_tests.cpp b/cpp/tests/strings/booleans_tests.cpp index b8e47a89274..d100729b33f 100644 --- a/cpp/tests/strings/booleans_tests.cpp +++ b/cpp/tests/strings/booleans_tests.cpp @@ -25,8 +25,7 @@ #include -struct StringsConvertTest : public cudf::test::BaseFixture { -}; +struct StringsConvertTest : public cudf::test::BaseFixture {}; TEST_F(StringsConvertTest, ToBooleans) { diff --git a/cpp/tests/strings/case_tests.cpp b/cpp/tests/strings/case_tests.cpp index 26b44b577eb..613570fe2e9 100644 --- a/cpp/tests/strings/case_tests.cpp +++ b/cpp/tests/strings/case_tests.cpp @@ -27,8 +27,7 @@ #include -struct StringsCaseTest : public cudf::test::BaseFixture { -}; +struct StringsCaseTest : public cudf::test::BaseFixture {}; TEST_F(StringsCaseTest, ToLower) { diff --git a/cpp/tests/strings/chars_types_tests.cpp b/cpp/tests/strings/chars_types_tests.cpp index c1552ab3f57..e00140cc35c 100644 --- a/cpp/tests/strings/chars_types_tests.cpp +++ b/cpp/tests/strings/chars_types_tests.cpp @@ -25,12 +25,10 @@ #include -struct StringsCharsTest : public cudf::test::BaseFixture { -}; +struct StringsCharsTest : public cudf::test::BaseFixture {}; class CharsTypes : public StringsCharsTest, - public testing::WithParamInterface { -}; + public testing::WithParamInterface {}; TEST_P(CharsTypes, AllTypes) { @@ -52,17 +50,17 @@ TEST_P(CharsTypes, AllTypes) "\t\r\n\f "}; bool expecteds[] = {false, false, false, false, false, false, false, false, - false, false, false, false, false, true, false, false, // decimal + false, false, false, false, false, true, false, false, // decimal false, false, false, false, false, false, false, false, - false, true, false, true, false, true, false, false, // numeric + false, true, false, true, false, true, false, false, // numeric false, false, false, false, false, false, false, false, - false, false, false, true, false, true, false, false, // digit + false, false, false, true, false, true, false, false, // digit true, true, false, true, false, false, false, false, - false, false, false, false, false, false, true, false, // alpha + false, false, false, false, false, false, true, false, // alpha false, false, false, false, false, false, false, false, - false, false, false, false, false, false, false, true, // space + false, false, false, false, false, false, false, true, // space false, false, false, true, false, false, false, false, - false, false, false, false, false, false, false, false, // upper + false, false, false, false, false, false, false, false, // upper false, true, false, false, false, false, false, false, false, false, false, false, false, false, true, false}; // lower diff --git a/cpp/tests/strings/combine/concatenate_tests.cpp b/cpp/tests/strings/combine/concatenate_tests.cpp index 0b744cd6bb4..256ca53d21c 100644 --- a/cpp/tests/strings/combine/concatenate_tests.cpp +++ b/cpp/tests/strings/combine/concatenate_tests.cpp @@ -29,8 +29,7 @@ constexpr cudf::test::debug_output_level verbosity{cudf::test::debug_output_level::ALL_ERRORS}; -struct StringsCombineTest : public cudf::test::BaseFixture { -}; +struct StringsCombineTest : public cudf::test::BaseFixture {}; TEST_F(StringsCombineTest, Concatenate) { @@ -166,8 +165,7 @@ TEST_F(StringsCombineTest, SingleColumnErrorCheck) EXPECT_THROW(cudf::strings::concatenate(cudf::table_view{{col0}}), cudf::logic_error); } -struct StringsConcatenateWithColSeparatorTest : public cudf::test::BaseFixture { -}; +struct StringsConcatenateWithColSeparatorTest : public cudf::test::BaseFixture {}; TEST_F(StringsConcatenateWithColSeparatorTest, ExceptionTests) { diff --git a/cpp/tests/strings/combine/join_list_elements_tests.cpp b/cpp/tests/strings/combine/join_list_elements_tests.cpp index bf739e83241..2d9c99adeb2 100644 --- a/cpp/tests/strings/combine/join_list_elements_tests.cpp +++ b/cpp/tests/strings/combine/join_list_elements_tests.cpp @@ -26,8 +26,7 @@ using namespace cudf::test::iterators; -struct StringsListsConcatenateTest : public cudf::test::BaseFixture { -}; +struct StringsListsConcatenateTest : public cudf::test::BaseFixture {}; namespace { using STR_LISTS = cudf::test::lists_column_wrapper; diff --git a/cpp/tests/strings/combine/join_strings_tests.cpp b/cpp/tests/strings/combine/join_strings_tests.cpp index e0187ce2e26..c5c5f79131c 100644 --- a/cpp/tests/strings/combine/join_strings_tests.cpp +++ b/cpp/tests/strings/combine/join_strings_tests.cpp @@ -26,8 +26,7 @@ #include -struct JoinStringsTest : public cudf::test::BaseFixture { -}; +struct JoinStringsTest : public cudf::test::BaseFixture {}; TEST_F(JoinStringsTest, Join) { diff --git a/cpp/tests/strings/concatenate_tests.cpp b/cpp/tests/strings/concatenate_tests.cpp index e4f2f7ca62c..cf424742d70 100644 --- a/cpp/tests/strings/concatenate_tests.cpp +++ b/cpp/tests/strings/concatenate_tests.cpp @@ -24,8 +24,7 @@ #include -struct StringsConcatenateTest : public cudf::test::BaseFixture { -}; +struct StringsConcatenateTest : public cudf::test::BaseFixture {}; TEST_F(StringsConcatenateTest, Concatenate) { diff --git a/cpp/tests/strings/contains_tests.cpp b/cpp/tests/strings/contains_tests.cpp index 316f24e4167..5bbf7b72588 100644 --- a/cpp/tests/strings/contains_tests.cpp +++ b/cpp/tests/strings/contains_tests.cpp @@ -31,8 +31,7 @@ #include #include -struct StringsContainsTests : public cudf::test::BaseFixture { -}; +struct StringsContainsTests : public cudf::test::BaseFixture {}; TEST_F(StringsContainsTests, ContainsTest) { @@ -516,7 +515,7 @@ TEST_F(StringsContainsTests, OverlappedClasses) TEST_F(StringsContainsTests, NegatedClasses) { auto input = cudf::test::strings_column_wrapper({"abcdefg", "def\tghí", "", "éeé\néeé", "ABC"}); - auto sv = cudf::strings_column_view(input); + auto sv = cudf::strings_column_view(input); { auto pattern = std::string("[^a-f]"); diff --git a/cpp/tests/strings/datetime_tests.cpp b/cpp/tests/strings/datetime_tests.cpp index 97dd26d4297..42802ef8d66 100644 --- a/cpp/tests/strings/datetime_tests.cpp +++ b/cpp/tests/strings/datetime_tests.cpp @@ -29,8 +29,7 @@ #include -struct StringsDatetimeTest : public cudf::test::BaseFixture { -}; +struct StringsDatetimeTest : public cudf::test::BaseFixture {}; TEST_F(StringsDatetimeTest, ToTimestamp) { diff --git a/cpp/tests/strings/durations_tests.cpp b/cpp/tests/strings/durations_tests.cpp index ac971aa300d..2bb6e8ec6e0 100644 --- a/cpp/tests/strings/durations_tests.cpp +++ b/cpp/tests/strings/durations_tests.cpp @@ -25,8 +25,7 @@ #include #include -struct StringsDurationsTest : public cudf::test::BaseFixture { -}; +struct StringsDurationsTest : public cudf::test::BaseFixture {}; TEST_F(StringsDurationsTest, FromToDurations) { @@ -398,7 +397,7 @@ TEST_F(StringsDurationsTest, ParseSingle) "-59", "999", "-999", - "", // error + "", // error "01", ""}; // error auto size = cudf::column_view(string_src).size(); @@ -449,7 +448,7 @@ TEST_F(StringsDurationsTest, ParseMultiple) "-59:00:00", "999:00:00", "-999:00:00", - "", // error + "", // error "01:01:01", ""}; // error auto size = cudf::column_view(string_src).size(); @@ -503,7 +502,7 @@ TEST_F(StringsDurationsTest, ParseSubsecond) "-59:00:00", "999:00:00", "-999:00:00", - "", // error + "", // error "01:01:01", ""}; // error auto size = cudf::column_view(string_src).size(); @@ -660,7 +659,7 @@ TEST_F(StringsDurationsTest, ParseCompoundSpecifier) "09:00 AM", // error "", // error "01:01:01", - ""}; // error + ""}; // error cudf::test::fixed_width_column_wrapper expected_s3( {0, diff --git a/cpp/tests/strings/extract_tests.cpp b/cpp/tests/strings/extract_tests.cpp index 1ca218a5522..1b232754c00 100644 --- a/cpp/tests/strings/extract_tests.cpp +++ b/cpp/tests/strings/extract_tests.cpp @@ -29,8 +29,7 @@ #include -struct StringsExtractTests : public cudf::test::BaseFixture { -}; +struct StringsExtractTests : public cudf::test::BaseFixture {}; TEST_F(StringsExtractTests, ExtractTest) { diff --git a/cpp/tests/strings/factories_test.cu b/cpp/tests/strings/factories_test.cu index 77857049e7a..7cbedac0a22 100644 --- a/cpp/tests/strings/factories_test.cu +++ b/cpp/tests/strings/factories_test.cu @@ -40,8 +40,7 @@ #include #include -struct StringsFactoriesTest : public cudf::test::BaseFixture { -}; +struct StringsFactoriesTest : public cudf::test::BaseFixture {}; TEST_F(StringsFactoriesTest, CreateColumnFromPair) { diff --git a/cpp/tests/strings/fill_tests.cpp b/cpp/tests/strings/fill_tests.cpp index c3a1710bb83..df639f47619 100644 --- a/cpp/tests/strings/fill_tests.cpp +++ b/cpp/tests/strings/fill_tests.cpp @@ -25,8 +25,7 @@ #include -struct StringsFillTest : public cudf::test::BaseFixture { -}; +struct StringsFillTest : public cudf::test::BaseFixture {}; TEST_F(StringsFillTest, Fill) { diff --git a/cpp/tests/strings/find_multiple_tests.cpp b/cpp/tests/strings/find_multiple_tests.cpp index 049cc254527..8d3703269c7 100644 --- a/cpp/tests/strings/find_multiple_tests.cpp +++ b/cpp/tests/strings/find_multiple_tests.cpp @@ -27,8 +27,7 @@ #include -struct StringsFindMultipleTest : public cudf::test::BaseFixture { -}; +struct StringsFindMultipleTest : public cudf::test::BaseFixture {}; TEST_F(StringsFindMultipleTest, FindMultiple) { diff --git a/cpp/tests/strings/find_tests.cpp b/cpp/tests/strings/find_tests.cpp index 208063adcb0..0342595df44 100644 --- a/cpp/tests/strings/find_tests.cpp +++ b/cpp/tests/strings/find_tests.cpp @@ -28,8 +28,7 @@ #include -struct StringsFindTest : public cudf::test::BaseFixture { -}; +struct StringsFindTest : public cudf::test::BaseFixture {}; TEST_F(StringsFindTest, Find) { @@ -302,8 +301,8 @@ TEST_F(StringsFindTest, ErrorCheck) cudf::logic_error); } -class FindParmsTest : public StringsFindTest, public testing::WithParamInterface { -}; +class FindParmsTest : public StringsFindTest, + public testing::WithParamInterface {}; TEST_P(FindParmsTest, Find) { diff --git a/cpp/tests/strings/findall_tests.cpp b/cpp/tests/strings/findall_tests.cpp index c105f4ace6f..c7eddb69ee7 100644 --- a/cpp/tests/strings/findall_tests.cpp +++ b/cpp/tests/strings/findall_tests.cpp @@ -27,8 +27,7 @@ #include -struct StringsFindallTests : public cudf::test::BaseFixture { -}; +struct StringsFindallTests : public cudf::test::BaseFixture {}; TEST_F(StringsFindallTests, FindallTest) { diff --git a/cpp/tests/strings/fixed_point_tests.cpp b/cpp/tests/strings/fixed_point_tests.cpp index 15c12421dd9..6985b8180e8 100644 --- a/cpp/tests/strings/fixed_point_tests.cpp +++ b/cpp/tests/strings/fixed_point_tests.cpp @@ -25,12 +25,10 @@ #include -struct StringsConvertTest : public cudf::test::BaseFixture { -}; +struct StringsConvertTest : public cudf::test::BaseFixture {}; template -class StringsFixedPointConvertTest : public StringsConvertTest { -}; +class StringsFixedPointConvertTest : public StringsConvertTest {}; TYPED_TEST_SUITE(StringsFixedPointConvertTest, cudf::test::FixedPointTypes); diff --git a/cpp/tests/strings/floats_tests.cpp b/cpp/tests/strings/floats_tests.cpp index 1a3c5ada04f..ac199438e6e 100644 --- a/cpp/tests/strings/floats_tests.cpp +++ b/cpp/tests/strings/floats_tests.cpp @@ -27,8 +27,7 @@ constexpr cudf::test::debug_output_level verbosity{cudf::test::debug_output_level::ALL_ERRORS}; -struct StringsConvertTest : public cudf::test::BaseFixture { -}; +struct StringsConvertTest : public cudf::test::BaseFixture {}; TEST_F(StringsConvertTest, IsFloat) { diff --git a/cpp/tests/strings/format_lists_tests.cpp b/cpp/tests/strings/format_lists_tests.cpp index f1ab90ee9c5..24e2e1dac52 100644 --- a/cpp/tests/strings/format_lists_tests.cpp +++ b/cpp/tests/strings/format_lists_tests.cpp @@ -23,8 +23,7 @@ #include #include -struct StringsFormatListsTest : public cudf::test::BaseFixture { -}; +struct StringsFormatListsTest : public cudf::test::BaseFixture {}; TEST_F(StringsFormatListsTest, EmptyList) { diff --git a/cpp/tests/strings/integers_tests.cpp b/cpp/tests/strings/integers_tests.cpp index 79e96ff5121..309a82edc97 100644 --- a/cpp/tests/strings/integers_tests.cpp +++ b/cpp/tests/strings/integers_tests.cpp @@ -36,8 +36,7 @@ // This will make the code looks cleaner constexpr auto NULL_VAL = 0; -struct StringsConvertTest : public cudf::test::BaseFixture { -}; +struct StringsConvertTest : public cudf::test::BaseFixture {}; TEST_F(StringsConvertTest, IsIntegerBasicCheck) { @@ -286,8 +285,7 @@ TEST_F(StringsConvertTest, EmptyStringsColumn) } template -class StringsIntegerConvertTest : public StringsConvertTest { -}; +class StringsIntegerConvertTest : public StringsConvertTest {}; TYPED_TEST_SUITE(StringsIntegerConvertTest, cudf::test::IntegralTypesNotBool); @@ -329,8 +327,7 @@ TYPED_TEST(StringsIntegerConvertTest, FromToInteger) // template -class StringsFloatConvertTest : public StringsConvertTest { -}; +class StringsFloatConvertTest : public StringsConvertTest {}; using FloatTypes = cudf::test::Types; TYPED_TEST_SUITE(StringsFloatConvertTest, FloatTypes); diff --git a/cpp/tests/strings/ipv4_tests.cpp b/cpp/tests/strings/ipv4_tests.cpp index 0a404534916..00a076baa81 100644 --- a/cpp/tests/strings/ipv4_tests.cpp +++ b/cpp/tests/strings/ipv4_tests.cpp @@ -25,8 +25,7 @@ #include -struct StringsConvertTest : public cudf::test::BaseFixture { -}; +struct StringsConvertTest : public cudf::test::BaseFixture {}; TEST_F(StringsConvertTest, IPv4ToIntegers) { diff --git a/cpp/tests/strings/json_tests.cpp b/cpp/tests/strings/json_tests.cpp index 4a485de2f2a..d74bb9258fa 100644 --- a/cpp/tests/strings/json_tests.cpp +++ b/cpp/tests/strings/json_tests.cpp @@ -78,8 +78,7 @@ std::unique_ptr drop_whitespace(cudf::column_view const& col) return cudf::strings::replace(strings, targets, replacements); } -struct JsonPathTests : public cudf::test::BaseFixture { -}; +struct JsonPathTests : public cudf::test::BaseFixture {}; TEST_F(JsonPathTests, GetJsonObjectRootOp) { diff --git a/cpp/tests/strings/like_tests.cpp b/cpp/tests/strings/like_tests.cpp index b6297d6b9cb..50d8edfd646 100644 --- a/cpp/tests/strings/like_tests.cpp +++ b/cpp/tests/strings/like_tests.cpp @@ -21,8 +21,7 @@ #include #include -struct StringsLikeTests : public cudf::test::BaseFixture { -}; +struct StringsLikeTests : public cudf::test::BaseFixture {}; TEST_F(StringsLikeTests, Basic) { diff --git a/cpp/tests/strings/pad_tests.cpp b/cpp/tests/strings/pad_tests.cpp index c416c2b3ce1..44081b39789 100644 --- a/cpp/tests/strings/pad_tests.cpp +++ b/cpp/tests/strings/pad_tests.cpp @@ -29,8 +29,7 @@ #include -struct StringsPadTest : public cudf::test::BaseFixture { -}; +struct StringsPadTest : public cudf::test::BaseFixture {}; TEST_F(StringsPadTest, Padding) { @@ -105,8 +104,7 @@ TEST_F(StringsPadTest, ZeroSizeStringsColumn) cudf::test::expect_column_empty(results->view()); } -class PadParameters : public StringsPadTest, public testing::WithParamInterface { -}; +class PadParameters : public StringsPadTest, public testing::WithParamInterface {}; TEST_P(PadParameters, Padding) { diff --git a/cpp/tests/strings/repeat_strings_tests.cpp b/cpp/tests/strings/repeat_strings_tests.cpp index 73009d167e8..b7bfad36817 100644 --- a/cpp/tests/strings/repeat_strings_tests.cpp +++ b/cpp/tests/strings/repeat_strings_tests.cpp @@ -33,12 +33,10 @@ constexpr int32_t null{0}; // mark for null elements in a column of int32_t val constexpr cudf::test::debug_output_level verbosity{cudf::test::debug_output_level::FIRST_ERROR}; } // namespace -struct RepeatStringsTest : public cudf::test::BaseFixture { -}; +struct RepeatStringsTest : public cudf::test::BaseFixture {}; template -struct RepeatStringsTypedTest : public cudf::test::BaseFixture { -}; +struct RepeatStringsTypedTest : public cudf::test::BaseFixture {}; // Test for signed types only, as we will need to use non-positive values. using TypesForTest = cudf::test::Types; @@ -369,15 +367,15 @@ TYPED_TEST(RepeatStringsTypedTest, SlicedStringsColumnNoNullWithColumnRepeatTime TYPED_TEST(RepeatStringsTypedTest, StringsColumnWithNullsWithScalarRepeatTimes) { auto const strs = strs_col{{"0a0b0c", - "" /*NULL*/, - "abcxyz", - "" /*NULL*/, - "xyzééé", - "" /*NULL*/, - "ááá", - "íí", - "", - "Hello World"}, + "" /*NULL*/, + "abcxyz", + "" /*NULL*/, + "xyzééé", + "" /*NULL*/, + "ááá", + "íí", + "", + "Hello World"}, nulls_at({1, 3, 5})}; auto const strs_cv = cudf::strings_column_view(strs); @@ -421,15 +419,15 @@ TYPED_TEST(RepeatStringsTypedTest, StringsColumnWithNullsWithColumnRepeatTimes) using ints_col = cudf::test::fixed_width_column_wrapper; auto const strs = strs_col{{"0a0b0c", - "" /*NULL*/, - "abcxyz", - "" /*NULL*/, - "xyzééé", - "" /*NULL*/, - "ááá", - "íí", - "", - "Hello World"}, + "" /*NULL*/, + "abcxyz", + "" /*NULL*/, + "xyzééé", + "" /*NULL*/, + "ááá", + "íí", + "", + "Hello World"}, nulls_at({1, 3, 5})}; auto const strs_cv = cudf::strings_column_view(strs); @@ -558,7 +556,7 @@ TYPED_TEST(RepeatStringsTypedTest, SlicedStringsColumnWithNullsWithColumnRepeatT auto const sliced_rtimes = cudf::slice(repeat_times, {2, 7})[0]; auto const sliced_strs_cv = cudf::strings_column_view(sliced_strs); auto const expected_strs = strs_col{ - {"" /*NULL*/, "" /*NULL*/, "" /*NULL*/, "" /*NULL*/, "áááááá"}, nulls_at({0, 1, 2, 3})}; + {"" /*NULL*/, "" /*NULL*/, "" /*NULL*/, "" /*NULL*/, "áááááá"}, nulls_at({0, 1, 2, 3})}; auto results = cudf::strings::repeat_strings(sliced_strs_cv, sliced_rtimes); CUDF_TEST_EXPECT_COLUMNS_EQUAL(expected_strs, *results, verbosity); diff --git a/cpp/tests/strings/replace_regex_tests.cpp b/cpp/tests/strings/replace_regex_tests.cpp index d7d0576d0eb..0b25a026bd1 100644 --- a/cpp/tests/strings/replace_regex_tests.cpp +++ b/cpp/tests/strings/replace_regex_tests.cpp @@ -27,8 +27,7 @@ #include -struct StringsReplaceRegexTest : public cudf::test::BaseFixture { -}; +struct StringsReplaceRegexTest : public cudf::test::BaseFixture {}; TEST_F(StringsReplaceRegexTest, ReplaceRegexTest) { diff --git a/cpp/tests/strings/reverse_tests.cpp b/cpp/tests/strings/reverse_tests.cpp index 479bd129879..dc9517f3714 100644 --- a/cpp/tests/strings/reverse_tests.cpp +++ b/cpp/tests/strings/reverse_tests.cpp @@ -25,8 +25,7 @@ #include -struct StringsReverseTest : public cudf::test::BaseFixture { -}; +struct StringsReverseTest : public cudf::test::BaseFixture {}; TEST_F(StringsReverseTest, Reverse) { diff --git a/cpp/tests/strings/slice_tests.cpp b/cpp/tests/strings/slice_tests.cpp index 845ce024f97..8e0c3b325b2 100644 --- a/cpp/tests/strings/slice_tests.cpp +++ b/cpp/tests/strings/slice_tests.cpp @@ -30,8 +30,7 @@ #include #include -struct StringsSliceTest : public cudf::test::BaseFixture { -}; +struct StringsSliceTest : public cudf::test::BaseFixture {}; TEST_F(StringsSliceTest, Substring) { @@ -51,8 +50,7 @@ TEST_F(StringsSliceTest, Substring) CUDF_TEST_EXPECT_COLUMNS_EQUAL(*results, expected); } -class Parameters : public StringsSliceTest, public testing::WithParamInterface { -}; +class Parameters : public StringsSliceTest, public testing::WithParamInterface {}; TEST_P(Parameters, Substring) { @@ -485,7 +483,7 @@ TEST_F(StringsSliceTest, SearchColumnDelimiter) } { - auto col0 = cudf::test::strings_column_wrapper({"H™élloff ffffi ™◎ooff™ff™", + auto col0 = cudf::test::strings_column_wrapper({"H™élloff ffffi ™◎ooff™ff™", "tffffhffesé", "", "lff fooff ffff eaffse™", diff --git a/cpp/tests/strings/split_tests.cpp b/cpp/tests/strings/split_tests.cpp index 9eeb11a4a1f..d129539e960 100644 --- a/cpp/tests/strings/split_tests.cpp +++ b/cpp/tests/strings/split_tests.cpp @@ -33,8 +33,7 @@ #include -struct StringsSplitTest : public cudf::test::BaseFixture { -}; +struct StringsSplitTest : public cudf::test::BaseFixture {}; TEST_F(StringsSplitTest, Split) { diff --git a/cpp/tests/strings/strip_tests.cpp b/cpp/tests/strings/strip_tests.cpp index f7044b48e40..e2ce7ee6e47 100644 --- a/cpp/tests/strings/strip_tests.cpp +++ b/cpp/tests/strings/strip_tests.cpp @@ -26,8 +26,7 @@ #include -struct StringsStripTest : public cudf::test::BaseFixture { -}; +struct StringsStripTest : public cudf::test::BaseFixture {}; TEST_F(StringsStripTest, StripLeft) { diff --git a/cpp/tests/strings/translate_tests.cpp b/cpp/tests/strings/translate_tests.cpp index 1e278caa366..a88800dc3fb 100644 --- a/cpp/tests/strings/translate_tests.cpp +++ b/cpp/tests/strings/translate_tests.cpp @@ -28,8 +28,7 @@ #include -struct StringsTranslateTest : public cudf::test::BaseFixture { -}; +struct StringsTranslateTest : public cudf::test::BaseFixture {}; std::pair make_entry(const char* from, const char* to) { diff --git a/cpp/tests/strings/urls_tests.cpp b/cpp/tests/strings/urls_tests.cpp index 9199d78cfb8..edcfd139d73 100644 --- a/cpp/tests/strings/urls_tests.cpp +++ b/cpp/tests/strings/urls_tests.cpp @@ -26,8 +26,7 @@ #include #include -struct StringsConvertTest : public cudf::test::BaseFixture { -}; +struct StringsConvertTest : public cudf::test::BaseFixture {}; TEST_F(StringsConvertTest, UrlEncode) { diff --git a/cpp/tests/structs/structs_column_tests.cpp b/cpp/tests/structs/structs_column_tests.cpp index 54158e486f3..ffc9647e52b 100644 --- a/cpp/tests/structs/structs_column_tests.cpp +++ b/cpp/tests/structs/structs_column_tests.cpp @@ -48,12 +48,10 @@ using vector_of_columns = std::vector>; using cudf::size_type; -struct StructColumnWrapperTest : public cudf::test::BaseFixture { -}; +struct StructColumnWrapperTest : public cudf::test::BaseFixture {}; template -struct TypedStructColumnWrapperTest : public cudf::test::BaseFixture { -}; +struct TypedStructColumnWrapperTest : public cudf::test::BaseFixture {}; using FixedWidthTypesNotBool = cudf::test::Concat; template using lists = cudf::test::lists_column_wrapper; -struct StructUtilitiesTest : cudf::test::BaseFixture { -}; +struct StructUtilitiesTest : cudf::test::BaseFixture {}; template -struct TypedStructUtilitiesTest : StructUtilitiesTest { -}; +struct TypedStructUtilitiesTest : StructUtilitiesTest {}; TYPED_TEST_SUITE(TypedStructUtilitiesTest, cudf::test::FixedWidthTypes); @@ -376,12 +374,10 @@ TYPED_TEST(TypedStructUtilitiesTest, ListsAreUnsupported) cudf::logic_error); } -struct SuperimposeTest : StructUtilitiesTest { -}; +struct SuperimposeTest : StructUtilitiesTest {}; template -struct TypedSuperimposeTest : StructUtilitiesTest { -}; +struct TypedSuperimposeTest : StructUtilitiesTest {}; TYPED_TEST_SUITE(TypedSuperimposeTest, cudf::test::FixedWidthTypes); @@ -521,7 +517,7 @@ TYPED_TEST(TypedSuperimposeTest, NestedStruct_ChildNullable_ParentNonNullable) auto expected_nums_member = make_nums_member(cudf::test::iterators::nulls_at({0, 3, 6})); auto expected_lists_member = make_lists_member(cudf::test::iterators::nulls_at({0, 4, 5})); auto expected_structs = cudf::test::structs_column_wrapper{ - {expected_nums_member, expected_lists_member}, cudf::test::iterators::null_at(0)}; + {expected_nums_member, expected_lists_member}, cudf::test::iterators::null_at(0)}; auto expected_structs_of_structs = cudf::test::structs_column_wrapper{{expected_structs}}; CUDF_TEST_EXPECT_COLUMNS_EQUAL(output, expected_structs_of_structs); @@ -564,7 +560,7 @@ TYPED_TEST(TypedSuperimposeTest, NestedStruct_ChildNullable_ParentNullable) auto expected_nums_member = make_nums_member(cudf::test::iterators::nulls_at({0, 1, 3, 6})); auto expected_lists_member = make_lists_member(cudf::test::iterators::nulls_at({0, 1, 4, 5})); auto expected_structs = cudf::test::structs_column_wrapper{ - {expected_nums_member, expected_lists_member}, cudf::test::iterators::nulls_at({0, 1})}; + {expected_nums_member, expected_lists_member}, cudf::test::iterators::nulls_at({0, 1})}; auto expected_structs_of_structs = cudf::test::structs_column_wrapper{{expected_structs}, cudf::test::iterators::null_at(1)}; diff --git a/cpp/tests/table/experimental_row_operator_tests.cu b/cpp/tests/table/experimental_row_operator_tests.cu index 1f3f7eefe79..42f1753494f 100644 --- a/cpp/tests/table/experimental_row_operator_tests.cu +++ b/cpp/tests/table/experimental_row_operator_tests.cu @@ -35,8 +35,7 @@ #include template -struct TypedTableViewTest : public cudf::test::BaseFixture { -}; +struct TypedTableViewTest : public cudf::test::BaseFixture {}; using NumericTypesNotBool = cudf::test::Concat; @@ -231,8 +230,7 @@ TYPED_TEST(TypedTableViewTest, TestLexicographicalComparatorSameTable) } template -struct NaNTableViewTest : public cudf::test::BaseFixture { -}; +struct NaNTableViewTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(NaNTableViewTest, cudf::test::FloatingPointTypes); diff --git a/cpp/tests/table/row_operators_tests.cpp b/cpp/tests/table/row_operators_tests.cpp index 876980a12f8..c70e546f668 100644 --- a/cpp/tests/table/row_operators_tests.cpp +++ b/cpp/tests/table/row_operators_tests.cpp @@ -25,8 +25,7 @@ #include -struct RowOperatorTestForNAN : public cudf::test::BaseFixture { -}; +struct RowOperatorTestForNAN : public cudf::test::BaseFixture {}; TEST_F(RowOperatorTestForNAN, NANEquality) { diff --git a/cpp/tests/table/table_tests.cpp b/cpp/tests/table/table_tests.cpp index f8f0fe4325e..23b70818481 100644 --- a/cpp/tests/table/table_tests.cpp +++ b/cpp/tests/table/table_tests.cpp @@ -39,8 +39,7 @@ using column_view = cudf::column_view; using TView = cudf::table_view; using Table = cudf::table; -struct TableTest : public cudf::test::BaseFixture { -}; +struct TableTest : public cudf::test::BaseFixture {}; TEST_F(TableTest, EmptyColumnedTable) { diff --git a/cpp/tests/table/table_view_tests.cu b/cpp/tests/table/table_view_tests.cu index 5127f69162f..77b3c6c475c 100644 --- a/cpp/tests/table/table_view_tests.cu +++ b/cpp/tests/table/table_view_tests.cu @@ -36,8 +36,7 @@ // Compares two tables row by row, if table1 row is less than table2, then corresponding row value // in `output` would be `true`/1 else `false`/0. -struct TableViewTest : public cudf::test::BaseFixture { -}; +struct TableViewTest : public cudf::test::BaseFixture {}; void row_comparison(cudf::table_view input1, cudf::table_view input2, cudf::mutable_column_view output, diff --git a/cpp/tests/text/bpe_tests.cpp b/cpp/tests/text/bpe_tests.cpp index 07f3a41f0e2..8829f929744 100644 --- a/cpp/tests/text/bpe_tests.cpp +++ b/cpp/tests/text/bpe_tests.cpp @@ -24,8 +24,7 @@ #include #include -struct TextBPETokenize : public cudf::test::BaseFixture { -}; +struct TextBPETokenize : public cudf::test::BaseFixture {}; TEST_F(TextBPETokenize, BytePairEncoding) { diff --git a/cpp/tests/text/edit_distance_tests.cpp b/cpp/tests/text/edit_distance_tests.cpp index 4085e797ad8..04f1788d0be 100644 --- a/cpp/tests/text/edit_distance_tests.cpp +++ b/cpp/tests/text/edit_distance_tests.cpp @@ -26,8 +26,7 @@ #include -struct TextEditDistanceTest : public cudf::test::BaseFixture { -}; +struct TextEditDistanceTest : public cudf::test::BaseFixture {}; TEST_F(TextEditDistanceTest, EditDistance) { diff --git a/cpp/tests/text/ngrams_tests.cpp b/cpp/tests/text/ngrams_tests.cpp index 61bd1b3dccd..64b4ac3e609 100644 --- a/cpp/tests/text/ngrams_tests.cpp +++ b/cpp/tests/text/ngrams_tests.cpp @@ -28,8 +28,7 @@ #include -struct TextGenerateNgramsTest : public cudf::test::BaseFixture { -}; +struct TextGenerateNgramsTest : public cudf::test::BaseFixture {}; TEST_F(TextGenerateNgramsTest, Ngrams) { diff --git a/cpp/tests/text/ngrams_tokenize_tests.cpp b/cpp/tests/text/ngrams_tokenize_tests.cpp index 92412d74678..b017c5dc222 100644 --- a/cpp/tests/text/ngrams_tokenize_tests.cpp +++ b/cpp/tests/text/ngrams_tokenize_tests.cpp @@ -27,8 +27,7 @@ #include -struct TextNgramsTokenizeTest : public cudf::test::BaseFixture { -}; +struct TextNgramsTokenizeTest : public cudf::test::BaseFixture {}; TEST_F(TextNgramsTokenizeTest, Tokenize) { diff --git a/cpp/tests/text/normalize_tests.cpp b/cpp/tests/text/normalize_tests.cpp index d8c8307f4ea..284dd563e77 100644 --- a/cpp/tests/text/normalize_tests.cpp +++ b/cpp/tests/text/normalize_tests.cpp @@ -29,8 +29,7 @@ #include -struct TextNormalizeTest : public cudf::test::BaseFixture { -}; +struct TextNormalizeTest : public cudf::test::BaseFixture {}; TEST_F(TextNormalizeTest, NormalizeSpaces) { diff --git a/cpp/tests/text/replace_tests.cpp b/cpp/tests/text/replace_tests.cpp index 00158cc9787..77daad445db 100644 --- a/cpp/tests/text/replace_tests.cpp +++ b/cpp/tests/text/replace_tests.cpp @@ -28,8 +28,7 @@ #include -struct TextReplaceTest : public cudf::test::BaseFixture { -}; +struct TextReplaceTest : public cudf::test::BaseFixture {}; TEST_F(TextReplaceTest, ReplaceTokens) { diff --git a/cpp/tests/text/stemmer_tests.cpp b/cpp/tests/text/stemmer_tests.cpp index f4e77ac19dd..3f306268869 100644 --- a/cpp/tests/text/stemmer_tests.cpp +++ b/cpp/tests/text/stemmer_tests.cpp @@ -28,8 +28,7 @@ #include -struct TextStemmerTest : public cudf::test::BaseFixture { -}; +struct TextStemmerTest : public cudf::test::BaseFixture {}; TEST_F(TextStemmerTest, PorterStemmer) { diff --git a/cpp/tests/text/subword_tests.cpp b/cpp/tests/text/subword_tests.cpp index 521a082faa2..908ed26a512 100644 --- a/cpp/tests/text/subword_tests.cpp +++ b/cpp/tests/text/subword_tests.cpp @@ -34,8 +34,7 @@ auto const temp_env = static_cast( ::testing::AddGlobalTestEnvironment(new cudf::test::TempDirTestEnvironment)); -struct TextSubwordTest : public cudf::test::BaseFixture { -}; +struct TextSubwordTest : public cudf::test::BaseFixture {}; // Create a fake hashed vocab text file for the tests in this source file. // The vocab only includes the following words: diff --git a/cpp/tests/text/tokenize_tests.cpp b/cpp/tests/text/tokenize_tests.cpp index 16c51354d08..954eca031e8 100644 --- a/cpp/tests/text/tokenize_tests.cpp +++ b/cpp/tests/text/tokenize_tests.cpp @@ -27,8 +27,7 @@ #include -struct TextTokenizeTest : public cudf::test::BaseFixture { -}; +struct TextTokenizeTest : public cudf::test::BaseFixture {}; TEST_F(TextTokenizeTest, Tokenize) { diff --git a/cpp/tests/transform/integration/unary_transform_test.cpp b/cpp/tests/transform/integration/unary_transform_test.cpp index 5034100c6c1..e99ad29a9d6 100644 --- a/cpp/tests/transform/integration/unary_transform_test.cpp +++ b/cpp/tests/transform/integration/unary_transform_test.cpp @@ -26,8 +26,7 @@ #include namespace transformation { -struct UnaryOperationIntegrationTest : public cudf::test::BaseFixture { -}; +struct UnaryOperationIntegrationTest : public cudf::test::BaseFixture {}; template void test_udf(const char udf[], Op op, Data data_init, cudf::size_type size, bool is_ptx) diff --git a/cpp/tests/transform/mask_to_bools_test.cpp b/cpp/tests/transform/mask_to_bools_test.cpp index bd6aaad9dd5..7bd156ad3e6 100644 --- a/cpp/tests/transform/mask_to_bools_test.cpp +++ b/cpp/tests/transform/mask_to_bools_test.cpp @@ -23,8 +23,7 @@ #include #include -struct MaskToBools : public cudf::test::BaseFixture { -}; +struct MaskToBools : public cudf::test::BaseFixture {}; TEST_F(MaskToBools, NullDataWithZeroLength) { @@ -50,8 +49,7 @@ TEST_F(MaskToBools, ImproperBitRange) struct MaskToBoolsTest : public MaskToBools, - public ::testing::WithParamInterface> { -}; + public ::testing::WithParamInterface> {}; TEST_P(MaskToBoolsTest, LargeDataSizeTest) { diff --git a/cpp/tests/transform/nans_to_null_test.cpp b/cpp/tests/transform/nans_to_null_test.cpp index 11a4a125a37..0eb513c6466 100644 --- a/cpp/tests/transform/nans_to_null_test.cpp +++ b/cpp/tests/transform/nans_to_null_test.cpp @@ -118,8 +118,7 @@ TYPED_TEST(NaNsToNullTest, EmptyColumn) this->run_test(input_column, expected_column->view()); } -struct NaNsToNullFailTest : public cudf::test::BaseFixture { -}; +struct NaNsToNullFailTest : public cudf::test::BaseFixture {}; TEST_F(NaNsToNullFailTest, StringType) { diff --git a/cpp/tests/transform/one_hot_encode_tests.cpp b/cpp/tests/transform/one_hot_encode_tests.cpp index 634ad49b5ea..1015370fe4b 100644 --- a/cpp/tests/transform/one_hot_encode_tests.cpp +++ b/cpp/tests/transform/one_hot_encode_tests.cpp @@ -33,11 +33,9 @@ using cudf::test::iterators::null_at; using cudf::test::iterators::nulls_at; template -struct OneHotEncodingTestTyped : public cudf::test::BaseFixture { -}; +struct OneHotEncodingTestTyped : public cudf::test::BaseFixture {}; -struct OneHotEncodingTest : public cudf::test::BaseFixture { -}; +struct OneHotEncodingTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(OneHotEncodingTestTyped, cudf::test::NumericTypes); diff --git a/cpp/tests/transform/row_bit_count_test.cu b/cpp/tests/transform/row_bit_count_test.cu index 615e948f545..37ffdb67ea0 100644 --- a/cpp/tests/transform/row_bit_count_test.cu +++ b/cpp/tests/transform/row_bit_count_test.cu @@ -36,8 +36,7 @@ #include template -struct RowBitCountTyped : public cudf::test::BaseFixture { -}; +struct RowBitCountTyped : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(RowBitCountTyped, cudf::test::FixedWidthTypes); @@ -167,8 +166,7 @@ TYPED_TEST(RowBitCountTyped, ListsWithNulls) CUDF_TEST_EXPECT_COLUMNS_EQUAL(expected, *result); } -struct RowBitCount : public cudf::test::BaseFixture { -}; +struct RowBitCount : public cudf::test::BaseFixture {}; TEST_F(RowBitCount, Strings) { diff --git a/cpp/tests/transpose/transpose_test.cpp b/cpp/tests/transpose/transpose_test.cpp index e3d9808b211..2b23e0622c4 100644 --- a/cpp/tests/transpose/transpose_test.cpp +++ b/cpp/tests/transpose/transpose_test.cpp @@ -158,8 +158,7 @@ void run_test(size_t ncols, size_t nrows, bool add_nulls) } // namespace template -class TransposeTest : public cudf::test::BaseFixture { -}; +class TransposeTest : public cudf::test::BaseFixture {}; // Using std::string here instead of cudf::test::StringTypes allows us to // use std::vector utilities in this file just like the fixed-width types. @@ -191,8 +190,7 @@ TYPED_TEST(TransposeTest, EmptyTable) { run_test(0, 0, false); } TYPED_TEST(TransposeTest, EmptyColumns) { run_test(10, 0, false); } -class TransposeTestError : public cudf::test::BaseFixture { -}; +class TransposeTestError : public cudf::test::BaseFixture {}; TEST_F(TransposeTestError, MismatchedColumns) { diff --git a/cpp/tests/types/traits_test.cpp b/cpp/tests/types/traits_test.cpp index 3510ceaa579..4ef693090b1 100644 --- a/cpp/tests/types/traits_test.cpp +++ b/cpp/tests/types/traits_test.cpp @@ -36,12 +36,10 @@ void tuple_for_each(const std::tuple& tuple, F&& f) tuple_for_each_impl(tuple, std::forward(f), std::index_sequence_for{}); } -class TraitsTest : public ::testing::Test { -}; +class TraitsTest : public ::testing::Test {}; template -class TypedTraitsTest : public TraitsTest { -}; +class TypedTraitsTest : public TraitsTest {}; TYPED_TEST_SUITE(TypedTraitsTest, cudf::test::AllTypes); @@ -87,8 +85,7 @@ TYPED_TEST(TypedTraitsTest, RelationallyComparable) TYPED_TEST(TypedTraitsTest, NotRelationallyComparable) { // No type should be comparable with an empty dummy type - struct foo { - }; + struct foo {}; bool comparable = cudf::is_relationally_comparable(); EXPECT_FALSE(comparable); @@ -115,8 +112,7 @@ TYPED_TEST(TypedTraitsTest, EqualityComparable) TYPED_TEST(TypedTraitsTest, NotEqualityComparable) { // No type should be comparable with an empty dummy type - struct foo { - }; + struct foo {}; bool comparable = cudf::is_equality_comparable(); EXPECT_FALSE(comparable); diff --git a/cpp/tests/types/type_dispatcher_test.cu b/cpp/tests/types/type_dispatcher_test.cu index a27d8931ee6..7b2384d38cb 100644 --- a/cpp/tests/types/type_dispatcher_test.cu +++ b/cpp/tests/types/type_dispatcher_test.cu @@ -25,12 +25,10 @@ #include -struct DispatcherTest : public cudf::test::BaseFixture { -}; +struct DispatcherTest : public cudf::test::BaseFixture {}; template -struct TypedDispatcherTest : public DispatcherTest { -}; +struct TypedDispatcherTest : public DispatcherTest {}; TYPED_TEST_SUITE(TypedDispatcherTest, cudf::test::AllTypes); @@ -77,8 +75,8 @@ TYPED_TEST(TypedDispatcherTest, DeviceDispatch) EXPECT_EQ(true, result.front_element(cudf::get_default_stream())); } -struct IdDispatcherTest : public DispatcherTest, public testing::WithParamInterface { -}; +struct IdDispatcherTest : public DispatcherTest, + public testing::WithParamInterface {}; INSTANTIATE_TEST_CASE_P(TestAllIds, IdDispatcherTest, testing::ValuesIn(cudf::test::all_type_ids)); @@ -89,8 +87,7 @@ TEST_P(IdDispatcherTest, IdToType) } template -struct TypedDoubleDispatcherTest : public DispatcherTest { -}; +struct TypedDoubleDispatcherTest : public DispatcherTest {}; TYPED_TEST_SUITE(TypedDoubleDispatcherTest, cudf::test::AllTypes); @@ -140,8 +137,7 @@ TYPED_TEST(TypedDoubleDispatcherTest, DeviceDoubleDispatch) } struct IdDoubleDispatcherTest : public DispatcherTest, - public testing::WithParamInterface { -}; + public testing::WithParamInterface {}; INSTANTIATE_TEST_CASE_P(TestAllIds, IdDoubleDispatcherTest, @@ -156,8 +152,7 @@ TEST_P(IdDoubleDispatcherTest, IdToType) } struct IdFixedDoubleDispatcherTest : public DispatcherTest, - public testing::WithParamInterface { -}; + public testing::WithParamInterface {}; INSTANTIATE_TEST_CASE_P(TestAllIds, IdFixedDoubleDispatcherTest, diff --git a/cpp/tests/unary/cast_tests.cpp b/cpp/tests/unary/cast_tests.cpp index ac68a277622..915d8d58e86 100644 --- a/cpp/tests/unary/cast_tests.cpp +++ b/cpp/tests/unary/cast_tests.cpp @@ -193,8 +193,7 @@ inline auto make_data_type() return cudf::data_type{cudf::type_to_id()}; } -struct CastTimestampsSimple : public cudf::test::BaseFixture { -}; +struct CastTimestampsSimple : public cudf::test::BaseFixture {}; TEST_F(CastTimestampsSimple, IsIdempotent) { @@ -235,8 +234,7 @@ TEST_F(CastTimestampsSimple, IsIdempotent) validate_cast_result(timestamps_ns, *timestamps_ns_got); } -struct CastDurationsSimple : public cudf::test::BaseFixture { -}; +struct CastDurationsSimple : public cudf::test::BaseFixture {}; TEST_F(CastDurationsSimple, IsIdempotent) { @@ -273,8 +271,7 @@ TEST_F(CastDurationsSimple, IsIdempotent) } template -struct CastChronosTyped : public cudf::test::BaseFixture { -}; +struct CastChronosTyped : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(CastChronosTyped, cudf::test::ChronoTypes); @@ -351,8 +348,7 @@ TYPED_TEST(CastChronosTyped, DownCastingToDaysFloorsValues) validate_cast_result(duration_exp, *duration_got); } -struct CastToTimestamps : public cudf::test::BaseFixture { -}; +struct CastToTimestamps : public cudf::test::BaseFixture {}; // Cast duration types to timestamps (as integral types can't be converted) TEST_F(CastToTimestamps, AllValid) @@ -382,8 +378,7 @@ TEST_F(CastToTimestamps, AllValid) validate_cast_result(durations_ns, *timestamps_ns_got); } -struct CastFromTimestamps : public cudf::test::BaseFixture { -}; +struct CastFromTimestamps : public cudf::test::BaseFixture {}; // Convert timestamps to duration types TEST_F(CastFromTimestamps, AllValid) @@ -445,8 +440,7 @@ TEST_F(CastFromTimestamps, WithNulls) } template -struct CastToDurations : public cudf::test::BaseFixture { -}; +struct CastToDurations : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(CastToDurations, cudf::test::IntegralTypes); @@ -478,8 +472,7 @@ TYPED_TEST(CastToDurations, AllValid) } template -struct CastFromDurations : public cudf::test::BaseFixture { -}; +struct CastFromDurations : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(CastFromDurations, cudf::test::NumericTypes); @@ -549,12 +542,10 @@ inline auto make_fixed_point_data_type(int32_t scale) return cudf::data_type{cudf::type_to_id(), scale}; } -struct FixedPointTestSingleType : public cudf::test::BaseFixture { -}; +struct FixedPointTestSingleType : public cudf::test::BaseFixture {}; template -struct FixedPointTests : public cudf::test::BaseFixture { -}; +struct FixedPointTests : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(FixedPointTests, cudf::test::FixedPointTypes); diff --git a/cpp/tests/unary/math_ops_test.cpp b/cpp/tests/unary/math_ops_test.cpp index 5b468bf4d9f..aec6a0624ef 100644 --- a/cpp/tests/unary/math_ops_test.cpp +++ b/cpp/tests/unary/math_ops_test.cpp @@ -29,8 +29,7 @@ #include template -struct UnaryLogicalOpsTest : public cudf::test::BaseFixture { -}; +struct UnaryLogicalOpsTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(UnaryLogicalOpsTest, cudf::test::NumericTypes); @@ -86,8 +85,7 @@ TYPED_TEST(UnaryLogicalOpsTest, EmptyLogicalNot) } template -struct UnaryMathOpsTest : public cudf::test::BaseFixture { -}; +struct UnaryMathOpsTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(UnaryMathOpsTest, cudf::test::NumericTypes); @@ -232,8 +230,7 @@ TYPED_TEST(UnaryMathOpsTest, DictionaryCBRT) } template -struct UnaryMathFloatOpsTest : public cudf::test::BaseFixture { -}; +struct UnaryMathFloatOpsTest : public cudf::test::BaseFixture {}; using floating_point_type_list = ::testing::Types; @@ -422,8 +419,7 @@ TYPED_TEST(UnaryMathFloatOpsTest, SimpleCBRT) CUDF_TEST_EXPECT_COLUMNS_EQUAL(expected, output->view()); } -struct UnaryMathOpsErrorTest : public cudf::test::BaseFixture { -}; +struct UnaryMathOpsErrorTest : public cudf::test::BaseFixture {}; TEST_F(UnaryMathOpsErrorTest, ArithmeticTypeFail) { diff --git a/cpp/tests/unary/unary_ops_test.cpp b/cpp/tests/unary/unary_ops_test.cpp index 4aee04aef97..4ced2163c5f 100644 --- a/cpp/tests/unary/unary_ops_test.cpp +++ b/cpp/tests/unary/unary_ops_test.cpp @@ -57,8 +57,7 @@ cudf::test::fixed_width_column_wrapper create_expected_columns(cudf::size_typ } template -struct IsNull : public cudf::test::BaseFixture { -}; +struct IsNull : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(IsNull, cudf::test::NumericTypes); @@ -108,8 +107,7 @@ TYPED_TEST(IsNull, EmptyColumns) } template -struct IsNotNull : public cudf::test::BaseFixture { -}; +struct IsNotNull : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(IsNotNull, cudf::test::NumericTypes); @@ -159,8 +157,7 @@ TYPED_TEST(IsNotNull, EmptyColumns) } template -struct IsNAN : public cudf::test::BaseFixture { -}; +struct IsNAN : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(IsNAN, cudf::test::FloatingPointTypes); @@ -212,8 +209,7 @@ TYPED_TEST(IsNAN, NonFloatingColumn) } template -struct IsNotNAN : public cudf::test::BaseFixture { -}; +struct IsNotNAN : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(IsNotNAN, cudf::test::FloatingPointTypes); @@ -265,8 +261,7 @@ TYPED_TEST(IsNotNAN, NonFloatingColumn) } template -struct FixedPointUnaryTests : public cudf::test::BaseFixture { -}; +struct FixedPointUnaryTests : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(FixedPointUnaryTests, cudf::test::FixedPointTypes); diff --git a/cpp/tests/utilities/column_utilities.cu b/cpp/tests/utilities/column_utilities.cu index 133ca99b31f..52a33def906 100644 --- a/cpp/tests/utilities/column_utilities.cu +++ b/cpp/tests/utilities/column_utilities.cu @@ -439,7 +439,7 @@ class corresponding_rows_not_equivalent { // Must handle inf and nan separately if (std::isinf(x) || std::isinf(y)) { - return x != y; // comparison of (inf==inf) returns true + return x != y; // comparison of (inf==inf) returns true } else if (std::isnan(x) || std::isnan(y)) { return std::isnan(x) != std::isnan(y); // comparison of (nan==nan) returns false } else { diff --git a/cpp/tests/utilities_tests/column_utilities_tests.cpp b/cpp/tests/utilities_tests/column_utilities_tests.cpp index 60f2ac768ec..ab2bd0c49e9 100644 --- a/cpp/tests/utilities_tests/column_utilities_tests.cpp +++ b/cpp/tests/utilities_tests/column_utilities_tests.cpp @@ -41,15 +41,12 @@ struct ColumnUtilitiesTest : public cudf::test::BaseFixture { }; template -struct ColumnUtilitiesTestIntegral : public cudf::test::BaseFixture { -}; +struct ColumnUtilitiesTestIntegral : public cudf::test::BaseFixture {}; template -struct ColumnUtilitiesTestFloatingPoint : public cudf::test::BaseFixture { -}; +struct ColumnUtilitiesTestFloatingPoint : public cudf::test::BaseFixture {}; template -struct ColumnUtilitiesTestFixedPoint : public cudf::test::BaseFixture { -}; +struct ColumnUtilitiesTestFixedPoint : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(ColumnUtilitiesTest, cudf::test::FixedWidthTypes); TYPED_TEST_SUITE(ColumnUtilitiesTestIntegral, cudf::test::IntegralTypes); @@ -137,8 +134,7 @@ TYPED_TEST(ColumnUtilitiesTest, NullableToHostAllValid) EXPECT_TRUE(cudf::test::validate_host_masks(masks, host_data.second, size)); } -struct ColumnUtilitiesEquivalenceTest : public cudf::test::BaseFixture { -}; +struct ColumnUtilitiesEquivalenceTest : public cudf::test::BaseFixture {}; TEST_F(ColumnUtilitiesEquivalenceTest, DoubleTest) { @@ -157,8 +153,7 @@ TEST_F(ColumnUtilitiesEquivalenceTest, NullabilityTest) CUDF_TEST_EXPECT_COLUMNS_EQUIVALENT(col1, col2); } -struct ColumnUtilitiesStringsTest : public cudf::test::BaseFixture { -}; +struct ColumnUtilitiesStringsTest : public cudf::test::BaseFixture {}; TEST_F(ColumnUtilitiesStringsTest, StringsToHost) { @@ -324,8 +319,7 @@ TYPED_TEST(ColumnUtilitiesTestFixedPoint, NonNullableToHostWithOffset) EXPECT_TRUE(std::equal(expected.begin(), expected.end(), host_data.first.begin())); } -struct ColumnUtilitiesListsTest : public cudf::test::BaseFixture { -}; +struct ColumnUtilitiesListsTest : public cudf::test::BaseFixture {}; TEST_F(ColumnUtilitiesListsTest, Equivalence) { @@ -499,8 +493,7 @@ TEST_F(ColumnUtilitiesListsTest, DifferentPhysicalStructureBeforeConstruction) } } -struct ColumnUtilitiesStructsTest : public cudf::test::BaseFixture { -}; +struct ColumnUtilitiesStructsTest : public cudf::test::BaseFixture {}; TEST_F(ColumnUtilitiesStructsTest, Properties) { diff --git a/cpp/tests/utilities_tests/lists_column_wrapper_tests.cpp b/cpp/tests/utilities_tests/lists_column_wrapper_tests.cpp index 387dd4c0714..8a7595eb8f3 100644 --- a/cpp/tests/utilities_tests/lists_column_wrapper_tests.cpp +++ b/cpp/tests/utilities_tests/lists_column_wrapper_tests.cpp @@ -30,8 +30,7 @@ #include #include -struct ListColumnWrapperTest : public cudf::test::BaseFixture { -}; +struct ListColumnWrapperTest : public cudf::test::BaseFixture {}; template struct ListColumnWrapperTestTyped : public cudf::test::BaseFixture { ListColumnWrapperTestTyped() {} diff --git a/cpp/tests/utilities_tests/span_tests.cu b/cpp/tests/utilities_tests/span_tests.cu index 43ca05644ff..7bcbd7a799f 100644 --- a/cpp/tests/utilities_tests/span_tests.cu +++ b/cpp/tests/utilities_tests/span_tests.cu @@ -80,8 +80,7 @@ std::vector create_hello_world_message() return std::vector(hello_world_message.begin(), hello_world_message.end()); } -class SpanTest : public cudf::test::BaseFixture { -}; +class SpanTest : public cudf::test::BaseFixture {}; TEST(SpanTest, CanCreateFullSubspan) { @@ -261,8 +260,7 @@ TEST(SpanTest, CanUseDeviceSpan) ASSERT_TRUE(d_message.element(0, cudf::get_default_stream())); } -class MdSpanTest : public cudf::test::BaseFixture { -}; +class MdSpanTest : public cudf::test::BaseFixture {}; TEST(MdSpanTest, CanDetermineEmptiness) { diff --git a/cpp/tests/utilities_tests/type_check_tests.cpp b/cpp/tests/utilities_tests/type_check_tests.cpp index f65c3652dc9..a8f7eaf5399 100644 --- a/cpp/tests/utilities_tests/type_check_tests.cpp +++ b/cpp/tests/utilities_tests/type_check_tests.cpp @@ -27,11 +27,9 @@ namespace cudf { namespace test { template -struct ColumnTypeCheckTestTyped : public cudf::test::BaseFixture { -}; +struct ColumnTypeCheckTestTyped : public cudf::test::BaseFixture {}; -struct ColumnTypeCheckTest : public cudf::test::BaseFixture { -}; +struct ColumnTypeCheckTest : public cudf::test::BaseFixture {}; TYPED_TEST_SUITE(ColumnTypeCheckTestTyped, cudf::test::FixedWidthTypes); From d546d9c259e9811783d65a7b302ff8d398a1167d Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 13 Apr 2023 11:59:14 -0500 Subject: [PATCH 3/4] Update script versions. --- cpp/scripts/run-clang-format.py | 2 +- cpp/scripts/run-clang-tidy.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/scripts/run-clang-format.py b/cpp/scripts/run-clang-format.py index 2a732dfdc67..1db511c5676 100755 --- a/cpp/scripts/run-clang-format.py +++ b/cpp/scripts/run-clang-format.py @@ -21,7 +21,7 @@ import sys import tempfile -EXPECTED_VERSION = "11.1.0" +EXPECTED_VERSION = "16.0.1" VERSION_REGEX = re.compile(r"clang-format version ([0-9.]+)") # NOTE: populate this list with more top-level dirs as we add more of them to # the cudf repo diff --git a/cpp/scripts/run-clang-tidy.py b/cpp/scripts/run-clang-tidy.py index f6b24ccb4bb..401a623b5a3 100644 --- a/cpp/scripts/run-clang-tidy.py +++ b/cpp/scripts/run-clang-tidy.py @@ -22,7 +22,7 @@ import shutil -EXPECTED_VERSION = "11.1.0" +EXPECTED_VERSION = "16.0.1" VERSION_REGEX = re.compile(r" LLVM version ([0-9.]+)") GPU_ARCH_REGEX = re.compile(r"sm_(\d+)") SPACES = re.compile(r"\s+") From 4d5c4fd71922a583392df0869173eaa74a053712 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Sat, 15 Apr 2023 11:38:05 -0500 Subject: [PATCH 4/4] Delete run-clang-format.py --- cpp/scripts/run-clang-format.py | 187 -------------------------------- 1 file changed, 187 deletions(-) delete mode 100755 cpp/scripts/run-clang-format.py diff --git a/cpp/scripts/run-clang-format.py b/cpp/scripts/run-clang-format.py deleted file mode 100755 index 19a38541be9..00000000000 --- a/cpp/scripts/run-clang-format.py +++ /dev/null @@ -1,187 +0,0 @@ -# Copyright (c) 2019-2023, 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. -# - - -import argparse -import os -import re -import subprocess -import sys -import tempfile - -EXPECTED_VERSION = "16.0.1" -VERSION_REGEX = re.compile(r"clang-format version ([0-9.]+)") -# NOTE: populate this list with more top-level dirs as we add more of them to -# the cudf repo -DEFAULT_DIRS = [ - "cpp/benchmarks", - "cpp/include", - "cpp/libcudf_kafka", - "cpp/src", - "cpp/tests", - "java/src/main/native", -] - - -def parse_args(): - argparser = argparse.ArgumentParser("Runs clang-format on a project") - argparser.add_argument( - "-dstdir", - type=str, - default=None, - help="Directory to store the temporary outputs of" - " clang-format. If nothing is passed for this, then" - " a temporary dir will be created using `mkdtemp`", - ) - argparser.add_argument( - "-exe", - type=str, - default="clang-format", - help="Path to clang-format exe", - ) - argparser.add_argument( - "-inplace", - default=False, - action="store_true", - help="Replace the source files itself.", - ) - argparser.add_argument( - "-regex", - type=str, - default=r"[.](cu|cuh|h|hpp|cpp|inl)$", - help="Regex string to filter in sources", - ) - argparser.add_argument( - "-ignore", - type=str, - default=r"cannylab/bh[.]cu$", - help="Regex used to ignore files from matched list", - ) - argparser.add_argument( - "-v", - dest="verbose", - action="store_true", - help="Print verbose messages", - ) - argparser.add_argument( - "dirs", type=str, nargs="*", help="List of dirs where to find sources" - ) - args = argparser.parse_args() - args.regex_compiled = re.compile(args.regex) - args.ignore_compiled = re.compile(args.ignore) - if args.dstdir is None: - args.dstdir = tempfile.mkdtemp() - ret = subprocess.check_output("%s --version" % args.exe, shell=True) - ret = ret.decode("utf-8") - version = VERSION_REGEX.match(ret) - if version is None: - raise Exception("Failed to figure out clang-format version!") - version = version.group(1) - if version != EXPECTED_VERSION: - raise Exception( - "clang-format exe must be v%s found '%s'" - % (EXPECTED_VERSION, version) - ) - if len(args.dirs) == 0: - args.dirs = DEFAULT_DIRS - return args - - -def list_all_src_files(file_regex, ignore_regex, srcdirs, dstdir, inplace): - allFiles = [] - for srcdir in srcdirs: - for root, dirs, files in os.walk(srcdir): - for f in files: - if re.search(file_regex, f): - src = os.path.join(root, f) - if re.search(ignore_regex, src): - continue - if inplace: - _dir = root - else: - _dir = os.path.join(dstdir, root) - dst = os.path.join(_dir, f) - allFiles.append((src, dst)) - return allFiles - - -def run_clang_format(src, dst, exe, verbose, inplace): - dstdir = os.path.dirname(dst) - if not os.path.exists(dstdir): - os.makedirs(dstdir) - # run the clang format command itself - if src == dst: - cmd = f"{exe} -i {src}" - else: - cmd = f"{exe} {src} > {dst}" - try: - subprocess.check_call(cmd, shell=True) - except subprocess.CalledProcessError: - print("Failed to run clang-format! Maybe your env is not proper?") - raise - # run the diff to check if there are any formatting issues - if inplace: - cmd = f"diff -q {src} {dst} >/dev/null" - else: - cmd = f"diff {src} {dst}" - - try: - subprocess.check_call(cmd, shell=True) - if verbose: - print("%s passed" % os.path.basename(src)) - except subprocess.CalledProcessError: - print( - "%s failed! 'diff %s %s' will show formatting violations!" - % (os.path.basename(src), src, dst) - ) - return False - return True - - -def main(): - args = parse_args() - # Attempt to making sure that we run this script from root of repo always - if not os.path.exists(".git"): - print("Error!! This needs to always be run from the root of repo") - sys.exit(-1) - all_files = list_all_src_files( - args.regex_compiled, - args.ignore_compiled, - args.dirs, - args.dstdir, - args.inplace, - ) - # actual format checker - status = True - for src, dst in all_files: - if not run_clang_format( - src, dst, args.exe, args.verbose, args.inplace - ): - status = False - if not status: - print("clang-format failed! You have 2 options:") - print(" 1. Look at formatting differences above and fix them manually") - print(" 2. Or run the below command to bulk-fix all these at once") - print("Bulk-fix command: ") - print( - " python cpp/scripts/run-clang-format.py %s -inplace" - % " ".join(sys.argv[1:]) - ) - sys.exit(-1) - return - - -if __name__ == "__main__": - main()