From 551f36d11ac2c68b113df1c77d7c6ec2be7661bd Mon Sep 17 00:00:00 2001 From: Mark Harris <783069+harrism@users.noreply.github.com> Date: Thu, 15 Feb 2024 00:15:47 +0000 Subject: [PATCH 1/5] Add IncludeCategories to clang-format --- .clang-format | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/.clang-format b/.clang-format index 26b9a5bf4ce..f215c28acf5 100644 --- a/.clang-format +++ b/.clang-format @@ -71,8 +71,30 @@ ForEachMacros: - foreach - Q_FOREACH - BOOST_FOREACH -IncludeBlocks: Preserve -IncludeIsMainRegex: '([-_](test|unittest))?$' +IncludeBlocks: Regroup +IncludeCategories: + - Regex: '^"' # quoted includes + Priority: 1 + - Regex: '^<(benchmarks|tests)/' # benchmark includes + Priority: 2 + - Regex: '^ Date: Thu, 15 Feb 2024 00:24:41 +0000 Subject: [PATCH 2/5] apply clang-format and copyright updates using new rules --- cpp/benchmarks/common/generate_input.cu | 3 +-- cpp/benchmarks/fixture/benchmark_fixture.hpp | 3 ++- cpp/benchmarks/io/cuio_common.cpp | 7 +++--- cpp/benchmarks/io/fst.cu | 8 +++---- cpp/benchmarks/io/json/nested_json.cpp | 6 ++--- cpp/benchmarks/iterator/iterator.cu | 3 +-- cpp/benchmarks/join/join_common.hpp | 6 ++--- cpp/benchmarks/merge/merge.cpp | 3 ++- cpp/benchmarks/sort/rank_lists.cpp | 6 ++--- cpp/benchmarks/sort/rank_structs.cpp | 3 ++- .../stream_compaction/apply_boolean_mask.cpp | 7 +++--- cpp/benchmarks/string/string_bench_args.hpp | 6 ++--- .../synchronization/synchronization.hpp | 8 +++---- cpp/benchmarks/text/edit_distance.cpp | 4 ++-- cpp/benchmarks/text/hash_ngrams.cpp | 4 ++-- cpp/benchmarks/text/jaccard.cpp | 4 ++-- cpp/benchmarks/text/minhash.cpp | 4 ++-- cpp/benchmarks/text/vocab.cpp | 4 ++-- cpp/examples/strings/custom_optimized.cu | 3 +-- cpp/include/cudf/ast/detail/operators.hpp | 5 ++--- cpp/include/cudf/column/column.hpp | 3 +-- cpp/include/cudf/detail/copy_if.cuh | 6 ++--- cpp/include/cudf/detail/copy_range.cuh | 1 - cpp/include/cudf/detail/gather.cuh | 6 ++--- .../cudf/detail/hash_reduce_by_row.cuh | 3 +-- cpp/include/cudf/detail/indexalator.cuh | 5 ++--- cpp/include/cudf/detail/interop.hpp | 5 +++-- cpp/include/cudf/detail/label_bins.hpp | 5 ++--- cpp/include/cudf/detail/null_mask.cuh | 4 +--- .../cudf/detail/sizes_to_offsets_iterator.cuh | 5 ++--- .../cudf/detail/utilities/device_atomics.cuh | 3 ++- .../detail/utilities/pinned_host_vector.hpp | 10 ++++----- cpp/include/cudf/fixed_point/temporary.hpp | 5 ++--- cpp/include/cudf/io/detail/orc.hpp | 4 ++-- .../cudf/io/text/detail/bgzip_utils.hpp | 6 ++--- .../cudf/io/text/detail/tile_state.hpp | 3 +-- cpp/include/cudf/lists/detail/gather.cuh | 5 ++--- cpp/include/cudf/lists/detail/scatter.cuh | 5 ++--- .../cudf/lists/detail/set_operations.hpp | 4 ++-- cpp/include/cudf/lists/list_device_view.cuh | 4 ++-- .../cudf/lists/lists_column_device_view.cuh | 5 +++-- .../cudf/reduction/detail/reduction.cuh | 3 +-- .../reduction/detail/reduction_operators.cuh | 5 +++-- .../reduction/detail/segmented_reduction.cuh | 3 +-- cpp/include/cudf/row_conversion.hpp | 7 +++--- .../strings/detail/convert/fixed_point.cuh | 5 ++--- .../cudf/strings/detail/copy_if_else.cuh | 3 +-- cpp/include/cudf/strings/detail/gather.cuh | 3 +-- cpp/include/cudf/strings/detail/merge.cuh | 3 +-- cpp/include/cudf/strings/detail/scatter.cuh | 5 ++--- .../detail/strings_column_factories.cuh | 3 +-- .../cudf/table/experimental/row_operators.cuh | 7 +++--- cpp/include/cudf/utilities/bit.hpp | 8 ++++--- cpp/include/cudf/utilities/error.hpp | 3 ++- cpp/include/cudf/wrappers/dictionary.hpp | 5 +++-- cpp/include/cudf_test/column_wrapper.hpp | 8 +++---- cpp/include/cudf_test/file_utilities.hpp | 5 +++-- cpp/include/cudf_test/random.hpp | 4 ++-- cpp/include/cudf_test/timestamp_utilities.cuh | 6 ++--- cpp/include/cudf_test/type_lists.hpp | 5 +++-- cpp/include/nvtext/detail/load_hash_file.hpp | 6 ++--- .../tests/kafka_consumer_tests.cpp | 10 +++++---- cpp/src/binaryop/binaryop.cpp | 17 +++++++------- cpp/src/binaryop/compiled/binary_ops.cu | 3 +-- cpp/src/binaryop/jit/kernel.cu | 3 ++- cpp/src/bitmask/null_mask.cu | 3 +-- cpp/src/column/column.cu | 6 ++--- cpp/src/copying/contiguous_split.cu | 3 +-- cpp/src/copying/gather.cu | 5 ++--- cpp/src/copying/reverse.cu | 5 ++--- cpp/src/copying/sample.cu | 5 ++--- cpp/src/copying/scatter.cu | 3 +-- cpp/src/datetime/timezone.cpp | 5 ++--- cpp/src/dictionary/detail/concatenate.cu | 5 ++--- cpp/src/filling/repeat.cu | 5 ++--- cpp/src/groupby/hash/groupby.cu | 13 +++++------ cpp/src/groupby/hash/groupby_kernels.cuh | 3 ++- cpp/src/groupby/sort/aggregate.cpp | 10 ++++----- cpp/src/groupby/sort/group_argmax.cu | 6 ++--- cpp/src/groupby/sort/group_argmin.cu | 6 ++--- cpp/src/groupby/sort/group_correlation.cu | 6 ++--- cpp/src/groupby/sort/group_count.cu | 5 ++--- cpp/src/groupby/sort/group_count_scan.cu | 8 +++---- cpp/src/groupby/sort/group_histogram.cu | 6 ++--- cpp/src/groupby/sort/group_max.cu | 6 ++--- cpp/src/groupby/sort/group_max_scan.cu | 6 ++--- cpp/src/groupby/sort/group_min.cu | 6 ++--- cpp/src/groupby/sort/group_min_scan.cu | 6 ++--- cpp/src/groupby/sort/group_nth_element.cu | 7 +++--- cpp/src/groupby/sort/group_product.cu | 5 +++-- cpp/src/groupby/sort/group_quantiles.cu | 5 +++-- cpp/src/groupby/sort/group_scan_util.cuh | 6 ++--- .../sort/group_single_pass_reduction_util.cuh | 6 ++--- cpp/src/groupby/sort/group_sum.cu | 5 +++-- cpp/src/groupby/sort/group_sum_scan.cu | 6 ++--- cpp/src/groupby/sort/scan.cpp | 12 +++++----- cpp/src/groupby/sort/sort_helper.cu | 7 +++--- cpp/src/hash/concurrent_unordered_map.cuh | 7 +++--- cpp/src/interop/detail/arrow_allocator.cpp | 5 +++-- cpp/src/interop/dlpack.cpp | 4 ++-- cpp/src/interop/to_arrow.cu | 4 ++-- cpp/src/io/avro/avro_gpu.cu | 4 ++-- cpp/src/io/avro/reader_impl.cu | 9 ++++---- cpp/src/io/comp/debrotli.cu | 4 ++-- cpp/src/io/comp/gpuinflate.cu | 4 ++-- cpp/src/io/comp/nvcomp_adapter.cpp | 3 ++- cpp/src/io/comp/nvcomp_adapter.cuh | 6 ++--- cpp/src/io/comp/nvcomp_adapter.hpp | 4 ++-- cpp/src/io/comp/snap.cu | 4 ++-- cpp/src/io/comp/statistics.cu | 3 ++- cpp/src/io/comp/uncomp.cpp | 9 ++++---- cpp/src/io/comp/unsnap.cu | 4 ++-- cpp/src/io/csv/csv_common.hpp | 5 +++-- cpp/src/io/csv/csv_gpu.cu | 8 +++---- cpp/src/io/csv/csv_gpu.hpp | 6 ++--- cpp/src/io/csv/datetime.cuh | 8 +++---- cpp/src/io/csv/reader_impl.cu | 12 +++++----- cpp/src/io/csv/writer_impl.cu | 3 +-- cpp/src/io/fst/agent_dfa.cuh | 1 - cpp/src/io/fst/logical_stack.cuh | 8 +++---- cpp/src/io/fst/lookup_tables.cuh | 8 +++---- cpp/src/io/functions.cpp | 4 ++-- cpp/src/io/json/byte_range_info.cu | 3 ++- cpp/src/io/json/json_column.cu | 8 +++---- cpp/src/io/json/json_quote_normalization.cu | 4 ++-- cpp/src/io/json/json_tree.cu | 6 ++--- cpp/src/io/json/legacy/json_gpu.cu | 8 +++---- cpp/src/io/json/legacy/json_gpu.hpp | 11 +++++----- cpp/src/io/json/legacy/reader_impl.cu | 11 +++++----- cpp/src/io/json/nested_json_gpu.cu | 12 +++++----- cpp/src/io/json/read_json.cu | 8 +++---- cpp/src/io/json/write_json.cu | 9 ++++---- cpp/src/io/orc/orc.cpp | 3 ++- cpp/src/io/orc/orc.hpp | 5 +++-- cpp/src/io/orc/orc_field_reader.hpp | 3 ++- cpp/src/io/orc/orc_gpu.hpp | 10 ++++----- cpp/src/io/orc/reader_impl.hpp | 4 ++-- cpp/src/io/orc/reader_impl_chunking.hpp | 4 ++-- cpp/src/io/orc/reader_impl_helpers.hpp | 4 ++-- cpp/src/io/orc/reader_impl_preprocess.cu | 8 +++---- cpp/src/io/orc/stats_enc.cu | 4 ++-- cpp/src/io/orc/stripe_data.cu | 6 +++-- cpp/src/io/orc/stripe_enc.cu | 14 ++++++------ cpp/src/io/orc/stripe_init.cu | 6 +++-- cpp/src/io/orc/writer_impl.cu | 16 ++++++-------- cpp/src/io/orc/writer_impl.hpp | 4 ++-- cpp/src/io/parquet/decode_preprocess.cu | 5 +++-- cpp/src/io/parquet/page_data.cu | 5 +++-- cpp/src/io/parquet/page_decode.cuh | 4 ++-- cpp/src/io/parquet/page_delta_decode.cu | 5 +++-- cpp/src/io/parquet/page_enc.cu | 6 ++--- cpp/src/io/parquet/page_hdr.cu | 5 +++-- cpp/src/io/parquet/parquet_gpu.hpp | 2 -- cpp/src/io/parquet/reader_impl.cpp | 1 + cpp/src/io/parquet/reader_impl_chunking.cu | 10 ++++----- cpp/src/io/parquet/reader_impl_preprocess.cu | 3 +-- cpp/src/io/parquet/rle_stream.cuh | 3 ++- cpp/src/io/parquet/writer_impl.cu | 10 ++++----- cpp/src/io/parquet/writer_impl.hpp | 5 ++--- cpp/src/io/statistics/column_statistics.cuh | 4 +--- .../statistics_type_identification.cuh | 13 ++++------- .../io/statistics/typed_statistics_chunk.cuh | 3 +-- cpp/src/io/text/bgzip_data_chunk_source.cu | 8 +++---- cpp/src/io/text/bgzip_utils.cpp | 6 ++--- cpp/src/io/text/multibyte_split.cu | 10 ++++----- cpp/src/io/utilities/column_buffer.cpp | 1 + cpp/src/io/utilities/column_utils.cuh | 6 ++--- cpp/src/io/utilities/data_casting.cu | 7 +++--- cpp/src/io/utilities/data_sink.cpp | 9 +++++--- cpp/src/io/utilities/datasource.cpp | 6 ++--- cpp/src/io/utilities/file_io_utilities.cpp | 3 ++- cpp/src/io/utilities/file_io_utilities.hpp | 5 +++-- cpp/src/io/utilities/parsing_utils.cu | 4 ++-- cpp/src/io/utilities/parsing_utils.cuh | 10 ++++----- cpp/src/io/utilities/row_selection.cpp | 6 ++--- cpp/src/io/utilities/string_parsing.hpp | 6 ++--- cpp/src/io/utilities/type_inference.cu | 8 +++---- cpp/src/jit/cache.cpp | 3 ++- cpp/src/jit/cache.hpp | 3 ++- cpp/src/join/conditional_join.cu | 7 +++--- cpp/src/join/conditional_join_kernels.cuh | 6 ++--- cpp/src/join/join_common_utils.cuh | 3 +-- cpp/src/join/join_common_utils.hpp | 1 - cpp/src/join/mixed_join_common_utils.cuh | 6 ++--- cpp/src/join/mixed_join_kernel.cuh | 1 - cpp/src/join/mixed_join_kernels.cuh | 6 ++--- cpp/src/join/mixed_join_kernels_semi.cu | 8 +++---- cpp/src/join/mixed_join_kernels_semi.cuh | 8 +++---- cpp/src/join/mixed_join_size_kernel.cuh | 1 - cpp/src/join/mixed_join_size_kernels_semi.cu | 8 +++---- cpp/src/join/semi_join.cu | 6 ++--- cpp/src/json/json_path.cu | 4 ++-- .../combine/concatenate_list_elements.cu | 5 ++--- cpp/src/lists/combine/concatenate_rows.cu | 5 ++--- cpp/src/lists/contains.cu | 5 ++--- cpp/src/lists/copying/scatter_helper.cu | 5 ++--- cpp/src/lists/copying/segmented_gather.cu | 9 ++++---- cpp/src/lists/dremel.cu | 5 ++--- cpp/src/lists/explode.cu | 5 ++--- cpp/src/lists/interleave_columns.cu | 3 +-- cpp/src/lists/set_operations.cu | 10 ++++----- cpp/src/lists/stream_compaction/distinct.cu | 6 ++--- cpp/src/merge/merge.cu | 7 +++--- cpp/src/partitioning/partitioning.cu | 5 ++--- cpp/src/partitioning/round_robin.cu | 5 ++--- cpp/src/quantiles/quantile.cu | 7 +++--- cpp/src/quantiles/quantiles.cu | 7 +++--- cpp/src/quantiles/quantiles_util.hpp | 5 +++-- cpp/src/quantiles/tdigest/tdigest.cu | 5 ++--- .../quantiles/tdigest/tdigest_aggregation.cu | 5 ++--- cpp/src/reductions/all.cu | 5 ++--- cpp/src/reductions/any.cu | 5 ++--- cpp/src/reductions/histogram.cu | 5 ++--- cpp/src/reductions/nth_element.cu | 5 ++--- cpp/src/reductions/scan/scan_exclusive.cu | 5 ++--- cpp/src/reductions/scan/scan_inclusive.cu | 6 ++--- cpp/src/reductions/segmented/simple.cuh | 5 ++--- cpp/src/replace/clamp.cu | 3 +-- cpp/src/reshape/interleave_columns.cu | 3 +-- cpp/src/rolling/detail/lead_lag_nested.cuh | 5 ++--- cpp/src/rolling/detail/rolling.cuh | 17 ++++++-------- .../rolling/detail/rolling_collect_list.cuh | 5 ++--- .../rolling/detail/rolling_fixed_window.cu | 9 ++++---- .../rolling/detail/rolling_variable_window.cu | 5 ++--- cpp/src/rolling/grouped_rolling.cu | 5 ++--- cpp/src/rolling/jit/kernel.cu | 6 ++--- cpp/src/rolling/range_window_bounds.cpp | 3 ++- cpp/src/round/round.cu | 3 ++- cpp/src/scalar/scalar_factories.cpp | 6 ++--- cpp/src/search/contains_table.cu | 8 +++---- cpp/src/sort/rank.cu | 7 +++--- cpp/src/stream_compaction/distinct.cu | 3 +-- cpp/src/stream_compaction/distinct_count.cu | 1 - cpp/src/strings/attributes.cu | 6 ++--- cpp/src/strings/char_types/char_cases.cu | 6 ++--- cpp/src/strings/contains.cu | 10 ++++----- .../strings/convert/convert_fixed_point.cu | 7 +++--- cpp/src/strings/copying/copying.cu | 3 +-- cpp/src/strings/count_matches.cu | 8 +++---- cpp/src/strings/extract/extract.cu | 9 ++++---- cpp/src/strings/extract/extract_all.cu | 10 ++++----- cpp/src/strings/regex/regcomp.cpp | 6 ++--- cpp/src/strings/regex/regex.cuh | 7 +++--- cpp/src/strings/regex/regexec.cpp | 8 +++---- cpp/src/strings/regex/utilities.cuh | 4 ++-- cpp/src/strings/replace/backref_re.cu | 6 ++--- cpp/src/strings/replace/backref_re.cuh | 6 ++--- cpp/src/strings/replace/multi.cu | 3 +-- cpp/src/strings/replace/multi_re.cu | 6 ++--- cpp/src/strings/replace/replace.cu | 3 +-- cpp/src/strings/replace/replace_re.cu | 6 ++--- cpp/src/strings/search/find.cu | 3 +-- cpp/src/strings/search/findall.cu | 8 +++---- cpp/src/strings/split/split.cu | 3 +-- cpp/src/strings/split/split.cuh | 3 +-- cpp/src/strings/split/split_re.cu | 8 +++---- cpp/src/strings/split/split_record.cu | 3 +-- cpp/src/strings/utilities.cu | 6 ++--- cpp/src/structs/scan/scan_inclusive.cu | 6 ++--- cpp/src/structs/structs_column_factories.cu | 3 ++- cpp/src/table/row_operators.cu | 6 ++--- cpp/src/text/bpe/byte_pair_encoding.cu | 8 +++---- cpp/src/text/bpe/byte_pair_encoding.cuh | 5 ++--- cpp/src/text/bpe/load_merge_pairs.cu | 12 +++++----- cpp/src/text/detokenize.cu | 4 ++-- cpp/src/text/edit_distance.cu | 6 ++--- cpp/src/text/generate_ngrams.cu | 7 +++--- cpp/src/text/jaccard.cu | 11 +++++----- cpp/src/text/minhash.cu | 7 +++--- cpp/src/text/ngrams_tokenize.cu | 11 +++++----- cpp/src/text/normalize.cu | 12 +++++----- cpp/src/text/replace.cu | 10 ++++----- cpp/src/text/stemmer.cu | 6 ++--- cpp/src/text/subword/data_normalizer.cu | 6 ++--- .../text/subword/detail/data_normalizer.hpp | 4 ++-- .../text/subword/detail/tokenizer_utils.cuh | 4 ++-- .../subword/detail/wordpiece_tokenizer.hpp | 4 ++-- cpp/src/text/subword/load_hash_file.cu | 12 +++++----- cpp/src/text/subword/subword_tokenize.cu | 3 ++- cpp/src/text/subword/wordpiece_tokenizer.cu | 9 ++++---- cpp/src/text/tokenize.cu | 10 ++++----- cpp/src/text/vocabulary_tokenize.cu | 10 ++++----- cpp/src/transform/jit/kernel.cu | 10 ++++----- cpp/src/transform/mask_to_bools.cu | 8 +++---- cpp/src/transform/one_hot_encode.cu | 8 +++---- cpp/src/transform/row_bit_count.cu | 6 ++--- cpp/src/transform/row_conversion.cu | 9 +++++--- cpp/src/transform/transform.cpp | 7 +++--- cpp/src/utilities/logger.cpp | 5 +++-- cpp/src/utilities/traits.cpp | 6 ++--- cpp/tests/ast/transform_tests.cpp | 14 ++++++------ cpp/tests/binaryop/util/operation.h | 5 +++-- cpp/tests/bitmask/bitmask_tests.cpp | 13 ++++++----- cpp/tests/bitmask/set_nullmask_tests.cu | 8 +++---- cpp/tests/bitmask/valid_if_tests.cu | 10 ++++----- cpp/tests/column/bit_cast_test.cpp | 10 ++++----- .../column/column_view_device_span_test.cpp | 14 ++++++------ cpp/tests/column/column_view_shallow_test.cpp | 12 +++++----- cpp/tests/column/compound_test.cu | 7 +++--- .../copying/purge_nonempty_nulls_tests.cpp | 14 ++++++------ cpp/tests/copying/slice_tests.cpp | 16 +++++++------- cpp/tests/copying/utility_tests.cpp | 11 +++++----- cpp/tests/datetime/datetime_ops_test.cpp | 13 ++++++----- .../device_atomics/device_atomics_test.cu | 12 +++++----- cpp/tests/dictionary/add_keys_test.cpp | 7 +++--- cpp/tests/dictionary/decode_test.cpp | 7 +++--- cpp/tests/dictionary/encode_test.cpp | 7 +++--- cpp/tests/dictionary/factories_test.cpp | 9 ++++---- cpp/tests/dictionary/fill_test.cpp | 9 ++++---- cpp/tests/dictionary/gather_test.cpp | 9 ++++---- cpp/tests/dictionary/remove_keys_test.cpp | 9 ++++---- cpp/tests/dictionary/scatter_test.cpp | 9 ++++---- cpp/tests/dictionary/search_test.cpp | 7 +++--- cpp/tests/dictionary/set_keys_test.cpp | 9 ++++---- cpp/tests/dictionary/slice_test.cpp | 9 ++++---- cpp/tests/encode/encode_tests.cpp | 5 +++-- cpp/tests/hash_map/map_test.cu | 4 ++-- cpp/tests/hashing/md5_test.cpp | 4 ++-- cpp/tests/hashing/murmurhash3_x86_32_test.cpp | 6 ++--- cpp/tests/hashing/sha1_test.cpp | 6 ++--- cpp/tests/hashing/sha224_test.cpp | 6 ++--- cpp/tests/hashing/sha256_test.cpp | 6 ++--- cpp/tests/hashing/sha384_test.cpp | 6 ++--- cpp/tests/hashing/sha512_test.cpp | 6 ++--- .../hashing/spark_murmurhash3_x86_32_test.cpp | 10 ++++----- cpp/tests/hashing/xxhash_64_test.cpp | 10 ++++----- cpp/tests/interop/arrow_utils.hpp | 15 +++++++------ cpp/tests/interop/dlpack_test.cpp | 7 +++--- cpp/tests/interop/from_arrow_test.cpp | 18 +++++++-------- cpp/tests/interop/to_arrow_test.cpp | 18 +++++++-------- cpp/tests/io/comp/decomp_test.cpp | 12 +++++----- cpp/tests/io/csv_test.cpp | 4 ++-- cpp/tests/io/fst/fst_test.cu | 5 +++-- cpp/tests/io/fst/logical_stack_test.cu | 5 +++-- .../io/json_quote_normalization_test.cpp | 8 +++---- cpp/tests/io/json_test.cpp | 2 +- cpp/tests/io/json_tree.cpp | 14 ++++++------ cpp/tests/io/json_type_cast_test.cu | 4 ++-- .../io/json_whitespace_normalization_test.cu | 12 +++++----- cpp/tests/io/nested_json_test.cpp | 22 +++++++++---------- cpp/tests/io/orc_test.cpp | 1 + cpp/tests/io/parquet_chunked_reader_test.cu | 8 +++---- cpp/tests/io/text/multibyte_split_test.cpp | 4 ++-- cpp/tests/io/type_inference_test.cu | 9 ++++---- cpp/tests/iterator/iterator_tests.cuh | 5 ++--- .../iterator/value_iterator_test_chrono.cu | 6 ++--- .../iterator/value_iterator_test_numeric.cu | 6 ++--- cpp/tests/jit/parse_ptx_function.cpp | 7 +++--- cpp/tests/join/conditional_join_tests.cu | 10 ++++----- cpp/tests/join/cross_join_tests.cpp | 14 ++++++------ cpp/tests/join/join_tests.cpp | 16 +++++++------- cpp/tests/join/mixed_join_tests.cu | 10 ++++----- cpp/tests/join/semi_anti_join_tests.cpp | 14 ++++++------ cpp/tests/json/json_tests.cpp | 8 +++---- cpp/tests/labeling/label_bins_tests.cpp | 11 +++++----- cpp/tests/lists/contains_tests.cpp | 12 +++++----- cpp/tests/lists/count_elements_tests.cpp | 8 +++---- cpp/tests/lists/sequences_tests.cpp | 6 ++--- .../apply_boolean_mask_tests.cpp | 12 +++++----- cpp/tests/merge/merge_dictionary_test.cpp | 12 +++++----- cpp/tests/merge/merge_string_test.cpp | 16 +++++++------- cpp/tests/merge/merge_test.cpp | 18 +++++++-------- .../partitioning/hash_partition_test.cpp | 11 +++++----- cpp/tests/partitioning/round_robin_test.cpp | 16 +++++++------- cpp/tests/reductions/list_rank_test.cpp | 6 ++--- cpp/tests/replace/clamp_test.cpp | 12 +++++----- cpp/tests/replace/normalize_replace_tests.cpp | 5 +++-- cpp/tests/replace/replace_tests.cpp | 5 +++-- cpp/tests/rolling/grouped_rolling_test.cpp | 5 +++-- cpp/tests/rolling/nth_element_test.cpp | 6 ++--- .../rolling/range_rolling_window_test.cpp | 7 +++--- .../rolling/range_window_bounds_test.cpp | 3 ++- cpp/tests/rolling/rolling_test.cpp | 3 ++- cpp/tests/scalar/scalar_device_view_test.cu | 12 +++++----- .../apply_boolean_mask_tests.cpp | 15 +++++++------ .../distinct_count_tests.cpp | 16 +++++++------- .../stream_compaction/drop_nans_tests.cpp | 16 ++++++++------ .../stream_compaction/drop_nulls_tests.cpp | 13 ++++++----- .../stream_compaction/unique_count_tests.cpp | 16 +++++++------- cpp/tests/stream_compaction/unique_tests.cpp | 16 +++++++------- cpp/tests/streams/binaryop_test.cpp | 10 ++++----- cpp/tests/streams/concatenate_test.cpp | 6 ++--- cpp/tests/streams/dictionary_test.cpp | 10 ++++----- cpp/tests/streams/filling_test.cpp | 10 ++++----- cpp/tests/streams/hash_test.cpp | 6 ++--- cpp/tests/streams/interop_test.cpp | 10 ++++----- cpp/tests/streams/io/csv_test.cpp | 12 +++++----- cpp/tests/streams/io/json_test.cpp | 12 +++++----- cpp/tests/streams/io/orc_test.cpp | 10 ++++----- cpp/tests/streams/io/parquet_test.cpp | 10 ++++----- cpp/tests/streams/labeling_bins_test.cpp | 4 ++-- cpp/tests/streams/null_mask_test.cpp | 10 ++++----- cpp/tests/streams/pool_test.cu | 1 + cpp/tests/streams/replace_test.cpp | 10 ++++----- cpp/tests/streams/search_test.cpp | 10 ++++----- cpp/tests/streams/sorting_test.cpp | 8 +++---- cpp/tests/streams/strings/case_test.cpp | 8 +++---- cpp/tests/streams/strings/filter_test.cpp | 8 +++---- cpp/tests/streams/strings/find_test.cpp | 10 ++++----- cpp/tests/streams/strings/reverse_test.cpp | 6 ++--- cpp/tests/streams/strings/strings_tests.cpp | 10 ++++----- cpp/tests/streams/text/edit_distance_test.cpp | 6 ++--- cpp/tests/streams/text/ngrams_test.cpp | 8 +++---- cpp/tests/streams/text/stemmer_test.cpp | 6 ++--- cpp/tests/streams/text/tokenize_test.cpp | 6 ++--- cpp/tests/streams/unary_test.cpp | 6 ++--- cpp/tests/strings/attrs_tests.cpp | 10 ++++----- cpp/tests/strings/chars_types_tests.cpp | 9 ++++---- .../combine/join_list_elements_tests.cpp | 12 +++++----- cpp/tests/strings/durations_tests.cpp | 3 ++- cpp/tests/strings/find_multiple_tests.cpp | 10 ++++----- cpp/tests/strings/find_tests.cpp | 8 +++---- cpp/tests/strings/like_tests.cpp | 8 +++---- cpp/tests/structs/structs_column_tests.cpp | 16 +++++++------- cpp/tests/structs/utilities_tests.cpp | 3 ++- cpp/tests/table/row_operators_tests.cpp | 11 +++++----- cpp/tests/table/table_tests.cpp | 12 +++++----- cpp/tests/text/bpe_tests.cpp | 6 ++--- cpp/tests/text/edit_distance_tests.cpp | 11 +++++----- cpp/tests/text/jaccard_tests.cpp | 6 ++--- cpp/tests/text/minhash_tests.cpp | 6 ++--- cpp/tests/text/ngrams_tokenize_tests.cpp | 11 +++++----- cpp/tests/text/normalize_tests.cpp | 10 ++++----- cpp/tests/text/replace_tests.cpp | 10 ++++----- cpp/tests/text/stemmer_tests.cpp | 10 ++++----- cpp/tests/text/subword_tests.cpp | 10 ++++----- cpp/tests/text/tokenize_tests.cpp | 6 ++--- cpp/tests/transform/bools_to_mask_test.cpp | 10 ++++----- cpp/tests/transform/nans_to_null_test.cpp | 11 +++++----- cpp/tests/transpose/transpose_test.cpp | 3 ++- cpp/tests/types/traits_test.cpp | 3 ++- cpp/tests/types/type_dispatcher_test.cu | 9 ++++---- cpp/tests/unary/cast_tests.cpp | 5 ++--- cpp/tests/unary/math_ops_test.cpp | 13 ++++++----- cpp/tests/unary/unary_ops_test.cpp | 3 +-- cpp/tests/utilities/column_utilities.cu | 5 ++--- cpp/tests/utilities/default_stream.cpp | 6 ++--- cpp/tests/utilities/identify_stream_usage.cpp | 7 +++--- cpp/tests/utilities/tdigest_utilities.cu | 10 ++++----- .../utilities_tests/column_debug_tests.cpp | 6 ++--- .../column_utilities_tests.cpp | 8 +++---- .../utilities_tests/default_stream_tests.cpp | 6 ++--- .../lists_column_wrapper_tests.cpp | 12 +++++----- cpp/tests/utilities_tests/span_tests.cu | 11 +++++----- .../utilities_tests/type_check_tests.cpp | 10 ++++----- python/cudf/udf_cpp/shim.cu | 5 ++--- .../strings/src/strings/udf/udf_apis.cu | 7 +++--- 447 files changed, 1532 insertions(+), 1565 deletions(-) diff --git a/cpp/benchmarks/common/generate_input.cu b/cpp/benchmarks/common/generate_input.cu index 0ea13957868..8952b86b5a3 100644 --- a/cpp/benchmarks/common/generate_input.cu +++ b/cpp/benchmarks/common/generate_input.cu @@ -33,6 +33,7 @@ #include #include +#include #include #include #include @@ -53,8 +54,6 @@ #include #include -#include - #include #include #include diff --git a/cpp/benchmarks/fixture/benchmark_fixture.hpp b/cpp/benchmarks/fixture/benchmark_fixture.hpp index 36370560727..adde0ae1720 100644 --- a/cpp/benchmarks/fixture/benchmark_fixture.hpp +++ b/cpp/benchmarks/fixture/benchmark_fixture.hpp @@ -16,7 +16,6 @@ #pragma once -#include #include #include #include @@ -24,6 +23,8 @@ #include #include +#include + namespace cudf { namespace { diff --git a/cpp/benchmarks/io/cuio_common.cpp b/cpp/benchmarks/io/cuio_common.cpp index 943b329a364..aa9bdba62da 100644 --- a/cpp/benchmarks/io/cuio_common.cpp +++ b/cpp/benchmarks/io/cuio_common.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,16 +15,17 @@ */ #include + #include #include +#include + #include #include #include #include -#include - temp_directory const cuio_source_sink_pair::tmpdir{"cudf_gbench"}; std::string random_file_in_dir(std::string const& dir_path) diff --git a/cpp/benchmarks/io/fst.cu b/cpp/benchmarks/io/fst.cu index c0c88517d41..d08b2288bee 100644 --- a/cpp/benchmarks/io/fst.cu +++ b/cpp/benchmarks/io/fst.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,10 +15,6 @@ */ #include - -#include -#include //TODO find better replacement - #include #include @@ -33,6 +29,8 @@ #include +#include +#include //TODO find better replacement #include #include diff --git a/cpp/benchmarks/io/json/nested_json.cpp b/cpp/benchmarks/io/json/nested_json.cpp index 03ccd4e245d..a1c404d6d87 100644 --- a/cpp/benchmarks/io/json/nested_json.cpp +++ b/cpp/benchmarks/io/json/nested_json.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,15 +16,13 @@ #include #include - -#include - #include #include #include #include +#include #include #include diff --git a/cpp/benchmarks/iterator/iterator.cu b/cpp/benchmarks/iterator/iterator.cu index dcd13cf62c4..ada7a9bd73d 100644 --- a/cpp/benchmarks/iterator/iterator.cu +++ b/cpp/benchmarks/iterator/iterator.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,7 +27,6 @@ #include #include - #include #include #include diff --git a/cpp/benchmarks/join/join_common.hpp b/cpp/benchmarks/join/join_common.hpp index 7d1b1c74465..9f869ddb1ac 100644 --- a/cpp/benchmarks/join/join_common.hpp +++ b/cpp/benchmarks/join/join_common.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,14 +31,14 @@ #include #include -#include - #include #include #include #include #include +#include + #include struct null75_generator { diff --git a/cpp/benchmarks/merge/merge.cpp b/cpp/benchmarks/merge/merge.cpp index 2d2f4fd0de5..9bb8ae666ec 100644 --- a/cpp/benchmarks/merge/merge.cpp +++ b/cpp/benchmarks/merge/merge.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +16,7 @@ #include #include + #include #include diff --git a/cpp/benchmarks/sort/rank_lists.cpp b/cpp/benchmarks/sort/rank_lists.cpp index c23f3c891f0..fbdb40b3537 100644 --- a/cpp/benchmarks/sort/rank_lists.cpp +++ b/cpp/benchmarks/sort/rank_lists.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,10 +18,10 @@ #include -#include - #include +#include + #include template diff --git a/cpp/benchmarks/sort/rank_structs.cpp b/cpp/benchmarks/sort/rank_structs.cpp index 271b883e62a..4b0da29df9d 100644 --- a/cpp/benchmarks/sort/rank_structs.cpp +++ b/cpp/benchmarks/sort/rank_structs.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,6 +15,7 @@ */ #include "rank_types_common.hpp" + #include #include diff --git a/cpp/benchmarks/stream_compaction/apply_boolean_mask.cpp b/cpp/benchmarks/stream_compaction/apply_boolean_mask.cpp index f78aa9fa654..492237474ff 100644 --- a/cpp/benchmarks/stream_compaction/apply_boolean_mask.cpp +++ b/cpp/benchmarks/stream_compaction/apply_boolean_mask.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,11 +15,12 @@ */ #include -#include -#include #include +#include +#include + namespace { constexpr cudf::size_type hundredM = 1e8; diff --git a/cpp/benchmarks/string/string_bench_args.hpp b/cpp/benchmarks/string/string_bench_args.hpp index 92a46374438..a34026281e8 100644 --- a/cpp/benchmarks/string/string_bench_args.hpp +++ b/cpp/benchmarks/string/string_bench_args.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,10 +15,10 @@ */ #pragma once -#include - #include +#include + #include /** diff --git a/cpp/benchmarks/synchronization/synchronization.hpp b/cpp/benchmarks/synchronization/synchronization.hpp index e56d881d459..6457560aa62 100644 --- a/cpp/benchmarks/synchronization/synchronization.hpp +++ b/cpp/benchmarks/synchronization/synchronization.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,9 +27,10 @@ * It is built on top of the idea of Resource acquisition is initialization * (RAII). In the following we show a minimal example of how to use this class. - #include #include + #include + static void sample_cuda_benchmark(benchmark::State& state) { for (auto _ : state){ @@ -61,13 +62,12 @@ #pragma once // Google Benchmark library -#include - #include #include #include +#include #include class cuda_event_timer { diff --git a/cpp/benchmarks/text/edit_distance.cpp b/cpp/benchmarks/text/edit_distance.cpp index 0a1ea52c415..6ffa90edb8f 100644 --- a/cpp/benchmarks/text/edit_distance.cpp +++ b/cpp/benchmarks/text/edit_distance.cpp @@ -20,10 +20,10 @@ #include -#include - #include +#include + static void bench_edit_distance(nvbench::state& state) { auto const num_rows = static_cast(state.get_int64("num_rows")); diff --git a/cpp/benchmarks/text/hash_ngrams.cpp b/cpp/benchmarks/text/hash_ngrams.cpp index 3df0c61fc31..4e5daf83a3c 100644 --- a/cpp/benchmarks/text/hash_ngrams.cpp +++ b/cpp/benchmarks/text/hash_ngrams.cpp @@ -20,10 +20,10 @@ #include -#include - #include +#include + static void bench_hash_ngrams(nvbench::state& state) { auto const num_rows = static_cast(state.get_int64("num_rows")); diff --git a/cpp/benchmarks/text/jaccard.cpp b/cpp/benchmarks/text/jaccard.cpp index 60251c96096..d05c195d077 100644 --- a/cpp/benchmarks/text/jaccard.cpp +++ b/cpp/benchmarks/text/jaccard.cpp @@ -21,10 +21,10 @@ #include -#include - #include +#include + static void bench_jaccard(nvbench::state& state) { auto const num_rows = static_cast(state.get_int64("num_rows")); diff --git a/cpp/benchmarks/text/minhash.cpp b/cpp/benchmarks/text/minhash.cpp index d10d0d307d7..31ce60d8f9a 100644 --- a/cpp/benchmarks/text/minhash.cpp +++ b/cpp/benchmarks/text/minhash.cpp @@ -20,10 +20,10 @@ #include -#include - #include +#include + static void bench_minhash(nvbench::state& state) { auto const num_rows = static_cast(state.get_int64("num_rows")); diff --git a/cpp/benchmarks/text/vocab.cpp b/cpp/benchmarks/text/vocab.cpp index 770519294ad..523d277df18 100644 --- a/cpp/benchmarks/text/vocab.cpp +++ b/cpp/benchmarks/text/vocab.cpp @@ -20,13 +20,13 @@ #include #include -#include - #include #include #include #include +#include + #include static void bench_vocab_tokenize(nvbench::state& state) diff --git a/cpp/examples/strings/custom_optimized.cu b/cpp/examples/strings/custom_optimized.cu index aa1468ea790..cefa3346150 100644 --- a/cpp/examples/strings/custom_optimized.cu +++ b/cpp/examples/strings/custom_optimized.cu @@ -23,10 +23,9 @@ #include #include -#include - #include #include +#include /** * @brief Computes the size of each output row diff --git a/cpp/include/cudf/ast/detail/operators.hpp b/cpp/include/cudf/ast/detail/operators.hpp index ed7f2d97cef..b618f33a6e5 100644 --- a/cpp/include/cudf/ast/detail/operators.hpp +++ b/cpp/include/cudf/ast/detail/operators.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,9 +20,8 @@ #include #include -#include - #include +#include #include #include diff --git a/cpp/include/cudf/column/column.hpp b/cpp/include/cudf/column/column.hpp index a38186458c4..023e58c5300 100644 --- a/cpp/include/cudf/column/column.hpp +++ b/cpp/include/cudf/column/column.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,6 @@ #pragma once #include - #include #include #include diff --git a/cpp/include/cudf/detail/copy_if.cuh b/cpp/include/cudf/detail/copy_if.cuh index 1d051ea32ff..3af050a5da6 100644 --- a/cpp/include/cudf/detail/copy_if.cuh +++ b/cpp/include/cudf/detail/copy_if.cuh @@ -38,12 +38,10 @@ #include #include -#include -#include - #include - #include +#include +#include #include diff --git a/cpp/include/cudf/detail/copy_range.cuh b/cpp/include/cudf/detail/copy_range.cuh index 4bfdaa94c53..9f8b0f8b619 100644 --- a/cpp/include/cudf/detail/copy_range.cuh +++ b/cpp/include/cudf/detail/copy_range.cuh @@ -29,7 +29,6 @@ #include #include - #include #include diff --git a/cpp/include/cudf/detail/gather.cuh b/cpp/include/cudf/detail/gather.cuh index c9975ef2199..311a100a21b 100644 --- a/cpp/include/cudf/detail/gather.cuh +++ b/cpp/include/cudf/detail/gather.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,8 +39,6 @@ #include #include -#include - #include #include #include @@ -48,6 +46,8 @@ #include #include +#include + namespace cudf { namespace detail { diff --git a/cpp/include/cudf/detail/hash_reduce_by_row.cuh b/cpp/include/cudf/detail/hash_reduce_by_row.cuh index 006cb5142c9..49893cd66c4 100644 --- a/cpp/include/cudf/detail/hash_reduce_by_row.cuh +++ b/cpp/include/cudf/detail/hash_reduce_by_row.cuh @@ -23,12 +23,11 @@ #include #include +#include #include #include #include -#include - namespace cudf::detail { using hash_map_type = diff --git a/cpp/include/cudf/detail/indexalator.cuh b/cpp/include/cudf/detail/indexalator.cuh index 4d261c54b29..b5d57da6cd5 100644 --- a/cpp/include/cudf/detail/indexalator.cuh +++ b/cpp/include/cudf/detail/indexalator.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,9 @@ #pragma once -#include - #include #include +#include #include #include diff --git a/cpp/include/cudf/detail/interop.hpp b/cpp/include/cudf/detail/interop.hpp index 8124471982d..683b49e1813 100644 --- a/cpp/include/cudf/detail/interop.hpp +++ b/cpp/include/cudf/detail/interop.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,10 +32,11 @@ #include #include #include -#include #include +#include + namespace cudf { namespace detail { diff --git a/cpp/include/cudf/detail/label_bins.hpp b/cpp/include/cudf/detail/label_bins.hpp index 7f3cf033e66..50eeba58cdd 100644 --- a/cpp/include/cudf/detail/label_bins.hpp +++ b/cpp/include/cudf/detail/label_bins.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,9 @@ #pragma once -#include - #include #include +#include #include #include diff --git a/cpp/include/cudf/detail/null_mask.cuh b/cpp/include/cudf/detail/null_mask.cuh index e57d85f2998..3b55a62cec0 100644 --- a/cpp/include/cudf/detail/null_mask.cuh +++ b/cpp/include/cudf/detail/null_mask.cuh @@ -29,7 +29,7 @@ #include #include - +#include #include #include #include @@ -37,8 +37,6 @@ #include #include -#include - #include #include #include diff --git a/cpp/include/cudf/detail/sizes_to_offsets_iterator.cuh b/cpp/include/cudf/detail/sizes_to_offsets_iterator.cuh index 358dcca02b9..08917bfce24 100644 --- a/cpp/include/cudf/detail/sizes_to_offsets_iterator.cuh +++ b/cpp/include/cudf/detail/sizes_to_offsets_iterator.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,11 +24,10 @@ #include #include +#include #include #include -#include - #include namespace cudf { diff --git a/cpp/include/cudf/detail/utilities/device_atomics.cuh b/cpp/include/cudf/detail/utilities/device_atomics.cuh index c56e88f07a8..1e3fe3d08dc 100644 --- a/cpp/include/cudf/detail/utilities/device_atomics.cuh +++ b/cpp/include/cudf/detail/utilities/device_atomics.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,6 +37,7 @@ #include #include #include + #include namespace cudf { diff --git a/cpp/include/cudf/detail/utilities/pinned_host_vector.hpp b/cpp/include/cudf/detail/utilities/pinned_host_vector.hpp index eee974c8399..c22b6a6ba15 100644 --- a/cpp/include/cudf/detail/utilities/pinned_host_vector.hpp +++ b/cpp/include/cudf/detail/utilities/pinned_host_vector.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2008-2023 NVIDIA Corporation + * Copyright (c) 2008-2024, NVIDIA CORPORATION * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,14 @@ #pragma once -#include -#include -#include // for bad_alloc - #include #include +#include +#include +#include // for bad_alloc + namespace cudf::detail { /*! \p pinned_allocator is a CUDA-specific host memory allocator diff --git a/cpp/include/cudf/fixed_point/temporary.hpp b/cpp/include/cudf/fixed_point/temporary.hpp index 1de7f66127b..6057892261a 100644 --- a/cpp/include/cudf/fixed_point/temporary.hpp +++ b/cpp/include/cudf/fixed_point/temporary.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,12 +17,11 @@ #pragma once // To avoid https://github.com/NVIDIA/libcudacxx/issues/460 // in libcudacxx with CTK 12.0/12.1 -#include - #include #include #include +#include #include #include diff --git a/cpp/include/cudf/io/detail/orc.hpp b/cpp/include/cudf/io/detail/orc.hpp index a0bf8b24b80..3c1486b60c2 100644 --- a/cpp/include/cudf/io/detail/orc.hpp +++ b/cpp/include/cudf/io/detail/orc.hpp @@ -22,12 +22,12 @@ #include #include +#include + #include #include #include -#include - namespace cudf::io { // Forward declaration diff --git a/cpp/include/cudf/io/text/detail/bgzip_utils.hpp b/cpp/include/cudf/io/text/detail/bgzip_utils.hpp index 627df5f358a..515bcf16de2 100644 --- a/cpp/include/cudf/io/text/detail/bgzip_utils.hpp +++ b/cpp/include/cudf/io/text/detail/bgzip_utils.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,11 @@ #pragma once -#include - #include #include +#include + #include #include #include diff --git a/cpp/include/cudf/io/text/detail/tile_state.hpp b/cpp/include/cudf/io/text/detail/tile_state.hpp index 6ae399fbe75..d42624aa9b7 100644 --- a/cpp/include/cudf/io/text/detail/tile_state.hpp +++ b/cpp/include/cudf/io/text/detail/tile_state.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ #pragma once #include - #include namespace cudf { diff --git a/cpp/include/cudf/lists/detail/gather.cuh b/cpp/include/cudf/lists/detail/gather.cuh index 4484a9995c3..03428bc347f 100644 --- a/cpp/include/cudf/lists/detail/gather.cuh +++ b/cpp/include/cudf/lists/detail/gather.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,12 +26,11 @@ #include #include +#include #include #include #include -#include - namespace cudf { namespace lists { namespace detail { diff --git a/cpp/include/cudf/lists/detail/scatter.cuh b/cpp/include/cudf/lists/detail/scatter.cuh index ea2f2bbf544..5fc52ff1c04 100644 --- a/cpp/include/cudf/lists/detail/scatter.cuh +++ b/cpp/include/cudf/lists/detail/scatter.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,6 +31,7 @@ #include #include +#include #include #include #include @@ -39,8 +40,6 @@ #include #include -#include - #include namespace cudf { diff --git a/cpp/include/cudf/lists/detail/set_operations.hpp b/cpp/include/cudf/lists/detail/set_operations.hpp index 1411c65448e..51fc58bee07 100644 --- a/cpp/include/cudf/lists/detail/set_operations.hpp +++ b/cpp/include/cudf/lists/detail/set_operations.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,8 +19,8 @@ #include #include #include -#include +#include #include namespace cudf::lists::detail { diff --git a/cpp/include/cudf/lists/list_device_view.cuh b/cpp/include/cudf/lists/list_device_view.cuh index 07346e78261..170a20bd7f5 100644 --- a/cpp/include/cudf/lists/list_device_view.cuh +++ b/cpp/include/cudf/lists/list_device_view.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2022, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,12 +15,12 @@ */ #pragma once -#include #include #include #include #include +#include #include #include #include diff --git a/cpp/include/cudf/lists/lists_column_device_view.cuh b/cpp/include/cudf/lists/lists_column_device_view.cuh index 943ccbfb2cd..4d12ee1cab4 100644 --- a/cpp/include/cudf/lists/lists_column_device_view.cuh +++ b/cpp/include/cudf/lists/lists_column_device_view.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2022, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,11 +15,12 @@ */ #pragma once -#include #include #include #include +#include + namespace cudf { namespace detail { diff --git a/cpp/include/cudf/reduction/detail/reduction.cuh b/cpp/include/cudf/reduction/detail/reduction.cuh index 48b65a3fc54..9807d4cb4ea 100644 --- a/cpp/include/cudf/reduction/detail/reduction.cuh +++ b/cpp/include/cudf/reduction/detail/reduction.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +28,6 @@ #include #include - #include #include diff --git a/cpp/include/cudf/reduction/detail/reduction_operators.cuh b/cpp/include/cudf/reduction/detail/reduction_operators.cuh index a747f7bade7..4cf8564ab3a 100644 --- a/cpp/include/cudf/reduction/detail/reduction_operators.cuh +++ b/cpp/include/cudf/reduction/detail/reduction_operators.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,9 +21,10 @@ #include #include //for CUDF_HOST_DEVICE -#include #include +#include + namespace cudf { namespace reduction { namespace detail { diff --git a/cpp/include/cudf/reduction/detail/segmented_reduction.cuh b/cpp/include/cudf/reduction/detail/segmented_reduction.cuh index e86506681eb..89ca78f1213 100644 --- a/cpp/include/cudf/reduction/detail/segmented_reduction.cuh +++ b/cpp/include/cudf/reduction/detail/segmented_reduction.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,7 +25,6 @@ #include #include - #include #include diff --git a/cpp/include/cudf/row_conversion.hpp b/cpp/include/cudf/row_conversion.hpp index 89453d49856..e2c0577b885 100644 --- a/cpp/include/cudf/row_conversion.hpp +++ b/cpp/include/cudf/row_conversion.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,14 @@ #pragma once -#include - #include #include #include + #include +#include + namespace cudf { //! @cond Doxygen_Suppress diff --git a/cpp/include/cudf/strings/detail/convert/fixed_point.cuh b/cpp/include/cudf/strings/detail/convert/fixed_point.cuh index dd55cae4537..5f51da967d3 100644 --- a/cpp/include/cudf/strings/detail/convert/fixed_point.cuh +++ b/cpp/include/cudf/strings/detail/convert/fixed_point.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,11 +17,10 @@ #include +#include #include #include -#include - namespace cudf { namespace strings { namespace detail { diff --git a/cpp/include/cudf/strings/detail/copy_if_else.cuh b/cpp/include/cudf/strings/detail/copy_if_else.cuh index e1ef97b7803..08ba99e90d8 100644 --- a/cpp/include/cudf/strings/detail/copy_if_else.cuh +++ b/cpp/include/cudf/strings/detail/copy_if_else.cuh @@ -23,12 +23,11 @@ #include #include +#include #include #include #include -#include - namespace cudf { namespace strings { namespace detail { diff --git a/cpp/include/cudf/strings/detail/gather.cuh b/cpp/include/cudf/strings/detail/gather.cuh index 442155380a2..8713831bc85 100644 --- a/cpp/include/cudf/strings/detail/gather.cuh +++ b/cpp/include/cudf/strings/detail/gather.cuh @@ -28,6 +28,7 @@ #include #include +#include #include #include #include @@ -36,8 +37,6 @@ #include #include -#include - namespace cudf { namespace strings { namespace detail { diff --git a/cpp/include/cudf/strings/detail/merge.cuh b/cpp/include/cudf/strings/detail/merge.cuh index 8049895c3c2..f05e957783f 100644 --- a/cpp/include/cudf/strings/detail/merge.cuh +++ b/cpp/include/cudf/strings/detail/merge.cuh @@ -27,13 +27,12 @@ #include #include +#include #include #include #include #include -#include - namespace cudf { namespace strings { namespace detail { diff --git a/cpp/include/cudf/strings/detail/scatter.cuh b/cpp/include/cudf/strings/detail/scatter.cuh index 56eeec01715..8b8c11dcd5c 100644 --- a/cpp/include/cudf/strings/detail/scatter.cuh +++ b/cpp/include/cudf/strings/detail/scatter.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,12 +25,11 @@ #include #include +#include #include #include #include -#include - namespace cudf { namespace strings { namespace detail { diff --git a/cpp/include/cudf/strings/detail/strings_column_factories.cuh b/cpp/include/cudf/strings/detail/strings_column_factories.cuh index fcbdfa619f4..efbb77c1d21 100644 --- a/cpp/include/cudf/strings/detail/strings_column_factories.cuh +++ b/cpp/include/cudf/strings/detail/strings_column_factories.cuh @@ -26,6 +26,7 @@ #include #include +#include #include #include #include @@ -37,8 +38,6 @@ #include #include -#include - namespace cudf { namespace strings { namespace detail { diff --git a/cpp/include/cudf/table/experimental/row_operators.cuh b/cpp/include/cudf/table/experimental/row_operators.cuh index 6946ccdb213..e9b81a525fc 100644 --- a/cpp/include/cudf/table/experimental/row_operators.cuh +++ b/cpp/include/cudf/table/experimental/row_operators.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,6 +33,8 @@ #include #include +#include +#include #include #include #include @@ -46,9 +48,6 @@ #include #include -#include -#include - #include #include #include diff --git a/cpp/include/cudf/utilities/bit.hpp b/cpp/include/cudf/utilities/bit.hpp index 11a797ec466..9bdc372419f 100644 --- a/cpp/include/cudf/utilities/bit.hpp +++ b/cpp/include/cudf/utilities/bit.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,12 @@ #pragma once -#include -#include #include +#include + +#include + /** * @file bit.hpp * @brief Utilities for bit and bitmask operations. diff --git a/cpp/include/cudf/utilities/error.hpp b/cpp/include/cudf/utilities/error.hpp index bf8b87e2563..719d44a9ab3 100644 --- a/cpp/include/cudf/utilities/error.hpp +++ b/cpp/include/cudf/utilities/error.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,7 @@ #include #include + #include #include #include diff --git a/cpp/include/cudf/wrappers/dictionary.hpp b/cpp/include/cudf/wrappers/dictionary.hpp index 329f1fa7754..37264c5a33c 100644 --- a/cpp/include/cudf/wrappers/dictionary.hpp +++ b/cpp/include/cudf/wrappers/dictionary.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,10 @@ #pragma once -#include #include +#include + #include /** diff --git a/cpp/include/cudf_test/column_wrapper.hpp b/cpp/include/cudf_test/column_wrapper.hpp index e7ca8400246..151fe50be4f 100644 --- a/cpp/include/cudf_test/column_wrapper.hpp +++ b/cpp/include/cudf_test/column_wrapper.hpp @@ -16,6 +16,10 @@ #pragma once +#include +#include +#include + #include #include #include @@ -33,10 +37,6 @@ #include #include -#include -#include -#include - #include #include diff --git a/cpp/include/cudf_test/file_utilities.hpp b/cpp/include/cudf_test/file_utilities.hpp index 202e7604fa0..defc6f95823 100644 --- a/cpp/include/cudf_test/file_utilities.hpp +++ b/cpp/include/cudf_test/file_utilities.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,10 +18,11 @@ #include +#include + #include #include #include -#include #include /** diff --git a/cpp/include/cudf_test/random.hpp b/cpp/include/cudf_test/random.hpp index 498bacc81c9..f4d539ecffe 100644 --- a/cpp/include/cudf_test/random.hpp +++ b/cpp/include/cudf_test/random.hpp @@ -16,10 +16,10 @@ #pragma once -#include - #include +#include + namespace cudf { namespace test { diff --git a/cpp/include/cudf_test/timestamp_utilities.cuh b/cpp/include/cudf_test/timestamp_utilities.cuh index 6cab8b92283..ebd93862151 100644 --- a/cpp/include/cudf_test/timestamp_utilities.cuh +++ b/cpp/include/cudf_test/timestamp_utilities.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2021, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,11 @@ #pragma once +#include + #include #include -#include - #include #include diff --git a/cpp/include/cudf_test/type_lists.hpp b/cpp/include/cudf_test/type_lists.hpp index 2404cf0d134..bbff45e2102 100644 --- a/cpp/include/cudf_test/type_lists.hpp +++ b/cpp/include/cudf_test/type_lists.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +16,8 @@ #pragma once +#include + #include #include #include @@ -23,7 +25,6 @@ #include #include #include -#include #include diff --git a/cpp/include/nvtext/detail/load_hash_file.hpp b/cpp/include/nvtext/detail/load_hash_file.hpp index 9f4640f1daf..f4107adb07e 100644 --- a/cpp/include/nvtext/detail/load_hash_file.hpp +++ b/cpp/include/nvtext/detail/load_hash_file.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2021, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,10 +15,10 @@ */ #pragma once -#include - #include +#include + #include #include diff --git a/cpp/libcudf_kafka/tests/kafka_consumer_tests.cpp b/cpp/libcudf_kafka/tests/kafka_consumer_tests.cpp index 53d87e04ddc..1400bc75b44 100644 --- a/cpp/libcudf_kafka/tests/kafka_consumer_tests.cpp +++ b/cpp/libcudf_kafka/tests/kafka_consumer_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,17 @@ * limitations under the License. */ +#include +#include + #include + #include + #include #include #include -#include -#include - namespace kafka = cudf::io::external::kafka; struct KafkaDatasourceTest : public ::testing::Test {}; diff --git a/cpp/src/binaryop/binaryop.cpp b/cpp/src/binaryop/binaryop.cpp index 53b04c4ca80..3e435a6745d 100644 --- a/cpp/src/binaryop/binaryop.cpp +++ b/cpp/src/binaryop/binaryop.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Copyright 2018-2019 BlazingDB, Inc. * Copyright 2018 Christian Noboa Mardini @@ -19,12 +19,6 @@ #include "compiled/binary_ops.hpp" -#include - -#include -#include -#include - #include #include #include @@ -43,10 +37,15 @@ #include -#include - #include +#include +#include +#include +#include + +#include + namespace cudf { namespace binops { diff --git a/cpp/src/binaryop/compiled/binary_ops.cu b/cpp/src/binaryop/compiled/binary_ops.cu index 73ba15e39f3..1429635b803 100644 --- a/cpp/src/binaryop/compiled/binary_ops.cu +++ b/cpp/src/binaryop/compiled/binary_ops.cu @@ -28,13 +28,12 @@ #include #include +#include #include #include #include #include -#include - namespace cudf { namespace binops { namespace compiled { diff --git a/cpp/src/binaryop/jit/kernel.cu b/cpp/src/binaryop/jit/kernel.cu index 39735a43474..c50b5f6dab0 100644 --- a/cpp/src/binaryop/jit/kernel.cu +++ b/cpp/src/binaryop/jit/kernel.cu @@ -24,9 +24,10 @@ #include #include -#include #include +#include + namespace cudf { namespace binops { namespace jit { diff --git a/cpp/src/bitmask/null_mask.cu b/cpp/src/bitmask/null_mask.cu index bb320e4b81a..806beeb4efe 100644 --- a/cpp/src/bitmask/null_mask.cu +++ b/cpp/src/bitmask/null_mask.cu @@ -34,13 +34,12 @@ #include #include +#include #include #include #include #include -#include - #include #include #include diff --git a/cpp/src/column/column.cu b/cpp/src/column/column.cu index 8276dbe78d2..d4a8fff69e2 100644 --- a/cpp/src/column/column.cu +++ b/cpp/src/column/column.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,11 +33,11 @@ #include #include -#include - #include #include +#include + #include #include #include diff --git a/cpp/src/copying/contiguous_split.cu b/cpp/src/copying/contiguous_split.cu index d711f40605a..c28237587eb 100644 --- a/cpp/src/copying/contiguous_split.cu +++ b/cpp/src/copying/contiguous_split.cu @@ -32,6 +32,7 @@ #include #include +#include #include #include #include @@ -45,8 +46,6 @@ #include #include -#include - #include #include diff --git a/cpp/src/copying/gather.cu b/cpp/src/copying/gather.cu index 2083d3ed618..921f84b6b50 100644 --- a/cpp/src/copying/gather.cu +++ b/cpp/src/copying/gather.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,9 +26,8 @@ #include -#include - #include +#include namespace cudf { namespace detail { diff --git a/cpp/src/copying/reverse.cu b/cpp/src/copying/reverse.cu index 884c93e268c..78d1b54882c 100644 --- a/cpp/src/copying/reverse.cu +++ b/cpp/src/copying/reverse.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,13 +27,12 @@ #include #include +#include #include #include #include #include -#include - namespace cudf { namespace detail { std::unique_ptr reverse(table_view const& source_table, diff --git a/cpp/src/copying/sample.cu b/cpp/src/copying/sample.cu index e7f5522d3b3..0211f97deb3 100644 --- a/cpp/src/copying/sample.cu +++ b/cpp/src/copying/sample.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,13 +26,12 @@ #include +#include #include #include #include #include -#include - namespace cudf { namespace detail { diff --git a/cpp/src/copying/scatter.cu b/cpp/src/copying/scatter.cu index 517435503ee..baa5d85d4d4 100644 --- a/cpp/src/copying/scatter.cu +++ b/cpp/src/copying/scatter.cu @@ -35,6 +35,7 @@ #include +#include #include #include #include @@ -43,8 +44,6 @@ #include #include -#include - namespace cudf { namespace detail { namespace { diff --git a/cpp/src/datetime/timezone.cpp b/cpp/src/datetime/timezone.cpp index 1b40a994ba9..a75eea7172f 100644 --- a/cpp/src/datetime/timezone.cpp +++ b/cpp/src/datetime/timezone.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023, NVIDIA CORPORATION. + * Copyright (c) 2018-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,10 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include - #include #include +#include #include #include diff --git a/cpp/src/dictionary/detail/concatenate.cu b/cpp/src/dictionary/detail/concatenate.cu index 024acaa872d..17295fb0345 100644 --- a/cpp/src/dictionary/detail/concatenate.cu +++ b/cpp/src/dictionary/detail/concatenate.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,6 +32,7 @@ #include #include +#include #include #include #include @@ -43,8 +44,6 @@ #include #include -#include - #include #include diff --git a/cpp/src/filling/repeat.cu b/cpp/src/filling/repeat.cu index b3ed9743953..bd53eeddbb5 100644 --- a/cpp/src/filling/repeat.cu +++ b/cpp/src/filling/repeat.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,6 +34,7 @@ #include #include +#include #include #include #include @@ -43,8 +44,6 @@ #include #include -#include - #include #include diff --git a/cpp/src/groupby/hash/groupby.cu b/cpp/src/groupby/hash/groupby.cu index 32693487c32..ddab7bb2b0a 100644 --- a/cpp/src/groupby/hash/groupby.cu +++ b/cpp/src/groupby/hash/groupby.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,6 @@ * limitations under the License. */ -#include -#include - #include #include #include @@ -45,17 +42,19 @@ #include #include #include -#include #include +#include +#include #include #include #include #include -#include -#include +#include +#include +#include #include #include diff --git a/cpp/src/groupby/hash/groupby_kernels.cuh b/cpp/src/groupby/hash/groupby_kernels.cuh index eedb07200a5..4dfb191480b 100644 --- a/cpp/src/groupby/hash/groupby_kernels.cuh +++ b/cpp/src/groupby/hash/groupby_kernels.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2022, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,6 +17,7 @@ #pragma once #include "multi_pass_kernels.cuh" + #include #include #include diff --git a/cpp/src/groupby/sort/aggregate.cpp b/cpp/src/groupby/sort/aggregate.cpp index 9233ad1932c..8a4946ed6ff 100644 --- a/cpp/src/groupby/sort/aggregate.cpp +++ b/cpp/src/groupby/sort/aggregate.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,6 @@ * limitations under the License. */ -#include -#include -#include - #include #include #include @@ -38,6 +34,10 @@ #include +#include +#include +#include + #include #include #include diff --git a/cpp/src/groupby/sort/group_argmax.cu b/cpp/src/groupby/sort/group_argmax.cu index 466171ec80b..7b7edebe379 100644 --- a/cpp/src/groupby/sort/group_argmax.cu +++ b/cpp/src/groupby/sort/group_argmax.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2021, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,8 +14,6 @@ * limitations under the License. */ -#include - #include #include @@ -23,6 +21,8 @@ #include +#include + namespace cudf { namespace groupby { namespace detail { diff --git a/cpp/src/groupby/sort/group_argmin.cu b/cpp/src/groupby/sort/group_argmin.cu index 4f7b2b713e6..4d8fb615405 100644 --- a/cpp/src/groupby/sort/group_argmin.cu +++ b/cpp/src/groupby/sort/group_argmin.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2021, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,8 +14,6 @@ * limitations under the License. */ -#include - #include #include @@ -23,6 +21,8 @@ #include +#include + namespace cudf { namespace groupby { namespace detail { diff --git a/cpp/src/groupby/sort/group_correlation.cu b/cpp/src/groupby/sort/group_correlation.cu index 887e82e66df..2e3904fcce3 100644 --- a/cpp/src/groupby/sort/group_correlation.cu +++ b/cpp/src/groupby/sort/group_correlation.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,8 +14,6 @@ * limitations under the License. */ -#include - #include #include #include @@ -35,6 +33,8 @@ #include #include +#include + #include namespace cudf { diff --git a/cpp/src/groupby/sort/group_count.cu b/cpp/src/groupby/sort/group_count.cu index e35b0c2b2fe..2f289c8c8a7 100644 --- a/cpp/src/groupby/sort/group_count.cu +++ b/cpp/src/groupby/sort/group_count.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,14 +23,13 @@ #include #include +#include #include #include #include #include #include -#include - namespace cudf { namespace groupby { namespace detail { diff --git a/cpp/src/groupby/sort/group_count_scan.cu b/cpp/src/groupby/sort/group_count_scan.cu index 0caef47f0e3..2e8fd41d984 100644 --- a/cpp/src/groupby/sort/group_count_scan.cu +++ b/cpp/src/groupby/sort/group_count_scan.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,12 +19,12 @@ #include #include -#include -#include - #include #include +#include +#include + namespace cudf { namespace groupby { namespace detail { diff --git a/cpp/src/groupby/sort/group_histogram.cu b/cpp/src/groupby/sort/group_histogram.cu index bb70037aaef..efe49a6cd5e 100644 --- a/cpp/src/groupby/sort/group_histogram.cu +++ b/cpp/src/groupby/sort/group_histogram.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,8 +14,6 @@ * limitations under the License. */ -#include - #include #include #include @@ -29,6 +27,8 @@ #include +#include + namespace cudf::groupby::detail { namespace { diff --git a/cpp/src/groupby/sort/group_max.cu b/cpp/src/groupby/sort/group_max.cu index 5da15266233..dfddf833a27 100644 --- a/cpp/src/groupby/sort/group_max.cu +++ b/cpp/src/groupby/sort/group_max.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2021, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -#include - #include +#include + namespace cudf { namespace groupby { namespace detail { diff --git a/cpp/src/groupby/sort/group_max_scan.cu b/cpp/src/groupby/sort/group_max_scan.cu index 1551dc00a04..f07797206bd 100644 --- a/cpp/src/groupby/sort/group_max_scan.cu +++ b/cpp/src/groupby/sort/group_max_scan.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -#include - #include +#include + namespace cudf { namespace groupby { namespace detail { diff --git a/cpp/src/groupby/sort/group_min.cu b/cpp/src/groupby/sort/group_min.cu index c42a0b94de0..5cbd5617914 100644 --- a/cpp/src/groupby/sort/group_min.cu +++ b/cpp/src/groupby/sort/group_min.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -#include - #include +#include + namespace cudf { namespace groupby { namespace detail { diff --git a/cpp/src/groupby/sort/group_min_scan.cu b/cpp/src/groupby/sort/group_min_scan.cu index daaeb6bb6f7..42f817d8e79 100644 --- a/cpp/src/groupby/sort/group_min_scan.cu +++ b/cpp/src/groupby/sort/group_min_scan.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -#include - #include +#include + namespace cudf { namespace groupby { namespace detail { diff --git a/cpp/src/groupby/sort/group_nth_element.cu b/cpp/src/groupby/sort/group_nth_element.cu index 037fa9a735c..694c052e42d 100644 --- a/cpp/src/groupby/sort/group_nth_element.cu +++ b/cpp/src/groupby/sort/group_nth_element.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,13 +23,14 @@ #include #include #include -#include #include #include +#include #include #include +#include #include #include #include @@ -37,8 +38,6 @@ #include #include -#include - namespace cudf { namespace groupby { namespace detail { diff --git a/cpp/src/groupby/sort/group_product.cu b/cpp/src/groupby/sort/group_product.cu index 74f5cbed041..2132216c356 100644 --- a/cpp/src/groupby/sort/group_product.cu +++ b/cpp/src/groupby/sort/group_product.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,11 @@ #include #include -#include #include +#include + namespace cudf { namespace groupby { namespace detail { diff --git a/cpp/src/groupby/sort/group_quantiles.cu b/cpp/src/groupby/sort/group_quantiles.cu index a456d4b5964..13b9946f4f8 100644 --- a/cpp/src/groupby/sort/group_quantiles.cu +++ b/cpp/src/groupby/sort/group_quantiles.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,6 @@ */ #include "group_reductions.hpp" -#include #include #include @@ -35,6 +34,8 @@ #include #include +#include + namespace cudf { namespace groupby { namespace detail { diff --git a/cpp/src/groupby/sort/group_scan_util.cuh b/cpp/src/groupby/sort/group_scan_util.cuh index 3ed53944172..93f591e3f96 100644 --- a/cpp/src/groupby/sort/group_scan_util.cuh +++ b/cpp/src/groupby/sort/group_scan_util.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ #pragma once -#include - #include #include #include @@ -40,6 +38,8 @@ #include #include +#include + namespace cudf { namespace groupby { namespace detail { diff --git a/cpp/src/groupby/sort/group_single_pass_reduction_util.cuh b/cpp/src/groupby/sort/group_single_pass_reduction_util.cuh index 34543147b1c..06a7d772d21 100644 --- a/cpp/src/groupby/sort/group_single_pass_reduction_util.cuh +++ b/cpp/src/groupby/sort/group_single_pass_reduction_util.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ #pragma once -#include - #include #include #include @@ -36,6 +34,8 @@ #include #include +#include + namespace cudf { namespace groupby { namespace detail { diff --git a/cpp/src/groupby/sort/group_sum.cu b/cpp/src/groupby/sort/group_sum.cu index e3c2ce7c864..c334da47599 100644 --- a/cpp/src/groupby/sort/group_sum.cu +++ b/cpp/src/groupby/sort/group_sum.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,11 @@ #include #include -#include #include +#include + namespace cudf { namespace groupby { namespace detail { diff --git a/cpp/src/groupby/sort/group_sum_scan.cu b/cpp/src/groupby/sort/group_sum_scan.cu index 632fde3b9d5..f915377a6e0 100644 --- a/cpp/src/groupby/sort/group_sum_scan.cu +++ b/cpp/src/groupby/sort/group_sum_scan.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -#include - #include +#include + namespace cudf { namespace groupby { namespace detail { diff --git a/cpp/src/groupby/sort/scan.cpp b/cpp/src/groupby/sort/scan.cpp index 32120988065..80e83f14853 100644 --- a/cpp/src/groupby/sort/scan.cpp +++ b/cpp/src/groupby/sort/scan.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,6 @@ * limitations under the License. */ -#include -#include -#include -#include - #include #include #include @@ -36,6 +31,11 @@ #include +#include +#include +#include +#include + #include namespace cudf { diff --git a/cpp/src/groupby/sort/sort_helper.cu b/cpp/src/groupby/sort/sort_helper.cu index 61cdfe16ab8..330e89d2bdb 100644 --- a/cpp/src/groupby/sort/sort_helper.cu +++ b/cpp/src/groupby/sort/sort_helper.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ #include "common_utils.cuh" -#include - #include #include #include @@ -37,12 +35,13 @@ #include #include +#include #include #include #include #include -#include +#include #include #include diff --git a/cpp/src/hash/concurrent_unordered_map.cuh b/cpp/src/hash/concurrent_unordered_map.cuh index adc87c2400e..a9f00d5d1ad 100644 --- a/cpp/src/hash/concurrent_unordered_map.cuh +++ b/cpp/src/hash/concurrent_unordered_map.cuh @@ -16,8 +16,6 @@ #pragma once -#include - #include #include #include @@ -27,15 +25,16 @@ #include #include +#include #include +#include + #include #include #include #include -#include - namespace { template struct packed { diff --git a/cpp/src/interop/detail/arrow_allocator.cpp b/cpp/src/interop/detail/arrow_allocator.cpp index 41fb68a5748..3e6a337457a 100644 --- a/cpp/src/interop/detail/arrow_allocator.cpp +++ b/cpp/src/interop/detail/arrow_allocator.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,11 @@ #include -#include #include #include +#include + namespace cudf { namespace detail { diff --git a/cpp/src/interop/dlpack.cpp b/cpp/src/interop/dlpack.cpp index 1759c998c75..9f36280930d 100644 --- a/cpp/src/interop/dlpack.cpp +++ b/cpp/src/interop/dlpack.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -27,7 +28,6 @@ #include #include -#include namespace cudf { namespace { diff --git a/cpp/src/interop/to_arrow.cu b/cpp/src/interop/to_arrow.cu index 04ca1250ed5..e871e656c48 100644 --- a/cpp/src/interop/to_arrow.cu +++ b/cpp/src/interop/to_arrow.cu @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "detail/arrow_allocator.hpp" + #include #include #include @@ -41,8 +43,6 @@ #include #include -#include "detail/arrow_allocator.hpp" - namespace cudf { namespace detail { namespace { diff --git a/cpp/src/io/avro/avro_gpu.cu b/cpp/src/io/avro/avro_gpu.cu index 59177a68ee7..ad4100b65f9 100644 --- a/cpp/src/io/avro/avro_gpu.cu +++ b/cpp/src/io/avro/avro_gpu.cu @@ -15,10 +15,10 @@ */ #include "avro_gpu.hpp" -#include - #include +#include + using cudf::device_span; namespace cudf { diff --git a/cpp/src/io/avro/reader_impl.cu b/cpp/src/io/avro/reader_impl.cu index f73e1db91c3..0f5c8e75d76 100644 --- a/cpp/src/io/avro/reader_impl.cu +++ b/cpp/src/io/avro/reader_impl.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,10 +17,6 @@ #include "avro.hpp" #include "avro_gpu.hpp" -#include -#include -#include - #include #include #include @@ -41,6 +37,9 @@ #include #include +#include +#include +#include #include #include diff --git a/cpp/src/io/comp/debrotli.cu b/cpp/src/io/comp/debrotli.cu index 9c936fefd6c..fb0fd5300f6 100644 --- a/cpp/src/io/comp/debrotli.cu +++ b/cpp/src/io/comp/debrotli.cu @@ -57,12 +57,12 @@ THE SOFTWARE. #include "brotli_dict.hpp" #include "gpuinflate.hpp" -#include - #include #include +#include + namespace cudf { namespace io { constexpr uint32_t huffman_lookup_table_width = 8; diff --git a/cpp/src/io/comp/gpuinflate.cu b/cpp/src/io/comp/gpuinflate.cu index cd50545afbd..ab3519d19ac 100644 --- a/cpp/src/io/comp/gpuinflate.cu +++ b/cpp/src/io/comp/gpuinflate.cu @@ -46,10 +46,10 @@ Mark Adler madler@alumni.caltech.edu #include "gpuinflate.hpp" #include "io_uncomp.hpp" -#include - #include +#include + namespace cudf { namespace io { diff --git a/cpp/src/io/comp/nvcomp_adapter.cpp b/cpp/src/io/comp/nvcomp_adapter.cpp index 7d98e047c7c..60a535f288b 100644 --- a/cpp/src/io/comp/nvcomp_adapter.cpp +++ b/cpp/src/io/comp/nvcomp_adapter.cpp @@ -14,11 +14,12 @@ * limitations under the License. */ #include "nvcomp_adapter.hpp" + #include "nvcomp_adapter.cuh" #include -#include +#include #include #include diff --git a/cpp/src/io/comp/nvcomp_adapter.cuh b/cpp/src/io/comp/nvcomp_adapter.cuh index dfc803d91bf..4a7b6463fa0 100644 --- a/cpp/src/io/comp/nvcomp_adapter.cuh +++ b/cpp/src/io/comp/nvcomp_adapter.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,11 +20,11 @@ #include -#include - #include #include +#include + #include namespace cudf::io::nvcomp { diff --git a/cpp/src/io/comp/nvcomp_adapter.hpp b/cpp/src/io/comp/nvcomp_adapter.hpp index ebaec617c10..bbfacf19b9c 100644 --- a/cpp/src/io/comp/nvcomp_adapter.hpp +++ b/cpp/src/io/comp/nvcomp_adapter.hpp @@ -18,13 +18,13 @@ #include "gpuinflate.hpp" -#include - #include #include #include +#include + #include namespace cudf::io::nvcomp { diff --git a/cpp/src/io/comp/snap.cu b/cpp/src/io/comp/snap.cu index a45e8b2083b..276dd690895 100644 --- a/cpp/src/io/comp/snap.cu +++ b/cpp/src/io/comp/snap.cu @@ -16,10 +16,10 @@ #include "gpuinflate.hpp" -#include - #include +#include + namespace cudf { namespace io { constexpr int hash_bits = 12; diff --git a/cpp/src/io/comp/statistics.cu b/cpp/src/io/comp/statistics.cu index e0f7e1ec6dd..2a9eb782800 100644 --- a/cpp/src/io/comp/statistics.cu +++ b/cpp/src/io/comp/statistics.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,6 +17,7 @@ #include "gpuinflate.hpp" #include + #include namespace cudf::io { diff --git a/cpp/src/io/comp/uncomp.cpp b/cpp/src/io/comp/uncomp.cpp index 0d2d21333bb..e802933a316 100644 --- a/cpp/src/io/comp/uncomp.cpp +++ b/cpp/src/io/comp/uncomp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023, NVIDIA CORPORATION. + * Copyright (c) 2018-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,18 +18,17 @@ #include "nvcomp_adapter.hpp" #include "unbz2.hpp" // bz2 uncompress -#include - #include #include #include #include -#include // memset - +#include #include // uncompress +#include // memset + using cudf::host_span; namespace cudf { diff --git a/cpp/src/io/comp/unsnap.cu b/cpp/src/io/comp/unsnap.cu index 46555a97e9c..97453d86b5c 100644 --- a/cpp/src/io/comp/unsnap.cu +++ b/cpp/src/io/comp/unsnap.cu @@ -16,12 +16,12 @@ #include "gpuinflate.hpp" -#include - #include #include +#include + namespace cudf { namespace io { constexpr int32_t batch_size = (1 << 5); diff --git a/cpp/src/io/csv/csv_common.hpp b/cpp/src/io/csv/csv_common.hpp index 7c9c0b00103..fd822c48c0d 100644 --- a/cpp/src/io/csv/csv_common.hpp +++ b/cpp/src/io/csv/csv_common.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,10 @@ #pragma once -#include #include +#include + namespace cudf { namespace io { namespace csv { diff --git a/cpp/src/io/csv/csv_gpu.cu b/cpp/src/io/csv/csv_gpu.cu index 8252cccbdb9..ab4506514f1 100644 --- a/cpp/src/io/csv/csv_gpu.cu +++ b/cpp/src/io/csv/csv_gpu.cu @@ -17,9 +17,6 @@ #include "csv_common.hpp" #include "csv_gpu.hpp" -#include -#include - #include #include #include @@ -31,7 +28,6 @@ #include #include #include -#include #include #include @@ -41,6 +37,10 @@ #include #include +#include +#include +#include + #include using namespace ::cudf::io; diff --git a/cpp/src/io/csv/csv_gpu.hpp b/cpp/src/io/csv/csv_gpu.hpp index 62bd8f1eff2..5d85b846517 100644 --- a/cpp/src/io/csv/csv_gpu.hpp +++ b/cpp/src/io/csv/csv_gpu.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,13 @@ #pragma once -#include - #include #include #include +#include + using cudf::device_span; namespace cudf { diff --git a/cpp/src/io/csv/datetime.cuh b/cpp/src/io/csv/datetime.cuh index 50d2106ec42..fb9952f1a14 100644 --- a/cpp/src/io/csv/datetime.cuh +++ b/cpp/src/io/csv/datetime.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ #pragma once -#include -#include - #include #include @@ -26,6 +23,9 @@ #include #include +#include +#include + namespace cudf { namespace io { diff --git a/cpp/src/io/csv/reader_impl.cu b/cpp/src/io/csv/reader_impl.cu index 393e44bddf4..b871b543bc7 100644 --- a/cpp/src/io/csv/reader_impl.cu +++ b/cpp/src/io/csv/reader_impl.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,11 +22,6 @@ #include "csv_common.hpp" #include "csv_gpu.hpp" -#include -#include -#include -#include - #include #include #include @@ -44,6 +39,11 @@ #include #include +#include +#include +#include +#include + #include #include #include diff --git a/cpp/src/io/csv/writer_impl.cu b/cpp/src/io/csv/writer_impl.cu index 65473073e31..cedcd97e44e 100644 --- a/cpp/src/io/csv/writer_impl.cu +++ b/cpp/src/io/csv/writer_impl.cu @@ -19,10 +19,9 @@ * @brief cuDF-IO CSV writer class implementation */ -#include "durations.hpp" - #include "csv_common.hpp" #include "csv_gpu.hpp" +#include "durations.hpp" #include #include diff --git a/cpp/src/io/fst/agent_dfa.cuh b/cpp/src/io/fst/agent_dfa.cuh index 9bb087e788d..9ba8696370a 100644 --- a/cpp/src/io/fst/agent_dfa.cuh +++ b/cpp/src/io/fst/agent_dfa.cuh @@ -18,7 +18,6 @@ #include "in_reg_array.cuh" #include - #include #include diff --git a/cpp/src/io/fst/logical_stack.cuh b/cpp/src/io/fst/logical_stack.cuh index 22385d33c7b..0f1fc7d572b 100644 --- a/cpp/src/io/fst/logical_stack.cuh +++ b/cpp/src/io/fst/logical_stack.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,24 +15,24 @@ */ #pragma once +#include + #include #include #include #include -#include #include #include #include +#include #include #include #include #include #include -#include - #include #include #include diff --git a/cpp/src/io/fst/lookup_tables.cuh b/cpp/src/io/fst/lookup_tables.cuh index a4e519d180d..0ef2a4e9e99 100644 --- a/cpp/src/io/fst/lookup_tables.cuh +++ b/cpp/src/io/fst/lookup_tables.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,13 +17,13 @@ #pragma once #include -#include -#include #include - #include +#include +#include + #include #include #include diff --git a/cpp/src/io/functions.cpp b/cpp/src/io/functions.cpp index 42f2fd02d52..0f32dc6e226 100644 --- a/cpp/src/io/functions.cpp +++ b/cpp/src/io/functions.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#include - #include #include #include @@ -36,6 +34,8 @@ #include #include +#include + #include namespace cudf::io { diff --git a/cpp/src/io/json/byte_range_info.cu b/cpp/src/io/json/byte_range_info.cu index d359e917dfa..258a40b0dd3 100644 --- a/cpp/src/io/json/byte_range_info.cu +++ b/cpp/src/io/json/byte_range_info.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,6 +19,7 @@ #include #include + #include namespace cudf::io::json::detail { diff --git a/cpp/src/io/json/json_column.cu b/cpp/src/io/json/json_column.cu index b1dc2c9dd7f..636c1e3d812 100644 --- a/cpp/src/io/json/json_column.cu +++ b/cpp/src/io/json/json_column.cu @@ -15,8 +15,6 @@ */ #include "nested_json.hpp" -#include -#include #include #include @@ -32,6 +30,8 @@ #include #include +#include +#include #include #include #include @@ -46,8 +46,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/cpp/src/io/json/json_quote_normalization.cu b/cpp/src/io/json/json_quote_normalization.cu index 7c9466748cd..c9403a0ae3b 100644 --- a/cpp/src/io/json/json_quote_normalization.cu +++ b/cpp/src/io/json/json_quote_normalization.cu @@ -14,8 +14,6 @@ * limitations under the License. */ -#include - #include #include @@ -26,6 +24,8 @@ #include +#include + #include #include #include diff --git a/cpp/src/io/json/json_tree.cu b/cpp/src/io/json/json_tree.cu index db9daf28c06..56c8b3f3760 100644 --- a/cpp/src/io/json/json_tree.cu +++ b/cpp/src/io/json/json_tree.cu @@ -15,7 +15,6 @@ */ #include "nested_json.hpp" -#include #include #include @@ -33,9 +32,8 @@ #include #include - #include - +#include #include #include #include @@ -54,7 +52,7 @@ #include #include -#include +#include #include diff --git a/cpp/src/io/json/legacy/json_gpu.cu b/cpp/src/io/json/legacy/json_gpu.cu index 4d5293e12fd..8be0e79239b 100644 --- a/cpp/src/io/json/legacy/json_gpu.cu +++ b/cpp/src/io/json/legacy/json_gpu.cu @@ -16,9 +16,6 @@ #include "json_gpu.hpp" -#include -#include - #include #include #include @@ -27,7 +24,6 @@ #include #include #include -#include #include #include @@ -44,6 +40,10 @@ #include #include +#include +#include +#include + using cudf::device_span; using cudf::detail::grid_1d; diff --git a/cpp/src/io/json/legacy/json_gpu.hpp b/cpp/src/io/json/legacy/json_gpu.hpp index 48fe6c69390..6cf0a4177cd 100644 --- a/cpp/src/io/json/legacy/json_gpu.hpp +++ b/cpp/src/io/json/legacy/json_gpu.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,6 @@ #pragma once -#include -#include - -#include - #include #include #include @@ -29,6 +24,10 @@ #include +#include +#include +#include + using cudf::device_span; namespace cudf::io::json::detail::legacy { diff --git a/cpp/src/io/json/legacy/reader_impl.cu b/cpp/src/io/json/legacy/reader_impl.cu index d461f27c921..b5c28be34d4 100644 --- a/cpp/src/io/json/legacy/reader_impl.cu +++ b/cpp/src/io/json/legacy/reader_impl.cu @@ -16,12 +16,6 @@ #include "json_gpu.hpp" -#include - -#include -#include -#include - #include #include #include @@ -52,6 +46,11 @@ #include #include +#include +#include +#include +#include + using cudf::host_span; namespace cudf::io::json::detail::legacy { diff --git a/cpp/src/io/json/nested_json_gpu.cu b/cpp/src/io/json/nested_json_gpu.cu index 5eb3883dc64..15c2a6155a9 100644 --- a/cpp/src/io/json/nested_json_gpu.cu +++ b/cpp/src/io/json/nested_json_gpu.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,6 @@ #include "nested_json.hpp" -#include -#include -#include -#include - #include #include #include @@ -45,6 +40,11 @@ #include #include +#include +#include +#include +#include + #include #include diff --git a/cpp/src/io/json/read_json.cu b/cpp/src/io/json/read_json.cu index 2cfb5fa03c9..b9865010550 100644 --- a/cpp/src/io/json/read_json.cu +++ b/cpp/src/io/json/read_json.cu @@ -16,10 +16,6 @@ #include "read_json.hpp" -#include -#include -#include - #include #include #include @@ -30,6 +26,10 @@ #include #include +#include +#include +#include + #include namespace cudf::io::json::detail { diff --git a/cpp/src/io/json/write_json.cu b/cpp/src/io/json/write_json.cu index 84e0ac9e74d..81b3e392373 100644 --- a/cpp/src/io/json/write_json.cu +++ b/cpp/src/io/json/write_json.cu @@ -19,10 +19,6 @@ * @brief cuDF-IO JSON writer implementation */ -#include -#include -#include - #include #include #include @@ -48,6 +44,7 @@ #include #include +#include #include #include #include @@ -56,7 +53,9 @@ #include #include -#include +#include +#include +#include #include #include diff --git a/cpp/src/io/orc/orc.cpp b/cpp/src/io/orc/orc.cpp index eab951efe36..de0d7a88614 100644 --- a/cpp/src/io/orc/orc.cpp +++ b/cpp/src/io/orc/orc.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,6 +15,7 @@ */ #include "orc.hpp" + #include "orc_field_reader.hpp" #include "orc_field_writer.hpp" diff --git a/cpp/src/io/orc/orc.hpp b/cpp/src/io/orc/orc.hpp index 4f3e0a82768..01cb8dfb5fa 100644 --- a/cpp/src/io/orc/orc.hpp +++ b/cpp/src/io/orc/orc.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,10 +21,11 @@ #include #include #include -#include #include +#include + #include #include #include diff --git a/cpp/src/io/orc/orc_field_reader.hpp b/cpp/src/io/orc/orc_field_reader.hpp index 58f3fff7eb4..3689e4d958b 100644 --- a/cpp/src/io/orc/orc_field_reader.hpp +++ b/cpp/src/io/orc/orc_field_reader.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +16,7 @@ #pragma once #include "orc.hpp" + #include /** diff --git a/cpp/src/io/orc/orc_gpu.hpp b/cpp/src/io/orc/orc_gpu.hpp index 243704b65d4..5122456b12c 100644 --- a/cpp/src/io/orc/orc_gpu.hpp +++ b/cpp/src/io/orc/orc_gpu.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,10 +18,6 @@ #include "orc.hpp" -#include -#include -#include - #include #include #include @@ -33,6 +29,10 @@ #include +#include +#include +#include + namespace cudf { namespace io { namespace orc { diff --git a/cpp/src/io/orc/reader_impl.hpp b/cpp/src/io/orc/reader_impl.hpp index 6561c08f2d9..d73ebbf7131 100644 --- a/cpp/src/io/orc/reader_impl.hpp +++ b/cpp/src/io/orc/reader_impl.hpp @@ -18,14 +18,14 @@ #include "aggregate_orc_metadata.hpp" -#include - #include #include #include #include +#include + #include #include #include diff --git a/cpp/src/io/orc/reader_impl_chunking.hpp b/cpp/src/io/orc/reader_impl_chunking.hpp index 44ece671155..0db62ad1845 100644 --- a/cpp/src/io/orc/reader_impl_chunking.hpp +++ b/cpp/src/io/orc/reader_impl_chunking.hpp @@ -18,13 +18,13 @@ #include "orc_gpu.hpp" -#include - #include #include #include +#include + namespace cudf::io::orc::detail { /** diff --git a/cpp/src/io/orc/reader_impl_helpers.hpp b/cpp/src/io/orc/reader_impl_helpers.hpp index f0d91c75fc3..0ecf0313f9b 100644 --- a/cpp/src/io/orc/reader_impl_helpers.hpp +++ b/cpp/src/io/orc/reader_impl_helpers.hpp @@ -19,12 +19,12 @@ #include "aggregate_orc_metadata.hpp" #include "orc.hpp" -#include - #include #include +#include + #include #include diff --git a/cpp/src/io/orc/reader_impl_preprocess.cu b/cpp/src/io/orc/reader_impl_preprocess.cu index 08f5adb0729..ef13beda966 100644 --- a/cpp/src/io/orc/reader_impl_preprocess.cu +++ b/cpp/src/io/orc/reader_impl_preprocess.cu @@ -18,10 +18,6 @@ #include "reader_impl_chunking.hpp" #include "reader_impl_helpers.hpp" -#include -#include -#include - #include #include #include @@ -43,6 +39,10 @@ #include #include +#include +#include +#include + #include #include diff --git a/cpp/src/io/orc/stats_enc.cu b/cpp/src/io/orc/stats_enc.cu index 31159ae0341..477888b7f02 100644 --- a/cpp/src/io/orc/stats_enc.cu +++ b/cpp/src/io/orc/stats_enc.cu @@ -16,13 +16,13 @@ #include "orc_gpu.hpp" -#include - #include #include #include +#include + namespace cudf::io::orc::gpu { using strings::detail::fixed_point_string_size; diff --git a/cpp/src/io/orc/stripe_data.cu b/cpp/src/io/orc/stripe_data.cu index 14072d79172..6363b040b2a 100644 --- a/cpp/src/io/orc/stripe_data.cu +++ b/cpp/src/io/orc/stripe_data.cu @@ -17,11 +17,13 @@ #include "orc_gpu.hpp" #include -#include -#include #include +#include + +#include + namespace cudf { namespace io { namespace orc { diff --git a/cpp/src/io/orc/stripe_enc.cu b/cpp/src/io/orc/stripe_enc.cu index 516922219d1..05184132392 100644 --- a/cpp/src/io/orc/stripe_enc.cu +++ b/cpp/src/io/orc/stripe_enc.cu @@ -16,27 +16,27 @@ #include "orc_gpu.hpp" -#include -#include -#include -#include -#include - #include #include #include +#include #include #include -#include #include #include +#include #include #include #include #include +#include +#include +#include +#include + namespace cudf { namespace io { namespace orc { diff --git a/cpp/src/io/orc/stripe_init.cu b/cpp/src/io/orc/stripe_init.cu index 327b9557176..6e242edc8cc 100644 --- a/cpp/src/io/orc/stripe_init.cu +++ b/cpp/src/io/orc/stripe_init.cu @@ -17,13 +17,15 @@ #include "orc_gpu.hpp" #include -#include -#include #include + +#include #include #include +#include + namespace cudf { namespace io { namespace orc { diff --git a/cpp/src/io/orc/writer_impl.cu b/cpp/src/io/orc/writer_impl.cu index cc1a18c9173..269afd193a7 100644 --- a/cpp/src/io/orc/writer_impl.cu +++ b/cpp/src/io/orc/writer_impl.cu @@ -21,10 +21,6 @@ #include "writer_impl.hpp" -#include -#include -#include - #include #include #include @@ -39,6 +35,10 @@ #include #include +#include +#include +#include +#include #include #include #include @@ -56,11 +56,9 @@ #include #include -#include -#include - -#include -#include +#include +#include +#include #include #include diff --git a/cpp/src/io/orc/writer_impl.hpp b/cpp/src/io/orc/writer_impl.hpp index f8ac5515f2e..3caaea90c41 100644 --- a/cpp/src/io/orc/writer_impl.hpp +++ b/cpp/src/io/orc/writer_impl.hpp @@ -19,8 +19,6 @@ #include "orc.hpp" #include "orc_gpu.hpp" -#include - #include #include #include @@ -35,6 +33,8 @@ #include #include +#include + #include #include #include diff --git a/cpp/src/io/parquet/decode_preprocess.cu b/cpp/src/io/parquet/decode_preprocess.cu index 2d000600028..07a0ca46893 100644 --- a/cpp/src/io/parquet/decode_preprocess.cu +++ b/cpp/src/io/parquet/decode_preprocess.cu @@ -16,13 +16,14 @@ #include "page_decode.cuh" -#include - #include #include + #include +#include + namespace cudf::io::parquet::detail { namespace { diff --git a/cpp/src/io/parquet/page_data.cu b/cpp/src/io/parquet/page_data.cu index 8d220e6fa96..2565ddbafd9 100644 --- a/cpp/src/io/parquet/page_data.cu +++ b/cpp/src/io/parquet/page_data.cu @@ -16,13 +16,14 @@ #include "page_decode.cuh" -#include - #include #include + #include +#include + namespace cudf::io::parquet::detail { namespace { diff --git a/cpp/src/io/parquet/page_decode.cuh b/cpp/src/io/parquet/page_decode.cuh index 409b1464cd1..969fd5a8f1f 100644 --- a/cpp/src/io/parquet/page_decode.cuh +++ b/cpp/src/io/parquet/page_decode.cuh @@ -20,11 +20,11 @@ #include "parquet_gpu.hpp" #include "rle_stream.cuh" -#include - #include #include +#include + namespace cudf::io::parquet::detail { struct page_state_s { diff --git a/cpp/src/io/parquet/page_delta_decode.cu b/cpp/src/io/parquet/page_delta_decode.cu index d0557446f14..564d28561f2 100644 --- a/cpp/src/io/parquet/page_delta_decode.cu +++ b/cpp/src/io/parquet/page_delta_decode.cu @@ -18,13 +18,14 @@ #include "page_string_utils.cuh" #include "parquet_gpu.hpp" -#include - #include #include + #include +#include + namespace cudf::io::parquet::detail { namespace { diff --git a/cpp/src/io/parquet/page_enc.cu b/cpp/src/io/parquet/page_enc.cu index 2f351edd2b9..0091d2025df 100644 --- a/cpp/src/io/parquet/page_enc.cu +++ b/cpp/src/io/parquet/page_enc.cu @@ -17,8 +17,6 @@ #include "delta_enc.cuh" #include "parquet_gpu.cuh" -#include - #include #include #include @@ -29,9 +27,7 @@ #include #include - #include - #include #include #include @@ -43,6 +39,8 @@ #include #include +#include + #include namespace cudf::io::parquet::detail { diff --git a/cpp/src/io/parquet/page_hdr.cu b/cpp/src/io/parquet/page_hdr.cu index 888d9452612..f86a84c8f1f 100644 --- a/cpp/src/io/parquet/page_hdr.cu +++ b/cpp/src/io/parquet/page_hdr.cu @@ -16,13 +16,14 @@ #include "error.hpp" #include "parquet_gpu.hpp" -#include #include +#include + #include -#include +#include namespace cudf::io::parquet::detail { diff --git a/cpp/src/io/parquet/parquet_gpu.hpp b/cpp/src/io/parquet/parquet_gpu.hpp index b215cd7a20b..64e1c199779 100644 --- a/cpp/src/io/parquet/parquet_gpu.hpp +++ b/cpp/src/io/parquet/parquet_gpu.hpp @@ -17,7 +17,6 @@ #pragma once #include "error.hpp" - #include "io/comp/gpuinflate.hpp" #include "io/parquet/parquet.hpp" #include "io/parquet/parquet_common.hpp" @@ -34,7 +33,6 @@ #include #include - #include #include diff --git a/cpp/src/io/parquet/reader_impl.cpp b/cpp/src/io/parquet/reader_impl.cpp index 24d46d91dbb..26d810a3337 100644 --- a/cpp/src/io/parquet/reader_impl.cpp +++ b/cpp/src/io/parquet/reader_impl.cpp @@ -15,6 +15,7 @@ */ #include "reader_impl.hpp" + #include "error.hpp" #include diff --git a/cpp/src/io/parquet/reader_impl_chunking.cu b/cpp/src/io/parquet/reader_impl_chunking.cu index 69141faa7fc..f7cca039404 100644 --- a/cpp/src/io/parquet/reader_impl_chunking.cu +++ b/cpp/src/io/parquet/reader_impl_chunking.cu @@ -21,13 +21,9 @@ #include #include -#include - -#include -#include - #include +#include #include #include #include @@ -35,7 +31,9 @@ #include #include -#include +#include +#include +#include #include diff --git a/cpp/src/io/parquet/reader_impl_preprocess.cu b/cpp/src/io/parquet/reader_impl_preprocess.cu index ee3b1c466e0..48ff32038b3 100644 --- a/cpp/src/io/parquet/reader_impl_preprocess.cu +++ b/cpp/src/io/parquet/reader_impl_preprocess.cu @@ -23,6 +23,7 @@ #include +#include #include #include #include @@ -38,8 +39,6 @@ #include #include -#include - #include #include diff --git a/cpp/src/io/parquet/rle_stream.cuh b/cpp/src/io/parquet/rle_stream.cuh index 799d6d9fd64..5faadf1369b 100644 --- a/cpp/src/io/parquet/rle_stream.cuh +++ b/cpp/src/io/parquet/rle_stream.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,6 +17,7 @@ #pragma once #include "parquet_gpu.hpp" + #include #include diff --git a/cpp/src/io/parquet/writer_impl.cu b/cpp/src/io/parquet/writer_impl.cu index 3dcc9716579..16e8e560d68 100644 --- a/cpp/src/io/parquet/writer_impl.cu +++ b/cpp/src/io/parquet/writer_impl.cu @@ -25,11 +25,6 @@ #include "parquet_gpu.cuh" #include "writer_impl.hpp" -#include -#include -#include -#include - #include #include #include @@ -50,6 +45,11 @@ #include #include +#include +#include +#include +#include + #include #include #include diff --git a/cpp/src/io/parquet/writer_impl.hpp b/cpp/src/io/parquet/writer_impl.hpp index 3415205d179..2f6608b0ae7 100644 --- a/cpp/src/io/parquet/writer_impl.hpp +++ b/cpp/src/io/parquet/writer_impl.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,9 +24,8 @@ #include "parquet.hpp" #include "parquet_gpu.hpp" -#include - #include +#include #include #include #include diff --git a/cpp/src/io/statistics/column_statistics.cuh b/cpp/src/io/statistics/column_statistics.cuh index db0d56ac321..b2cabe24a50 100644 --- a/cpp/src/io/statistics/column_statistics.cuh +++ b/cpp/src/io/statistics/column_statistics.cuh @@ -21,12 +21,10 @@ #pragma once +#include "statistics.cuh" #include "temp_storage_wrapper.cuh" - #include "typed_statistics_chunk.cuh" -#include "statistics.cuh" - namespace cudf { namespace io { diff --git a/cpp/src/io/statistics/statistics_type_identification.cuh b/cpp/src/io/statistics/statistics_type_identification.cuh index ea8c71f0dcb..5e11646be6b 100644 --- a/cpp/src/io/statistics/statistics_type_identification.cuh +++ b/cpp/src/io/statistics/statistics_type_identification.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,18 +22,13 @@ #pragma once #include "byte_array_view.cuh" +#include "conversion_type_select.cuh" #include - -#include - #include - -#include - #include - -#include "conversion_type_select.cuh" +#include +#include #include diff --git a/cpp/src/io/statistics/typed_statistics_chunk.cuh b/cpp/src/io/statistics/typed_statistics_chunk.cuh index e6ec1471cb7..01db781c766 100644 --- a/cpp/src/io/statistics/typed_statistics_chunk.cuh +++ b/cpp/src/io/statistics/typed_statistics_chunk.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +31,6 @@ #include #include - #include namespace cudf { diff --git a/cpp/src/io/text/bgzip_data_chunk_source.cu b/cpp/src/io/text/bgzip_data_chunk_source.cu index 77647c18b20..17baed18b5a 100644 --- a/cpp/src/io/text/bgzip_data_chunk_source.cu +++ b/cpp/src/io/text/bgzip_data_chunk_source.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ #include "io/text/device_data_chunks.hpp" -#include -#include - #include #include #include @@ -35,6 +32,9 @@ #include #include +#include +#include + #include #include diff --git a/cpp/src/io/text/bgzip_utils.cpp b/cpp/src/io/text/bgzip_utils.cpp index 43e2c26f132..cb412828e2d 100644 --- a/cpp/src/io/text/bgzip_utils.cpp +++ b/cpp/src/io/text/bgzip_utils.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -#include - #include #include #include +#include + #include #include #include diff --git a/cpp/src/io/text/multibyte_split.cu b/cpp/src/io/text/multibyte_split.cu index 34a476974e4..bd80535fac3 100644 --- a/cpp/src/io/text/multibyte_split.cu +++ b/cpp/src/io/text/multibyte_split.cu @@ -14,8 +14,6 @@ * limitations under the License. */ -#include - #include #include #include @@ -38,15 +36,15 @@ #include #include +#include +#include +#include #include #include #include #include -#include -#include - -#include +#include #include #include diff --git a/cpp/src/io/utilities/column_buffer.cpp b/cpp/src/io/utilities/column_buffer.cpp index 951217dc442..96503e4907b 100644 --- a/cpp/src/io/utilities/column_buffer.cpp +++ b/cpp/src/io/utilities/column_buffer.cpp @@ -20,6 +20,7 @@ */ #include "column_buffer.hpp" + #include #include #include diff --git a/cpp/src/io/utilities/column_utils.cuh b/cpp/src/io/utilities/column_utils.cuh index 5f4bf646452..d6c044af0e6 100644 --- a/cpp/src/io/utilities/column_utils.cuh +++ b/cpp/src/io/utilities/column_utils.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ #pragma once -#include - #include #include #include @@ -30,6 +28,8 @@ #include #include +#include + namespace cudf { namespace io { diff --git a/cpp/src/io/utilities/data_casting.cu b/cpp/src/io/utilities/data_casting.cu index 8fd860d9492..4f5ef9ac7e4 100644 --- a/cpp/src/io/utilities/data_casting.cu +++ b/cpp/src/io/utilities/data_casting.cu @@ -14,9 +14,6 @@ * limitations under the License. */ -#include -#include - #include #include #include @@ -32,11 +29,13 @@ #include #include +#include #include #include #include -#include +#include +#include #include #include diff --git a/cpp/src/io/utilities/data_sink.cpp b/cpp/src/io/utilities/data_sink.cpp index 0b14d060b05..cd91c051fb4 100644 --- a/cpp/src/io/utilities/data_sink.cpp +++ b/cpp/src/io/utilities/data_sink.cpp @@ -14,16 +14,19 @@ * limitations under the License. */ -#include - #include "file_io_utilities.hpp" + #include #include -#include #include + #include +#include + +#include + namespace cudf { namespace io { diff --git a/cpp/src/io/utilities/datasource.cpp b/cpp/src/io/utilities/datasource.cpp index 687764be911..4bcd0cb9593 100644 --- a/cpp/src/io/utilities/datasource.cpp +++ b/cpp/src/io/utilities/datasource.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,14 +21,14 @@ #include #include #include -#include #include + #include #include - #include +#include #include #include diff --git a/cpp/src/io/utilities/file_io_utilities.cpp b/cpp/src/io/utilities/file_io_utilities.cpp index 63c1114c9ce..136abee1634 100644 --- a/cpp/src/io/utilities/file_io_utilities.cpp +++ b/cpp/src/io/utilities/file_io_utilities.cpp @@ -15,13 +15,14 @@ */ #include "file_io_utilities.hpp" + #include -#include #include #include #include +#include #include #include diff --git a/cpp/src/io/utilities/file_io_utilities.hpp b/cpp/src/io/utilities/file_io_utilities.hpp index 90bf591fe0c..0d5a5b218da 100644 --- a/cpp/src/io/utilities/file_io_utilities.hpp +++ b/cpp/src/io/utilities/file_io_utilities.hpp @@ -20,14 +20,15 @@ #include "thread_pool.hpp" #include + #include #endif -#include - #include #include +#include + #include namespace cudf { diff --git a/cpp/src/io/utilities/parsing_utils.cu b/cpp/src/io/utilities/parsing_utils.cu index d02ce99e6e5..c1cbcd0baca 100644 --- a/cpp/src/io/utilities/parsing_utils.cu +++ b/cpp/src/io/utilities/parsing_utils.cu @@ -19,10 +19,10 @@ #include #include -#include - #include +#include + #include namespace cudf { diff --git a/cpp/src/io/utilities/parsing_utils.cuh b/cpp/src/io/utilities/parsing_utils.cuh index 43d62fcd513..e465a615c3b 100644 --- a/cpp/src/io/utilities/parsing_utils.cuh +++ b/cpp/src/io/utilities/parsing_utils.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,7 @@ #pragma once -#include -#include +#include "column_type_histogram.hpp" #include #include @@ -27,14 +26,15 @@ #include #include -#include "column_type_histogram.hpp" - #include #include #include #include +#include +#include + #include using cudf::device_span; diff --git a/cpp/src/io/utilities/row_selection.cpp b/cpp/src/io/utilities/row_selection.cpp index ae5c7b5fbda..7a09f5eb4ec 100644 --- a/cpp/src/io/utilities/row_selection.cpp +++ b/cpp/src/io/utilities/row_selection.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -#include - #include +#include + #include #include diff --git a/cpp/src/io/utilities/string_parsing.hpp b/cpp/src/io/utilities/string_parsing.hpp index 12fc0a5b2e7..3f1d287380b 100644 --- a/cpp/src/io/utilities/string_parsing.hpp +++ b/cpp/src/io/utilities/string_parsing.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,8 +15,6 @@ */ #pragma once -#include - #include #include @@ -25,6 +23,8 @@ #include #include +#include + namespace cudf::io { namespace detail { diff --git a/cpp/src/io/utilities/type_inference.cu b/cpp/src/io/utilities/type_inference.cu index b446ad41946..c96db286d47 100644 --- a/cpp/src/io/utilities/type_inference.cu +++ b/cpp/src/io/utilities/type_inference.cu @@ -14,10 +14,6 @@ * limitations under the License. */ -#include -#include -#include - #include #include @@ -25,6 +21,10 @@ #include +#include +#include +#include + #include namespace cudf::io::detail { diff --git a/cpp/src/jit/cache.cpp b/cpp/src/jit/cache.cpp index 46b347d39b1..bc8e3e8e392 100644 --- a/cpp/src/jit/cache.cpp +++ b/cpp/src/jit/cache.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,6 +17,7 @@ #include #include + #include #include diff --git a/cpp/src/jit/cache.hpp b/cpp/src/jit/cache.hpp index df8d4278f0f..8e6c07911f7 100644 --- a/cpp/src/jit/cache.hpp +++ b/cpp/src/jit/cache.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2021, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,6 +17,7 @@ #pragma once #include + #include namespace cudf { diff --git a/cpp/src/join/conditional_join.cu b/cpp/src/join/conditional_join.cu index c3073524467..d5c9d696de1 100644 --- a/cpp/src/join/conditional_join.cu +++ b/cpp/src/join/conditional_join.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,13 +23,14 @@ #include #include #include + +#include + #include #include #include #include -#include - #include namespace cudf { diff --git a/cpp/src/join/conditional_join_kernels.cuh b/cpp/src/join/conditional_join_kernels.cuh index 02ce27a36ba..ce158df628e 100644 --- a/cpp/src/join/conditional_join_kernels.cuh +++ b/cpp/src/join/conditional_join_kernels.cuh @@ -16,9 +16,6 @@ #pragma once -#include -#include - #include #include #include @@ -26,6 +23,9 @@ #include +#include +#include + namespace cudf { namespace detail { diff --git a/cpp/src/join/join_common_utils.cuh b/cpp/src/join/join_common_utils.cuh index f3ce6de4598..9da41e296e6 100644 --- a/cpp/src/join/join_common_utils.cuh +++ b/cpp/src/join/join_common_utils.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,7 +26,6 @@ #include #include - #include namespace cudf { diff --git a/cpp/src/join/join_common_utils.hpp b/cpp/src/join/join_common_utils.hpp index b88a4fdef58..94e8c07a3f0 100644 --- a/cpp/src/join/join_common_utils.hpp +++ b/cpp/src/join/join_common_utils.hpp @@ -24,7 +24,6 @@ #include #include - #include #include diff --git a/cpp/src/join/mixed_join_common_utils.cuh b/cpp/src/join/mixed_join_common_utils.cuh index 38e5b75ade6..023880f7dc7 100644 --- a/cpp/src/join/mixed_join_common_utils.cuh +++ b/cpp/src/join/mixed_join_common_utils.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,8 +15,6 @@ */ #pragma once -#include - #include #include #include @@ -26,6 +24,8 @@ #include +#include + namespace cudf { namespace detail { diff --git a/cpp/src/join/mixed_join_kernel.cuh b/cpp/src/join/mixed_join_kernel.cuh index 22bbbff967a..0fc1c3718b1 100644 --- a/cpp/src/join/mixed_join_kernel.cuh +++ b/cpp/src/join/mixed_join_kernel.cuh @@ -27,7 +27,6 @@ #include #include - #include #include diff --git a/cpp/src/join/mixed_join_kernels.cuh b/cpp/src/join/mixed_join_kernels.cuh index 1d36a246f02..4ad2e89cc38 100644 --- a/cpp/src/join/mixed_join_kernels.cuh +++ b/cpp/src/join/mixed_join_kernels.cuh @@ -16,13 +16,13 @@ #pragma once -#include -#include - #include #include #include +#include +#include + namespace cudf { namespace detail { diff --git a/cpp/src/join/mixed_join_kernels_semi.cu b/cpp/src/join/mixed_join_kernels_semi.cu index bde75395371..bc8b4188b99 100644 --- a/cpp/src/join/mixed_join_kernels_semi.cu +++ b/cpp/src/join/mixed_join_kernels_semi.cu @@ -14,10 +14,6 @@ * limitations under the License. */ -#include -#include -#include - #include #include #include @@ -26,6 +22,10 @@ #include +#include +#include +#include + namespace cudf { namespace detail { diff --git a/cpp/src/join/mixed_join_kernels_semi.cuh b/cpp/src/join/mixed_join_kernels_semi.cuh index 8e4966e3432..d1849f6d038 100644 --- a/cpp/src/join/mixed_join_kernels_semi.cuh +++ b/cpp/src/join/mixed_join_kernels_semi.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,13 @@ #pragma once -#include -#include - #include #include #include +#include +#include + namespace cudf { namespace detail { diff --git a/cpp/src/join/mixed_join_size_kernel.cuh b/cpp/src/join/mixed_join_size_kernel.cuh index 3bd7bfd7c9a..618e7a9082e 100644 --- a/cpp/src/join/mixed_join_size_kernel.cuh +++ b/cpp/src/join/mixed_join_size_kernel.cuh @@ -25,7 +25,6 @@ #include #include - #include #include diff --git a/cpp/src/join/mixed_join_size_kernels_semi.cu b/cpp/src/join/mixed_join_size_kernels_semi.cu index 31da6677aef..8cd4d536eff 100644 --- a/cpp/src/join/mixed_join_size_kernels_semi.cu +++ b/cpp/src/join/mixed_join_size_kernels_semi.cu @@ -14,10 +14,6 @@ * limitations under the License. */ -#include -#include -#include - #include #include #include @@ -26,6 +22,10 @@ #include +#include +#include +#include + namespace cudf { namespace detail { diff --git a/cpp/src/join/semi_join.cu b/cpp/src/join/semi_join.cu index dcb6835ec09..403df892cf8 100644 --- a/cpp/src/join/semi_join.cu +++ b/cpp/src/join/semi_join.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,8 +14,6 @@ * limitations under the License. */ -#include - #include #include #include @@ -36,6 +34,8 @@ #include #include +#include + namespace cudf { namespace detail { diff --git a/cpp/src/json/json_path.cu b/cpp/src/json/json_path.cu index 2be5798098d..70ece18c3b0 100644 --- a/cpp/src/json/json_path.cu +++ b/cpp/src/json/json_path.cu @@ -33,8 +33,6 @@ #include #include -#include - #include #include @@ -43,6 +41,8 @@ #include #include +#include + namespace cudf { namespace detail { diff --git a/cpp/src/lists/combine/concatenate_list_elements.cu b/cpp/src/lists/combine/concatenate_list_elements.cu index 26fb81a600f..579ad8e7dff 100644 --- a/cpp/src/lists/combine/concatenate_list_elements.cu +++ b/cpp/src/lists/combine/concatenate_list_elements.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,6 +31,7 @@ #include #include +#include #include #include #include @@ -40,8 +41,6 @@ #include #include -#include - namespace cudf { namespace lists { namespace detail { diff --git a/cpp/src/lists/combine/concatenate_rows.cu b/cpp/src/lists/combine/concatenate_rows.cu index e143fae5742..baecef3b92d 100644 --- a/cpp/src/lists/combine/concatenate_rows.cu +++ b/cpp/src/lists/combine/concatenate_rows.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,14 +27,13 @@ #include #include +#include #include #include #include #include #include -#include - namespace cudf { namespace lists { namespace detail { diff --git a/cpp/src/lists/contains.cu b/cpp/src/lists/contains.cu index 1a88844928e..378cf678f1f 100644 --- a/cpp/src/lists/contains.cu +++ b/cpp/src/lists/contains.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,6 +31,7 @@ #include +#include #include #include #include @@ -41,8 +42,6 @@ #include #include -#include - #include namespace cudf::lists { diff --git a/cpp/src/lists/copying/scatter_helper.cu b/cpp/src/lists/copying/scatter_helper.cu index a341028d805..1ec66b4f98e 100644 --- a/cpp/src/lists/copying/scatter_helper.cu +++ b/cpp/src/lists/copying/scatter_helper.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,6 +23,7 @@ #include #include +#include #include #include #include @@ -30,8 +31,6 @@ #include #include -#include - namespace cudf { namespace lists { namespace detail { diff --git a/cpp/src/lists/copying/segmented_gather.cu b/cpp/src/lists/copying/segmented_gather.cu index 5439a95966b..156f868c5bd 100644 --- a/cpp/src/lists/copying/segmented_gather.cu +++ b/cpp/src/lists/copying/segmented_gather.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,12 +21,11 @@ #include #include -#include -#include +#include #include - -#include +#include +#include namespace cudf { namespace lists { diff --git a/cpp/src/lists/dremel.cu b/cpp/src/lists/dremel.cu index 7a460d3dfab..5625e1bf05c 100644 --- a/cpp/src/lists/dremel.cu +++ b/cpp/src/lists/dremel.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,6 +25,7 @@ #include +#include #include #include #include @@ -34,8 +35,6 @@ #include #include -#include - namespace cudf::detail { namespace { /** diff --git a/cpp/src/lists/explode.cu b/cpp/src/lists/explode.cu index cdb7857b74a..5f1d30321a2 100644 --- a/cpp/src/lists/explode.cu +++ b/cpp/src/lists/explode.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,6 +27,7 @@ #include #include +#include #include #include #include @@ -38,8 +39,6 @@ #include #include -#include - #include #include diff --git a/cpp/src/lists/interleave_columns.cu b/cpp/src/lists/interleave_columns.cu index 8f05b020a2e..fe5e1e677ca 100644 --- a/cpp/src/lists/interleave_columns.cu +++ b/cpp/src/lists/interleave_columns.cu @@ -30,6 +30,7 @@ #include #include +#include #include #include #include @@ -38,8 +39,6 @@ #include #include -#include - namespace cudf { namespace lists { namespace detail { diff --git a/cpp/src/lists/set_operations.cu b/cpp/src/lists/set_operations.cu index 5647b503cf7..5735c84e3d3 100644 --- a/cpp/src/lists/set_operations.cu +++ b/cpp/src/lists/set_operations.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,16 +28,16 @@ #include #include +#include +#include +#include + #include #include #include #include #include -#include -#include -#include - namespace cudf::lists { namespace detail { diff --git a/cpp/src/lists/stream_compaction/distinct.cu b/cpp/src/lists/stream_compaction/distinct.cu index eb21787b3fa..1e75a5856b5 100644 --- a/cpp/src/lists/stream_compaction/distinct.cu +++ b/cpp/src/lists/stream_compaction/distinct.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,8 +14,6 @@ * limitations under the License. */ -#include - #include #include #include @@ -27,6 +25,8 @@ #include +#include + #include #include diff --git a/cpp/src/merge/merge.cu b/cpp/src/merge/merge.cu index 073a2a6b97e..8be503025bd 100644 --- a/cpp/src/merge/merge.cu +++ b/cpp/src/merge/merge.cu @@ -36,11 +36,10 @@ #include #include -#include -#include #include #include +#include #include #include #include @@ -50,8 +49,8 @@ #include #include -#include - +#include +#include #include #include diff --git a/cpp/src/partitioning/partitioning.cu b/cpp/src/partitioning/partitioning.cu index 8d8f1a71672..0d2daaddb8c 100644 --- a/cpp/src/partitioning/partitioning.cu +++ b/cpp/src/partitioning/partitioning.cu @@ -32,13 +32,12 @@ #include #include +#include +#include #include #include #include -#include -#include - namespace cudf { namespace { // Launch configuration for optimized hash partition diff --git a/cpp/src/partitioning/round_robin.cu b/cpp/src/partitioning/round_robin.cu index c615f08ff12..3283a7c35ee 100644 --- a/cpp/src/partitioning/round_robin.cu +++ b/cpp/src/partitioning/round_robin.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,6 +31,7 @@ #include #include +#include #include #include #include @@ -40,8 +41,6 @@ #include #include -#include - #include #include // for std::ceil() #include diff --git a/cpp/src/quantiles/quantile.cu b/cpp/src/quantiles/quantile.cu index 946ebd479c5..9551db8a065 100644 --- a/cpp/src/quantiles/quantile.cu +++ b/cpp/src/quantiles/quantile.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,8 +14,6 @@ * limitations under the License. */ -#include - #include #include #include @@ -34,12 +32,13 @@ #include #include +#include #include #include #include #include -#include +#include #include #include diff --git a/cpp/src/quantiles/quantiles.cu b/cpp/src/quantiles/quantiles.cu index f55e9c4cb6a..9d5cd6ba5e6 100644 --- a/cpp/src/quantiles/quantiles.cu +++ b/cpp/src/quantiles/quantiles.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,8 +14,6 @@ * limitations under the License. */ -#include - #include #include #include @@ -28,10 +26,11 @@ #include +#include #include #include -#include +#include #include #include diff --git a/cpp/src/quantiles/quantiles_util.hpp b/cpp/src/quantiles/quantiles_util.hpp index 5edb323fb38..5efafdd0be6 100644 --- a/cpp/src/quantiles/quantiles_util.hpp +++ b/cpp/src/quantiles/quantiles_util.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,13 @@ * limitations under the License. */ -#include #include #include #include #include +#include + namespace cudf { namespace detail { template diff --git a/cpp/src/quantiles/tdigest/tdigest.cu b/cpp/src/quantiles/tdigest/tdigest.cu index c8ac19e01cc..891f773cc84 100644 --- a/cpp/src/quantiles/tdigest/tdigest.cu +++ b/cpp/src/quantiles/tdigest/tdigest.cu @@ -14,8 +14,6 @@ * limitations under the License. */ -#include - #include #include #include @@ -28,6 +26,7 @@ #include #include +#include #include #include #include @@ -40,7 +39,7 @@ #include #include -#include +#include using namespace cudf::tdigest; diff --git a/cpp/src/quantiles/tdigest/tdigest_aggregation.cu b/cpp/src/quantiles/tdigest/tdigest_aggregation.cu index fc56d17d73b..cfc0d76f3c4 100644 --- a/cpp/src/quantiles/tdigest/tdigest_aggregation.cu +++ b/cpp/src/quantiles/tdigest/tdigest_aggregation.cu @@ -14,8 +14,6 @@ * limitations under the License. */ -#include - #include #include #include @@ -33,6 +31,7 @@ #include #include +#include #include #include #include @@ -52,7 +51,7 @@ #include #include -#include +#include namespace cudf { namespace tdigest { diff --git a/cpp/src/reductions/all.cu b/cpp/src/reductions/all.cu index 4717c0673e3..6cea4e4ada3 100644 --- a/cpp/src/reductions/all.cu +++ b/cpp/src/reductions/all.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,13 +19,12 @@ #include #include +#include #include #include #include #include -#include - namespace cudf { namespace reduction { namespace detail { diff --git a/cpp/src/reductions/any.cu b/cpp/src/reductions/any.cu index f3093df5ac7..c0c044a1e6f 100644 --- a/cpp/src/reductions/any.cu +++ b/cpp/src/reductions/any.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,13 +19,12 @@ #include #include +#include #include #include #include #include -#include - namespace cudf { namespace reduction { namespace detail { diff --git a/cpp/src/reductions/histogram.cu b/cpp/src/reductions/histogram.cu index 42ef266a684..3e46a34cc6a 100644 --- a/cpp/src/reductions/histogram.cu +++ b/cpp/src/reductions/histogram.cu @@ -21,13 +21,12 @@ #include #include +#include +#include #include #include #include -#include -#include - #include namespace cudf::reduction::detail { diff --git a/cpp/src/reductions/nth_element.cu b/cpp/src/reductions/nth_element.cu index 82035fa78ce..88a1778bb7b 100644 --- a/cpp/src/reductions/nth_element.cu +++ b/cpp/src/reductions/nth_element.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,12 +24,11 @@ #include #include +#include #include #include #include -#include - namespace cudf::reduction::detail { std::unique_ptr nth_element(column_view const& col, diff --git a/cpp/src/reductions/scan/scan_exclusive.cu b/cpp/src/reductions/scan/scan_exclusive.cu index 4d7cb605cd4..47301ad91f6 100644 --- a/cpp/src/reductions/scan/scan_exclusive.cu +++ b/cpp/src/reductions/scan/scan_exclusive.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,9 +27,8 @@ #include #include -#include - #include +#include namespace cudf { namespace detail { diff --git a/cpp/src/reductions/scan/scan_inclusive.cu b/cpp/src/reductions/scan/scan_inclusive.cu index 00b608f36b6..d13aa40ab31 100644 --- a/cpp/src/reductions/scan/scan_inclusive.cu +++ b/cpp/src/reductions/scan/scan_inclusive.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,8 +14,6 @@ * limitations under the License. */ -#include - #include #include #include @@ -36,6 +34,8 @@ #include #include +#include + #include namespace cudf { diff --git a/cpp/src/reductions/segmented/simple.cuh b/cpp/src/reductions/segmented/simple.cuh index 31ad24cd1f9..4d4c6661428 100644 --- a/cpp/src/reductions/segmented/simple.cuh +++ b/cpp/src/reductions/segmented/simple.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,13 +34,12 @@ #include +#include #include #include #include #include -#include - #include #include diff --git a/cpp/src/replace/clamp.cu b/cpp/src/replace/clamp.cu index 23c792ddcae..43358a3b165 100644 --- a/cpp/src/replace/clamp.cu +++ b/cpp/src/replace/clamp.cu @@ -37,6 +37,7 @@ #include #include +#include #include #include #include @@ -44,8 +45,6 @@ #include #include -#include - namespace cudf { namespace detail { namespace { diff --git a/cpp/src/reshape/interleave_columns.cu b/cpp/src/reshape/interleave_columns.cu index 6aa322d4d78..72227ab5dda 100644 --- a/cpp/src/reshape/interleave_columns.cu +++ b/cpp/src/reshape/interleave_columns.cu @@ -31,13 +31,12 @@ #include #include +#include #include #include #include #include -#include - namespace cudf { namespace detail { namespace { diff --git a/cpp/src/rolling/detail/lead_lag_nested.cuh b/cpp/src/rolling/detail/lead_lag_nested.cuh index 734f7d1f565..66104fe5c77 100644 --- a/cpp/src/rolling/detail/lead_lag_nested.cuh +++ b/cpp/src/rolling/detail/lead_lag_nested.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,14 +28,13 @@ #include #include +#include #include #include #include #include #include -#include - #include namespace cudf::detail { diff --git a/cpp/src/rolling/detail/rolling.cuh b/cpp/src/rolling/detail/rolling.cuh index 20845a97c7e..0093400096c 100644 --- a/cpp/src/rolling/detail/rolling.cuh +++ b/cpp/src/rolling/detail/rolling.cuh @@ -22,8 +22,6 @@ #include "rolling_collect_list.cuh" #include "rolling_jit.hpp" -#include - #include #include #include @@ -45,24 +43,23 @@ #include #include -#include -#include -#include - -#include - #include #include #include +#include +#include #include #include #include #include #include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/cpp/src/rolling/detail/rolling_collect_list.cuh b/cpp/src/rolling/detail/rolling_collect_list.cuh index 22e55561eca..0ce14792cfa 100644 --- a/cpp/src/rolling/detail/rolling_collect_list.cuh +++ b/cpp/src/rolling/detail/rolling_collect_list.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,13 +25,12 @@ #include #include +#include #include #include #include #include -#include - namespace cudf { namespace detail { diff --git a/cpp/src/rolling/detail/rolling_fixed_window.cu b/cpp/src/rolling/detail/rolling_fixed_window.cu index 07ecf2730a0..f51937f7a0e 100644 --- a/cpp/src/rolling/detail/rolling_fixed_window.cu +++ b/cpp/src/rolling/detail/rolling_fixed_window.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,13 @@ #include "rolling.cuh" -#include -#include - #include -#include +#include +#include #include +#include namespace cudf::detail { diff --git a/cpp/src/rolling/detail/rolling_variable_window.cu b/cpp/src/rolling/detail/rolling_variable_window.cu index 85c5e5cb67e..bb73f305c7b 100644 --- a/cpp/src/rolling/detail/rolling_variable_window.cu +++ b/cpp/src/rolling/detail/rolling_variable_window.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,11 +19,10 @@ #include #include +#include #include #include -#include - namespace cudf::detail { // Applies a variable-size rolling window function to the values in a column. diff --git a/cpp/src/rolling/grouped_rolling.cu b/cpp/src/rolling/grouped_rolling.cu index aa009e47c2a..89a51ad1d87 100644 --- a/cpp/src/rolling/grouped_rolling.cu +++ b/cpp/src/rolling/grouped_rolling.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,6 +29,7 @@ #include #include +#include #include #include #include @@ -36,8 +37,6 @@ #include #include -#include - namespace cudf { std::unique_ptr grouped_rolling_window(table_view const& group_keys, column_view const& input, diff --git a/cpp/src/rolling/jit/kernel.cu b/cpp/src/rolling/jit/kernel.cu index 2c753965c1c..83e7370b2ca 100644 --- a/cpp/src/rolling/jit/kernel.cu +++ b/cpp/src/rolling/jit/kernel.cu @@ -14,12 +14,12 @@ * limitations under the License. */ -#include -#include - #include #include +#include +#include + namespace cudf { namespace rolling { namespace jit { diff --git a/cpp/src/rolling/range_window_bounds.cpp b/cpp/src/rolling/range_window_bounds.cpp index a136f152d25..68e80c6e84e 100644 --- a/cpp/src/rolling/range_window_bounds.cpp +++ b/cpp/src/rolling/range_window_bounds.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,6 +15,7 @@ */ #include "detail/range_window_bounds.hpp" + #include #include #include diff --git a/cpp/src/round/round.cu b/cpp/src/round/round.cu index 8a6367a1f87..8336e1ef2b0 100644 --- a/cpp/src/round/round.cu +++ b/cpp/src/round/round.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,6 +37,7 @@ #include #include + #include namespace cudf { diff --git a/cpp/src/scalar/scalar_factories.cpp b/cpp/src/scalar/scalar_factories.cpp index 3a2920f8f1a..2336b9075de 100644 --- a/cpp/src/scalar/scalar_factories.cpp +++ b/cpp/src/scalar/scalar_factories.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ +#include +#include #include #include #include #include #include -#include -#include #include namespace cudf { diff --git a/cpp/src/search/contains_table.cu b/cpp/src/search/contains_table.cu index ce069abcb78..bcbb60d1dd8 100644 --- a/cpp/src/search/contains_table.cu +++ b/cpp/src/search/contains_table.cu @@ -14,8 +14,6 @@ * limitations under the License. */ -#include - #include #include #include @@ -26,11 +24,11 @@ #include #include -#include - #include - #include +#include + +#include #include diff --git a/cpp/src/sort/rank.cu b/cpp/src/sort/rank.cu index 9cf07f065d2..cbd0207c20e 100644 --- a/cpp/src/sort/rank.cu +++ b/cpp/src/sort/rank.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,6 +31,8 @@ #include #include +#include +#include #include #include #include @@ -44,9 +46,6 @@ #include #include -#include -#include - namespace cudf { namespace detail { namespace { diff --git a/cpp/src/stream_compaction/distinct.cu b/cpp/src/stream_compaction/distinct.cu index e73bab1345e..11e2e77c253 100644 --- a/cpp/src/stream_compaction/distinct.cu +++ b/cpp/src/stream_compaction/distinct.cu @@ -27,13 +27,12 @@ #include +#include #include #include #include #include -#include - #include #include diff --git a/cpp/src/stream_compaction/distinct_count.cu b/cpp/src/stream_compaction/distinct_count.cu index 507bad777eb..da9870fb2c0 100644 --- a/cpp/src/stream_compaction/distinct_count.cu +++ b/cpp/src/stream_compaction/distinct_count.cu @@ -35,7 +35,6 @@ #include #include - #include #include #include diff --git a/cpp/src/strings/attributes.cu b/cpp/src/strings/attributes.cu index 2856c077fb2..073ed74d8c9 100644 --- a/cpp/src/strings/attributes.cu +++ b/cpp/src/strings/attributes.cu @@ -31,6 +31,8 @@ #include #include +#include +#include #include #include #include @@ -40,10 +42,6 @@ #include #include -#include - -#include - namespace cudf { namespace strings { namespace detail { diff --git a/cpp/src/strings/char_types/char_cases.cu b/cpp/src/strings/char_types/char_cases.cu index 1021d5768c1..3b2b6dfaa6c 100644 --- a/cpp/src/strings/char_types/char_cases.cu +++ b/cpp/src/strings/char_types/char_cases.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2021, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ +#include + #include #include #include #include -#include - // namespace cudf { namespace strings { diff --git a/cpp/src/strings/contains.cu b/cpp/src/strings/contains.cu index 4383f358a33..da43c79c2ac 100644 --- a/cpp/src/strings/contains.cu +++ b/cpp/src/strings/contains.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,6 @@ * limitations under the License. */ -#include -#include -#include - #include #include #include @@ -30,6 +26,10 @@ #include +#include +#include +#include + namespace cudf { namespace strings { namespace detail { diff --git a/cpp/src/strings/convert/convert_fixed_point.cu b/cpp/src/strings/convert/convert_fixed_point.cu index 975f03b37d6..c59952834d6 100644 --- a/cpp/src/strings/convert/convert_fixed_point.cu +++ b/cpp/src/strings/convert/convert_fixed_point.cu @@ -32,6 +32,9 @@ #include #include +#include +#include +#include #include #include #include @@ -39,10 +42,6 @@ #include #include -#include -#include -#include - namespace cudf { namespace strings { namespace detail { diff --git a/cpp/src/strings/copying/copying.cu b/cpp/src/strings/copying/copying.cu index 013028d6df3..6f045fa7ea8 100644 --- a/cpp/src/strings/copying/copying.cu +++ b/cpp/src/strings/copying/copying.cu @@ -26,9 +26,8 @@ #include #include -#include - #include +#include namespace cudf { namespace strings { diff --git a/cpp/src/strings/count_matches.cu b/cpp/src/strings/count_matches.cu index 6de5d43dc94..97ef7cd5161 100644 --- a/cpp/src/strings/count_matches.cu +++ b/cpp/src/strings/count_matches.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -#include -#include - #include #include #include +#include +#include + namespace cudf { namespace strings { namespace detail { diff --git a/cpp/src/strings/extract/extract.cu b/cpp/src/strings/extract/extract.cu index 9af1e54fe66..15a4209fe2b 100644 --- a/cpp/src/strings/extract/extract.cu +++ b/cpp/src/strings/extract/extract.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,6 @@ * limitations under the License. */ -#include -#include - #include #include #include @@ -30,13 +27,15 @@ #include +#include #include #include #include #include #include -#include +#include +#include namespace cudf { namespace strings { diff --git a/cpp/src/strings/extract/extract_all.cu b/cpp/src/strings/extract/extract_all.cu index 0c0d4ae4fbf..85a1610c978 100644 --- a/cpp/src/strings/extract/extract_all.cu +++ b/cpp/src/strings/extract/extract_all.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,6 @@ * limitations under the License. */ -#include -#include -#include - #include #include #include @@ -34,6 +30,10 @@ #include #include +#include +#include +#include + namespace cudf { namespace strings { namespace detail { diff --git a/cpp/src/strings/regex/regcomp.cpp b/cpp/src/strings/regex/regcomp.cpp index b7a7f19369d..e00ea4712e4 100644 --- a/cpp/src/strings/regex/regcomp.cpp +++ b/cpp/src/strings/regex/regcomp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -#include - #include #include #include +#include + #include #include #include diff --git a/cpp/src/strings/regex/regex.cuh b/cpp/src/strings/regex/regex.cuh index c1abbd78b43..dec0a79de4a 100644 --- a/cpp/src/strings/regex/regex.cuh +++ b/cpp/src/strings/regex/regex.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,18 +15,17 @@ */ #pragma once -#include - #include #include #include #include +#include #include #include -#include +#include #include diff --git a/cpp/src/strings/regex/regexec.cpp b/cpp/src/strings/regex/regexec.cpp index a82f035f61b..a8bd8b53f88 100644 --- a/cpp/src/strings/regex/regexec.cpp +++ b/cpp/src/strings/regex/regexec.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,6 @@ * limitations under the License. */ -#include -#include - #include #include #include @@ -24,6 +21,9 @@ #include #include +#include +#include + #include #include #include diff --git a/cpp/src/strings/regex/utilities.cuh b/cpp/src/strings/regex/utilities.cuh index bc8f5d68a4b..f60bd258d84 100644 --- a/cpp/src/strings/regex/utilities.cuh +++ b/cpp/src/strings/regex/utilities.cuh @@ -16,8 +16,6 @@ #pragma once -#include - #include #include #include @@ -28,6 +26,8 @@ #include +#include + #include namespace cudf { diff --git a/cpp/src/strings/replace/backref_re.cu b/cpp/src/strings/replace/backref_re.cu index edec525a913..ebe431802ed 100644 --- a/cpp/src/strings/replace/backref_re.cu +++ b/cpp/src/strings/replace/backref_re.cu @@ -16,9 +16,6 @@ #include "backref_re.cuh" -#include -#include - #include #include #include @@ -32,6 +29,9 @@ #include +#include +#include + #include namespace cudf { diff --git a/cpp/src/strings/replace/backref_re.cuh b/cpp/src/strings/replace/backref_re.cuh index aeaea40358f..0107ac9bd52 100644 --- a/cpp/src/strings/replace/backref_re.cuh +++ b/cpp/src/strings/replace/backref_re.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,8 +14,6 @@ * limitations under the License. */ -#include - #include #include #include @@ -27,6 +25,8 @@ #include #include +#include + namespace cudf { namespace strings { namespace detail { diff --git a/cpp/src/strings/replace/multi.cu b/cpp/src/strings/replace/multi.cu index 3d0210d61b0..ab35393651f 100644 --- a/cpp/src/strings/replace/multi.cu +++ b/cpp/src/strings/replace/multi.cu @@ -34,6 +34,7 @@ #include #include +#include #include #include #include @@ -45,8 +46,6 @@ #include #include -#include - namespace cudf { namespace strings { namespace detail { diff --git a/cpp/src/strings/replace/multi_re.cu b/cpp/src/strings/replace/multi_re.cu index c212d9f44ba..09ab9af725e 100644 --- a/cpp/src/strings/replace/multi_re.cu +++ b/cpp/src/strings/replace/multi_re.cu @@ -14,9 +14,6 @@ * limitations under the License. */ -#include -#include - #include #include #include @@ -37,6 +34,9 @@ #include #include +#include +#include + #include namespace cudf { diff --git a/cpp/src/strings/replace/replace.cu b/cpp/src/strings/replace/replace.cu index 936127f254b..d68ec84f68c 100644 --- a/cpp/src/strings/replace/replace.cu +++ b/cpp/src/strings/replace/replace.cu @@ -32,6 +32,7 @@ #include #include +#include #include #include #include @@ -45,8 +46,6 @@ #include #include -#include - namespace cudf { namespace strings { namespace detail { diff --git a/cpp/src/strings/replace/replace_re.cu b/cpp/src/strings/replace/replace_re.cu index 10d83932928..51e53e96992 100644 --- a/cpp/src/strings/replace/replace_re.cu +++ b/cpp/src/strings/replace/replace_re.cu @@ -14,9 +14,6 @@ * limitations under the License. */ -#include -#include - #include #include #include @@ -30,6 +27,9 @@ #include +#include +#include + namespace cudf { namespace strings { namespace detail { diff --git a/cpp/src/strings/search/find.cu b/cpp/src/strings/search/find.cu index 78343d58626..598d48157d9 100644 --- a/cpp/src/strings/search/find.cu +++ b/cpp/src/strings/search/find.cu @@ -31,6 +31,7 @@ #include #include +#include #include #include #include @@ -38,8 +39,6 @@ #include #include -#include - namespace cudf { namespace strings { namespace detail { diff --git a/cpp/src/strings/search/findall.cu b/cpp/src/strings/search/findall.cu index 8df1a67d56d..dd9674bc17d 100644 --- a/cpp/src/strings/search/findall.cu +++ b/cpp/src/strings/search/findall.cu @@ -14,10 +14,6 @@ * limitations under the License. */ -#include -#include -#include - #include #include #include @@ -34,6 +30,10 @@ #include +#include +#include +#include + namespace cudf { namespace strings { namespace detail { diff --git a/cpp/src/strings/split/split.cu b/cpp/src/strings/split/split.cu index fbab5220383..61e33fc0043 100644 --- a/cpp/src/strings/split/split.cu +++ b/cpp/src/strings/split/split.cu @@ -32,6 +32,7 @@ #include #include +#include #include #include #include @@ -39,8 +40,6 @@ #include #include -#include - namespace cudf { namespace strings { namespace detail { diff --git a/cpp/src/strings/split/split.cuh b/cpp/src/strings/split/split.cuh index 906c522e898..ce94791d55a 100644 --- a/cpp/src/strings/split/split.cuh +++ b/cpp/src/strings/split/split.cuh @@ -28,6 +28,7 @@ #include +#include #include #include #include @@ -36,8 +37,6 @@ #include #include -#include - namespace cudf::strings::detail { /** diff --git a/cpp/src/strings/split/split_re.cu b/cpp/src/strings/split/split_re.cu index d8385549840..68a68095814 100644 --- a/cpp/src/strings/split/split_re.cu +++ b/cpp/src/strings/split/split_re.cu @@ -14,10 +14,6 @@ * limitations under the License. */ -#include -#include -#include - #include #include #include @@ -36,6 +32,10 @@ #include #include +#include +#include +#include + namespace cudf { namespace strings { namespace detail { diff --git a/cpp/src/strings/split/split_record.cu b/cpp/src/strings/split/split_record.cu index c9ed7b0ed26..0971069592e 100644 --- a/cpp/src/strings/split/split_record.cu +++ b/cpp/src/strings/split/split_record.cu @@ -30,13 +30,12 @@ #include +#include #include #include #include #include -#include - namespace cudf { namespace strings { namespace detail { diff --git a/cpp/src/strings/utilities.cu b/cpp/src/strings/utilities.cu index 782d9767fb5..c3cf86b09fe 100644 --- a/cpp/src/strings/utilities.cu +++ b/cpp/src/strings/utilities.cu @@ -14,9 +14,6 @@ * limitations under the License. */ -#include -#include - #include #include #include @@ -31,6 +28,9 @@ #include #include +#include +#include + namespace cudf { namespace strings { namespace detail { diff --git a/cpp/src/structs/scan/scan_inclusive.cu b/cpp/src/structs/scan/scan_inclusive.cu index 823e4472960..6ac385dd355 100644 --- a/cpp/src/structs/scan/scan_inclusive.cu +++ b/cpp/src/structs/scan/scan_inclusive.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,8 +14,6 @@ * limitations under the License. */ -#include - #include #include #include @@ -28,6 +26,8 @@ #include #include +#include + #include namespace cudf { diff --git a/cpp/src/structs/structs_column_factories.cu b/cpp/src/structs/structs_column_factories.cu index 9e511c62d2a..d94a33ce9fb 100644 --- a/cpp/src/structs/structs_column_factories.cu +++ b/cpp/src/structs/structs_column_factories.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2022, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,6 +17,7 @@ #include #include #include + #include #include diff --git a/cpp/src/table/row_operators.cu b/cpp/src/table/row_operators.cu index 770a7c775b4..2010d6175bc 100644 --- a/cpp/src/table/row_operators.cu +++ b/cpp/src/table/row_operators.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,8 +14,6 @@ * limitations under the License. */ -#include - #include #include #include @@ -34,6 +32,8 @@ #include +#include + namespace cudf { namespace experimental { diff --git a/cpp/src/text/bpe/byte_pair_encoding.cu b/cpp/src/text/bpe/byte_pair_encoding.cu index 62d91054c14..9124e269cb4 100644 --- a/cpp/src/text/bpe/byte_pair_encoding.cu +++ b/cpp/src/text/bpe/byte_pair_encoding.cu @@ -14,10 +14,6 @@ * limitations under the License. */ -#include - -#include - #include #include #include @@ -32,6 +28,8 @@ #include #include +#include + #include #include @@ -45,6 +43,8 @@ #include #include +#include + namespace nvtext { /** diff --git a/cpp/src/text/bpe/byte_pair_encoding.cuh b/cpp/src/text/bpe/byte_pair_encoding.cuh index 1a3f8eadea0..b018295f227 100644 --- a/cpp/src/text/bpe/byte_pair_encoding.cuh +++ b/cpp/src/text/bpe/byte_pair_encoding.cuh @@ -16,8 +16,6 @@ #pragma once -#include - #include #include #include @@ -25,11 +23,12 @@ #include #include +#include + #include #include #include - #include #include #include diff --git a/cpp/src/text/bpe/load_merge_pairs.cu b/cpp/src/text/bpe/load_merge_pairs.cu index 3b630886b3e..eb04781689c 100644 --- a/cpp/src/text/bpe/load_merge_pairs.cu +++ b/cpp/src/text/bpe/load_merge_pairs.cu @@ -14,10 +14,6 @@ * limitations under the License. */ -#include - -#include - #include #include #include @@ -26,15 +22,19 @@ #include #include +#include + #include #include +#include + +#include + #include #include #include -#include - namespace nvtext { namespace detail { namespace { diff --git a/cpp/src/text/detokenize.cu b/cpp/src/text/detokenize.cu index 60625d6383a..a317739e4ca 100644 --- a/cpp/src/text/detokenize.cu +++ b/cpp/src/text/detokenize.cu @@ -14,8 +14,6 @@ * limitations under the License. */ -#include - #include #include #include @@ -30,6 +28,8 @@ #include #include +#include + #include #include diff --git a/cpp/src/text/edit_distance.cu b/cpp/src/text/edit_distance.cu index a1d97409987..606bebe2174 100644 --- a/cpp/src/text/edit_distance.cu +++ b/cpp/src/text/edit_distance.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,8 +14,6 @@ * limitations under the License. */ -#include - #include #include #include @@ -25,6 +23,8 @@ #include #include +#include + #include #include #include diff --git a/cpp/src/text/generate_ngrams.cu b/cpp/src/text/generate_ngrams.cu index 882d9a04501..433237bbf81 100644 --- a/cpp/src/text/generate_ngrams.cu +++ b/cpp/src/text/generate_ngrams.cu @@ -14,8 +14,6 @@ * limitations under the License. */ -#include - #include #include #include @@ -32,15 +30,16 @@ #include #include +#include + #include #include +#include #include #include #include -#include - namespace nvtext { namespace detail { namespace { diff --git a/cpp/src/text/jaccard.cu b/cpp/src/text/jaccard.cu index 1f453f60831..612eb52af01 100644 --- a/cpp/src/text/jaccard.cu +++ b/cpp/src/text/jaccard.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,6 @@ * limitations under the License. */ -#include -#include - #include #include #include @@ -28,16 +25,18 @@ #include #include +#include +#include + #include #include +#include #include #include #include #include -#include - namespace nvtext { namespace detail { namespace { diff --git a/cpp/src/text/minhash.cu b/cpp/src/text/minhash.cu index dcb59166cec..8d22c784584 100644 --- a/cpp/src/text/minhash.cu +++ b/cpp/src/text/minhash.cu @@ -14,8 +14,6 @@ * limitations under the License. */ -#include - #include #include #include @@ -31,16 +29,17 @@ #include #include +#include + #include #include +#include #include #include #include -#include - namespace nvtext { namespace detail { namespace { diff --git a/cpp/src/text/ngrams_tokenize.cu b/cpp/src/text/ngrams_tokenize.cu index 3444786ff80..210e0cfcd21 100644 --- a/cpp/src/text/ngrams_tokenize.cu +++ b/cpp/src/text/ngrams_tokenize.cu @@ -14,11 +14,6 @@ * limitations under the License. */ -#include - -#include -#include - #include #include #include @@ -31,15 +26,19 @@ #include #include +#include +#include + #include #include +#include #include #include #include #include -#include +#include namespace nvtext { namespace detail { diff --git a/cpp/src/text/normalize.cu b/cpp/src/text/normalize.cu index 6044689473c..2119b8ec463 100644 --- a/cpp/src/text/normalize.cu +++ b/cpp/src/text/normalize.cu @@ -14,12 +14,6 @@ * limitations under the License. */ -#include -#include -#include - -#include - #include #include #include @@ -35,6 +29,8 @@ #include #include +#include + #include #include @@ -42,6 +38,10 @@ #include #include +#include +#include +#include + #include namespace nvtext { diff --git a/cpp/src/text/replace.cu b/cpp/src/text/replace.cu index 50d7bbd077d..ac3c84f1ef0 100644 --- a/cpp/src/text/replace.cu +++ b/cpp/src/text/replace.cu @@ -14,11 +14,6 @@ * limitations under the License. */ -#include - -#include -#include - #include #include #include @@ -31,6 +26,9 @@ #include #include +#include +#include + #include #include @@ -38,6 +36,8 @@ #include #include +#include + namespace nvtext { namespace detail { namespace { diff --git a/cpp/src/text/stemmer.cu b/cpp/src/text/stemmer.cu index bdcb0b2af32..5c67b2e5f54 100644 --- a/cpp/src/text/stemmer.cu +++ b/cpp/src/text/stemmer.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,8 +14,6 @@ * limitations under the License. */ -#include - #include #include #include @@ -28,6 +26,8 @@ #include #include +#include + #include #include diff --git a/cpp/src/text/subword/data_normalizer.cu b/cpp/src/text/subword/data_normalizer.cu index a56d71cf951..8bf55eb99b4 100644 --- a/cpp/src/text/subword/data_normalizer.cu +++ b/cpp/src/text/subword/data_normalizer.cu @@ -14,9 +14,6 @@ * limitations under the License. */ -#include -#include - #include #include #include @@ -33,6 +30,9 @@ #include #include +#include +#include + namespace nvtext { namespace detail { namespace { diff --git a/cpp/src/text/subword/detail/data_normalizer.hpp b/cpp/src/text/subword/detail/data_normalizer.hpp index 897a0f31e15..93a60bf4cb0 100644 --- a/cpp/src/text/subword/detail/data_normalizer.hpp +++ b/cpp/src/text/subword/detail/data_normalizer.hpp @@ -16,14 +16,14 @@ #pragma once -#include - #include #include #include #include +#include + using uvector_pair = std::pair>, std::unique_ptr>>; diff --git a/cpp/src/text/subword/detail/tokenizer_utils.cuh b/cpp/src/text/subword/detail/tokenizer_utils.cuh index f2317518663..354ef46451e 100644 --- a/cpp/src/text/subword/detail/tokenizer_utils.cuh +++ b/cpp/src/text/subword/detail/tokenizer_utils.cuh @@ -16,13 +16,13 @@ #pragma once -#include - #include #include #include +#include + #include namespace nvtext { diff --git a/cpp/src/text/subword/detail/wordpiece_tokenizer.hpp b/cpp/src/text/subword/detail/wordpiece_tokenizer.hpp index 71e00c2e852..c9de07bfd3a 100644 --- a/cpp/src/text/subword/detail/wordpiece_tokenizer.hpp +++ b/cpp/src/text/subword/detail/wordpiece_tokenizer.hpp @@ -16,12 +16,12 @@ #pragma once -#include - #include #include +#include + namespace nvtext { struct hashed_vocabulary; diff --git a/cpp/src/text/subword/load_hash_file.cu b/cpp/src/text/subword/load_hash_file.cu index cb18d0e0ecf..ae9208ff81f 100644 --- a/cpp/src/text/subword/load_hash_file.cu +++ b/cpp/src/text/subword/load_hash_file.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,23 +14,23 @@ * limitations under the License. */ -#include -#include - -#include - #include #include #include #include #include +#include + #include #include #include #include +#include +#include + #include #include #include diff --git a/cpp/src/text/subword/subword_tokenize.cu b/cpp/src/text/subword/subword_tokenize.cu index 6d40882659a..77a8816d6b6 100644 --- a/cpp/src/text/subword/subword_tokenize.cu +++ b/cpp/src/text/subword/subword_tokenize.cu @@ -26,7 +26,6 @@ #include #include -#include #include #include @@ -37,6 +36,8 @@ #include #include +#include + namespace nvtext { namespace detail { namespace { diff --git a/cpp/src/text/subword/wordpiece_tokenizer.cu b/cpp/src/text/subword/wordpiece_tokenizer.cu index 6e0c324db7d..b6861ec43b9 100644 --- a/cpp/src/text/subword/wordpiece_tokenizer.cu +++ b/cpp/src/text/subword/wordpiece_tokenizer.cu @@ -14,13 +14,10 @@ * limitations under the License. */ -#include -#include -#include - #include #include #include + #include #include @@ -38,6 +35,10 @@ #include #include +#include +#include +#include + namespace nvtext { namespace detail { namespace { diff --git a/cpp/src/text/tokenize.cu b/cpp/src/text/tokenize.cu index 97896f20f4f..e85c9399844 100644 --- a/cpp/src/text/tokenize.cu +++ b/cpp/src/text/tokenize.cu @@ -14,11 +14,6 @@ * limitations under the License. */ -#include - -#include -#include - #include #include #include @@ -30,6 +25,9 @@ #include #include +#include +#include + #include #include #include @@ -40,6 +38,8 @@ #include #include +#include + namespace nvtext { namespace detail { namespace { diff --git a/cpp/src/text/vocabulary_tokenize.cu b/cpp/src/text/vocabulary_tokenize.cu index c6e90c6fcaa..82f2e79f493 100644 --- a/cpp/src/text/vocabulary_tokenize.cu +++ b/cpp/src/text/vocabulary_tokenize.cu @@ -14,10 +14,6 @@ * limitations under the License. */ -#include - -#include - #include #include #include @@ -35,10 +31,12 @@ #include #include +#include + #include +#include #include - #include #include #include @@ -46,7 +44,7 @@ #include #include -#include +#include namespace nvtext { namespace detail { diff --git a/cpp/src/transform/jit/kernel.cu b/cpp/src/transform/jit/kernel.cu index 1e913ecb5bb..2c3329e3ea9 100644 --- a/cpp/src/transform/jit/kernel.cu +++ b/cpp/src/transform/jit/kernel.cu @@ -15,20 +15,18 @@ */ // Include Jitify's cstddef header first -#include +#include +#include +#include #include #include #include #include -#include -#include - #include -#include -#include +#include namespace cudf { namespace transformation { diff --git a/cpp/src/transform/mask_to_bools.cu b/cpp/src/transform/mask_to_bools.cu index 1b9a58c4724..73c1a83cfe1 100644 --- a/cpp/src/transform/mask_to_bools.cu +++ b/cpp/src/transform/mask_to_bools.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2022, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,13 +22,13 @@ #include #include +#include +#include + #include #include #include -#include -#include - namespace cudf { namespace detail { std::unique_ptr mask_to_bools(bitmask_type const* bitmask, diff --git a/cpp/src/transform/one_hot_encode.cu b/cpp/src/transform/one_hot_encode.cu index c7bb40e3bcb..72f864346a4 100644 --- a/cpp/src/transform/one_hot_encode.cu +++ b/cpp/src/transform/one_hot_encode.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,12 +25,12 @@ #include #include -#include -#include - #include #include +#include +#include + #include namespace cudf { diff --git a/cpp/src/transform/row_bit_count.cu b/cpp/src/transform/row_bit_count.cu index a91dc8fbbc6..5d328f615bc 100644 --- a/cpp/src/transform/row_bit_count.cu +++ b/cpp/src/transform/row_bit_count.cu @@ -26,13 +26,13 @@ #include #include -#include -#include - #include #include #include +#include +#include + namespace cudf { namespace detail { diff --git a/cpp/src/transform/row_conversion.cu b/cpp/src/transform/row_conversion.cu index b294369a90e..361a3610afa 100644 --- a/cpp/src/transform/row_conversion.cu +++ b/cpp/src/transform/row_conversion.cu @@ -14,7 +14,6 @@ * limitations under the License. */ -#include #include #include #include @@ -32,15 +31,19 @@ #include #include #include + #include #include #include #include + +#include #include #include #include #include #include + #include #if defined(__CUDA_ARCH__) && __CUDA_ARCH__ >= 700 @@ -51,6 +54,8 @@ #include #endif // #if !defined(__CUDA_ARCH__) || defined(ASYNC_MEMCPY_SUPPORTED) +#include + #include #include #include @@ -60,8 +65,6 @@ #include #include -#include - namespace { constexpr auto JCUDF_ROW_ALIGNMENT = 8; diff --git a/cpp/src/transform/transform.cpp b/cpp/src/transform/transform.cpp index 53750679dbc..aae2c5bf729 100644 --- a/cpp/src/transform/transform.cpp +++ b/cpp/src/transform/transform.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,13 +23,12 @@ #include #include -#include +#include #include #include #include - -#include +#include namespace cudf { namespace transformation { diff --git a/cpp/src/utilities/logger.cpp b/cpp/src/utilities/logger.cpp index 91950850e3b..4bed18e83f1 100644 --- a/cpp/src/utilities/logger.cpp +++ b/cpp/src/utilities/logger.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,11 @@ * limitations under the License. */ +#include "spdlog/sinks/stdout_sinks.h" + #include #include -#include "spdlog/sinks/stdout_sinks.h" #include #include diff --git a/cpp/src/utilities/traits.cpp b/cpp/src/utilities/traits.cpp index b0078ff85a2..a68dc84e340 100644 --- a/cpp/src/utilities/traits.cpp +++ b/cpp/src/utilities/traits.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -#include - #include #include #include #include +#include + namespace cudf { namespace { diff --git a/cpp/tests/ast/transform_tests.cpp b/cpp/tests/ast/transform_tests.cpp index 01842969268..ef1d09e5652 100644 --- a/cpp/tests/ast/transform_tests.cpp +++ b/cpp/tests/ast/transform_tests.cpp @@ -14,6 +14,13 @@ * limitations under the License. */ +#include +#include +#include +#include +#include +#include + #include #include #include @@ -26,13 +33,6 @@ #include #include -#include -#include -#include -#include -#include -#include - #include #include diff --git a/cpp/tests/binaryop/util/operation.h b/cpp/tests/binaryop/util/operation.h index f14fe85059a..efebc02bc89 100644 --- a/cpp/tests/binaryop/util/operation.h +++ b/cpp/tests/binaryop/util/operation.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Copyright 2018-2019 BlazingDB, Inc. * Copyright 2018 Christian Noboa Mardini @@ -19,9 +19,10 @@ #pragma once +#include + #include #include -#include #include namespace cudf { diff --git a/cpp/tests/bitmask/bitmask_tests.cpp b/cpp/tests/bitmask/bitmask_tests.cpp index 1dd39c1c7ae..72ef88e4ed1 100644 --- a/cpp/tests/bitmask/bitmask_tests.cpp +++ b/cpp/tests/bitmask/bitmask_tests.cpp @@ -13,6 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include +#include +#include +#include +#include +#include + #include #include #include @@ -21,12 +28,6 @@ #include #include #include -#include -#include -#include -#include -#include -#include #include #include diff --git a/cpp/tests/bitmask/set_nullmask_tests.cu b/cpp/tests/bitmask/set_nullmask_tests.cu index 19e3202a6d7..e95c9fb41c6 100644 --- a/cpp/tests/bitmask/set_nullmask_tests.cu +++ b/cpp/tests/bitmask/set_nullmask_tests.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2022, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,9 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include -#include - #include #include @@ -31,6 +28,9 @@ #include #include +#include +#include + struct valid_bit_functor { cudf::bitmask_type const* _null_mask; __device__ bool operator()(cudf::size_type element_index) const noexcept diff --git a/cpp/tests/bitmask/valid_if_tests.cu b/cpp/tests/bitmask/valid_if_tests.cu index 164f8d77838..65143ec17f1 100644 --- a/cpp/tests/bitmask/valid_if_tests.cu +++ b/cpp/tests/bitmask/valid_if_tests.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,15 @@ * limitations under the License. */ -#include -#include -#include - #include #include #include #include +#include +#include +#include + #include struct ValidIfTest : public cudf::test::BaseFixture {}; diff --git a/cpp/tests/column/bit_cast_test.cpp b/cpp/tests/column/bit_cast_test.cpp index a6654bb6f29..ab230ab036e 100644 --- a/cpp/tests/column/bit_cast_test.cpp +++ b/cpp/tests/column/bit_cast_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,16 +14,16 @@ * limitations under the License. */ -#include -#include -#include - #include #include #include #include #include +#include +#include +#include + #include #include diff --git a/cpp/tests/column/column_view_device_span_test.cpp b/cpp/tests/column/column_view_device_span_test.cpp index 7daf6870eac..6de9121158b 100644 --- a/cpp/tests/column/column_view_device_span_test.cpp +++ b/cpp/tests/column/column_view_device_span_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,18 +14,18 @@ * limitations under the License. */ -#include -#include -#include -#include -#include - #include #include #include #include #include +#include +#include +#include +#include +#include + #include #include diff --git a/cpp/tests/column/column_view_shallow_test.cpp b/cpp/tests/column/column_view_shallow_test.cpp index 3e5650652e1..87187dfe57b 100644 --- a/cpp/tests/column/column_view_shallow_test.cpp +++ b/cpp/tests/column/column_view_shallow_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,17 +14,17 @@ * limitations under the License. */ -#include -#include -#include -#include - #include #include #include #include #include +#include +#include +#include +#include + #include #include diff --git a/cpp/tests/column/compound_test.cu b/cpp/tests/column/compound_test.cu index fc348284e09..d7e93fb22a3 100644 --- a/cpp/tests/column/compound_test.cu +++ b/cpp/tests/column/compound_test.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,14 @@ * limitations under the License. */ +#include +#include + #include #include #include #include #include -#include -#include #include #include diff --git a/cpp/tests/copying/purge_nonempty_nulls_tests.cpp b/cpp/tests/copying/purge_nonempty_nulls_tests.cpp index 8e652cb565a..4f28ff12941 100644 --- a/cpp/tests/copying/purge_nonempty_nulls_tests.cpp +++ b/cpp/tests/copying/purge_nonempty_nulls_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,6 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include +#include +#include +#include +#include + #include #include #include @@ -23,12 +29,6 @@ #include #include -#include -#include -#include -#include -#include - using cudf::test::iterators::no_nulls; using cudf::test::iterators::null_at; using cudf::test::iterators::nulls_at; diff --git a/cpp/tests/copying/slice_tests.cpp b/cpp/tests/copying/slice_tests.cpp index b7f00b49fe6..29ff3e1cf9b 100644 --- a/cpp/tests/copying/slice_tests.cpp +++ b/cpp/tests/copying/slice_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,7 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include +#include #include #include @@ -27,7 +22,12 @@ #include #include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/cpp/tests/copying/utility_tests.cpp b/cpp/tests/copying/utility_tests.cpp index f69bea2834f..0905f9babdc 100644 --- a/cpp/tests/copying/utility_tests.cpp +++ b/cpp/tests/copying/utility_tests.cpp @@ -14,11 +14,6 @@ * limitations under the License. */ -#include -#include -#include -#include -#include #include #include #include @@ -26,6 +21,12 @@ #include #include +#include +#include +#include +#include +#include + #include #include diff --git a/cpp/tests/datetime/datetime_ops_test.cpp b/cpp/tests/datetime/datetime_ops_test.cpp index b58cd0e0cb9..13577c4d0ea 100644 --- a/cpp/tests/datetime/datetime_ops_test.cpp +++ b/cpp/tests/datetime/datetime_ops_test.cpp @@ -14,12 +14,6 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include #include #include #include @@ -28,6 +22,13 @@ #include #include +#include +#include +#include +#include +#include +#include + #include #define XXX false // stub for null values diff --git a/cpp/tests/device_atomics/device_atomics_test.cu b/cpp/tests/device_atomics/device_atomics_test.cu index 6e90d4462df..0d846404ea2 100644 --- a/cpp/tests/device_atomics/device_atomics_test.cu +++ b/cpp/tests/device_atomics/device_atomics_test.cu @@ -14,18 +14,18 @@ * limitations under the License. */ -#include -#include -#include -#include -#include - #include #include #include #include #include +#include +#include +#include +#include +#include + #include #include diff --git a/cpp/tests/dictionary/add_keys_test.cpp b/cpp/tests/dictionary/add_keys_test.cpp index 32a6885df09..1314375f383 100644 --- a/cpp/tests/dictionary/add_keys_test.cpp +++ b/cpp/tests/dictionary/add_keys_test.cpp @@ -14,14 +14,15 @@ * limitations under the License. */ -#include -#include -#include #include #include #include #include +#include +#include +#include + #include struct DictionaryAddKeysTest : public cudf::test::BaseFixture {}; diff --git a/cpp/tests/dictionary/decode_test.cpp b/cpp/tests/dictionary/decode_test.cpp index 25ccb331756..33c8cb23110 100644 --- a/cpp/tests/dictionary/decode_test.cpp +++ b/cpp/tests/dictionary/decode_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,13 @@ * limitations under the License. */ -#include -#include #include #include #include +#include +#include + #include struct DictionaryDecodeTest : public cudf::test::BaseFixture {}; diff --git a/cpp/tests/dictionary/encode_test.cpp b/cpp/tests/dictionary/encode_test.cpp index 6b0b33d4e25..93c2ab4c0ef 100644 --- a/cpp/tests/dictionary/encode_test.cpp +++ b/cpp/tests/dictionary/encode_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,13 @@ * limitations under the License. */ -#include -#include #include #include #include +#include +#include + #include struct DictionaryEncodeTest : public cudf::test::BaseFixture {}; diff --git a/cpp/tests/dictionary/factories_test.cpp b/cpp/tests/dictionary/factories_test.cpp index 5db4bf98a24..35aa19c5558 100644 --- a/cpp/tests/dictionary/factories_test.cpp +++ b/cpp/tests/dictionary/factories_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,14 @@ * limitations under the License. */ -#include -#include -#include #include #include #include +#include +#include +#include + #include struct DictionaryFactoriesTest : public cudf::test::BaseFixture {}; diff --git a/cpp/tests/dictionary/fill_test.cpp b/cpp/tests/dictionary/fill_test.cpp index 60e57d96f97..7f2bb5496f3 100644 --- a/cpp/tests/dictionary/fill_test.cpp +++ b/cpp/tests/dictionary/fill_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,14 @@ * limitations under the License. */ +#include +#include +#include + #include #include #include #include -#include -#include -#include #include diff --git a/cpp/tests/dictionary/gather_test.cpp b/cpp/tests/dictionary/gather_test.cpp index 3267da794ee..8fd8751bc76 100644 --- a/cpp/tests/dictionary/gather_test.cpp +++ b/cpp/tests/dictionary/gather_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,14 @@ * limitations under the License. */ +#include +#include +#include + #include #include #include #include -#include -#include -#include #include diff --git a/cpp/tests/dictionary/remove_keys_test.cpp b/cpp/tests/dictionary/remove_keys_test.cpp index eb48c3e783f..13fe3efd0f4 100644 --- a/cpp/tests/dictionary/remove_keys_test.cpp +++ b/cpp/tests/dictionary/remove_keys_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,14 @@ * limitations under the License. */ +#include +#include +#include + #include #include #include #include -#include -#include -#include #include diff --git a/cpp/tests/dictionary/scatter_test.cpp b/cpp/tests/dictionary/scatter_test.cpp index 7030f1e716a..2a2841827d0 100644 --- a/cpp/tests/dictionary/scatter_test.cpp +++ b/cpp/tests/dictionary/scatter_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,15 @@ * limitations under the License. */ -#include -#include -#include #include #include #include #include +#include +#include +#include + #include struct DictionaryScatterTest : public cudf::test::BaseFixture {}; diff --git a/cpp/tests/dictionary/search_test.cpp b/cpp/tests/dictionary/search_test.cpp index 35972bac375..600d00ac186 100644 --- a/cpp/tests/dictionary/search_test.cpp +++ b/cpp/tests/dictionary/search_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,13 @@ * limitations under the License. */ -#include -#include #include #include #include +#include +#include + 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 9eb4b43b786..d0c37493cf8 100644 --- a/cpp/tests/dictionary/set_keys_test.cpp +++ b/cpp/tests/dictionary/set_keys_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,14 @@ * limitations under the License. */ -#include -#include -#include #include #include #include +#include +#include +#include + #include #include diff --git a/cpp/tests/dictionary/slice_test.cpp b/cpp/tests/dictionary/slice_test.cpp index 6446378b779..42bf7d488d2 100644 --- a/cpp/tests/dictionary/slice_test.cpp +++ b/cpp/tests/dictionary/slice_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,15 @@ * limitations under the License. */ +#include +#include +#include + #include #include #include #include #include -#include -#include -#include #include diff --git a/cpp/tests/encode/encode_tests.cpp b/cpp/tests/encode/encode_tests.cpp index 87818e16bb9..4f3463ef00d 100644 --- a/cpp/tests/encode/encode_tests.cpp +++ b/cpp/tests/encode/encode_tests.cpp @@ -13,8 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include -#include #include #include #include @@ -22,6 +20,9 @@ #include #include +#include +#include + template class EncodeNumericTests : public cudf::test::BaseFixture {}; diff --git a/cpp/tests/hash_map/map_test.cu b/cpp/tests/hash_map/map_test.cu index 0232696a123..f2b9688f3cc 100644 --- a/cpp/tests/hash_map/map_test.cu +++ b/cpp/tests/hash_map/map_test.cu @@ -18,8 +18,6 @@ #include #include -#include - #include #include @@ -30,6 +28,8 @@ #include #include +#include + #include #include #include diff --git a/cpp/tests/hashing/md5_test.cpp b/cpp/tests/hashing/md5_test.cpp index 9361c4e748c..081ab7978cd 100644 --- a/cpp/tests/hashing/md5_test.cpp +++ b/cpp/tests/hashing/md5_test.cpp @@ -14,14 +14,14 @@ * limitations under the License. */ -#include - #include #include #include #include #include +#include + constexpr cudf::test::debug_output_level verbosity{cudf::test::debug_output_level::ALL_ERRORS}; class MD5HashTest : public cudf::test::BaseFixture {}; diff --git a/cpp/tests/hashing/murmurhash3_x86_32_test.cpp b/cpp/tests/hashing/murmurhash3_x86_32_test.cpp index c3cc20c28b7..24524140e74 100644 --- a/cpp/tests/hashing/murmurhash3_x86_32_test.cpp +++ b/cpp/tests/hashing/murmurhash3_x86_32_test.cpp @@ -14,9 +14,6 @@ * limitations under the License. */ -#include -#include - #include #include #include @@ -24,6 +21,9 @@ #include #include +#include +#include + constexpr cudf::test::debug_output_level verbosity{cudf::test::debug_output_level::ALL_ERRORS}; class MurmurHashTest : public cudf::test::BaseFixture {}; diff --git a/cpp/tests/hashing/sha1_test.cpp b/cpp/tests/hashing/sha1_test.cpp index 31145e4c3c4..c3d0fe7450a 100644 --- a/cpp/tests/hashing/sha1_test.cpp +++ b/cpp/tests/hashing/sha1_test.cpp @@ -14,15 +14,15 @@ * limitations under the License. */ -#include -#include - #include #include #include #include #include +#include +#include + class SHA1HashTest : public cudf::test::BaseFixture {}; TEST_F(SHA1HashTest, EmptyTable) diff --git a/cpp/tests/hashing/sha224_test.cpp b/cpp/tests/hashing/sha224_test.cpp index 9aa1ee0fac2..def5e934177 100644 --- a/cpp/tests/hashing/sha224_test.cpp +++ b/cpp/tests/hashing/sha224_test.cpp @@ -14,15 +14,15 @@ * limitations under the License. */ -#include -#include - #include #include #include #include #include +#include +#include + class SHA224HashTest : public cudf::test::BaseFixture {}; TEST_F(SHA224HashTest, EmptyTable) diff --git a/cpp/tests/hashing/sha256_test.cpp b/cpp/tests/hashing/sha256_test.cpp index 4fed8c55fc2..410a99edd77 100644 --- a/cpp/tests/hashing/sha256_test.cpp +++ b/cpp/tests/hashing/sha256_test.cpp @@ -14,15 +14,15 @@ * limitations under the License. */ -#include -#include - #include #include #include #include #include +#include +#include + constexpr cudf::test::debug_output_level verbosity{cudf::test::debug_output_level::ALL_ERRORS}; class SHA256HashTest : public cudf::test::BaseFixture {}; diff --git a/cpp/tests/hashing/sha384_test.cpp b/cpp/tests/hashing/sha384_test.cpp index 49b9b5ef3a5..810fbc82d8e 100644 --- a/cpp/tests/hashing/sha384_test.cpp +++ b/cpp/tests/hashing/sha384_test.cpp @@ -14,15 +14,15 @@ * limitations under the License. */ -#include -#include - #include #include #include #include #include +#include +#include + class SHA384HashTest : public cudf::test::BaseFixture {}; TEST_F(SHA384HashTest, EmptyTable) diff --git a/cpp/tests/hashing/sha512_test.cpp b/cpp/tests/hashing/sha512_test.cpp index df0315099fb..93caa16c1c4 100644 --- a/cpp/tests/hashing/sha512_test.cpp +++ b/cpp/tests/hashing/sha512_test.cpp @@ -14,15 +14,15 @@ * limitations under the License. */ -#include -#include - #include #include #include #include #include +#include +#include + class SHA512HashTest : public cudf::test::BaseFixture {}; TEST_F(SHA512HashTest, EmptyTable) diff --git a/cpp/tests/hashing/spark_murmurhash3_x86_32_test.cpp b/cpp/tests/hashing/spark_murmurhash3_x86_32_test.cpp index c228c1e6378..e8bbfaa2cba 100644 --- a/cpp/tests/hashing/spark_murmurhash3_x86_32_test.cpp +++ b/cpp/tests/hashing/spark_murmurhash3_x86_32_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,16 +14,16 @@ * limitations under the License. */ -#include -#include -#include - #include #include #include #include #include +#include +#include +#include + constexpr cudf::test::debug_output_level verbosity{cudf::test::debug_output_level::ALL_ERRORS}; template diff --git a/cpp/tests/hashing/xxhash_64_test.cpp b/cpp/tests/hashing/xxhash_64_test.cpp index 5916c4c2fb9..ab4ed829681 100644 --- a/cpp/tests/hashing/xxhash_64_test.cpp +++ b/cpp/tests/hashing/xxhash_64_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,16 +14,16 @@ * limitations under the License. */ -#include -#include -#include - #include #include #include #include #include +#include +#include +#include + using NumericTypesNoBools = cudf::test::Concat; diff --git a/cpp/tests/interop/arrow_utils.hpp b/cpp/tests/interop/arrow_utils.hpp index 2c5f7458ce5..1fdf02e02f1 100644 --- a/cpp/tests/interop/arrow_utils.hpp +++ b/cpp/tests/interop/arrow_utils.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,11 @@ * limitations under the License. */ -#include +#include +#include +#include +#include +#include #include #include @@ -25,11 +29,8 @@ #include #include #include -#include -#include -#include -#include -#include + +#include #pragma once diff --git a/cpp/tests/interop/dlpack_test.cpp b/cpp/tests/interop/dlpack_test.cpp index ed44727b712..895887ee348 100644 --- a/cpp/tests/interop/dlpack_test.cpp +++ b/cpp/tests/interop/dlpack_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,17 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include #include #include #include #include #include -#include +#include #include +#include + struct dlpack_deleter { void operator()(DLManagedTensor* tensor) { tensor->deleter(tensor); } }; diff --git a/cpp/tests/interop/from_arrow_test.cpp b/cpp/tests/interop/from_arrow_test.cpp index a898106a5b2..94b0c75f184 100644 --- a/cpp/tests/interop/from_arrow_test.cpp +++ b/cpp/tests/interop/from_arrow_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,6 +14,14 @@ * limitations under the License. */ +#include + +#include +#include +#include +#include +#include + #include #include #include @@ -26,16 +34,8 @@ #include #include -#include -#include -#include -#include -#include - #include -#include - std::unique_ptr get_cudf_table() { std::vector> columns; diff --git a/cpp/tests/interop/to_arrow_test.cpp b/cpp/tests/interop/to_arrow_test.cpp index 82c4ad7d2f1..a1ece0ce0f1 100644 --- a/cpp/tests/interop/to_arrow_test.cpp +++ b/cpp/tests/interop/to_arrow_test.cpp @@ -14,6 +14,15 @@ * limitations under the License. */ +#include + +#include +#include +#include +#include +#include +#include + #include #include #include @@ -27,15 +36,6 @@ #include #include -#include -#include -#include -#include -#include -#include - -#include - #include using vector_of_columns = std::vector>; diff --git a/cpp/tests/io/comp/decomp_test.cpp b/cpp/tests/io/comp/decomp_test.cpp index cf5a4f1fda5..82d28e90f7b 100644 --- a/cpp/tests/io/comp/decomp_test.cpp +++ b/cpp/tests/io/comp/decomp_test.cpp @@ -14,18 +14,18 @@ * limitations under the License. */ -#include -#include -#include - -#include - #include #include +#include + #include #include +#include +#include +#include + #include using cudf::device_span; diff --git a/cpp/tests/io/csv_test.cpp b/cpp/tests/io/csv_test.cpp index c6e9114605b..8e3ecd817e4 100644 --- a/cpp/tests/io/csv_test.cpp +++ b/cpp/tests/io/csv_test.cpp @@ -34,13 +34,13 @@ #include #include -#include - #include #include #include #include +#include + #include #include #include diff --git a/cpp/tests/io/fst/fst_test.cu b/cpp/tests/io/fst/fst_test.cu index 4064204c56d..3ae4157e9f2 100644 --- a/cpp/tests/io/fst/fst_test.cu +++ b/cpp/tests/io/fst/fst_test.cu @@ -14,8 +14,6 @@ * limitations under the License. */ -#include -#include #include #include @@ -31,6 +29,9 @@ #include #include +#include +#include + #include #include diff --git a/cpp/tests/io/fst/logical_stack_test.cu b/cpp/tests/io/fst/logical_stack_test.cu index f434736d7f5..2fb1bd97071 100644 --- a/cpp/tests/io/fst/logical_stack_test.cu +++ b/cpp/tests/io/fst/logical_stack_test.cu @@ -18,13 +18,14 @@ #include #include -#include -#include #include #include #include +#include +#include + #include #include #include diff --git a/cpp/tests/io/json_quote_normalization_test.cpp b/cpp/tests/io/json_quote_normalization_test.cpp index 50faea5e4d8..b13e5bd4177 100644 --- a/cpp/tests/io/json_quote_normalization_test.cpp +++ b/cpp/tests/io/json_quote_normalization_test.cpp @@ -14,16 +14,16 @@ * limitations under the License. */ -#include -#include -#include - #include #include #include #include #include +#include +#include +#include + #include #include #include diff --git a/cpp/tests/io/json_test.cpp b/cpp/tests/io/json_test.cpp index 22c2f0de924..e4ed09d3962 100644 --- a/cpp/tests/io/json_test.cpp +++ b/cpp/tests/io/json_test.cpp @@ -35,12 +35,12 @@ #include #include -#include #include #include #include +#include #include #define wrapper cudf::test::fixed_width_column_wrapper diff --git a/cpp/tests/io/json_tree.cpp b/cpp/tests/io/json_tree.cpp index 40996e4fffa..ed7f4d577be 100644 --- a/cpp/tests/io/json_tree.cpp +++ b/cpp/tests/io/json_tree.cpp @@ -14,8 +14,10 @@ * limitations under the License. */ -#include -#include +#include +#include +#include +#include #include #include @@ -23,14 +25,12 @@ #include #include -#include -#include -#include -#include - #include #include +#include +#include + #include #include #include diff --git a/cpp/tests/io/json_type_cast_test.cu b/cpp/tests/io/json_type_cast_test.cu index 6923b7be42d..0aebedc7078 100644 --- a/cpp/tests/io/json_type_cast_test.cu +++ b/cpp/tests/io/json_type_cast_test.cu @@ -22,8 +22,6 @@ #include #include -#include - #include #include #include @@ -34,6 +32,8 @@ #include +#include + #include #include #include diff --git a/cpp/tests/io/json_whitespace_normalization_test.cu b/cpp/tests/io/json_whitespace_normalization_test.cu index ef4172b0ff7..77c8d53e062 100644 --- a/cpp/tests/io/json_whitespace_normalization_test.cu +++ b/cpp/tests/io/json_whitespace_normalization_test.cu @@ -13,22 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include -#include - -#include -#include - #include #include #include #include +#include +#include + #include #include #include +#include +#include + #include #include diff --git a/cpp/tests/io/nested_json_test.cpp b/cpp/tests/io/nested_json_test.cpp index 070ac5ce870..24f3e347a5f 100644 --- a/cpp/tests/io/nested_json_test.cpp +++ b/cpp/tests/io/nested_json_test.cpp @@ -14,17 +14,6 @@ * limitations under the License. */ -#include -#include - -#include -#include -#include -#include -#include -#include -#include - #include #include #include @@ -34,11 +23,22 @@ #include #include +#include +#include +#include +#include +#include +#include +#include + #include #include #include +#include +#include + #include namespace cuio_json = cudf::io::json; diff --git a/cpp/tests/io/orc_test.cpp b/cpp/tests/io/orc_test.cpp index f1a397f1747..0b34b39f739 100644 --- a/cpp/tests/io/orc_test.cpp +++ b/cpp/tests/io/orc_test.cpp @@ -34,6 +34,7 @@ #include #include #include + #include #include diff --git a/cpp/tests/io/parquet_chunked_reader_test.cu b/cpp/tests/io/parquet_chunked_reader_test.cu index dea44f0e7c3..ea6d65a8c14 100644 --- a/cpp/tests/io/parquet_chunked_reader_test.cu +++ b/cpp/tests/io/parquet_chunked_reader_test.cu @@ -40,13 +40,13 @@ #include #include -#include -#include +#include +#include #include -#include -#include +#include +#include #include #include diff --git a/cpp/tests/io/text/multibyte_split_test.cpp b/cpp/tests/io/text/multibyte_split_test.cpp index b207c3f15a6..989d659f0e4 100644 --- a/cpp/tests/io/text/multibyte_split_test.cpp +++ b/cpp/tests/io/text/multibyte_split_test.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#include - #include #include #include @@ -31,6 +29,8 @@ #include #include +#include + using cudf::test::strings_column_wrapper; // 😀 | F0 9F 98 80 | 11110000 10011111 10011000 10000000 // 😎 | F0 9F 98 8E | 11110000 10011111 10011000 10001110 diff --git a/cpp/tests/io/type_inference_test.cu b/cpp/tests/io/type_inference_test.cu index 3bb15a59aa3..b5f1dbb6055 100644 --- a/cpp/tests/io/type_inference_test.cu +++ b/cpp/tests/io/type_inference_test.cu @@ -14,13 +14,11 @@ * limitations under the License. */ -#include -#include +#include +#include #include #include -#include -#include #include #include @@ -28,6 +26,9 @@ #include #include +#include +#include + #include #include #include diff --git a/cpp/tests/iterator/iterator_tests.cuh b/cpp/tests/iterator/iterator_tests.cuh index 7a5a9eae91c..c6da6b75930 100644 --- a/cpp/tests/iterator/iterator_tests.cuh +++ b/cpp/tests/iterator/iterator_tests.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,6 +26,7 @@ #include #include +#include #include #include #include @@ -34,8 +35,6 @@ #include #include -#include - #include #include #include diff --git a/cpp/tests/iterator/value_iterator_test_chrono.cu b/cpp/tests/iterator/value_iterator_test_chrono.cu index 73796f589bb..03ca0e503e0 100644 --- a/cpp/tests/iterator/value_iterator_test_chrono.cu +++ b/cpp/tests/iterator/value_iterator_test_chrono.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,11 +12,11 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ +#include + #include #include -#include - using TestingTypes = cudf::test::ChronoTypes; template diff --git a/cpp/tests/iterator/value_iterator_test_numeric.cu b/cpp/tests/iterator/value_iterator_test_numeric.cu index 0d5ab6a857d..39e05ff6832 100644 --- a/cpp/tests/iterator/value_iterator_test_numeric.cu +++ b/cpp/tests/iterator/value_iterator_test_numeric.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,11 +12,11 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ +#include + #include #include -#include - using TestingTypes = cudf::test::NumericTypes; template diff --git a/cpp/tests/jit/parse_ptx_function.cpp b/cpp/tests/jit/parse_ptx_function.cpp index f6df2abc01a..f86cd32ca61 100644 --- a/cpp/tests/jit/parse_ptx_function.cpp +++ b/cpp/tests/jit/parse_ptx_function.cpp @@ -14,13 +14,14 @@ * limitations under the License. */ -#include -#include - #include #include + #include +#include +#include + struct JitParseTest : public ::testing::Test {}; TEST_F(JitParseTest, PTXNoFunction) diff --git a/cpp/tests/join/conditional_join_tests.cu b/cpp/tests/join/conditional_join_tests.cu index ad5a33157fd..79968bcd7f4 100644 --- a/cpp/tests/join/conditional_join_tests.cu +++ b/cpp/tests/join/conditional_join_tests.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,16 +14,16 @@ * limitations under the License. */ +#include +#include +#include + #include #include #include #include #include -#include -#include -#include - #include #include diff --git a/cpp/tests/join/cross_join_tests.cpp b/cpp/tests/join/cross_join_tests.cpp index 8fe8c449218..d87f5e54153 100644 --- a/cpp/tests/join/cross_join_tests.cpp +++ b/cpp/tests/join/cross_join_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,18 +14,18 @@ * limitations under the License. */ -#include -#include -#include -#include -#include - #include #include #include #include #include +#include +#include +#include +#include +#include + template using column_wrapper = cudf::test::fixed_width_column_wrapper; diff --git a/cpp/tests/join/join_tests.cpp b/cpp/tests/join/join_tests.cpp index 651e44511fb..b42f378d872 100644 --- a/cpp/tests/join/join_tests.cpp +++ b/cpp/tests/join/join_tests.cpp @@ -14,6 +14,14 @@ * limitations under the License. */ +#include +#include +#include +#include +#include +#include +#include + #include #include #include @@ -30,14 +38,6 @@ #include #include -#include -#include -#include -#include -#include -#include -#include - #include template diff --git a/cpp/tests/join/mixed_join_tests.cu b/cpp/tests/join/mixed_join_tests.cu index eb450d44efd..cc37dadffd8 100644 --- a/cpp/tests/join/mixed_join_tests.cu +++ b/cpp/tests/join/mixed_join_tests.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,16 +14,16 @@ * limitations under the License. */ +#include +#include +#include + #include #include #include #include #include -#include -#include -#include - #include #include #include diff --git a/cpp/tests/join/semi_anti_join_tests.cpp b/cpp/tests/join/semi_anti_join_tests.cpp index 0e0c92bc4a2..5cdf5b2a374 100644 --- a/cpp/tests/join/semi_anti_join_tests.cpp +++ b/cpp/tests/join/semi_anti_join_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,6 +14,12 @@ * limitations under the License. */ +#include +#include +#include +#include +#include + #include #include #include @@ -23,12 +29,6 @@ #include #include -#include -#include -#include -#include -#include - #include template diff --git a/cpp/tests/json/json_tests.cpp b/cpp/tests/json/json_tests.cpp index 548047f0410..0894472dcc3 100644 --- a/cpp/tests/json/json_tests.cpp +++ b/cpp/tests/json/json_tests.cpp @@ -14,15 +14,15 @@ * limitations under the License. */ +#include +#include +#include + #include #include #include #include -#include -#include -#include - #include // reference: https://jsonpath.herokuapp.com/ diff --git a/cpp/tests/labeling/label_bins_tests.cpp b/cpp/tests/labeling/label_bins_tests.cpp index 2356c7e5ce1..2ac6ad5dd0d 100644 --- a/cpp/tests/labeling/label_bins_tests.cpp +++ b/cpp/tests/labeling/label_bins_tests.cpp @@ -14,17 +14,18 @@ * limitations under the License. */ -#include -#include -#include -#include -#include #include #include #include #include #include +#include +#include +#include +#include +#include + #include #include #include diff --git a/cpp/tests/lists/contains_tests.cpp b/cpp/tests/lists/contains_tests.cpp index 62e6653347b..961437ba81e 100644 --- a/cpp/tests/lists/contains_tests.cpp +++ b/cpp/tests/lists/contains_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,17 +15,17 @@ * */ -#include -#include -#include -#include - #include #include #include #include #include +#include +#include +#include +#include + namespace { template (), void>* = nullptr> auto create_scalar_search_key(T const& value) diff --git a/cpp/tests/lists/count_elements_tests.cpp b/cpp/tests/lists/count_elements_tests.cpp index e099139a2fc..0933740b850 100644 --- a/cpp/tests/lists/count_elements_tests.cpp +++ b/cpp/tests/lists/count_elements_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -#include -#include - #include #include #include #include +#include +#include + #include #include diff --git a/cpp/tests/lists/sequences_tests.cpp b/cpp/tests/lists/sequences_tests.cpp index 9aed3428d69..e97600a76d3 100644 --- a/cpp/tests/lists/sequences_tests.cpp +++ b/cpp/tests/lists/sequences_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,8 +14,6 @@ * limitations under the License. */ -#include - #include #include #include @@ -23,6 +21,8 @@ #include #include +#include + using namespace cudf::test::iterators; namespace { 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 4d38dbce569..5625b47e7ea 100644 --- a/cpp/tests/lists/stream_compaction/apply_boolean_mask_tests.cpp +++ b/cpp/tests/lists/stream_compaction/apply_boolean_mask_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include -#include -#include -#include - #include #include #include #include #include +#include +#include +#include +#include + namespace cudf::test { using namespace iterators; diff --git a/cpp/tests/merge/merge_dictionary_test.cpp b/cpp/tests/merge/merge_dictionary_test.cpp index 5a5655e4720..55365cb972a 100644 --- a/cpp/tests/merge/merge_dictionary_test.cpp +++ b/cpp/tests/merge/merge_dictionary_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,17 +14,17 @@ * limitations under the License. */ +#include +#include +#include +#include + #include #include #include #include #include -#include -#include -#include -#include - #include struct MergeDictionaryTest : public cudf::test::BaseFixture {}; diff --git a/cpp/tests/merge/merge_string_test.cpp b/cpp/tests/merge/merge_string_test.cpp index 291167e0f9d..28179a7341c 100644 --- a/cpp/tests/merge/merge_string_test.cpp +++ b/cpp/tests/merge/merge_string_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,6 +14,12 @@ * limitations under the License. */ +#include +#include +#include +#include +#include + #include #include #include @@ -22,11 +28,7 @@ #include #include -#include -#include -#include -#include -#include +#include #include #include @@ -35,8 +37,6 @@ #include #include -#include - using cudf::test::fixed_width_column_wrapper; using cudf::test::strings_column_wrapper; diff --git a/cpp/tests/merge/merge_test.cpp b/cpp/tests/merge/merge_test.cpp index d73c3192549..2e09f25b51f 100644 --- a/cpp/tests/merge/merge_test.cpp +++ b/cpp/tests/merge/merge_test.cpp @@ -14,15 +14,6 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include -#include -#include - #include #include #include @@ -33,6 +24,15 @@ #include #include +#include +#include +#include +#include +#include +#include +#include +#include + #include #include diff --git a/cpp/tests/partitioning/hash_partition_test.cpp b/cpp/tests/partitioning/hash_partition_test.cpp index f1486a49bf9..a54a801bb75 100644 --- a/cpp/tests/partitioning/hash_partition_test.cpp +++ b/cpp/tests/partitioning/hash_partition_test.cpp @@ -13,11 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include -#include -#include -#include -#include #include #include #include @@ -26,6 +21,12 @@ #include #include +#include +#include +#include +#include +#include + #include #include diff --git a/cpp/tests/partitioning/round_robin_test.cpp b/cpp/tests/partitioning/round_robin_test.cpp index 7f83b5dafd0..8049c7c3a7a 100644 --- a/cpp/tests/partitioning/round_robin_test.cpp +++ b/cpp/tests/partitioning/round_robin_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,6 +14,12 @@ * limitations under the License. */ +#include +#include +#include +#include +#include + #include #include #include @@ -22,11 +28,7 @@ #include #include -#include -#include -#include -#include -#include +#include #include #include @@ -36,8 +38,6 @@ #include #include -#include - using cudf::test::fixed_width_column_wrapper; using cudf::test::strings_column_wrapper; diff --git a/cpp/tests/reductions/list_rank_test.cpp b/cpp/tests/reductions/list_rank_test.cpp index 68da95fbb12..f5aeb87a3c0 100644 --- a/cpp/tests/reductions/list_rank_test.cpp +++ b/cpp/tests/reductions/list_rank_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ +#include + #include #include #include -#include - #include #include #include diff --git a/cpp/tests/replace/clamp_test.cpp b/cpp/tests/replace/clamp_test.cpp index 74ee27137ed..bb33de1f1e7 100644 --- a/cpp/tests/replace/clamp_test.cpp +++ b/cpp/tests/replace/clamp_test.cpp @@ -14,11 +14,6 @@ * limitations under the License. */ -#include -#include -#include -#include - #include #include #include @@ -26,10 +21,15 @@ #include #include -#include +#include +#include +#include +#include #include +#include + struct ClampErrorTest : public cudf::test::BaseFixture {}; TEST_F(ClampErrorTest, MisMatchingScalarTypes) diff --git a/cpp/tests/replace/normalize_replace_tests.cpp b/cpp/tests/replace/normalize_replace_tests.cpp index 50736940520..2de17388ee8 100644 --- a/cpp/tests/replace/normalize_replace_tests.cpp +++ b/cpp/tests/replace/normalize_replace_tests.cpp @@ -14,13 +14,14 @@ * limitations under the License. */ -#include -#include #include #include #include #include +#include +#include + // This is the main test fixture struct ReplaceTest : public cudf::test::BaseFixture {}; diff --git a/cpp/tests/replace/replace_tests.cpp b/cpp/tests/replace/replace_tests.cpp index 8b953079d34..8685e7300ba 100644 --- a/cpp/tests/replace/replace_tests.cpp +++ b/cpp/tests/replace/replace_tests.cpp @@ -29,13 +29,14 @@ #include #include #include +#include #include #include -#include -#include #include + +#include #include #include diff --git a/cpp/tests/rolling/grouped_rolling_test.cpp b/cpp/tests/rolling/grouped_rolling_test.cpp index 7dd72ace53c..a4abe5ee608 100644 --- a/cpp/tests/rolling/grouped_rolling_test.cpp +++ b/cpp/tests/rolling/grouped_rolling_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,11 +28,12 @@ #include #include #include -#include #include #include +#include + const std::string cuda_func{ R"***( template diff --git a/cpp/tests/rolling/nth_element_test.cpp b/cpp/tests/rolling/nth_element_test.cpp index 4edbcf0d8a6..9cc8b6dec81 100644 --- a/cpp/tests/rolling/nth_element_test.cpp +++ b/cpp/tests/rolling/nth_element_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,13 +26,13 @@ #include #include -#include - #include #include #include +#include + #include #include diff --git a/cpp/tests/rolling/range_rolling_window_test.cpp b/cpp/tests/rolling/range_rolling_window_test.cpp index eed9db1fe04..fcd0cc18019 100644 --- a/cpp/tests/rolling/range_rolling_window_test.cpp +++ b/cpp/tests/rolling/range_rolling_window_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,13 +26,14 @@ #include #include #include -#include -#include #include #include #include +#include +#include + #include template diff --git a/cpp/tests/rolling/range_window_bounds_test.cpp b/cpp/tests/rolling/range_window_bounds_test.cpp index ceedda70075..b77451bf0bc 100644 --- a/cpp/tests/rolling/range_window_bounds_test.cpp +++ b/cpp/tests/rolling/range_window_bounds_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +22,7 @@ #include #include + #include #include diff --git a/cpp/tests/rolling/rolling_test.cpp b/cpp/tests/rolling/rolling_test.cpp index c0307000f5c..c2c22986975 100644 --- a/cpp/tests/rolling/rolling_test.cpp +++ b/cpp/tests/rolling/rolling_test.cpp @@ -33,12 +33,13 @@ #include #include #include -#include #include #include #include +#include + #include #include #include diff --git a/cpp/tests/scalar/scalar_device_view_test.cu b/cpp/tests/scalar/scalar_device_view_test.cu index 8444716bccd..5026954403b 100644 --- a/cpp/tests/scalar/scalar_device_view_test.cu +++ b/cpp/tests/scalar/scalar_device_view_test.cu @@ -14,6 +14,11 @@ * limitations under the License. */ +#include +#include +#include +#include + #include #include #include @@ -21,14 +26,11 @@ #include #include #include -#include -#include -#include -#include -#include #include +#include + template struct TypedScalarDeviceViewTest : public cudf::test::BaseFixture {}; diff --git a/cpp/tests/stream_compaction/apply_boolean_mask_tests.cpp b/cpp/tests/stream_compaction/apply_boolean_mask_tests.cpp index cb7d11dab35..6c0582fb846 100644 --- a/cpp/tests/stream_compaction/apply_boolean_mask_tests.cpp +++ b/cpp/tests/stream_compaction/apply_boolean_mask_tests.cpp @@ -14,6 +14,14 @@ * limitations under the License. */ +#include +#include +#include +#include +#include +#include +#include + #include #include #include @@ -22,13 +30,6 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include #include #include diff --git a/cpp/tests/stream_compaction/distinct_count_tests.cpp b/cpp/tests/stream_compaction/distinct_count_tests.cpp index 864ac8f84c6..ee0ca3f86c1 100644 --- a/cpp/tests/stream_compaction/distinct_count_tests.cpp +++ b/cpp/tests/stream_compaction/distinct_count_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,6 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include - #include #include #include @@ -28,6 +21,13 @@ #include #include +#include +#include +#include +#include +#include +#include + #include #include diff --git a/cpp/tests/stream_compaction/drop_nans_tests.cpp b/cpp/tests/stream_compaction/drop_nans_tests.cpp index bce8b19802c..425d9a47ecc 100644 --- a/cpp/tests/stream_compaction/drop_nans_tests.cpp +++ b/cpp/tests/stream_compaction/drop_nans_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,18 +14,20 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include #include #include #include #include #include +#include +#include +#include +#include +#include + +#include + 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 bff56eb5b81..47aa2d8ee3e 100644 --- a/cpp/tests/stream_compaction/drop_nulls_tests.cpp +++ b/cpp/tests/stream_compaction/drop_nulls_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,17 +14,18 @@ * limitations under the License. */ -#include -#include -#include -#include -#include #include #include #include #include #include +#include +#include +#include +#include +#include + #include #include diff --git a/cpp/tests/stream_compaction/unique_count_tests.cpp b/cpp/tests/stream_compaction/unique_count_tests.cpp index af0b45b97e3..640d159fc4f 100644 --- a/cpp/tests/stream_compaction/unique_count_tests.cpp +++ b/cpp/tests/stream_compaction/unique_count_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,6 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include - #include #include #include @@ -28,6 +21,13 @@ #include #include +#include +#include +#include +#include +#include +#include + #include #include diff --git a/cpp/tests/stream_compaction/unique_tests.cpp b/cpp/tests/stream_compaction/unique_tests.cpp index d64c6f589db..01f5f4d39db 100644 --- a/cpp/tests/stream_compaction/unique_tests.cpp +++ b/cpp/tests/stream_compaction/unique_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,6 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include - #include #include #include @@ -28,6 +21,13 @@ #include #include +#include +#include +#include +#include +#include +#include + #include #include diff --git a/cpp/tests/streams/binaryop_test.cpp b/cpp/tests/streams/binaryop_test.cpp index 2520aed0458..2a7b52b1b6b 100644 --- a/cpp/tests/streams/binaryop_test.cpp +++ b/cpp/tests/streams/binaryop_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,14 @@ #include -#include -#include -#include - #include #include #include +#include +#include +#include + class BinaryopTest : public cudf::test::BaseFixture {}; TEST_F(BinaryopTest, ColumnColumn) diff --git a/cpp/tests/streams/concatenate_test.cpp b/cpp/tests/streams/concatenate_test.cpp index 6e6ff58686f..648fb01a636 100644 --- a/cpp/tests/streams/concatenate_test.cpp +++ b/cpp/tests/streams/concatenate_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -#include - #include #include #include +#include + class ConcatenateTest : public cudf::test::BaseFixture {}; TEST_F(ConcatenateTest, Column) diff --git a/cpp/tests/streams/dictionary_test.cpp b/cpp/tests/streams/dictionary_test.cpp index f48e64c078e..9e81c8574b8 100644 --- a/cpp/tests/streams/dictionary_test.cpp +++ b/cpp/tests/streams/dictionary_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,16 +14,16 @@ * limitations under the License. */ +#include +#include +#include + #include #include #include #include #include -#include -#include -#include - class DictionaryTest : public cudf::test::BaseFixture {}; TEST_F(DictionaryTest, Encode) diff --git a/cpp/tests/streams/filling_test.cpp b/cpp/tests/streams/filling_test.cpp index b822743d4ca..d8d48fe6557 100644 --- a/cpp/tests/streams/filling_test.cpp +++ b/cpp/tests/streams/filling_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -#include -#include -#include - #include #include #include +#include +#include +#include + class FillingTest : public cudf::test::BaseFixture {}; TEST_F(FillingTest, FillInPlace) diff --git a/cpp/tests/streams/hash_test.cpp b/cpp/tests/streams/hash_test.cpp index 0f60c506abe..eb33457e486 100644 --- a/cpp/tests/streams/hash_test.cpp +++ b/cpp/tests/streams/hash_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -#include - #include #include #include +#include + class HashTest : public cudf::test::BaseFixture {}; TEST_F(HashTest, MultiValue) diff --git a/cpp/tests/streams/interop_test.cpp b/cpp/tests/streams/interop_test.cpp index 7eac9e016eb..cf620749d8f 100644 --- a/cpp/tests/streams/interop_test.cpp +++ b/cpp/tests/streams/interop_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -#include -#include -#include - #include #include #include +#include +#include +#include + struct ArrowTest : public cudf::test::BaseFixture {}; TEST_F(ArrowTest, ToArrow) diff --git a/cpp/tests/streams/io/csv_test.cpp b/cpp/tests/streams/io/csv_test.cpp index d227446ba94..6e27db02d56 100644 --- a/cpp/tests/streams/io/csv_test.cpp +++ b/cpp/tests/streams/io/csv_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,17 +14,17 @@ * limitations under the License. */ +#include +#include +#include +#include + #include #include #include #include #include -#include -#include -#include -#include - #include #include diff --git a/cpp/tests/streams/io/json_test.cpp b/cpp/tests/streams/io/json_test.cpp index 80619d4d58c..21da19a5a38 100644 --- a/cpp/tests/streams/io/json_test.cpp +++ b/cpp/tests/streams/io/json_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,17 +14,17 @@ * limitations under the License. */ +#include +#include +#include +#include + #include #include #include #include #include -#include -#include -#include -#include - #include #include diff --git a/cpp/tests/streams/io/orc_test.cpp b/cpp/tests/streams/io/orc_test.cpp index 929c3697b3b..57e36d13224 100644 --- a/cpp/tests/streams/io/orc_test.cpp +++ b/cpp/tests/streams/io/orc_test.cpp @@ -14,6 +14,11 @@ * limitations under the License. */ +#include +#include +#include +#include + #include #include #include @@ -22,11 +27,6 @@ #include #include -#include -#include -#include -#include - #include #include #include diff --git a/cpp/tests/streams/io/parquet_test.cpp b/cpp/tests/streams/io/parquet_test.cpp index c6d531bc376..f6bb2cf4336 100644 --- a/cpp/tests/streams/io/parquet_test.cpp +++ b/cpp/tests/streams/io/parquet_test.cpp @@ -14,17 +14,17 @@ * limitations under the License. */ +#include +#include +#include +#include + #include #include #include #include #include -#include -#include -#include -#include - #include #include diff --git a/cpp/tests/streams/labeling_bins_test.cpp b/cpp/tests/streams/labeling_bins_test.cpp index a1d3983aacc..c7dc49436b0 100644 --- a/cpp/tests/streams/labeling_bins_test.cpp +++ b/cpp/tests/streams/labeling_bins_test.cpp @@ -14,12 +14,12 @@ * limitations under the License. */ -#include - #include #include #include +#include + class LabelingBinsStreamTest : public cudf::test::BaseFixture {}; TEST_F(LabelingBinsStreamTest, SimpleStringsTest) diff --git a/cpp/tests/streams/null_mask_test.cpp b/cpp/tests/streams/null_mask_test.cpp index 7e59201c8cf..e96224003f4 100644 --- a/cpp/tests/streams/null_mask_test.cpp +++ b/cpp/tests/streams/null_mask_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,14 @@ #include -#include -#include -#include - #include #include #include +#include +#include +#include + class NullMaskTest : public cudf::test::BaseFixture {}; TEST_F(NullMaskTest, CreateNullMask) diff --git a/cpp/tests/streams/pool_test.cu b/cpp/tests/streams/pool_test.cu index 52debe24fe8..92aa43b101a 100644 --- a/cpp/tests/streams/pool_test.cu +++ b/cpp/tests/streams/pool_test.cu @@ -18,6 +18,7 @@ #include #include + #include class StreamPoolTest : public cudf::test::BaseFixture {}; diff --git a/cpp/tests/streams/replace_test.cpp b/cpp/tests/streams/replace_test.cpp index c794f99b6f6..25293db4347 100644 --- a/cpp/tests/streams/replace_test.cpp +++ b/cpp/tests/streams/replace_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,15 @@ * limitations under the License. */ -#include -#include -#include - #include #include #include #include +#include +#include +#include + class ReplaceTest : public cudf::test::BaseFixture {}; TEST_F(ReplaceTest, ReplaceNullsColumn) diff --git a/cpp/tests/streams/search_test.cpp b/cpp/tests/streams/search_test.cpp index fbe17fb0cc4..d0249b0a45e 100644 --- a/cpp/tests/streams/search_test.cpp +++ b/cpp/tests/streams/search_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -#include -#include -#include - #include #include #include +#include +#include +#include + class SearchTest : public cudf::test::BaseFixture {}; TEST_F(SearchTest, LowerBound) diff --git a/cpp/tests/streams/sorting_test.cpp b/cpp/tests/streams/sorting_test.cpp index e481f95bded..ae0e293c8e6 100644 --- a/cpp/tests/streams/sorting_test.cpp +++ b/cpp/tests/streams/sorting_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -#include -#include - #include #include #include +#include +#include + class SortingTest : public cudf::test::BaseFixture {}; TEST_F(SortingTest, SortedOrder) diff --git a/cpp/tests/streams/strings/case_test.cpp b/cpp/tests/streams/strings/case_test.cpp index df3eabd773a..4852e8e1c7b 100644 --- a/cpp/tests/streams/strings/case_test.cpp +++ b/cpp/tests/streams/strings/case_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -#include -#include - #include #include #include +#include +#include + class StringsCaseTest : public cudf::test::BaseFixture {}; TEST_F(StringsCaseTest, LowerUpper) diff --git a/cpp/tests/streams/strings/filter_test.cpp b/cpp/tests/streams/strings/filter_test.cpp index 3c44eb81380..53ebe4e0b0d 100644 --- a/cpp/tests/streams/strings/filter_test.cpp +++ b/cpp/tests/streams/strings/filter_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -#include -#include - #include #include #include +#include +#include + #include #include diff --git a/cpp/tests/streams/strings/find_test.cpp b/cpp/tests/streams/strings/find_test.cpp index b734a1738cc..52839c6fc9f 100644 --- a/cpp/tests/streams/strings/find_test.cpp +++ b/cpp/tests/streams/strings/find_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,15 @@ * limitations under the License. */ +#include +#include +#include + #include #include #include #include -#include -#include -#include - #include class StringsFindTest : public cudf::test::BaseFixture {}; diff --git a/cpp/tests/streams/strings/reverse_test.cpp b/cpp/tests/streams/strings/reverse_test.cpp index 83dcf24594e..4b4d0a7aff5 100644 --- a/cpp/tests/streams/strings/reverse_test.cpp +++ b/cpp/tests/streams/strings/reverse_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -#include - #include #include #include +#include + #include #include diff --git a/cpp/tests/streams/strings/strings_tests.cpp b/cpp/tests/streams/strings/strings_tests.cpp index 0db467a6895..482d39e866b 100644 --- a/cpp/tests/streams/strings/strings_tests.cpp +++ b/cpp/tests/streams/strings/strings_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,15 @@ * limitations under the License. */ +#include +#include +#include + #include #include #include #include -#include -#include -#include - #include class StringsTest : public cudf::test::BaseFixture {}; diff --git a/cpp/tests/streams/text/edit_distance_test.cpp b/cpp/tests/streams/text/edit_distance_test.cpp index 59206c39e69..a4545ca577f 100644 --- a/cpp/tests/streams/text/edit_distance_test.cpp +++ b/cpp/tests/streams/text/edit_distance_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -#include - #include #include #include +#include + class TextEditDistanceTest : public cudf::test::BaseFixture {}; TEST_F(TextEditDistanceTest, EditDistance) diff --git a/cpp/tests/streams/text/ngrams_test.cpp b/cpp/tests/streams/text/ngrams_test.cpp index bce0d2b680b..221c0a62f3e 100644 --- a/cpp/tests/streams/text/ngrams_test.cpp +++ b/cpp/tests/streams/text/ngrams_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -#include -#include - #include #include #include +#include +#include + class TextNGramsTest : public cudf::test::BaseFixture {}; TEST_F(TextNGramsTest, GenerateNgrams) diff --git a/cpp/tests/streams/text/stemmer_test.cpp b/cpp/tests/streams/text/stemmer_test.cpp index 7aa51befa73..03ed6ec5a72 100644 --- a/cpp/tests/streams/text/stemmer_test.cpp +++ b/cpp/tests/streams/text/stemmer_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -#include - #include #include #include +#include + class TextStemmerTest : public cudf::test::BaseFixture {}; TEST_F(TextStemmerTest, IsLetter) diff --git a/cpp/tests/streams/text/tokenize_test.cpp b/cpp/tests/streams/text/tokenize_test.cpp index b281fbc2c0c..619aaeeaeab 100644 --- a/cpp/tests/streams/text/tokenize_test.cpp +++ b/cpp/tests/streams/text/tokenize_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -#include - #include #include #include +#include + class TextTokenizeTest : public cudf::test::BaseFixture {}; TEST_F(TextTokenizeTest, Tokenize) diff --git a/cpp/tests/streams/unary_test.cpp b/cpp/tests/streams/unary_test.cpp index 1734c0c4e9f..15f04df70d3 100644 --- a/cpp/tests/streams/unary_test.cpp +++ b/cpp/tests/streams/unary_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -#include - #include #include #include +#include + class UnaryTest : public cudf::test::BaseFixture {}; TEST_F(UnaryTest, UnaryOperation) diff --git a/cpp/tests/strings/attrs_tests.cpp b/cpp/tests/strings/attrs_tests.cpp index c5f38697f00..93fe5142f00 100644 --- a/cpp/tests/strings/attrs_tests.cpp +++ b/cpp/tests/strings/attrs_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -#include -#include -#include - #include #include #include +#include +#include +#include + #include #include diff --git a/cpp/tests/strings/chars_types_tests.cpp b/cpp/tests/strings/chars_types_tests.cpp index c595977c269..fbc059186a8 100644 --- a/cpp/tests/strings/chars_types_tests.cpp +++ b/cpp/tests/strings/chars_types_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,14 @@ * limitations under the License. */ -#include -#include -#include #include #include #include +#include +#include +#include + #include #include diff --git a/cpp/tests/strings/combine/join_list_elements_tests.cpp b/cpp/tests/strings/combine/join_list_elements_tests.cpp index 4637113ca33..00317146088 100644 --- a/cpp/tests/strings/combine/join_list_elements_tests.cpp +++ b/cpp/tests/strings/combine/join_list_elements_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,16 +14,16 @@ * limitations under the License. */ -#include -#include -#include -#include - #include #include #include #include +#include +#include +#include +#include + using namespace cudf::test::iterators; struct StringsListsConcatenateTest : public cudf::test::BaseFixture {}; diff --git a/cpp/tests/strings/durations_tests.cpp b/cpp/tests/strings/durations_tests.cpp index 1902f907f43..86189b29981 100644 --- a/cpp/tests/strings/durations_tests.cpp +++ b/cpp/tests/strings/durations_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,6 +23,7 @@ #include #include + #include struct StringsDurationsTest : public cudf::test::BaseFixture {}; diff --git a/cpp/tests/strings/find_multiple_tests.cpp b/cpp/tests/strings/find_multiple_tests.cpp index 986f86d2b49..57cba495ba0 100644 --- a/cpp/tests/strings/find_multiple_tests.cpp +++ b/cpp/tests/strings/find_multiple_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,15 @@ * limitations under the License. */ +#include +#include +#include + #include #include #include #include -#include -#include -#include - #include #include diff --git a/cpp/tests/strings/find_tests.cpp b/cpp/tests/strings/find_tests.cpp index 3f291e870c0..7f89cc9fb53 100644 --- a/cpp/tests/strings/find_tests.cpp +++ b/cpp/tests/strings/find_tests.cpp @@ -14,6 +14,10 @@ * limitations under the License. */ +#include +#include +#include + #include #include #include @@ -21,10 +25,6 @@ #include #include -#include -#include -#include - #include #include diff --git a/cpp/tests/strings/like_tests.cpp b/cpp/tests/strings/like_tests.cpp index 50d8edfd646..4352a1ed584 100644 --- a/cpp/tests/strings/like_tests.cpp +++ b/cpp/tests/strings/like_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -#include -#include - #include #include #include +#include +#include + struct StringsLikeTests : public cudf::test::BaseFixture {}; TEST_F(StringsLikeTests, Basic) diff --git a/cpp/tests/structs/structs_column_tests.cpp b/cpp/tests/structs/structs_column_tests.cpp index fb25c67b763..8f492a930a8 100644 --- a/cpp/tests/structs/structs_column_tests.cpp +++ b/cpp/tests/structs/structs_column_tests.cpp @@ -14,6 +14,13 @@ * limitations under the License. */ +#include +#include +#include +#include +#include +#include + #include #include #include @@ -26,20 +33,13 @@ #include #include -#include -#include -#include -#include -#include -#include +#include #include #include #include #include -#include - #include #include #include diff --git a/cpp/tests/structs/utilities_tests.cpp b/cpp/tests/structs/utilities_tests.cpp index 6ecc03b9222..00f7d636530 100644 --- a/cpp/tests/structs/utilities_tests.cpp +++ b/cpp/tests/structs/utilities_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,6 +15,7 @@ */ #include "cudf_test/default_stream.hpp" + #include #include #include diff --git a/cpp/tests/table/row_operators_tests.cpp b/cpp/tests/table/row_operators_tests.cpp index d37c14fd858..974e7d67658 100644 --- a/cpp/tests/table/row_operators_tests.cpp +++ b/cpp/tests/table/row_operators_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,16 @@ * limitations under the License. */ -#include -#include -#include -#include #include #include #include #include +#include +#include +#include +#include + #include struct RowOperatorTestForNAN : public cudf::test::BaseFixture {}; diff --git a/cpp/tests/table/table_tests.cpp b/cpp/tests/table/table_tests.cpp index 0d6b870c33b..1637ba7d7d3 100644 --- a/cpp/tests/table/table_tests.cpp +++ b/cpp/tests/table/table_tests.cpp @@ -14,18 +14,18 @@ * limitations under the License. */ -#include -#include -#include -#include -#include - #include #include #include #include #include +#include +#include +#include +#include +#include + #include #include diff --git a/cpp/tests/text/bpe_tests.cpp b/cpp/tests/text/bpe_tests.cpp index a13b61e0ba4..b03df12c5ed 100644 --- a/cpp/tests/text/bpe_tests.cpp +++ b/cpp/tests/text/bpe_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,8 +14,6 @@ * limitations under the License. */ -#include - #include #include #include @@ -24,6 +22,8 @@ #include #include +#include + struct TextBytePairEncoding : public cudf::test::BaseFixture {}; TEST_F(TextBytePairEncoding, BytePairEncoding) diff --git a/cpp/tests/text/edit_distance_tests.cpp b/cpp/tests/text/edit_distance_tests.cpp index 837a4eb8de4..04b28460d23 100644 --- a/cpp/tests/text/edit_distance_tests.cpp +++ b/cpp/tests/text/edit_distance_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,15 @@ * limitations under the License. */ -#include -#include -#include - #include #include #include +#include +#include + +#include + #include #include diff --git a/cpp/tests/text/jaccard_tests.cpp b/cpp/tests/text/jaccard_tests.cpp index 987de316e7f..a0aee594609 100644 --- a/cpp/tests/text/jaccard_tests.cpp +++ b/cpp/tests/text/jaccard_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,10 +18,10 @@ #include #include -#include - #include +#include + struct JaccardTest : public cudf::test::BaseFixture {}; TEST_F(JaccardTest, Basic) diff --git a/cpp/tests/text/minhash_tests.cpp b/cpp/tests/text/minhash_tests.cpp index b1c961ec9e1..7575a3ba846 100644 --- a/cpp/tests/text/minhash_tests.cpp +++ b/cpp/tests/text/minhash_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,12 +19,12 @@ #include #include -#include - #include #include #include +#include + #include #include diff --git a/cpp/tests/text/ngrams_tokenize_tests.cpp b/cpp/tests/text/ngrams_tokenize_tests.cpp index c6fb886f7e5..998bddedd18 100644 --- a/cpp/tests/text/ngrams_tokenize_tests.cpp +++ b/cpp/tests/text/ngrams_tokenize_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,15 @@ * limitations under the License. */ +#include +#include +#include + #include #include #include -#include -#include -#include -#include +#include #include diff --git a/cpp/tests/text/normalize_tests.cpp b/cpp/tests/text/normalize_tests.cpp index 5fa3bb24f24..bf619bf49bc 100644 --- a/cpp/tests/text/normalize_tests.cpp +++ b/cpp/tests/text/normalize_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,15 @@ * limitations under the License. */ +#include +#include +#include + #include #include #include #include -#include -#include -#include - #include #include diff --git a/cpp/tests/text/replace_tests.cpp b/cpp/tests/text/replace_tests.cpp index f798d596a3c..8c58c6bcaca 100644 --- a/cpp/tests/text/replace_tests.cpp +++ b/cpp/tests/text/replace_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -#include -#include -#include - #include #include #include +#include +#include +#include + #include #include diff --git a/cpp/tests/text/stemmer_tests.cpp b/cpp/tests/text/stemmer_tests.cpp index 939d2f1cd2f..bbc145e0fe7 100644 --- a/cpp/tests/text/stemmer_tests.cpp +++ b/cpp/tests/text/stemmer_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -#include -#include -#include - #include #include #include +#include +#include +#include + #include #include diff --git a/cpp/tests/text/subword_tests.cpp b/cpp/tests/text/subword_tests.cpp index 4db289ac5b8..5a347e5fe68 100644 --- a/cpp/tests/text/subword_tests.cpp +++ b/cpp/tests/text/subword_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -#include -#include -#include - #include #include #include +#include +#include +#include + #include #include diff --git a/cpp/tests/text/tokenize_tests.cpp b/cpp/tests/text/tokenize_tests.cpp index ea36e13de6f..6a6bcda87cc 100644 --- a/cpp/tests/text/tokenize_tests.cpp +++ b/cpp/tests/text/tokenize_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,12 +19,12 @@ #include #include -#include - #include #include #include +#include + #include #include diff --git a/cpp/tests/transform/bools_to_mask_test.cpp b/cpp/tests/transform/bools_to_mask_test.cpp index ce8ed9285fe..215ca158f37 100644 --- a/cpp/tests/transform/bools_to_mask_test.cpp +++ b/cpp/tests/transform/bools_to_mask_test.cpp @@ -14,17 +14,17 @@ * limitations under the License. */ +#include +#include +#include +#include + #include #include #include #include #include -#include -#include -#include -#include - #include struct MaskToNullTest : public cudf::test::BaseFixture { diff --git a/cpp/tests/transform/nans_to_null_test.cpp b/cpp/tests/transform/nans_to_null_test.cpp index 2de06641c7f..5dcfe18b7a0 100644 --- a/cpp/tests/transform/nans_to_null_test.cpp +++ b/cpp/tests/transform/nans_to_null_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,16 @@ * limitations under the License. */ -#include -#include -#include -#include #include #include #include #include +#include +#include +#include +#include + template struct NaNsToNullTest : public cudf::test::BaseFixture { void run_test(cudf::column_view const& input, cudf::column_view const& expected) diff --git a/cpp/tests/transpose/transpose_test.cpp b/cpp/tests/transpose/transpose_test.cpp index 59094db6cc3..5a88c402b8c 100644 --- a/cpp/tests/transpose/transpose_test.cpp +++ b/cpp/tests/transpose/transpose_test.cpp @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include #include #include #include #include #include +#include + #include #include #include diff --git a/cpp/tests/types/traits_test.cpp b/cpp/tests/types/traits_test.cpp index 53bf224649e..0d9092c33da 100644 --- a/cpp/tests/types/traits_test.cpp +++ b/cpp/tests/types/traits_test.cpp @@ -14,11 +14,12 @@ * limitations under the License. */ -#include #include #include #include +#include + #include #include diff --git a/cpp/tests/types/type_dispatcher_test.cu b/cpp/tests/types/type_dispatcher_test.cu index 0b26330d323..21e56de4621 100644 --- a/cpp/tests/types/type_dispatcher_test.cu +++ b/cpp/tests/types/type_dispatcher_test.cu @@ -14,16 +14,17 @@ * limitations under the License. */ -#include -#include -#include -#include #include #include #include #include #include +#include +#include +#include +#include + #include struct DispatcherTest : public cudf::test::BaseFixture {}; diff --git a/cpp/tests/unary/cast_tests.cpp b/cpp/tests/unary/cast_tests.cpp index d565359a4ea..a82449ffc10 100644 --- a/cpp/tests/unary/cast_tests.cpp +++ b/cpp/tests/unary/cast_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,11 +27,10 @@ #include #include +#include #include #include -#include - #include #include diff --git a/cpp/tests/unary/math_ops_test.cpp b/cpp/tests/unary/math_ops_test.cpp index b86d798917f..acbf0732522 100644 --- a/cpp/tests/unary/math_ops_test.cpp +++ b/cpp/tests/unary/math_ops_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,18 +14,19 @@ * limitations under the License. */ +#include +#include +#include +#include + #include #include #include #include #include -#include -#include -#include -#include - #include + #include template diff --git a/cpp/tests/unary/unary_ops_test.cpp b/cpp/tests/unary/unary_ops_test.cpp index 19c18a8b0c1..e7477c34642 100644 --- a/cpp/tests/unary/unary_ops_test.cpp +++ b/cpp/tests/unary/unary_ops_test.cpp @@ -23,9 +23,8 @@ #include #include -#include - #include +#include template cudf::test::fixed_width_column_wrapper create_fixed_columns(cudf::size_type start, diff --git a/cpp/tests/utilities/column_utilities.cu b/cpp/tests/utilities/column_utilities.cu index 450e8e935b4..018c6aeec2c 100644 --- a/cpp/tests/utilities/column_utilities.cu +++ b/cpp/tests/utilities/column_utilities.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,6 +35,7 @@ #include +#include #include #include #include @@ -50,8 +51,6 @@ #include #include -#include - #include #include diff --git a/cpp/tests/utilities/default_stream.cpp b/cpp/tests/utilities/default_stream.cpp index 52752f78bb9..747e09115bd 100644 --- a/cpp/tests/utilities/default_stream.cpp +++ b/cpp/tests/utilities/default_stream.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -#include - #include +#include + namespace cudf { namespace test { diff --git a/cpp/tests/utilities/identify_stream_usage.cpp b/cpp/tests/utilities/identify_stream_usage.cpp index bdc338d2c92..5628f7966c3 100644 --- a/cpp/tests/utilities/identify_stream_usage.cpp +++ b/cpp/tests/utilities/identify_stream_usage.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,11 +22,12 @@ #include -#include -#include #include #include #include + +#include +#include #include #include #include diff --git a/cpp/tests/utilities/tdigest_utilities.cu b/cpp/tests/utilities/tdigest_utilities.cu index 9294aa0f681..ec3ea0d9a83 100644 --- a/cpp/tests/utilities/tdigest_utilities.cu +++ b/cpp/tests/utilities/tdigest_utilities.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,16 +14,16 @@ * limitations under the License. */ +#include +#include +#include + #include #include #include #include #include -#include -#include -#include - #include #include diff --git a/cpp/tests/utilities_tests/column_debug_tests.cpp b/cpp/tests/utilities_tests/column_debug_tests.cpp index 0dae407ad21..7aa05af4591 100644 --- a/cpp/tests/utilities_tests/column_debug_tests.cpp +++ b/cpp/tests/utilities_tests/column_debug_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -#include - #include #include #include #include #include +#include + #include #include diff --git a/cpp/tests/utilities_tests/column_utilities_tests.cpp b/cpp/tests/utilities_tests/column_utilities_tests.cpp index f5b7a499243..9d6d5ccb9b5 100644 --- a/cpp/tests/utilities_tests/column_utilities_tests.cpp +++ b/cpp/tests/utilities_tests/column_utilities_tests.cpp @@ -14,10 +14,6 @@ * limitations under the License. */ -#include -#include -#include - #include #include #include @@ -26,6 +22,10 @@ #include #include +#include +#include +#include + #include #include diff --git a/cpp/tests/utilities_tests/default_stream_tests.cpp b/cpp/tests/utilities_tests/default_stream_tests.cpp index f5c55879b9c..469ee1bb78e 100644 --- a/cpp/tests/utilities_tests/default_stream_tests.cpp +++ b/cpp/tests/utilities_tests/default_stream_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -#include - #include +#include + #ifdef CUDA_API_PER_THREAD_DEFAULT_STREAM TEST(DefaultStreamTest, PtdsIsEnabled) { EXPECT_TRUE(cudf::is_ptds_enabled()); } #else diff --git a/cpp/tests/utilities_tests/lists_column_wrapper_tests.cpp b/cpp/tests/utilities_tests/lists_column_wrapper_tests.cpp index 35e86040e73..5e3fda5e6f7 100644 --- a/cpp/tests/utilities_tests/lists_column_wrapper_tests.cpp +++ b/cpp/tests/utilities_tests/lists_column_wrapper_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,17 +14,17 @@ * limitations under the License. */ -#include -#include -#include -#include - #include #include #include #include #include +#include +#include +#include +#include + #include #include diff --git a/cpp/tests/utilities_tests/span_tests.cu b/cpp/tests/utilities_tests/span_tests.cu index 2075c67a18a..c4f7267e268 100644 --- a/cpp/tests/utilities_tests/span_tests.cu +++ b/cpp/tests/utilities_tests/span_tests.cu @@ -14,22 +14,23 @@ * limitations under the License. */ -#include -#include -#include -#include - #include #include #include #include +#include +#include +#include + #include #include #include #include +#include + #include #include #include diff --git a/cpp/tests/utilities_tests/type_check_tests.cpp b/cpp/tests/utilities_tests/type_check_tests.cpp index a8f7eaf5399..9c23798fce6 100644 --- a/cpp/tests/utilities_tests/type_check_tests.cpp +++ b/cpp/tests/utilities_tests/type_check_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023, NVIDIA CORPORATION. + * Copyright (c) 2021-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,15 @@ * limitations under the License. */ +#include +#include +#include + #include #include #include #include -#include -#include -#include - namespace cudf { namespace test { diff --git a/python/cudf/udf_cpp/shim.cu b/python/cudf/udf_cpp/shim.cu index cabca3154be..5d0aabc3907 100644 --- a/python/cudf/udf_cpp/shim.cu +++ b/python/cudf/udf_cpp/shim.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,9 +23,8 @@ #include #include -#include - #include +#include #include #include diff --git a/python/cudf/udf_cpp/strings/src/strings/udf/udf_apis.cu b/python/cudf/udf_cpp/strings/src/strings/udf/udf_apis.cu index bedaa8e8fff..9cf86b5ea48 100644 --- a/python/cudf/udf_cpp/strings/src/strings/udf/udf_apis.cu +++ b/python/cudf/udf_cpp/strings/src/strings/udf/udf_apis.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,11 @@ * limitations under the License. */ -#include -#include - #include #include #include +#include +#include #include #include From f30728b903929535bda135c56b02e24a82fad69f Mon Sep 17 00:00:00 2001 From: Mark Harris <783069+harrism@users.noreply.github.com> Date: Thu, 15 Feb 2024 00:53:44 +0000 Subject: [PATCH 3/5] Changes based on PR reviews --- cpp/benchmarks/synchronization/synchronization.hpp | 1 - cpp/include/cudf/fixed_point/temporary.hpp | 4 +--- cpp/src/io/json/legacy/reader_impl.cu | 2 +- cpp/src/io/parquet/reader_impl_helpers.cpp | 4 ++-- cpp/src/transform/jit/kernel.cu | 1 - 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/cpp/benchmarks/synchronization/synchronization.hpp b/cpp/benchmarks/synchronization/synchronization.hpp index 6457560aa62..cc3bf828d60 100644 --- a/cpp/benchmarks/synchronization/synchronization.hpp +++ b/cpp/benchmarks/synchronization/synchronization.hpp @@ -61,7 +61,6 @@ #pragma once -// Google Benchmark library #include #include diff --git a/cpp/include/cudf/fixed_point/temporary.hpp b/cpp/include/cudf/fixed_point/temporary.hpp index 6057892261a..17dba6c2452 100644 --- a/cpp/include/cudf/fixed_point/temporary.hpp +++ b/cpp/include/cudf/fixed_point/temporary.hpp @@ -15,13 +15,11 @@ */ #pragma once -// To avoid https://github.com/NVIDIA/libcudacxx/issues/460 -// in libcudacxx with CTK 12.0/12.1 + #include #include #include -#include #include #include diff --git a/cpp/src/io/json/legacy/reader_impl.cu b/cpp/src/io/json/legacy/reader_impl.cu index b5c28be34d4..b1a5a2db5fd 100644 --- a/cpp/src/io/json/legacy/reader_impl.cu +++ b/cpp/src/io/json/legacy/reader_impl.cu @@ -14,6 +14,7 @@ * limitations under the License. */ +#include "hash/concurrent_unordered_map.cuh" #include "json_gpu.hpp" #include @@ -46,7 +47,6 @@ #include #include -#include #include #include #include diff --git a/cpp/src/io/parquet/reader_impl_helpers.cpp b/cpp/src/io/parquet/reader_impl_helpers.cpp index ef51f373b24..6f11debb8df 100644 --- a/cpp/src/io/parquet/reader_impl_helpers.cpp +++ b/cpp/src/io/parquet/reader_impl_helpers.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ #include "reader_impl_helpers.hpp" -#include +#include "io/utilities/row_selection.hpp" #include #include diff --git a/cpp/src/transform/jit/kernel.cu b/cpp/src/transform/jit/kernel.cu index 2c3329e3ea9..48c432e7e26 100644 --- a/cpp/src/transform/jit/kernel.cu +++ b/cpp/src/transform/jit/kernel.cu @@ -14,7 +14,6 @@ * limitations under the License. */ -// Include Jitify's cstddef header first #include #include #include From 6738774ef780ffc4ed004b425a63a289f3d4b3d8 Mon Sep 17 00:00:00 2001 From: Mark Harris Date: Tue, 20 Feb 2024 06:33:28 +0000 Subject: [PATCH 4/5] Change <> to "" for src includes. Add missing needed forward decl and includes. --- cpp/benchmarks/io/fst.cu | 5 +++-- cpp/benchmarks/io/json/nested_json.cpp | 3 ++- cpp/src/binaryop/binaryop.cpp | 6 +++--- cpp/src/binaryop/jit/kernel.cu | 4 ++-- cpp/src/groupby/hash/groupby.cu | 8 ++++---- cpp/src/groupby/sort/aggregate.cpp | 8 ++++---- cpp/src/groupby/sort/group_argmax.cu | 4 ++-- cpp/src/groupby/sort/group_argmin.cu | 4 ++-- cpp/src/groupby/sort/group_correlation.cu | 4 ++-- cpp/src/groupby/sort/group_histogram.cu | 4 ++-- cpp/src/groupby/sort/group_max.cu | 4 ++-- cpp/src/groupby/sort/group_max_scan.cu | 4 ++-- cpp/src/groupby/sort/group_min.cu | 4 ++-- cpp/src/groupby/sort/group_min_scan.cu | 4 ++-- cpp/src/groupby/sort/group_product.cu | 4 ++-- cpp/src/groupby/sort/group_quantiles.cu | 3 +-- cpp/src/groupby/sort/group_scan_util.cuh | 4 ++-- .../groupby/sort/group_single_pass_reduction_util.cuh | 4 ++-- cpp/src/groupby/sort/group_sum.cu | 4 ++-- cpp/src/groupby/sort/group_sum_scan.cu | 4 ++-- cpp/src/groupby/sort/scan.cpp | 10 +++++----- cpp/src/groupby/sort/sort_helper.cu | 3 +-- cpp/src/hash/concurrent_unordered_map.cuh | 4 ++-- cpp/src/hash/managed.cuh | 3 ++- cpp/src/io/avro/avro_common.hpp | 4 ++-- cpp/src/io/avro/avro_gpu.cu | 3 +-- cpp/src/io/avro/reader_impl.cu | 6 +++--- cpp/src/io/comp/debrotli.cu | 3 +-- cpp/src/io/comp/gpuinflate.cu | 3 +-- cpp/src/io/comp/nvcomp_adapter.cpp | 2 +- cpp/src/io/comp/nvcomp_adapter.hpp | 3 +-- cpp/src/io/comp/snap.cu | 3 +-- cpp/src/io/comp/uncomp.cpp | 2 +- cpp/src/io/comp/unsnap.cu | 3 +-- cpp/src/io/csv/csv_common.hpp | 2 +- cpp/src/io/csv/csv_gpu.cu | 7 +++---- cpp/src/io/csv/csv_gpu.hpp | 4 ++-- cpp/src/io/csv/datetime.cuh | 6 +++--- cpp/src/io/csv/reader_impl.cu | 9 ++++----- cpp/src/io/fst/device_dfa.cuh | 5 ++--- cpp/src/io/fst/lookup_tables.cuh | 6 +++--- cpp/src/io/functions.cpp | 4 ++-- cpp/src/io/json/json_column.cu | 5 ++--- cpp/src/io/json/json_quote_normalization.cu | 4 ++-- cpp/src/io/json/json_tree.cu | 3 +-- cpp/src/io/json/legacy/json_gpu.cu | 7 +++---- cpp/src/io/json/legacy/json_gpu.hpp | 8 ++++---- cpp/src/io/json/legacy/read_json.hpp | 6 +++++- cpp/src/io/json/legacy/reader_impl.cu | 7 +++---- cpp/src/io/json/nested_json_gpu.cu | 9 ++++----- cpp/src/io/json/read_json.cu | 7 +++---- cpp/src/io/json/write_json.cu | 8 ++++---- cpp/src/io/orc/aggregate_orc_metadata.cpp | 2 +- cpp/src/io/orc/orc.hpp | 4 ++-- cpp/src/io/orc/orc_gpu.hpp | 7 +++---- cpp/src/io/orc/reader_impl.hpp | 3 +-- cpp/src/io/orc/reader_impl_chunking.hpp | 3 +-- cpp/src/io/orc/reader_impl_helpers.hpp | 3 +-- cpp/src/io/orc/reader_impl_preprocess.cu | 7 +++---- cpp/src/io/orc/stats_enc.cu | 3 +-- cpp/src/io/orc/stripe_data.cu | 3 +-- cpp/src/io/orc/stripe_enc.cu | 9 ++++----- cpp/src/io/orc/stripe_init.cu | 3 +-- cpp/src/io/orc/writer_impl.cu | 7 +++---- cpp/src/io/orc/writer_impl.hpp | 3 +-- cpp/src/io/parquet/decode_preprocess.cu | 3 +-- cpp/src/io/parquet/page_data.cu | 3 +-- cpp/src/io/parquet/page_decode.cuh | 3 +-- cpp/src/io/parquet/page_delta_decode.cu | 3 +-- cpp/src/io/parquet/page_enc.cu | 3 +-- cpp/src/io/parquet/page_hdr.cu | 3 +-- cpp/src/io/parquet/reader_impl_chunking.cu | 7 +++---- cpp/src/io/parquet/writer_impl.cu | 9 ++++----- cpp/src/io/text/bgzip_data_chunk_source.cu | 5 ++--- cpp/src/io/text/multibyte_split.cu | 4 ++-- cpp/src/io/utilities/column_utils.cuh | 4 ++-- cpp/src/io/utilities/data_casting.cu | 6 +++--- cpp/src/io/utilities/data_sink.cpp | 3 +-- cpp/src/io/utilities/datasource.cpp | 2 +- cpp/src/io/utilities/file_io_utilities.cpp | 3 ++- cpp/src/io/utilities/parsing_utils.cuh | 5 ++--- cpp/src/io/utilities/row_selection.cpp | 4 ++-- cpp/src/io/utilities/string_parsing.hpp | 4 ++-- cpp/src/io/utilities/type_inference.cu | 8 ++++---- cpp/src/join/conditional_join.cu | 10 +++++----- cpp/src/join/conditional_join_kernels.cuh | 6 +++--- cpp/src/join/mixed_join_common_utils.cuh | 4 ++-- cpp/src/join/mixed_join_kernels.cuh | 6 +++--- cpp/src/join/mixed_join_kernels_semi.cu | 8 ++++---- cpp/src/join/mixed_join_kernels_semi.cuh | 6 +++--- cpp/src/join/mixed_join_size_kernels_semi.cu | 8 ++++---- cpp/src/join/semi_join.cu | 4 +++- cpp/src/json/json_path.cu | 4 ++-- cpp/src/lists/stream_compaction/distinct.cu | 4 ++-- cpp/src/quantiles/quantile.cu | 4 ++-- cpp/src/quantiles/quantiles.cu | 4 ++-- cpp/src/quantiles/tdigest/tdigest.cu | 4 ++-- cpp/src/quantiles/tdigest/tdigest_aggregation.cu | 4 ++-- cpp/src/reductions/scan/scan_inclusive.cu | 4 ++-- cpp/src/rolling/detail/rolling.cuh | 8 ++++---- cpp/src/rolling/jit/kernel.cu | 6 +++--- cpp/src/rolling/jit/operation.hpp | 6 +++--- cpp/src/search/contains_table.cu | 4 ++-- cpp/src/stream_compaction/stream_compaction_common.hpp | 1 + cpp/src/strings/contains.cu | 8 ++++---- cpp/src/strings/count_matches.cu | 6 +++--- cpp/src/strings/extract/extract.cu | 6 +++--- cpp/src/strings/extract/extract_all.cu | 8 ++++---- cpp/src/strings/regex/regcomp.cpp | 4 ++-- cpp/src/strings/regex/regex.cuh | 4 ++-- cpp/src/strings/regex/regexec.cpp | 6 +++--- cpp/src/strings/regex/utilities.cuh | 4 ++-- cpp/src/strings/replace/backref_re.cu | 5 ++--- cpp/src/strings/replace/backref_re.cuh | 4 ++-- cpp/src/strings/replace/multi_re.cu | 6 +++--- cpp/src/strings/replace/replace_re.cu | 6 +++--- cpp/src/strings/search/findall.cu | 8 ++++---- cpp/src/strings/split/split_re.cu | 8 ++++---- cpp/src/strings/utilities.cu | 6 +++--- cpp/src/structs/scan/scan_inclusive.cu | 4 ++-- cpp/src/table/row_operators.cu | 4 ++-- cpp/src/text/bpe/byte_pair_encoding.cu | 4 ++-- cpp/src/text/bpe/load_merge_pairs.cu | 4 ++-- cpp/src/text/ngrams_tokenize.cu | 4 ++-- cpp/src/text/normalize.cu | 8 ++++---- cpp/src/text/replace.cu | 4 ++-- cpp/src/text/subword/data_normalizer.cu | 6 +++--- cpp/src/text/subword/detail/data_normalizer.hpp | 4 ++-- cpp/src/text/subword/detail/tokenizer_utils.cuh | 4 ++-- cpp/src/text/subword/detail/wordpiece_tokenizer.hpp | 4 ++-- cpp/src/text/subword/load_hash_file.cu | 6 +++--- cpp/src/text/subword/subword_tokenize.cu | 4 ++-- cpp/src/text/subword/wordpiece_tokenizer.cu | 8 ++++---- cpp/src/text/tokenize.cu | 4 ++-- cpp/src/text/vocabulary_tokenize.cu | 4 ++-- cpp/src/transform/jit/kernel.cu | 4 ++-- cpp/src/transform/transform.cpp | 7 ++++--- cpp/src/utilities/logger.cpp | 3 +-- cpp/tests/hash_map/map_test.cu | 4 ++-- cpp/tests/io/comp/decomp_test.cpp | 5 +++-- cpp/tests/io/fst/fst_test.cu | 6 +++--- cpp/tests/io/fst/logical_stack_test.cu | 3 ++- cpp/tests/io/json_chunked_reader.cpp | 6 +++--- cpp/tests/io/json_tree.cpp | 6 +++--- cpp/tests/io/json_type_cast_test.cu | 4 ++-- cpp/tests/io/json_whitespace_normalization_test.cu | 6 +++--- cpp/tests/io/nested_json_test.cpp | 6 +++--- cpp/tests/io/text/multibyte_split_test.cpp | 4 ++-- cpp/tests/io/type_inference_test.cu | 6 +++--- cpp/tests/jit/parse_ptx_function.cpp | 4 ++-- cpp/tests/utilities_tests/span_tests.cu | 4 ++-- 151 files changed, 354 insertions(+), 381 deletions(-) diff --git a/cpp/benchmarks/io/fst.cu b/cpp/benchmarks/io/fst.cu index d08b2288bee..ad19bdfdfcb 100644 --- a/cpp/benchmarks/io/fst.cu +++ b/cpp/benchmarks/io/fst.cu @@ -14,6 +14,9 @@ * limitations under the License. */ +#include "io/fst/lookup_tables.cuh" +#include "io/utilities/hostdevice_vector.hpp" //TODO find better replacement + #include #include @@ -29,8 +32,6 @@ #include -#include -#include //TODO find better replacement #include #include diff --git a/cpp/benchmarks/io/json/nested_json.cpp b/cpp/benchmarks/io/json/nested_json.cpp index a1c404d6d87..9fd8de172a3 100644 --- a/cpp/benchmarks/io/json/nested_json.cpp +++ b/cpp/benchmarks/io/json/nested_json.cpp @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "io/json/nested_json.hpp" + #include #include #include @@ -22,7 +24,6 @@ #include #include -#include #include #include diff --git a/cpp/src/binaryop/binaryop.cpp b/cpp/src/binaryop/binaryop.cpp index 3e435a6745d..be91c3b4d08 100644 --- a/cpp/src/binaryop/binaryop.cpp +++ b/cpp/src/binaryop/binaryop.cpp @@ -18,6 +18,9 @@ */ #include "compiled/binary_ops.hpp" +#include "jit/cache.hpp" +#include "jit/parser.hpp" +#include "jit/util.hpp" #include #include @@ -39,9 +42,6 @@ #include -#include -#include -#include #include #include diff --git a/cpp/src/binaryop/jit/kernel.cu b/cpp/src/binaryop/jit/kernel.cu index c50b5f6dab0..920e9876559 100644 --- a/cpp/src/binaryop/jit/kernel.cu +++ b/cpp/src/binaryop/jit/kernel.cu @@ -18,6 +18,8 @@ * limitations under the License. */ +#include "binaryop/jit/operation-udf.hpp" + #include #include #include @@ -26,8 +28,6 @@ #include -#include - namespace cudf { namespace binops { namespace jit { diff --git a/cpp/src/groupby/hash/groupby.cu b/cpp/src/groupby/hash/groupby.cu index ddab7bb2b0a..7b85dd02c10 100644 --- a/cpp/src/groupby/hash/groupby.cu +++ b/cpp/src/groupby/hash/groupby.cu @@ -14,6 +14,10 @@ * limitations under the License. */ +#include "groupby/common/utils.hpp" +#include "groupby/hash/groupby_kernels.cuh" +#include "hash/concurrent_unordered_map.cuh" + #include #include #include @@ -52,10 +56,6 @@ #include #include -#include -#include -#include - #include #include #include diff --git a/cpp/src/groupby/sort/aggregate.cpp b/cpp/src/groupby/sort/aggregate.cpp index 8a4946ed6ff..2d6f99de25a 100644 --- a/cpp/src/groupby/sort/aggregate.cpp +++ b/cpp/src/groupby/sort/aggregate.cpp @@ -14,6 +14,10 @@ * limitations under the License. */ +#include "groupby/common/utils.hpp" +#include "groupby/sort/functors.hpp" +#include "groupby/sort/group_reductions.hpp" + #include #include #include @@ -34,10 +38,6 @@ #include -#include -#include -#include - #include #include #include diff --git a/cpp/src/groupby/sort/group_argmax.cu b/cpp/src/groupby/sort/group_argmax.cu index 7b7edebe379..a9c098bcf61 100644 --- a/cpp/src/groupby/sort/group_argmax.cu +++ b/cpp/src/groupby/sort/group_argmax.cu @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "groupby/sort/group_single_pass_reduction_util.cuh" + #include #include @@ -21,8 +23,6 @@ #include -#include - namespace cudf { namespace groupby { namespace detail { diff --git a/cpp/src/groupby/sort/group_argmin.cu b/cpp/src/groupby/sort/group_argmin.cu index 4d8fb615405..53a514ac8a7 100644 --- a/cpp/src/groupby/sort/group_argmin.cu +++ b/cpp/src/groupby/sort/group_argmin.cu @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "groupby/sort/group_single_pass_reduction_util.cuh" + #include #include @@ -21,8 +23,6 @@ #include -#include - namespace cudf { namespace groupby { namespace detail { diff --git a/cpp/src/groupby/sort/group_correlation.cu b/cpp/src/groupby/sort/group_correlation.cu index 2e3904fcce3..4389b833c33 100644 --- a/cpp/src/groupby/sort/group_correlation.cu +++ b/cpp/src/groupby/sort/group_correlation.cu @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "groupby/sort/group_reductions.hpp" + #include #include #include @@ -33,8 +35,6 @@ #include #include -#include - #include namespace cudf { diff --git a/cpp/src/groupby/sort/group_histogram.cu b/cpp/src/groupby/sort/group_histogram.cu index efe49a6cd5e..67c30adcd47 100644 --- a/cpp/src/groupby/sort/group_histogram.cu +++ b/cpp/src/groupby/sort/group_histogram.cu @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "lists/utilities.hpp" + #include #include #include @@ -27,8 +29,6 @@ #include -#include - namespace cudf::groupby::detail { namespace { diff --git a/cpp/src/groupby/sort/group_max.cu b/cpp/src/groupby/sort/group_max.cu index dfddf833a27..148188f5fdf 100644 --- a/cpp/src/groupby/sort/group_max.cu +++ b/cpp/src/groupby/sort/group_max.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include +#include "groupby/sort/group_single_pass_reduction_util.cuh" -#include +#include namespace cudf { namespace groupby { diff --git a/cpp/src/groupby/sort/group_max_scan.cu b/cpp/src/groupby/sort/group_max_scan.cu index f07797206bd..8679ab09df6 100644 --- a/cpp/src/groupby/sort/group_max_scan.cu +++ b/cpp/src/groupby/sort/group_max_scan.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include +#include "groupby/sort/group_scan_util.cuh" -#include +#include namespace cudf { namespace groupby { diff --git a/cpp/src/groupby/sort/group_min.cu b/cpp/src/groupby/sort/group_min.cu index 5cbd5617914..3939fc41b65 100644 --- a/cpp/src/groupby/sort/group_min.cu +++ b/cpp/src/groupby/sort/group_min.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include +#include "groupby/sort/group_single_pass_reduction_util.cuh" -#include +#include namespace cudf { namespace groupby { diff --git a/cpp/src/groupby/sort/group_min_scan.cu b/cpp/src/groupby/sort/group_min_scan.cu index 42f817d8e79..7d2a88fb038 100644 --- a/cpp/src/groupby/sort/group_min_scan.cu +++ b/cpp/src/groupby/sort/group_min_scan.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include +#include "groupby/sort/group_scan_util.cuh" -#include +#include namespace cudf { namespace groupby { diff --git a/cpp/src/groupby/sort/group_product.cu b/cpp/src/groupby/sort/group_product.cu index 2132216c356..c53362f2095 100644 --- a/cpp/src/groupby/sort/group_product.cu +++ b/cpp/src/groupby/sort/group_product.cu @@ -14,13 +14,13 @@ * limitations under the License. */ +#include "groupby/sort/group_single_pass_reduction_util.cuh" + #include #include #include -#include - namespace cudf { namespace groupby { namespace detail { diff --git a/cpp/src/groupby/sort/group_quantiles.cu b/cpp/src/groupby/sort/group_quantiles.cu index 13b9946f4f8..a6bc2d5b38d 100644 --- a/cpp/src/groupby/sort/group_quantiles.cu +++ b/cpp/src/groupby/sort/group_quantiles.cu @@ -15,6 +15,7 @@ */ #include "group_reductions.hpp" +#include "quantiles/quantiles_util.hpp" #include #include @@ -34,8 +35,6 @@ #include #include -#include - namespace cudf { namespace groupby { namespace detail { diff --git a/cpp/src/groupby/sort/group_scan_util.cuh b/cpp/src/groupby/sort/group_scan_util.cuh index 93f591e3f96..1cfbf400062 100644 --- a/cpp/src/groupby/sort/group_scan_util.cuh +++ b/cpp/src/groupby/sort/group_scan_util.cuh @@ -16,6 +16,8 @@ #pragma once +#include "reductions/nested_type_minmax_util.cuh" + #include #include #include @@ -38,8 +40,6 @@ #include #include -#include - namespace cudf { namespace groupby { namespace detail { diff --git a/cpp/src/groupby/sort/group_single_pass_reduction_util.cuh b/cpp/src/groupby/sort/group_single_pass_reduction_util.cuh index 06a7d772d21..42d4b654346 100644 --- a/cpp/src/groupby/sort/group_single_pass_reduction_util.cuh +++ b/cpp/src/groupby/sort/group_single_pass_reduction_util.cuh @@ -16,6 +16,8 @@ #pragma once +#include "reductions/nested_type_minmax_util.cuh" + #include #include #include @@ -34,8 +36,6 @@ #include #include -#include - namespace cudf { namespace groupby { namespace detail { diff --git a/cpp/src/groupby/sort/group_sum.cu b/cpp/src/groupby/sort/group_sum.cu index c334da47599..0af7cb22159 100644 --- a/cpp/src/groupby/sort/group_sum.cu +++ b/cpp/src/groupby/sort/group_sum.cu @@ -14,13 +14,13 @@ * limitations under the License. */ +#include "groupby/sort/group_single_pass_reduction_util.cuh" + #include #include #include -#include - namespace cudf { namespace groupby { namespace detail { diff --git a/cpp/src/groupby/sort/group_sum_scan.cu b/cpp/src/groupby/sort/group_sum_scan.cu index f915377a6e0..2efa1185899 100644 --- a/cpp/src/groupby/sort/group_sum_scan.cu +++ b/cpp/src/groupby/sort/group_sum_scan.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include +#include "groupby/sort/group_scan_util.cuh" -#include +#include namespace cudf { namespace groupby { diff --git a/cpp/src/groupby/sort/scan.cpp b/cpp/src/groupby/sort/scan.cpp index 80e83f14853..ae183474810 100644 --- a/cpp/src/groupby/sort/scan.cpp +++ b/cpp/src/groupby/sort/scan.cpp @@ -14,6 +14,11 @@ * limitations under the License. */ +#include "groupby/common/utils.hpp" +#include "groupby/sort/functors.hpp" +#include "groupby/sort/group_reductions.hpp" +#include "groupby/sort/group_scan.hpp" + #include #include #include @@ -31,11 +36,6 @@ #include -#include -#include -#include -#include - #include namespace cudf { diff --git a/cpp/src/groupby/sort/sort_helper.cu b/cpp/src/groupby/sort/sort_helper.cu index 330e89d2bdb..1e6c7a9393f 100644 --- a/cpp/src/groupby/sort/sort_helper.cu +++ b/cpp/src/groupby/sort/sort_helper.cu @@ -15,6 +15,7 @@ */ #include "common_utils.cuh" +#include "stream_compaction/stream_compaction_common.cuh" #include #include @@ -41,8 +42,6 @@ #include #include -#include - #include #include #include diff --git a/cpp/src/hash/concurrent_unordered_map.cuh b/cpp/src/hash/concurrent_unordered_map.cuh index a9f00d5d1ad..a010a462de3 100644 --- a/cpp/src/hash/concurrent_unordered_map.cuh +++ b/cpp/src/hash/concurrent_unordered_map.cuh @@ -16,6 +16,8 @@ #pragma once +#include "hash/managed.cuh" + #include #include #include @@ -28,8 +30,6 @@ #include #include -#include - #include #include #include diff --git a/cpp/src/hash/managed.cuh b/cpp/src/hash/managed.cuh index 10aeb6e52be..aa7bff85ea6 100644 --- a/cpp/src/hash/managed.cuh +++ b/cpp/src/hash/managed.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2023, NVIDIA CORPORATION. + * Copyright (c) 2017-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +16,7 @@ #pragma once +#include #include struct managed { diff --git a/cpp/src/io/avro/avro_common.hpp b/cpp/src/io/avro/avro_common.hpp index 0058d236d8c..9bf66369d6a 100644 --- a/cpp/src/io/avro/avro_common.hpp +++ b/cpp/src/io/avro/avro_common.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ #pragma once -#include +#include "io/utilities/column_buffer.hpp" #include #include diff --git a/cpp/src/io/avro/avro_gpu.cu b/cpp/src/io/avro/avro_gpu.cu index ad4100b65f9..612b2d32b7d 100644 --- a/cpp/src/io/avro/avro_gpu.cu +++ b/cpp/src/io/avro/avro_gpu.cu @@ -14,11 +14,10 @@ * limitations under the License. */ #include "avro_gpu.hpp" +#include "io/utilities/block_utils.cuh" #include -#include - using cudf::device_span; namespace cudf { diff --git a/cpp/src/io/avro/reader_impl.cu b/cpp/src/io/avro/reader_impl.cu index 0f5c8e75d76..03fd663040a 100644 --- a/cpp/src/io/avro/reader_impl.cu +++ b/cpp/src/io/avro/reader_impl.cu @@ -16,6 +16,9 @@ #include "avro.hpp" #include "avro_gpu.hpp" +#include "io/comp/gpuinflate.hpp" +#include "io/utilities/column_buffer.hpp" +#include "io/utilities/hostdevice_vector.hpp" #include #include @@ -37,9 +40,6 @@ #include #include -#include -#include -#include #include #include diff --git a/cpp/src/io/comp/debrotli.cu b/cpp/src/io/comp/debrotli.cu index fb0fd5300f6..861820f47e7 100644 --- a/cpp/src/io/comp/debrotli.cu +++ b/cpp/src/io/comp/debrotli.cu @@ -56,13 +56,12 @@ THE SOFTWARE. #include "brotli_dict.hpp" #include "gpuinflate.hpp" +#include "io/utilities/block_utils.cuh" #include #include -#include - namespace cudf { namespace io { constexpr uint32_t huffman_lookup_table_width = 8; diff --git a/cpp/src/io/comp/gpuinflate.cu b/cpp/src/io/comp/gpuinflate.cu index ab3519d19ac..f29e830eb41 100644 --- a/cpp/src/io/comp/gpuinflate.cu +++ b/cpp/src/io/comp/gpuinflate.cu @@ -44,12 +44,11 @@ Mark Adler madler@alumni.caltech.edu */ #include "gpuinflate.hpp" +#include "io/utilities/block_utils.cuh" #include "io_uncomp.hpp" #include -#include - namespace cudf { namespace io { diff --git a/cpp/src/io/comp/nvcomp_adapter.cpp b/cpp/src/io/comp/nvcomp_adapter.cpp index 60a535f288b..f8920bf82c2 100644 --- a/cpp/src/io/comp/nvcomp_adapter.cpp +++ b/cpp/src/io/comp/nvcomp_adapter.cpp @@ -15,11 +15,11 @@ */ #include "nvcomp_adapter.hpp" +#include "io/utilities/config_utils.hpp" #include "nvcomp_adapter.cuh" #include -#include #include #include diff --git a/cpp/src/io/comp/nvcomp_adapter.hpp b/cpp/src/io/comp/nvcomp_adapter.hpp index bbfacf19b9c..1a680a050fd 100644 --- a/cpp/src/io/comp/nvcomp_adapter.hpp +++ b/cpp/src/io/comp/nvcomp_adapter.hpp @@ -17,14 +17,13 @@ #pragma once #include "gpuinflate.hpp" +#include "io/utilities/config_utils.hpp" #include #include #include -#include - #include namespace cudf::io::nvcomp { diff --git a/cpp/src/io/comp/snap.cu b/cpp/src/io/comp/snap.cu index 276dd690895..252c96f496a 100644 --- a/cpp/src/io/comp/snap.cu +++ b/cpp/src/io/comp/snap.cu @@ -15,11 +15,10 @@ */ #include "gpuinflate.hpp" +#include "io/utilities/block_utils.cuh" #include -#include - namespace cudf { namespace io { constexpr int hash_bits = 12; diff --git a/cpp/src/io/comp/uncomp.cpp b/cpp/src/io/comp/uncomp.cpp index e802933a316..3e5d966282d 100644 --- a/cpp/src/io/comp/uncomp.cpp +++ b/cpp/src/io/comp/uncomp.cpp @@ -14,6 +14,7 @@ * limitations under the License. */ +#include "io/utilities/hostdevice_vector.hpp" #include "io_uncomp.hpp" #include "nvcomp_adapter.hpp" #include "unbz2.hpp" // bz2 uncompress @@ -24,7 +25,6 @@ #include -#include #include // uncompress #include // memset diff --git a/cpp/src/io/comp/unsnap.cu b/cpp/src/io/comp/unsnap.cu index 97453d86b5c..b48e49ffd78 100644 --- a/cpp/src/io/comp/unsnap.cu +++ b/cpp/src/io/comp/unsnap.cu @@ -15,13 +15,12 @@ */ #include "gpuinflate.hpp" +#include "io/utilities/block_utils.cuh" #include #include -#include - namespace cudf { namespace io { constexpr int32_t batch_size = (1 << 5); diff --git a/cpp/src/io/csv/csv_common.hpp b/cpp/src/io/csv/csv_common.hpp index fd822c48c0d..9b48e191aca 100644 --- a/cpp/src/io/csv/csv_common.hpp +++ b/cpp/src/io/csv/csv_common.hpp @@ -16,7 +16,7 @@ #pragma once -#include +#include "io/utilities/column_type_histogram.hpp" #include diff --git a/cpp/src/io/csv/csv_gpu.cu b/cpp/src/io/csv/csv_gpu.cu index ab4506514f1..9c186f161b3 100644 --- a/cpp/src/io/csv/csv_gpu.cu +++ b/cpp/src/io/csv/csv_gpu.cu @@ -16,6 +16,9 @@ #include "csv_common.hpp" #include "csv_gpu.hpp" +#include "io/utilities/block_utils.cuh" +#include "io/utilities/parsing_utils.cuh" +#include "io/utilities/trie.cuh" #include #include @@ -37,10 +40,6 @@ #include #include -#include -#include -#include - #include using namespace ::cudf::io; diff --git a/cpp/src/io/csv/csv_gpu.hpp b/cpp/src/io/csv/csv_gpu.hpp index 5d85b846517..06c60319371 100644 --- a/cpp/src/io/csv/csv_gpu.hpp +++ b/cpp/src/io/csv/csv_gpu.hpp @@ -16,13 +16,13 @@ #pragma once +#include "io/utilities/parsing_utils.cuh" + #include #include #include -#include - using cudf::device_span; namespace cudf { diff --git a/cpp/src/io/csv/datetime.cuh b/cpp/src/io/csv/datetime.cuh index fb9952f1a14..bfdba238a1e 100644 --- a/cpp/src/io/csv/datetime.cuh +++ b/cpp/src/io/csv/datetime.cuh @@ -16,6 +16,9 @@ #pragma once +#include "io/utilities/parsing_utils.cuh" +#include "io/utilities/time_utils.cuh" + #include #include @@ -23,9 +26,6 @@ #include #include -#include -#include - namespace cudf { namespace io { diff --git a/cpp/src/io/csv/reader_impl.cu b/cpp/src/io/csv/reader_impl.cu index b871b543bc7..02daf4655db 100644 --- a/cpp/src/io/csv/reader_impl.cu +++ b/cpp/src/io/csv/reader_impl.cu @@ -21,6 +21,10 @@ #include "csv_common.hpp" #include "csv_gpu.hpp" +#include "io/comp/io_uncomp.hpp" +#include "io/utilities/column_buffer.hpp" +#include "io/utilities/hostdevice_vector.hpp" +#include "io/utilities/parsing_utils.cuh" #include #include @@ -39,11 +43,6 @@ #include #include -#include -#include -#include -#include - #include #include #include diff --git a/cpp/src/io/fst/device_dfa.cuh b/cpp/src/io/fst/device_dfa.cuh index 7eeff27eef1..4729c1c1b15 100644 --- a/cpp/src/io/fst/device_dfa.cuh +++ b/cpp/src/io/fst/device_dfa.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,7 @@ #pragma once #include "dispatch_dfa.cuh" - -#include +#include "io/utilities/hostdevice_vector.hpp" #include diff --git a/cpp/src/io/fst/lookup_tables.cuh b/cpp/src/io/fst/lookup_tables.cuh index 0ef2a4e9e99..5532a7f994b 100644 --- a/cpp/src/io/fst/lookup_tables.cuh +++ b/cpp/src/io/fst/lookup_tables.cuh @@ -16,14 +16,14 @@ #pragma once +#include "io/fst/device_dfa.cuh" +#include "io/utilities/hostdevice_vector.hpp" + #include #include #include -#include -#include - #include #include #include diff --git a/cpp/src/io/functions.cpp b/cpp/src/io/functions.cpp index 0f32dc6e226..315562e9183 100644 --- a/cpp/src/io/functions.cpp +++ b/cpp/src/io/functions.cpp @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "io/orc/orc.hpp" + #include #include #include @@ -34,8 +36,6 @@ #include #include -#include - #include namespace cudf::io { diff --git a/cpp/src/io/json/json_column.cu b/cpp/src/io/json/json_column.cu index 636c1e3d812..56da1095b81 100644 --- a/cpp/src/io/json/json_column.cu +++ b/cpp/src/io/json/json_column.cu @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "io/utilities/parsing_utils.cuh" +#include "io/utilities/string_parsing.hpp" #include "nested_json.hpp" #include @@ -46,9 +48,6 @@ #include #include -#include -#include - #include #include diff --git a/cpp/src/io/json/json_quote_normalization.cu b/cpp/src/io/json/json_quote_normalization.cu index c9403a0ae3b..a13b6e0b016 100644 --- a/cpp/src/io/json/json_quote_normalization.cu +++ b/cpp/src/io/json/json_quote_normalization.cu @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "io/fst/lookup_tables.cuh" + #include #include @@ -24,8 +26,6 @@ #include -#include - #include #include #include diff --git a/cpp/src/io/json/json_tree.cu b/cpp/src/io/json/json_tree.cu index b50f97d7ed6..1b7976dab89 100644 --- a/cpp/src/io/json/json_tree.cu +++ b/cpp/src/io/json/json_tree.cu @@ -14,6 +14,7 @@ * limitations under the License. */ +#include "io/utilities/hostdevice_vector.hpp" #include "nested_json.hpp" #include @@ -52,8 +53,6 @@ #include #include -#include - #include namespace cudf::io::json { diff --git a/cpp/src/io/json/legacy/json_gpu.cu b/cpp/src/io/json/legacy/json_gpu.cu index 8be0e79239b..9beeecdd6fb 100644 --- a/cpp/src/io/json/legacy/json_gpu.cu +++ b/cpp/src/io/json/legacy/json_gpu.cu @@ -14,6 +14,9 @@ * limitations under the License. */ +#include "io/utilities/column_type_histogram.hpp" +#include "io/utilities/parsing_utils.cuh" +#include "io/utilities/trie.cuh" #include "json_gpu.hpp" #include @@ -40,10 +43,6 @@ #include #include -#include -#include -#include - using cudf::device_span; using cudf::detail::grid_1d; diff --git a/cpp/src/io/json/legacy/json_gpu.hpp b/cpp/src/io/json/legacy/json_gpu.hpp index 6cf0a4177cd..853e30c9427 100644 --- a/cpp/src/io/json/legacy/json_gpu.hpp +++ b/cpp/src/io/json/legacy/json_gpu.hpp @@ -16,6 +16,10 @@ #pragma once +#include "hash/concurrent_unordered_map.cuh" +#include "io/utilities/column_type_histogram.hpp" +#include "io/utilities/parsing_utils.cuh" + #include #include #include @@ -24,10 +28,6 @@ #include -#include -#include -#include - using cudf::device_span; namespace cudf::io::json::detail::legacy { diff --git a/cpp/src/io/json/legacy/read_json.hpp b/cpp/src/io/json/legacy/read_json.hpp index e3fa010e08e..32d05c432b4 100644 --- a/cpp/src/io/json/legacy/read_json.hpp +++ b/cpp/src/io/json/legacy/read_json.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, NVIDIA CORPORATION. + * Copyright (c) 2023-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,6 +23,10 @@ #include #include +namespace cudf::io { +class json_reader_options; // forward decl +} + namespace cudf::io::json::detail::legacy { table_with_metadata read_json(host_span> sources, diff --git a/cpp/src/io/json/legacy/reader_impl.cu b/cpp/src/io/json/legacy/reader_impl.cu index b1a5a2db5fd..f9d0f6895b9 100644 --- a/cpp/src/io/json/legacy/reader_impl.cu +++ b/cpp/src/io/json/legacy/reader_impl.cu @@ -15,6 +15,9 @@ */ #include "hash/concurrent_unordered_map.cuh" +#include "io/comp/io_uncomp.hpp" +#include "io/utilities/column_buffer.hpp" +#include "io/utilities/parsing_utils.cuh" #include "json_gpu.hpp" #include @@ -47,10 +50,6 @@ #include #include -#include -#include -#include - using cudf::host_span; namespace cudf::io::json::detail::legacy { diff --git a/cpp/src/io/json/nested_json_gpu.cu b/cpp/src/io/json/nested_json_gpu.cu index 15c2a6155a9..73af983d108 100644 --- a/cpp/src/io/json/nested_json_gpu.cu +++ b/cpp/src/io/json/nested_json_gpu.cu @@ -14,6 +14,10 @@ * limitations under the License. */ +#include "io/fst/logical_stack.cuh" +#include "io/fst/lookup_tables.cuh" +#include "io/utilities/parsing_utils.cuh" +#include "io/utilities/string_parsing.hpp" #include "nested_json.hpp" #include @@ -40,11 +44,6 @@ #include #include -#include -#include -#include -#include - #include #include diff --git a/cpp/src/io/json/read_json.cu b/cpp/src/io/json/read_json.cu index b9865010550..ba8acf2d47a 100644 --- a/cpp/src/io/json/read_json.cu +++ b/cpp/src/io/json/read_json.cu @@ -14,6 +14,9 @@ * limitations under the License. */ +#include "io/comp/io_uncomp.hpp" +#include "io/json/legacy/read_json.hpp" +#include "io/json/nested_json.hpp" #include "read_json.hpp" #include @@ -26,10 +29,6 @@ #include #include -#include -#include -#include - #include namespace cudf::io::json::detail { diff --git a/cpp/src/io/json/write_json.cu b/cpp/src/io/json/write_json.cu index 81b3e392373..8c5b309244d 100644 --- a/cpp/src/io/json/write_json.cu +++ b/cpp/src/io/json/write_json.cu @@ -19,6 +19,10 @@ * @brief cuDF-IO JSON writer implementation */ +#include "io/csv/durations.hpp" +#include "io/utilities/parsing_utils.cuh" +#include "lists/utilities.hpp" + #include #include #include @@ -53,10 +57,6 @@ #include #include -#include -#include -#include - #include #include #include diff --git a/cpp/src/io/orc/aggregate_orc_metadata.cpp b/cpp/src/io/orc/aggregate_orc_metadata.cpp index 8cae1ff5309..ea091099b6e 100644 --- a/cpp/src/io/orc/aggregate_orc_metadata.cpp +++ b/cpp/src/io/orc/aggregate_orc_metadata.cpp @@ -16,7 +16,7 @@ #include "aggregate_orc_metadata.hpp" -#include +#include "io/utilities/row_selection.hpp" #include #include diff --git a/cpp/src/io/orc/orc.hpp b/cpp/src/io/orc/orc.hpp index 01cb8dfb5fa..6fbee2824eb 100644 --- a/cpp/src/io/orc/orc.hpp +++ b/cpp/src/io/orc/orc.hpp @@ -16,6 +16,8 @@ #pragma once +#include "io/comp/io_uncomp.hpp" + #include #include #include @@ -24,8 +26,6 @@ #include -#include - #include #include #include diff --git a/cpp/src/io/orc/orc_gpu.hpp b/cpp/src/io/orc/orc_gpu.hpp index 5fde2c72fc6..b69722bbded 100644 --- a/cpp/src/io/orc/orc_gpu.hpp +++ b/cpp/src/io/orc/orc_gpu.hpp @@ -16,6 +16,9 @@ #pragma once +#include "io/comp/gpuinflate.hpp" +#include "io/statistics/statistics.cuh" +#include "io/utilities/column_buffer.hpp" #include "orc.hpp" #include @@ -29,10 +32,6 @@ #include -#include -#include -#include - namespace cudf { namespace io { namespace orc { diff --git a/cpp/src/io/orc/reader_impl.hpp b/cpp/src/io/orc/reader_impl.hpp index d73ebbf7131..7746bacd188 100644 --- a/cpp/src/io/orc/reader_impl.hpp +++ b/cpp/src/io/orc/reader_impl.hpp @@ -17,6 +17,7 @@ #pragma once #include "aggregate_orc_metadata.hpp" +#include "io/utilities/column_buffer.hpp" #include #include @@ -24,8 +25,6 @@ #include -#include - #include #include #include diff --git a/cpp/src/io/orc/reader_impl_chunking.hpp b/cpp/src/io/orc/reader_impl_chunking.hpp index 0db62ad1845..0ad0f9af589 100644 --- a/cpp/src/io/orc/reader_impl_chunking.hpp +++ b/cpp/src/io/orc/reader_impl_chunking.hpp @@ -16,6 +16,7 @@ #pragma once +#include "io/utilities/hostdevice_vector.hpp" #include "orc_gpu.hpp" #include @@ -23,8 +24,6 @@ #include #include -#include - namespace cudf::io::orc::detail { /** diff --git a/cpp/src/io/orc/reader_impl_helpers.hpp b/cpp/src/io/orc/reader_impl_helpers.hpp index 0ecf0313f9b..48742b5fc8c 100644 --- a/cpp/src/io/orc/reader_impl_helpers.hpp +++ b/cpp/src/io/orc/reader_impl_helpers.hpp @@ -17,14 +17,13 @@ #pragma once #include "aggregate_orc_metadata.hpp" +#include "io/utilities/column_buffer.hpp" #include "orc.hpp" #include #include -#include - #include #include diff --git a/cpp/src/io/orc/reader_impl_preprocess.cu b/cpp/src/io/orc/reader_impl_preprocess.cu index ef13beda966..5a384affc8c 100644 --- a/cpp/src/io/orc/reader_impl_preprocess.cu +++ b/cpp/src/io/orc/reader_impl_preprocess.cu @@ -14,6 +14,9 @@ * limitations under the License. */ +#include "io/comp/gpuinflate.hpp" +#include "io/comp/nvcomp_adapter.hpp" +#include "io/utilities/config_utils.hpp" #include "reader_impl.hpp" #include "reader_impl_chunking.hpp" #include "reader_impl_helpers.hpp" @@ -39,10 +42,6 @@ #include #include -#include -#include -#include - #include #include diff --git a/cpp/src/io/orc/stats_enc.cu b/cpp/src/io/orc/stats_enc.cu index 477888b7f02..2fce981e8a5 100644 --- a/cpp/src/io/orc/stats_enc.cu +++ b/cpp/src/io/orc/stats_enc.cu @@ -14,6 +14,7 @@ * limitations under the License. */ +#include "io/utilities/block_utils.cuh" #include "orc_gpu.hpp" #include @@ -21,8 +22,6 @@ #include -#include - namespace cudf::io::orc::gpu { using strings::detail::fixed_point_string_size; diff --git a/cpp/src/io/orc/stripe_data.cu b/cpp/src/io/orc/stripe_data.cu index 6363b040b2a..5e10d90ae9b 100644 --- a/cpp/src/io/orc/stripe_data.cu +++ b/cpp/src/io/orc/stripe_data.cu @@ -14,6 +14,7 @@ * limitations under the License. */ +#include "io/utilities/block_utils.cuh" #include "orc_gpu.hpp" #include @@ -22,8 +23,6 @@ #include -#include - namespace cudf { namespace io { namespace orc { diff --git a/cpp/src/io/orc/stripe_enc.cu b/cpp/src/io/orc/stripe_enc.cu index 05184132392..748e4d2c27b 100644 --- a/cpp/src/io/orc/stripe_enc.cu +++ b/cpp/src/io/orc/stripe_enc.cu @@ -14,6 +14,10 @@ * limitations under the License. */ +#include "io/comp/nvcomp_adapter.hpp" +#include "io/utilities/block_utils.cuh" +#include "io/utilities/config_utils.hpp" +#include "io/utilities/time_utils.cuh" #include "orc_gpu.hpp" #include @@ -32,11 +36,6 @@ #include #include -#include -#include -#include -#include - namespace cudf { namespace io { namespace orc { diff --git a/cpp/src/io/orc/stripe_init.cu b/cpp/src/io/orc/stripe_init.cu index 6e242edc8cc..350700a22fd 100644 --- a/cpp/src/io/orc/stripe_init.cu +++ b/cpp/src/io/orc/stripe_init.cu @@ -14,6 +14,7 @@ * limitations under the License. */ +#include "io/utilities/block_utils.cuh" #include "orc_gpu.hpp" #include @@ -24,8 +25,6 @@ #include #include -#include - namespace cudf { namespace io { namespace orc { diff --git a/cpp/src/io/orc/writer_impl.cu b/cpp/src/io/orc/writer_impl.cu index 269afd193a7..f0235e13422 100644 --- a/cpp/src/io/orc/writer_impl.cu +++ b/cpp/src/io/orc/writer_impl.cu @@ -19,6 +19,9 @@ * @brief cuDF-IO ORC writer class implementation */ +#include "io/comp/nvcomp_adapter.hpp" +#include "io/statistics/column_statistics.cuh" +#include "io/utilities/column_utils.cuh" #include "writer_impl.hpp" #include @@ -56,10 +59,6 @@ #include #include -#include -#include -#include - #include #include #include diff --git a/cpp/src/io/orc/writer_impl.hpp b/cpp/src/io/orc/writer_impl.hpp index 3caaea90c41..f1dc45087d5 100644 --- a/cpp/src/io/orc/writer_impl.hpp +++ b/cpp/src/io/orc/writer_impl.hpp @@ -16,6 +16,7 @@ #pragma once +#include "io/utilities/hostdevice_vector.hpp" #include "orc.hpp" #include "orc_gpu.hpp" @@ -33,8 +34,6 @@ #include #include -#include - #include #include #include diff --git a/cpp/src/io/parquet/decode_preprocess.cu b/cpp/src/io/parquet/decode_preprocess.cu index 07a0ca46893..fea4777af43 100644 --- a/cpp/src/io/parquet/decode_preprocess.cu +++ b/cpp/src/io/parquet/decode_preprocess.cu @@ -14,6 +14,7 @@ * limitations under the License. */ +#include "io/utilities/column_buffer.hpp" #include "page_decode.cuh" #include @@ -22,8 +23,6 @@ #include -#include - namespace cudf::io::parquet::detail { namespace { diff --git a/cpp/src/io/parquet/page_data.cu b/cpp/src/io/parquet/page_data.cu index 2565ddbafd9..2a9f2d56755 100644 --- a/cpp/src/io/parquet/page_data.cu +++ b/cpp/src/io/parquet/page_data.cu @@ -14,6 +14,7 @@ * limitations under the License. */ +#include "io/utilities/column_buffer.hpp" #include "page_decode.cuh" #include @@ -22,8 +23,6 @@ #include -#include - namespace cudf::io::parquet::detail { namespace { diff --git a/cpp/src/io/parquet/page_decode.cuh b/cpp/src/io/parquet/page_decode.cuh index 969fd5a8f1f..4353e079496 100644 --- a/cpp/src/io/parquet/page_decode.cuh +++ b/cpp/src/io/parquet/page_decode.cuh @@ -17,14 +17,13 @@ #pragma once #include "error.hpp" +#include "io/utilities/block_utils.cuh" #include "parquet_gpu.hpp" #include "rle_stream.cuh" #include #include -#include - namespace cudf::io::parquet::detail { struct page_state_s { diff --git a/cpp/src/io/parquet/page_delta_decode.cu b/cpp/src/io/parquet/page_delta_decode.cu index 564d28561f2..ebad1434c7f 100644 --- a/cpp/src/io/parquet/page_delta_decode.cu +++ b/cpp/src/io/parquet/page_delta_decode.cu @@ -15,6 +15,7 @@ */ #include "delta_binary.cuh" +#include "io/utilities/block_utils.cuh" #include "page_string_utils.cuh" #include "parquet_gpu.hpp" @@ -24,8 +25,6 @@ #include -#include - namespace cudf::io::parquet::detail { namespace { diff --git a/cpp/src/io/parquet/page_enc.cu b/cpp/src/io/parquet/page_enc.cu index 0091d2025df..5aad31bd057 100644 --- a/cpp/src/io/parquet/page_enc.cu +++ b/cpp/src/io/parquet/page_enc.cu @@ -15,6 +15,7 @@ */ #include "delta_enc.cuh" +#include "io/utilities/block_utils.cuh" #include "parquet_gpu.cuh" #include @@ -39,8 +40,6 @@ #include #include -#include - #include namespace cudf::io::parquet::detail { diff --git a/cpp/src/io/parquet/page_hdr.cu b/cpp/src/io/parquet/page_hdr.cu index f86a84c8f1f..a15ccf328de 100644 --- a/cpp/src/io/parquet/page_hdr.cu +++ b/cpp/src/io/parquet/page_hdr.cu @@ -15,6 +15,7 @@ */ #include "error.hpp" +#include "io/utilities/block_utils.cuh" #include "parquet_gpu.hpp" #include @@ -23,8 +24,6 @@ #include -#include - namespace cudf::io::parquet::detail { // Minimal thrift implementation for parsing page headers diff --git a/cpp/src/io/parquet/reader_impl_chunking.cu b/cpp/src/io/parquet/reader_impl_chunking.cu index f7cca039404..a7af20f5d7c 100644 --- a/cpp/src/io/parquet/reader_impl_chunking.cu +++ b/cpp/src/io/parquet/reader_impl_chunking.cu @@ -14,6 +14,9 @@ * limitations under the License. */ +#include "io/comp/nvcomp_adapter.hpp" +#include "io/utilities/config_utils.hpp" +#include "io/utilities/time_utils.cuh" #include "reader_impl.hpp" #include "reader_impl_chunking.hpp" @@ -31,10 +34,6 @@ #include #include -#include -#include -#include - #include namespace cudf::io::parquet::detail { diff --git a/cpp/src/io/parquet/writer_impl.cu b/cpp/src/io/parquet/writer_impl.cu index 16e8e560d68..ecdbdd0fd5f 100644 --- a/cpp/src/io/parquet/writer_impl.cu +++ b/cpp/src/io/parquet/writer_impl.cu @@ -21,6 +21,10 @@ #include "compact_protocol_reader.hpp" #include "compact_protocol_writer.hpp" +#include "io/comp/nvcomp_adapter.hpp" +#include "io/statistics/column_statistics.cuh" +#include "io/utilities/column_utils.cuh" +#include "io/utilities/config_utils.hpp" #include "parquet_common.hpp" #include "parquet_gpu.cuh" #include "writer_impl.hpp" @@ -45,11 +49,6 @@ #include #include -#include -#include -#include -#include - #include #include #include diff --git a/cpp/src/io/text/bgzip_data_chunk_source.cu b/cpp/src/io/text/bgzip_data_chunk_source.cu index 17baed18b5a..faa09e586ab 100644 --- a/cpp/src/io/text/bgzip_data_chunk_source.cu +++ b/cpp/src/io/text/bgzip_data_chunk_source.cu @@ -14,7 +14,9 @@ * limitations under the License. */ +#include "io/comp/nvcomp_adapter.hpp" #include "io/text/device_data_chunks.hpp" +#include "io/utilities/config_utils.hpp" #include #include @@ -32,9 +34,6 @@ #include #include -#include -#include - #include #include diff --git a/cpp/src/io/text/multibyte_split.cu b/cpp/src/io/text/multibyte_split.cu index bd80535fac3..8e37564fc35 100644 --- a/cpp/src/io/text/multibyte_split.cu +++ b/cpp/src/io/text/multibyte_split.cu @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "io/utilities/output_builder.cuh" + #include #include #include @@ -44,8 +46,6 @@ #include #include -#include - #include #include #include diff --git a/cpp/src/io/utilities/column_utils.cuh b/cpp/src/io/utilities/column_utils.cuh index d6c044af0e6..a0c20a56233 100644 --- a/cpp/src/io/utilities/column_utils.cuh +++ b/cpp/src/io/utilities/column_utils.cuh @@ -16,6 +16,8 @@ #pragma once +#include "io/statistics/statistics.cuh" + #include #include #include @@ -28,8 +30,6 @@ #include #include -#include - namespace cudf { namespace io { diff --git a/cpp/src/io/utilities/data_casting.cu b/cpp/src/io/utilities/data_casting.cu index 4f5ef9ac7e4..4b5d47e71fb 100644 --- a/cpp/src/io/utilities/data_casting.cu +++ b/cpp/src/io/utilities/data_casting.cu @@ -14,6 +14,9 @@ * limitations under the License. */ +#include "io/utilities/parsing_utils.cuh" +#include "io/utilities/string_parsing.hpp" + #include #include #include @@ -34,9 +37,6 @@ #include #include -#include -#include - #include #include diff --git a/cpp/src/io/utilities/data_sink.cpp b/cpp/src/io/utilities/data_sink.cpp index 720facc0cb3..5557648ebbe 100644 --- a/cpp/src/io/utilities/data_sink.cpp +++ b/cpp/src/io/utilities/data_sink.cpp @@ -15,6 +15,7 @@ */ #include "file_io_utilities.hpp" +#include "io/utilities/config_utils.hpp" #include #include @@ -23,8 +24,6 @@ #include -#include - #include namespace cudf { diff --git a/cpp/src/io/utilities/datasource.cpp b/cpp/src/io/utilities/datasource.cpp index 4bcd0cb9593..cf2ba369023 100644 --- a/cpp/src/io/utilities/datasource.cpp +++ b/cpp/src/io/utilities/datasource.cpp @@ -15,6 +15,7 @@ */ #include "file_io_utilities.hpp" +#include "io/utilities/config_utils.hpp" #include #include @@ -28,7 +29,6 @@ #include #include -#include #include #include diff --git a/cpp/src/io/utilities/file_io_utilities.cpp b/cpp/src/io/utilities/file_io_utilities.cpp index 136abee1634..01090a43a0e 100644 --- a/cpp/src/io/utilities/file_io_utilities.cpp +++ b/cpp/src/io/utilities/file_io_utilities.cpp @@ -16,13 +16,14 @@ #include "file_io_utilities.hpp" +#include "io/utilities/config_utils.hpp" + #include #include #include #include -#include #include #include diff --git a/cpp/src/io/utilities/parsing_utils.cuh b/cpp/src/io/utilities/parsing_utils.cuh index e465a615c3b..06a0a63c0ab 100644 --- a/cpp/src/io/utilities/parsing_utils.cuh +++ b/cpp/src/io/utilities/parsing_utils.cuh @@ -17,6 +17,8 @@ #pragma once #include "column_type_histogram.hpp" +#include "io/csv/datetime.cuh" +#include "io/utilities/trie.cuh" #include #include @@ -32,9 +34,6 @@ #include #include -#include -#include - #include using cudf::device_span; diff --git a/cpp/src/io/utilities/row_selection.cpp b/cpp/src/io/utilities/row_selection.cpp index 7a09f5eb4ec..bb5565d8ce7 100644 --- a/cpp/src/io/utilities/row_selection.cpp +++ b/cpp/src/io/utilities/row_selection.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include +#include "io/utilities/row_selection.hpp" -#include +#include #include #include diff --git a/cpp/src/io/utilities/string_parsing.hpp b/cpp/src/io/utilities/string_parsing.hpp index 3f1d287380b..a98660c98a9 100644 --- a/cpp/src/io/utilities/string_parsing.hpp +++ b/cpp/src/io/utilities/string_parsing.hpp @@ -15,6 +15,8 @@ */ #pragma once +#include "io/utilities/parsing_utils.cuh" + #include #include @@ -23,8 +25,6 @@ #include #include -#include - namespace cudf::io { namespace detail { diff --git a/cpp/src/io/utilities/type_inference.cu b/cpp/src/io/utilities/type_inference.cu index c96db286d47..dff40cc09ed 100644 --- a/cpp/src/io/utilities/type_inference.cu +++ b/cpp/src/io/utilities/type_inference.cu @@ -14,6 +14,10 @@ * limitations under the License. */ +#include "io/utilities/column_type_histogram.hpp" +#include "io/utilities/string_parsing.hpp" +#include "io/utilities/trie.cuh" + #include #include @@ -21,10 +25,6 @@ #include -#include -#include -#include - #include namespace cudf::io::detail { diff --git a/cpp/src/join/conditional_join.cu b/cpp/src/join/conditional_join.cu index d5c9d696de1..cc729ad5e8b 100644 --- a/cpp/src/join/conditional_join.cu +++ b/cpp/src/join/conditional_join.cu @@ -14,6 +14,11 @@ * limitations under the License. */ +#include "join/conditional_join.hpp" +#include "join/conditional_join_kernels.cuh" +#include "join/join_common_utils.cuh" +#include "join/join_common_utils.hpp" + #include #include #include @@ -26,11 +31,6 @@ #include -#include -#include -#include -#include - #include namespace cudf { diff --git a/cpp/src/join/conditional_join_kernels.cuh b/cpp/src/join/conditional_join_kernels.cuh index ce158df628e..cc57fa7b03b 100644 --- a/cpp/src/join/conditional_join_kernels.cuh +++ b/cpp/src/join/conditional_join_kernels.cuh @@ -16,6 +16,9 @@ #pragma once +#include "join/join_common_utils.cuh" +#include "join/join_common_utils.hpp" + #include #include #include @@ -23,9 +26,6 @@ #include -#include -#include - namespace cudf { namespace detail { diff --git a/cpp/src/join/mixed_join_common_utils.cuh b/cpp/src/join/mixed_join_common_utils.cuh index 023880f7dc7..19701816867 100644 --- a/cpp/src/join/mixed_join_common_utils.cuh +++ b/cpp/src/join/mixed_join_common_utils.cuh @@ -15,6 +15,8 @@ */ #pragma once +#include "join/join_common_utils.hpp" + #include #include #include @@ -24,8 +26,6 @@ #include -#include - namespace cudf { namespace detail { diff --git a/cpp/src/join/mixed_join_kernels.cuh b/cpp/src/join/mixed_join_kernels.cuh index 4ad2e89cc38..037c02666d4 100644 --- a/cpp/src/join/mixed_join_kernels.cuh +++ b/cpp/src/join/mixed_join_kernels.cuh @@ -16,13 +16,13 @@ #pragma once +#include "join/join_common_utils.hpp" +#include "join/mixed_join_common_utils.cuh" + #include #include #include -#include -#include - namespace cudf { namespace detail { diff --git a/cpp/src/join/mixed_join_kernels_semi.cu b/cpp/src/join/mixed_join_kernels_semi.cu index bc8b4188b99..5a543997a50 100644 --- a/cpp/src/join/mixed_join_kernels_semi.cu +++ b/cpp/src/join/mixed_join_kernels_semi.cu @@ -14,6 +14,10 @@ * limitations under the License. */ +#include "join/join_common_utils.cuh" +#include "join/join_common_utils.hpp" +#include "join/mixed_join_common_utils.cuh" + #include #include #include @@ -22,10 +26,6 @@ #include -#include -#include -#include - namespace cudf { namespace detail { diff --git a/cpp/src/join/mixed_join_kernels_semi.cuh b/cpp/src/join/mixed_join_kernels_semi.cuh index d1849f6d038..f411d36f0a8 100644 --- a/cpp/src/join/mixed_join_kernels_semi.cuh +++ b/cpp/src/join/mixed_join_kernels_semi.cuh @@ -16,13 +16,13 @@ #pragma once +#include "join/join_common_utils.hpp" +#include "join/mixed_join_common_utils.cuh" + #include #include #include -#include -#include - namespace cudf { namespace detail { diff --git a/cpp/src/join/mixed_join_size_kernels_semi.cu b/cpp/src/join/mixed_join_size_kernels_semi.cu index 8cd4d536eff..7a22ac60710 100644 --- a/cpp/src/join/mixed_join_size_kernels_semi.cu +++ b/cpp/src/join/mixed_join_size_kernels_semi.cu @@ -14,6 +14,10 @@ * limitations under the License. */ +#include "join/join_common_utils.cuh" +#include "join/join_common_utils.hpp" +#include "join/mixed_join_common_utils.cuh" + #include #include #include @@ -22,10 +26,6 @@ #include -#include -#include -#include - namespace cudf { namespace detail { diff --git a/cpp/src/join/semi_join.cu b/cpp/src/join/semi_join.cu index 403df892cf8..b0e5282d97f 100644 --- a/cpp/src/join/semi_join.cu +++ b/cpp/src/join/semi_join.cu @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "join/join_common_utils.hpp" + #include #include #include @@ -34,7 +36,7 @@ #include #include -#include +#include namespace cudf { namespace detail { diff --git a/cpp/src/json/json_path.cu b/cpp/src/json/json_path.cu index 70ece18c3b0..25f136e2336 100644 --- a/cpp/src/json/json_path.cu +++ b/cpp/src/json/json_path.cu @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "io/utilities/parsing_utils.cuh" + #include #include #include @@ -41,8 +43,6 @@ #include #include -#include - namespace cudf { namespace detail { diff --git a/cpp/src/lists/stream_compaction/distinct.cu b/cpp/src/lists/stream_compaction/distinct.cu index 1e75a5856b5..c8d9c15706f 100644 --- a/cpp/src/lists/stream_compaction/distinct.cu +++ b/cpp/src/lists/stream_compaction/distinct.cu @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "lists/utilities.hpp" + #include #include #include @@ -25,8 +27,6 @@ #include -#include - #include #include diff --git a/cpp/src/quantiles/quantile.cu b/cpp/src/quantiles/quantile.cu index 9551db8a065..cba7203483b 100644 --- a/cpp/src/quantiles/quantile.cu +++ b/cpp/src/quantiles/quantile.cu @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "quantiles/quantiles_util.hpp" + #include #include #include @@ -38,8 +40,6 @@ #include #include -#include - #include #include diff --git a/cpp/src/quantiles/quantiles.cu b/cpp/src/quantiles/quantiles.cu index 9d5cd6ba5e6..8fee821dfc4 100644 --- a/cpp/src/quantiles/quantiles.cu +++ b/cpp/src/quantiles/quantiles.cu @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "quantiles/quantiles_util.hpp" + #include #include #include @@ -30,8 +32,6 @@ #include #include -#include - #include #include diff --git a/cpp/src/quantiles/tdigest/tdigest.cu b/cpp/src/quantiles/tdigest/tdigest.cu index 891f773cc84..96b0355c6e5 100644 --- a/cpp/src/quantiles/tdigest/tdigest.cu +++ b/cpp/src/quantiles/tdigest/tdigest.cu @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "quantiles/tdigest/tdigest_util.cuh" + #include #include #include @@ -39,8 +41,6 @@ #include #include -#include - using namespace cudf::tdigest; namespace cudf { diff --git a/cpp/src/quantiles/tdigest/tdigest_aggregation.cu b/cpp/src/quantiles/tdigest/tdigest_aggregation.cu index cfc0d76f3c4..56e1bfbe003 100644 --- a/cpp/src/quantiles/tdigest/tdigest_aggregation.cu +++ b/cpp/src/quantiles/tdigest/tdigest_aggregation.cu @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "quantiles/tdigest/tdigest_util.cuh" + #include #include #include @@ -51,8 +53,6 @@ #include #include -#include - namespace cudf { namespace tdigest { namespace detail { diff --git a/cpp/src/reductions/scan/scan_inclusive.cu b/cpp/src/reductions/scan/scan_inclusive.cu index d13aa40ab31..7edf89a0c91 100644 --- a/cpp/src/reductions/scan/scan_inclusive.cu +++ b/cpp/src/reductions/scan/scan_inclusive.cu @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "reductions/scan/scan.cuh" + #include #include #include @@ -34,8 +36,6 @@ #include #include -#include - #include namespace cudf { diff --git a/cpp/src/rolling/detail/rolling.cuh b/cpp/src/rolling/detail/rolling.cuh index 0093400096c..af6d6d7f157 100644 --- a/cpp/src/rolling/detail/rolling.cuh +++ b/cpp/src/rolling/detail/rolling.cuh @@ -16,8 +16,12 @@ #pragma once +#include "jit/cache.hpp" +#include "jit/parser.hpp" +#include "jit/util.hpp" #include "lead_lag_nested.cuh" #include "nth_element.cuh" +#include "reductions/nested_type_minmax_util.cuh" #include "rolling.hpp" #include "rolling_collect_list.cuh" #include "rolling_jit.hpp" @@ -55,11 +59,7 @@ #include #include -#include -#include -#include #include -#include #include diff --git a/cpp/src/rolling/jit/kernel.cu b/cpp/src/rolling/jit/kernel.cu index 83e7370b2ca..466f120022b 100644 --- a/cpp/src/rolling/jit/kernel.cu +++ b/cpp/src/rolling/jit/kernel.cu @@ -14,12 +14,12 @@ * limitations under the License. */ +#include "rolling/detail/rolling_jit.hpp" +#include "rolling/jit/operation.hpp" + #include #include -#include -#include - namespace cudf { namespace rolling { namespace jit { diff --git a/cpp/src/rolling/jit/operation.hpp b/cpp/src/rolling/jit/operation.hpp index 22943f0db95..f8a52c03d4e 100644 --- a/cpp/src/rolling/jit/operation.hpp +++ b/cpp/src/rolling/jit/operation.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,9 @@ * limitations under the License. */ -#include +#include "rolling/jit/operation-udf.hpp" -#include +#include #pragma once diff --git a/cpp/src/search/contains_table.cu b/cpp/src/search/contains_table.cu index fd8c5ee341d..f7b6d8fdb72 100644 --- a/cpp/src/search/contains_table.cu +++ b/cpp/src/search/contains_table.cu @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "join/join_common_utils.cuh" + #include #include #include @@ -28,8 +30,6 @@ #include #include -#include - #include namespace cudf::detail { diff --git a/cpp/src/stream_compaction/stream_compaction_common.hpp b/cpp/src/stream_compaction/stream_compaction_common.hpp index dd7d76168d9..13795f49781 100644 --- a/cpp/src/stream_compaction/stream_compaction_common.hpp +++ b/cpp/src/stream_compaction/stream_compaction_common.hpp @@ -21,6 +21,7 @@ #include #include +#include #include diff --git a/cpp/src/strings/contains.cu b/cpp/src/strings/contains.cu index da43c79c2ac..3f0ebc5962b 100644 --- a/cpp/src/strings/contains.cu +++ b/cpp/src/strings/contains.cu @@ -14,6 +14,10 @@ * limitations under the License. */ +#include "strings/count_matches.hpp" +#include "strings/regex/regex_program_impl.h" +#include "strings/regex/utilities.cuh" + #include #include #include @@ -26,10 +30,6 @@ #include -#include -#include -#include - namespace cudf { namespace strings { namespace detail { diff --git a/cpp/src/strings/count_matches.cu b/cpp/src/strings/count_matches.cu index 97ef7cd5161..8a32a46cc2b 100644 --- a/cpp/src/strings/count_matches.cu +++ b/cpp/src/strings/count_matches.cu @@ -14,13 +14,13 @@ * limitations under the License. */ +#include "strings/count_matches.hpp" +#include "strings/regex/utilities.cuh" + #include #include #include -#include -#include - namespace cudf { namespace strings { namespace detail { diff --git a/cpp/src/strings/extract/extract.cu b/cpp/src/strings/extract/extract.cu index 15a4209fe2b..ffd4e03ea87 100644 --- a/cpp/src/strings/extract/extract.cu +++ b/cpp/src/strings/extract/extract.cu @@ -14,6 +14,9 @@ * limitations under the License. */ +#include "strings/regex/regex_program_impl.h" +#include "strings/regex/utilities.cuh" + #include #include #include @@ -34,9 +37,6 @@ #include #include -#include -#include - namespace cudf { namespace strings { namespace detail { diff --git a/cpp/src/strings/extract/extract_all.cu b/cpp/src/strings/extract/extract_all.cu index 85a1610c978..63ce04df830 100644 --- a/cpp/src/strings/extract/extract_all.cu +++ b/cpp/src/strings/extract/extract_all.cu @@ -14,6 +14,10 @@ * limitations under the License. */ +#include "strings/count_matches.hpp" +#include "strings/regex/regex_program_impl.h" +#include "strings/regex/utilities.cuh" + #include #include #include @@ -30,10 +34,6 @@ #include #include -#include -#include -#include - namespace cudf { namespace strings { namespace detail { diff --git a/cpp/src/strings/regex/regcomp.cpp b/cpp/src/strings/regex/regcomp.cpp index e00ea4712e4..170ed59d2fe 100644 --- a/cpp/src/strings/regex/regcomp.cpp +++ b/cpp/src/strings/regex/regcomp.cpp @@ -14,13 +14,13 @@ * limitations under the License. */ +#include "strings/regex/regcomp.h" + #include #include #include -#include - #include #include #include diff --git a/cpp/src/strings/regex/regex.cuh b/cpp/src/strings/regex/regex.cuh index dec0a79de4a..c8d846624f8 100644 --- a/cpp/src/strings/regex/regex.cuh +++ b/cpp/src/strings/regex/regex.cuh @@ -15,6 +15,8 @@ */ #pragma once +#include "strings/regex/regcomp.h" + #include #include #include @@ -25,8 +27,6 @@ #include #include -#include - #include namespace cudf { diff --git a/cpp/src/strings/regex/regexec.cpp b/cpp/src/strings/regex/regexec.cpp index a8bd8b53f88..b5e7e7e8922 100644 --- a/cpp/src/strings/regex/regexec.cpp +++ b/cpp/src/strings/regex/regexec.cpp @@ -14,6 +14,9 @@ * limitations under the License. */ +#include "strings/regex/regcomp.h" +#include "strings/regex/regex.cuh" + #include #include #include @@ -21,9 +24,6 @@ #include #include -#include -#include - #include #include #include diff --git a/cpp/src/strings/regex/utilities.cuh b/cpp/src/strings/regex/utilities.cuh index f60bd258d84..d5dd80aba53 100644 --- a/cpp/src/strings/regex/utilities.cuh +++ b/cpp/src/strings/regex/utilities.cuh @@ -16,6 +16,8 @@ #pragma once +#include "strings/regex/regex.cuh" + #include #include #include @@ -26,8 +28,6 @@ #include -#include - #include namespace cudf { diff --git a/cpp/src/strings/replace/backref_re.cu b/cpp/src/strings/replace/backref_re.cu index ebe431802ed..bb99dc0644c 100644 --- a/cpp/src/strings/replace/backref_re.cu +++ b/cpp/src/strings/replace/backref_re.cu @@ -15,6 +15,8 @@ */ #include "backref_re.cuh" +#include "strings/regex/regex_program_impl.h" +#include "strings/regex/utilities.cuh" #include #include @@ -29,9 +31,6 @@ #include -#include -#include - #include namespace cudf { diff --git a/cpp/src/strings/replace/backref_re.cuh b/cpp/src/strings/replace/backref_re.cuh index 0107ac9bd52..edd85f29e6c 100644 --- a/cpp/src/strings/replace/backref_re.cuh +++ b/cpp/src/strings/replace/backref_re.cuh @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "strings/regex/regex.cuh" + #include #include #include @@ -25,8 +27,6 @@ #include #include -#include - namespace cudf { namespace strings { namespace detail { diff --git a/cpp/src/strings/replace/multi_re.cu b/cpp/src/strings/replace/multi_re.cu index 09ab9af725e..ba122d11e0b 100644 --- a/cpp/src/strings/replace/multi_re.cu +++ b/cpp/src/strings/replace/multi_re.cu @@ -14,6 +14,9 @@ * limitations under the License. */ +#include "strings/regex/regex.cuh" +#include "strings/regex/regex_program_impl.h" + #include #include #include @@ -34,9 +37,6 @@ #include #include -#include -#include - #include namespace cudf { diff --git a/cpp/src/strings/replace/replace_re.cu b/cpp/src/strings/replace/replace_re.cu index 51e53e96992..500bc0c5bb5 100644 --- a/cpp/src/strings/replace/replace_re.cu +++ b/cpp/src/strings/replace/replace_re.cu @@ -14,6 +14,9 @@ * limitations under the License. */ +#include "strings/regex/regex_program_impl.h" +#include "strings/regex/utilities.cuh" + #include #include #include @@ -27,9 +30,6 @@ #include -#include -#include - namespace cudf { namespace strings { namespace detail { diff --git a/cpp/src/strings/search/findall.cu b/cpp/src/strings/search/findall.cu index dd9674bc17d..4b4a1191e1b 100644 --- a/cpp/src/strings/search/findall.cu +++ b/cpp/src/strings/search/findall.cu @@ -14,6 +14,10 @@ * limitations under the License. */ +#include "strings/count_matches.hpp" +#include "strings/regex/regex_program_impl.h" +#include "strings/regex/utilities.cuh" + #include #include #include @@ -30,10 +34,6 @@ #include -#include -#include -#include - namespace cudf { namespace strings { namespace detail { diff --git a/cpp/src/strings/split/split_re.cu b/cpp/src/strings/split/split_re.cu index 68a68095814..16725fe006a 100644 --- a/cpp/src/strings/split/split_re.cu +++ b/cpp/src/strings/split/split_re.cu @@ -14,6 +14,10 @@ * limitations under the License. */ +#include "strings/count_matches.hpp" +#include "strings/regex/regex_program_impl.h" +#include "strings/regex/utilities.cuh" + #include #include #include @@ -32,10 +36,6 @@ #include #include -#include -#include -#include - namespace cudf { namespace strings { namespace detail { diff --git a/cpp/src/strings/utilities.cu b/cpp/src/strings/utilities.cu index c3cf86b09fe..72c3ccf4ac5 100644 --- a/cpp/src/strings/utilities.cu +++ b/cpp/src/strings/utilities.cu @@ -14,6 +14,9 @@ * limitations under the License. */ +#include "strings/char_types/char_cases.h" +#include "strings/char_types/char_flags.h" + #include #include #include @@ -28,9 +31,6 @@ #include #include -#include -#include - namespace cudf { namespace strings { namespace detail { diff --git a/cpp/src/structs/scan/scan_inclusive.cu b/cpp/src/structs/scan/scan_inclusive.cu index 6ac385dd355..410a7d9348e 100644 --- a/cpp/src/structs/scan/scan_inclusive.cu +++ b/cpp/src/structs/scan/scan_inclusive.cu @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "reductions/nested_type_minmax_util.cuh" + #include #include #include @@ -26,8 +28,6 @@ #include #include -#include - #include namespace cudf { diff --git a/cpp/src/table/row_operators.cu b/cpp/src/table/row_operators.cu index 2010d6175bc..71b437cb47d 100644 --- a/cpp/src/table/row_operators.cu +++ b/cpp/src/table/row_operators.cu @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "lists/utilities.hpp" + #include #include #include @@ -32,8 +34,6 @@ #include -#include - namespace cudf { namespace experimental { diff --git a/cpp/src/text/bpe/byte_pair_encoding.cu b/cpp/src/text/bpe/byte_pair_encoding.cu index 9124e269cb4..363e15d74c1 100644 --- a/cpp/src/text/bpe/byte_pair_encoding.cu +++ b/cpp/src/text/bpe/byte_pair_encoding.cu @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "text/bpe/byte_pair_encoding.cuh" + #include #include #include @@ -43,8 +45,6 @@ #include #include -#include - namespace nvtext { /** diff --git a/cpp/src/text/bpe/load_merge_pairs.cu b/cpp/src/text/bpe/load_merge_pairs.cu index 539c57a6c78..1658f20182b 100644 --- a/cpp/src/text/bpe/load_merge_pairs.cu +++ b/cpp/src/text/bpe/load_merge_pairs.cu @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "text/bpe/byte_pair_encoding.cuh" + #include #include #include @@ -29,8 +31,6 @@ #include -#include - #include #include #include diff --git a/cpp/src/text/ngrams_tokenize.cu b/cpp/src/text/ngrams_tokenize.cu index 210e0cfcd21..75ad542548b 100644 --- a/cpp/src/text/ngrams_tokenize.cu +++ b/cpp/src/text/ngrams_tokenize.cu @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "text/utilities/tokenize_ops.cuh" + #include #include #include @@ -38,8 +40,6 @@ #include #include -#include - namespace nvtext { namespace detail { namespace { diff --git a/cpp/src/text/normalize.cu b/cpp/src/text/normalize.cu index 2119b8ec463..3d98ae59dc0 100644 --- a/cpp/src/text/normalize.cu +++ b/cpp/src/text/normalize.cu @@ -14,6 +14,10 @@ * limitations under the License. */ +#include "text/subword/detail/data_normalizer.hpp" +#include "text/subword/detail/tokenizer_utils.cuh" +#include "text/utilities/tokenize_ops.cuh" + #include #include #include @@ -38,10 +42,6 @@ #include #include -#include -#include -#include - #include namespace nvtext { diff --git a/cpp/src/text/replace.cu b/cpp/src/text/replace.cu index ac3c84f1ef0..1fa0606424c 100644 --- a/cpp/src/text/replace.cu +++ b/cpp/src/text/replace.cu @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "text/utilities/tokenize_ops.cuh" + #include #include #include @@ -36,8 +38,6 @@ #include #include -#include - namespace nvtext { namespace detail { namespace { diff --git a/cpp/src/text/subword/data_normalizer.cu b/cpp/src/text/subword/data_normalizer.cu index 8bf55eb99b4..c662581b3f4 100644 --- a/cpp/src/text/subword/data_normalizer.cu +++ b/cpp/src/text/subword/data_normalizer.cu @@ -14,6 +14,9 @@ * limitations under the License. */ +#include "text/subword/detail/data_normalizer.hpp" +#include "text/subword/detail/tokenizer_utils.cuh" + #include #include #include @@ -30,9 +33,6 @@ #include #include -#include -#include - namespace nvtext { namespace detail { namespace { diff --git a/cpp/src/text/subword/detail/data_normalizer.hpp b/cpp/src/text/subword/detail/data_normalizer.hpp index 93a60bf4cb0..c70e3734691 100644 --- a/cpp/src/text/subword/detail/data_normalizer.hpp +++ b/cpp/src/text/subword/detail/data_normalizer.hpp @@ -16,14 +16,14 @@ #pragma once +#include "text/subword/detail/cp_data.h" + #include #include #include #include -#include - using uvector_pair = std::pair>, std::unique_ptr>>; diff --git a/cpp/src/text/subword/detail/tokenizer_utils.cuh b/cpp/src/text/subword/detail/tokenizer_utils.cuh index 354ef46451e..01df910d420 100644 --- a/cpp/src/text/subword/detail/tokenizer_utils.cuh +++ b/cpp/src/text/subword/detail/tokenizer_utils.cuh @@ -16,13 +16,13 @@ #pragma once +#include "text/subword/detail/cp_data.h" + #include #include #include -#include - #include namespace nvtext { diff --git a/cpp/src/text/subword/detail/wordpiece_tokenizer.hpp b/cpp/src/text/subword/detail/wordpiece_tokenizer.hpp index c9de07bfd3a..244fe5092e7 100644 --- a/cpp/src/text/subword/detail/wordpiece_tokenizer.hpp +++ b/cpp/src/text/subword/detail/wordpiece_tokenizer.hpp @@ -16,12 +16,12 @@ #pragma once +#include "text/subword/detail/data_normalizer.hpp" + #include #include -#include - namespace nvtext { struct hashed_vocabulary; diff --git a/cpp/src/text/subword/load_hash_file.cu b/cpp/src/text/subword/load_hash_file.cu index ae9208ff81f..0b4f9f729c3 100644 --- a/cpp/src/text/subword/load_hash_file.cu +++ b/cpp/src/text/subword/load_hash_file.cu @@ -14,6 +14,9 @@ * limitations under the License. */ +#include "text/subword/detail/codepoint_metadata.ah" +#include "text/subword/detail/tokenizer_utils.cuh" + #include #include #include @@ -28,9 +31,6 @@ #include -#include -#include - #include #include #include diff --git a/cpp/src/text/subword/subword_tokenize.cu b/cpp/src/text/subword/subword_tokenize.cu index 77a8816d6b6..a623450ecad 100644 --- a/cpp/src/text/subword/subword_tokenize.cu +++ b/cpp/src/text/subword/subword_tokenize.cu @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "text/subword/detail/wordpiece_tokenizer.hpp" + #include #include #include @@ -36,8 +38,6 @@ #include #include -#include - namespace nvtext { namespace detail { namespace { diff --git a/cpp/src/text/subword/wordpiece_tokenizer.cu b/cpp/src/text/subword/wordpiece_tokenizer.cu index b6861ec43b9..c094537ebc2 100644 --- a/cpp/src/text/subword/wordpiece_tokenizer.cu +++ b/cpp/src/text/subword/wordpiece_tokenizer.cu @@ -14,6 +14,10 @@ * limitations under the License. */ +#include "text/subword/detail/hash_utils.cuh" +#include "text/subword/detail/tokenizer_utils.cuh" +#include "text/subword/detail/wordpiece_tokenizer.hpp" + #include #include #include @@ -35,10 +39,6 @@ #include #include -#include -#include -#include - namespace nvtext { namespace detail { namespace { diff --git a/cpp/src/text/tokenize.cu b/cpp/src/text/tokenize.cu index e85c9399844..82c51e72b31 100644 --- a/cpp/src/text/tokenize.cu +++ b/cpp/src/text/tokenize.cu @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "text/utilities/tokenize_ops.cuh" + #include #include #include @@ -38,8 +40,6 @@ #include #include -#include - namespace nvtext { namespace detail { namespace { diff --git a/cpp/src/text/vocabulary_tokenize.cu b/cpp/src/text/vocabulary_tokenize.cu index 91a39798291..c99adda3fad 100644 --- a/cpp/src/text/vocabulary_tokenize.cu +++ b/cpp/src/text/vocabulary_tokenize.cu @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "text/utilities/tokenize_ops.cuh" + #include #include #include @@ -44,8 +46,6 @@ #include #include -#include - namespace nvtext { namespace detail { namespace { diff --git a/cpp/src/transform/jit/kernel.cu b/cpp/src/transform/jit/kernel.cu index 48c432e7e26..72eae2315cf 100644 --- a/cpp/src/transform/jit/kernel.cu +++ b/cpp/src/transform/jit/kernel.cu @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "transform/jit/operation-udf.hpp" + #include #include #include @@ -23,8 +25,6 @@ #include #include -#include - #include namespace cudf { diff --git a/cpp/src/transform/transform.cpp b/cpp/src/transform/transform.cpp index aae2c5bf729..6f61ed80dd8 100644 --- a/cpp/src/transform/transform.cpp +++ b/cpp/src/transform/transform.cpp @@ -14,6 +14,10 @@ * limitations under the License. */ +#include "jit/cache.hpp" +#include "jit/parser.hpp" +#include "jit/util.hpp" + #include #include #include @@ -25,9 +29,6 @@ #include -#include -#include -#include #include namespace cudf { diff --git a/cpp/src/utilities/logger.cpp b/cpp/src/utilities/logger.cpp index 4bed18e83f1..d54f5677c4c 100644 --- a/cpp/src/utilities/logger.cpp +++ b/cpp/src/utilities/logger.cpp @@ -14,12 +14,11 @@ * limitations under the License. */ -#include "spdlog/sinks/stdout_sinks.h" - #include #include #include +#include #include diff --git a/cpp/tests/hash_map/map_test.cu b/cpp/tests/hash_map/map_test.cu index f2b9688f3cc..4b10716706b 100644 --- a/cpp/tests/hash_map/map_test.cu +++ b/cpp/tests/hash_map/map_test.cu @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "hash/concurrent_unordered_map.cuh" + #include #include #include @@ -28,8 +30,6 @@ #include #include -#include - #include #include #include diff --git a/cpp/tests/io/comp/decomp_test.cpp b/cpp/tests/io/comp/decomp_test.cpp index 82d28e90f7b..38c1a57eca9 100644 --- a/cpp/tests/io/comp/decomp_test.cpp +++ b/cpp/tests/io/comp/decomp_test.cpp @@ -14,6 +14,9 @@ * limitations under the License. */ +#include "io/comp/gpuinflate.hpp" +#include "io/utilities/hostdevice_vector.hpp" + #include #include @@ -22,8 +25,6 @@ #include #include -#include -#include #include #include diff --git a/cpp/tests/io/fst/fst_test.cu b/cpp/tests/io/fst/fst_test.cu index 3ae4157e9f2..4df0d3ae04d 100644 --- a/cpp/tests/io/fst/fst_test.cu +++ b/cpp/tests/io/fst/fst_test.cu @@ -14,6 +14,9 @@ * limitations under the License. */ +#include "io/fst/lookup_tables.cuh" +#include "io/utilities/hostdevice_vector.hpp" + #include #include @@ -29,9 +32,6 @@ #include #include -#include -#include - #include #include diff --git a/cpp/tests/io/fst/logical_stack_test.cu b/cpp/tests/io/fst/logical_stack_test.cu index 2fb1bd97071..012f24c4e9f 100644 --- a/cpp/tests/io/fst/logical_stack_test.cu +++ b/cpp/tests/io/fst/logical_stack_test.cu @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "io/utilities/hostdevice_vector.hpp" + #include #include @@ -23,7 +25,6 @@ #include #include -#include #include #include diff --git a/cpp/tests/io/json_chunked_reader.cpp b/cpp/tests/io/json_chunked_reader.cpp index e2d5959c19f..8d8fdd2a0e1 100644 --- a/cpp/tests/io/json_chunked_reader.cpp +++ b/cpp/tests/io/json_chunked_reader.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ +#include "io/json/read_json.hpp" + #include #include #include #include #include -#include - /** * @brief Base test fixture for JSON reader tests */ diff --git a/cpp/tests/io/json_tree.cpp b/cpp/tests/io/json_tree.cpp index ed7f4d577be..3577b47a7e2 100644 --- a/cpp/tests/io/json_tree.cpp +++ b/cpp/tests/io/json_tree.cpp @@ -14,6 +14,9 @@ * limitations under the License. */ +#include "io/json/nested_json.hpp" +#include "io/utilities/hostdevice_vector.hpp" + #include #include #include @@ -28,9 +31,6 @@ #include #include -#include -#include - #include #include #include diff --git a/cpp/tests/io/json_type_cast_test.cu b/cpp/tests/io/json_type_cast_test.cu index 0aebedc7078..8a541022ab0 100644 --- a/cpp/tests/io/json_type_cast_test.cu +++ b/cpp/tests/io/json_type_cast_test.cu @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "io/utilities/string_parsing.hpp" + #include #include #include @@ -32,8 +34,6 @@ #include -#include - #include #include #include diff --git a/cpp/tests/io/json_whitespace_normalization_test.cu b/cpp/tests/io/json_whitespace_normalization_test.cu index 77c8d53e062..545d8d2c4f9 100644 --- a/cpp/tests/io/json_whitespace_normalization_test.cu +++ b/cpp/tests/io/json_whitespace_normalization_test.cu @@ -13,6 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include "io/fst/lookup_tables.cuh" +#include "io/utilities/hostdevice_vector.hpp" + #include #include #include @@ -26,9 +29,6 @@ #include -#include -#include - #include #include diff --git a/cpp/tests/io/nested_json_test.cpp b/cpp/tests/io/nested_json_test.cpp index 24f3e347a5f..97e1a78f909 100644 --- a/cpp/tests/io/nested_json_test.cpp +++ b/cpp/tests/io/nested_json_test.cpp @@ -14,6 +14,9 @@ * limitations under the License. */ +#include "io/json/nested_json.hpp" +#include "io/utilities/hostdevice_vector.hpp" + #include #include #include @@ -36,9 +39,6 @@ #include #include -#include -#include - #include namespace cuio_json = cudf::io::json; diff --git a/cpp/tests/io/text/multibyte_split_test.cpp b/cpp/tests/io/text/multibyte_split_test.cpp index 989d659f0e4..36338253c9b 100644 --- a/cpp/tests/io/text/multibyte_split_test.cpp +++ b/cpp/tests/io/text/multibyte_split_test.cpp @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "io/utilities/output_builder.cuh" + #include #include #include @@ -29,8 +31,6 @@ #include #include -#include - using cudf::test::strings_column_wrapper; // 😀 | F0 9F 98 80 | 11110000 10011111 10011000 10000000 // 😎 | F0 9F 98 8E | 11110000 10011111 10011000 10001110 diff --git a/cpp/tests/io/type_inference_test.cu b/cpp/tests/io/type_inference_test.cu index b5f1dbb6055..37156292f44 100644 --- a/cpp/tests/io/type_inference_test.cu +++ b/cpp/tests/io/type_inference_test.cu @@ -14,6 +14,9 @@ * limitations under the License. */ +#include "io/utilities/string_parsing.hpp" +#include "io/utilities/trie.cuh" + #include #include @@ -26,9 +29,6 @@ #include #include -#include -#include - #include #include #include diff --git a/cpp/tests/jit/parse_ptx_function.cpp b/cpp/tests/jit/parse_ptx_function.cpp index f86cd32ca61..6f9dfd06730 100644 --- a/cpp/tests/jit/parse_ptx_function.cpp +++ b/cpp/tests/jit/parse_ptx_function.cpp @@ -14,11 +14,11 @@ * limitations under the License. */ +#include "jit/parser.hpp" + #include #include -#include - #include #include diff --git a/cpp/tests/utilities_tests/span_tests.cu b/cpp/tests/utilities_tests/span_tests.cu index c4f7267e268..30496728083 100644 --- a/cpp/tests/utilities_tests/span_tests.cu +++ b/cpp/tests/utilities_tests/span_tests.cu @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "io/utilities/hostdevice_vector.hpp" + #include #include #include @@ -29,8 +31,6 @@ #include #include -#include - #include #include #include From e168f3c419bae8e8c6c9375fb9ddb230f6b506e4 Mon Sep 17 00:00:00 2001 From: Mark Harris Date: Tue, 20 Feb 2024 21:22:02 +0000 Subject: [PATCH 5/5] Force include of JIT header to be last to fix failing JIT tests. --- cpp/src/binaryop/jit/kernel.cu | 6 ++++-- cpp/src/transform/jit/kernel.cu | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cpp/src/binaryop/jit/kernel.cu b/cpp/src/binaryop/jit/kernel.cu index 920e9876559..985fc87521c 100644 --- a/cpp/src/binaryop/jit/kernel.cu +++ b/cpp/src/binaryop/jit/kernel.cu @@ -18,8 +18,6 @@ * limitations under the License. */ -#include "binaryop/jit/operation-udf.hpp" - #include #include #include @@ -28,6 +26,10 @@ #include +// clang-format off +#include "binaryop/jit/operation-udf.hpp" +// clang-format on + namespace cudf { namespace binops { namespace jit { diff --git a/cpp/src/transform/jit/kernel.cu b/cpp/src/transform/jit/kernel.cu index 72eae2315cf..4fd0369c26b 100644 --- a/cpp/src/transform/jit/kernel.cu +++ b/cpp/src/transform/jit/kernel.cu @@ -14,8 +14,6 @@ * limitations under the License. */ -#include "transform/jit/operation-udf.hpp" - #include #include #include @@ -27,6 +25,10 @@ #include +// clang-format off +#include "transform/jit/operation-udf.hpp" +// clang-format on + namespace cudf { namespace transformation { namespace jit {