diff --git a/cpp/include/cudf/aggregation.hpp b/cpp/include/cudf/aggregation.hpp index 74b964ccb25..0ef253560c2 100644 --- a/cpp/include/cudf/aggregation.hpp +++ b/cpp/include/cudf/aggregation.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. @@ -732,4 +732,4 @@ template std::unique_ptr make_merge_tdigest_aggregation(int max_centroids = 1000); /** @} */ // end of group -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/ast/expressions.hpp b/cpp/include/cudf/ast/expressions.hpp index c738cde9b0d..8e79e98a81c 100644 --- a/cpp/include/cudf/ast/expressions.hpp +++ b/cpp/include/cudf/ast/expressions.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. diff --git a/cpp/include/cudf/binaryop.hpp b/cpp/include/cudf/binaryop.hpp index eba848645f5..772894b1a23 100644 --- a/cpp/include/cudf/binaryop.hpp +++ b/cpp/include/cudf/binaryop.hpp @@ -259,7 +259,7 @@ std::pair scalar_col_valid_mask_and( } // namespace binops /** @} */ // end of group -} // namespace cudf +} // namespace CUDF_EXPORT cudf namespace cudf::binops::compiled::detail { diff --git a/cpp/include/cudf/column/column_device_view.cuh b/cpp/include/cudf/column/column_device_view.cuh index d2cf20c52cd..6aa2b6864b7 100644 --- a/cpp/include/cudf/column/column_device_view.cuh +++ b/cpp/include/cudf/column/column_device_view.cuh @@ -1497,11 +1497,10 @@ struct mutable_value_accessor { * @return The device pointer to be used for the d_children member of the given column */ template -CUDF_HIDDEN -ColumnDeviceView* child_columns_to_device_array(ColumnViewIterator child_begin, - ColumnViewIterator child_end, - void* h_ptr, - void* d_ptr) +CUDF_HIDDEN ColumnDeviceView* child_columns_to_device_array(ColumnViewIterator child_begin, + ColumnViewIterator child_end, + void* h_ptr, + void* d_ptr) { ColumnDeviceView* d_children = detail::align_ptr_for_type(d_ptr); auto num_children = std::distance(child_begin, child_end); diff --git a/cpp/include/cudf/column/column_view.hpp b/cpp/include/cudf/column/column_view.hpp index f6841202d29..fb8806cb1e4 100644 --- a/cpp/include/cudf/column/column_view.hpp +++ b/cpp/include/cudf/column/column_view.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. @@ -283,8 +283,7 @@ class column_view_base { size_type offset = 0); }; -class mutable_column_view_base : public column_view_base { -}; +class mutable_column_view_base : public column_view_base {}; } // namespace cudf::detail @@ -767,4 +766,4 @@ std::size_t shallow_hash(column_view const& input); bool is_shallow_equivalent(column_view const& lhs, column_view const& rhs); } // namespace detail -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/concatenate.hpp b/cpp/include/cudf/concatenate.hpp index b0b25d0e20a..0935bdf7def 100644 --- a/cpp/include/cudf/concatenate.hpp +++ b/cpp/include/cudf/concatenate.hpp @@ -98,4 +98,4 @@ std::unique_ptr concatenate( rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); /** @} */ // end of group -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/contiguous_split.hpp b/cpp/include/cudf/contiguous_split.hpp index 8cc9ed1fc97..179d53db49f 100644 --- a/cpp/include/cudf/contiguous_split.hpp +++ b/cpp/include/cudf/contiguous_split.hpp @@ -125,8 +125,14 @@ std::vector contiguous_split( rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); namespace detail { + +/** + * @brief A helper struct containing the state of contiguous_split, whether the caller + * is using the single-pass contiguous_split or chunked_pack. + * + */ struct CUDF_HIDDEN contiguous_split_state; -}; +} // namespace detail /** * @brief Perform a chunked "pack" operation of the input `table_view` using a user provided @@ -339,4 +345,4 @@ table_view unpack(packed_columns const& input); table_view unpack(uint8_t const* metadata, uint8_t const* gpu_data); /** @} */ -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/copying.hpp b/cpp/include/cudf/copying.hpp index 3e098bd4d4d..3c44ff48fdf 100644 --- a/cpp/include/cudf/copying.hpp +++ b/cpp/include/cudf/copying.hpp @@ -973,4 +973,4 @@ std::unique_ptr purge_nonempty_nulls( rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); /** @} */ -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/datetime.hpp b/cpp/include/cudf/datetime.hpp index a07a69d079e..f7bed8bdc7e 100644 --- a/cpp/include/cudf/datetime.hpp +++ b/cpp/include/cudf/datetime.hpp @@ -402,4 +402,4 @@ std::unique_ptr round_datetimes( /** @} */ // end of group } // namespace datetime -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/copy_if.cuh b/cpp/include/cudf/detail/copy_if.cuh index 1b03b830167..b6310e6cd2f 100644 --- a/cpp/include/cudf/detail/copy_if.cuh +++ b/cpp/include/cudf/detail/copy_if.cuh @@ -242,8 +242,8 @@ struct scatter_gather_functor { rmm::cuda_stream_view stream, rmm::device_async_resource_ref mr) { - auto output_column = cudf::allocate_like( - input, output_size, cudf::mask_allocation_policy::RETAIN, stream, mr); + auto output_column = + cudf::allocate_like(input, output_size, cudf::mask_allocation_policy::RETAIN, stream, mr); auto output = output_column->mutable_view(); bool has_valid = input.nullable(); diff --git a/cpp/include/cudf/detail/gather.cuh b/cpp/include/cudf/detail/gather.cuh index 75224e52c30..f6caf85c7ff 100644 --- a/cpp/include/cudf/detail/gather.cuh +++ b/cpp/include/cudf/detail/gather.cuh @@ -217,10 +217,9 @@ struct column_gatherer_impl(), source_column.size(), @@ -413,8 +412,8 @@ struct column_gatherer_impl { auto keys_copy = std::make_unique(dictionary.keys(), stream, mr); // Perform gather on just the indices column_view indices = dictionary.get_indices_annotated(); - auto new_indices = cudf::allocate_like( - indices, output_count, cudf::mask_allocation_policy::NEVER, stream, mr); + auto new_indices = + cudf::allocate_like(indices, output_count, cudf::mask_allocation_policy::NEVER, stream, mr); gather_helper( cudf::detail::indexalator_factory::make_input_iterator(indices), indices.size(), diff --git a/cpp/include/cudf/detail/gather.hpp b/cpp/include/cudf/detail/gather.hpp index 2e2623955c2..39cd43934e3 100644 --- a/cpp/include/cudf/detail/gather.hpp +++ b/cpp/include/cudf/detail/gather.hpp @@ -85,4 +85,4 @@ std::unique_ptr
gather(table_view const& source_table, rmm::device_async_resource_ref mr); } // namespace detail -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/is_element_valid.hpp b/cpp/include/cudf/detail/is_element_valid.hpp index 966f6bc60de..4b74d12f306 100644 --- a/cpp/include/cudf/detail/is_element_valid.hpp +++ b/cpp/include/cudf/detail/is_element_valid.hpp @@ -45,4 +45,4 @@ bool is_element_valid_sync(column_view const& col_view, rmm::cuda_stream_view stream); } // namespace detail -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/utilities/default_stream.hpp b/cpp/include/cudf/detail/utilities/default_stream.hpp index cafa31bcdfe..f988355e6e0 100644 --- a/cpp/include/cudf/detail/utilities/default_stream.hpp +++ b/cpp/include/cudf/detail/utilities/default_stream.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. @@ -35,4 +35,4 @@ extern rmm::cuda_stream_view const default_stream_value; } // namespace detail -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/utilities/stacktrace.hpp b/cpp/include/cudf/detail/utilities/stacktrace.hpp index 384571533e7..f54f5f3579a 100644 --- a/cpp/include/cudf/detail/utilities/stacktrace.hpp +++ b/cpp/include/cudf/detail/utilities/stacktrace.hpp @@ -48,4 +48,4 @@ std::string get_stacktrace(capture_last_stackframe capture_last_frame); /** @} */ // end of group } // namespace detail -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/utilities/stream_pool.hpp b/cpp/include/cudf/detail/utilities/stream_pool.hpp index 995ecb04671..3f03f994777 100644 --- a/cpp/include/cudf/detail/utilities/stream_pool.hpp +++ b/cpp/include/cudf/detail/utilities/stream_pool.hpp @@ -125,4 +125,4 @@ cuda_stream_pool& global_cuda_stream_pool(); void join_streams(host_span streams, rmm::cuda_stream_view stream); } // namespace detail -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/dictionary/detail/search.hpp b/cpp/include/cudf/dictionary/detail/search.hpp index fcab5b0348c..921acc258a9 100644 --- a/cpp/include/cudf/dictionary/detail/search.hpp +++ b/cpp/include/cudf/dictionary/detail/search.hpp @@ -64,4 +64,4 @@ std::unique_ptr get_insert_index(dictionary_column_view const& dictionar } // namespace detail } // namespace dictionary -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/dictionary/dictionary_column_view.hpp b/cpp/include/cudf/dictionary/dictionary_column_view.hpp index 0d3e73ac84a..dc822fee38b 100644 --- a/cpp/include/cudf/dictionary/dictionary_column_view.hpp +++ b/cpp/include/cudf/dictionary/dictionary_column_view.hpp @@ -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. diff --git a/cpp/include/cudf/filling.hpp b/cpp/include/cudf/filling.hpp index 28a935b1ae9..054f1e859f4 100644 --- a/cpp/include/cudf/filling.hpp +++ b/cpp/include/cudf/filling.hpp @@ -245,4 +245,4 @@ std::unique_ptr calendrical_month_sequence( rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); /** @} */ // end of group -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/groupby.hpp b/cpp/include/cudf/groupby.hpp index 320e937107e..f7df9c1aa9b 100644 --- a/cpp/include/cudf/groupby.hpp +++ b/cpp/include/cudf/groupby.hpp @@ -421,4 +421,4 @@ class groupby { }; /** @} */ } // namespace groupby -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/hashing.hpp b/cpp/include/cudf/hashing.hpp index d209461cc56..b8be2af6967 100644 --- a/cpp/include/cudf/hashing.hpp +++ b/cpp/include/cudf/hashing.hpp @@ -188,4 +188,4 @@ std::unique_ptr xxhash_64( } // namespace hashing /** @} */ // end of group -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/interop.hpp b/cpp/include/cudf/interop.hpp index 4d0edc66471..009f34cd508 100644 --- a/cpp/include/cudf/interop.hpp +++ b/cpp/include/cudf/interop.hpp @@ -561,4 +561,4 @@ unique_column_view_t from_arrow_device_column( rmm::mr::device_memory_resource* mr = rmm::mr::get_current_device_resource()); /** @} */ // end of group -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/io/arrow_io_source.hpp b/cpp/include/cudf/io/arrow_io_source.hpp index 7ba4733e0d7..8d5b39b9381 100644 --- a/cpp/include/cudf/io/arrow_io_source.hpp +++ b/cpp/include/cudf/io/arrow_io_source.hpp @@ -86,4 +86,4 @@ class arrow_io_source : public datasource { /** @} */ // end of group } // namespace io -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/io/config_utils.hpp b/cpp/include/cudf/io/config_utils.hpp index 430f9caf0f6..1827ba0e3e6 100644 --- a/cpp/include/cudf/io/config_utils.hpp +++ b/cpp/include/cudf/io/config_utils.hpp @@ -50,4 +50,4 @@ bool is_all_enabled(); bool is_stable_enabled(); } // namespace io::nvcomp_integration -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/io/detail/avro.hpp b/cpp/include/cudf/io/detail/avro.hpp index f7c6ee6f29d..297cbe3e40f 100644 --- a/cpp/include/cudf/io/detail/avro.hpp +++ b/cpp/include/cudf/io/detail/avro.hpp @@ -46,4 +46,4 @@ table_with_metadata read_avro(std::unique_ptr&& source, } // namespace avro } // namespace detail } // namespace io -} // namespace CUDF_EXPORT cudf +} // namespace cudf diff --git a/cpp/include/cudf/io/detail/csv.hpp b/cpp/include/cudf/io/detail/csv.hpp index 65eda69c7fa..e1aa89f610c 100644 --- a/cpp/include/cudf/io/detail/csv.hpp +++ b/cpp/include/cudf/io/detail/csv.hpp @@ -62,4 +62,4 @@ void write_csv(data_sink* sink, } // namespace csv } // namespace detail } // namespace io -} // namespace CUDF_EXPORT cudf +} // namespace cudf diff --git a/cpp/include/cudf/io/detail/parquet.hpp b/cpp/include/cudf/io/detail/parquet.hpp index fff451c42c8..d2fa0e28d5f 100644 --- a/cpp/include/cudf/io/detail/parquet.hpp +++ b/cpp/include/cudf/io/detail/parquet.hpp @@ -34,7 +34,7 @@ #include namespace cudf { - namespace io { +namespace io { // Forward declaration class CUDF_EXPORT parquet_reader_options; diff --git a/cpp/include/cudf/io/detail/tokenize_json.hpp b/cpp/include/cudf/io/detail/tokenize_json.hpp index 74c046ef0d6..715eb855daa 100644 --- a/cpp/include/cudf/io/detail/tokenize_json.hpp +++ b/cpp/include/cudf/io/detail/tokenize_json.hpp @@ -24,8 +24,7 @@ #include #include -namespace CUDF_EXPORT cudf { -namespace io::json { +namespace cudf::io::json { /// Type used to represent the atomic symbol type used within the finite-state machine using SymbolT = char; @@ -119,7 +118,7 @@ enum token_t : PdaTokenT { NUM_TOKENS }; -namespace detail { +namespace CUDF_EXPORT detail { /** * @brief Parses the given JSON string and emits a sequence of tokens that demarcate relevant @@ -138,7 +137,6 @@ std::pair, rmm::device_uvector> ge rmm::cuda_stream_view stream, rmm::device_async_resource_ref mr); -} // namespace detail +} // namespace CUDF_EXPORT detail -} // namespace io::json -} // namespace cudf +} // namespace cudf::io::json diff --git a/cpp/include/cudf/io/memory_resource.hpp b/cpp/include/cudf/io/memory_resource.hpp index 03b1581667f..811880992d7 100644 --- a/cpp/include/cudf/io/memory_resource.hpp +++ b/cpp/include/cudf/io/memory_resource.hpp @@ -66,4 +66,4 @@ struct host_mr_options { bool config_default_host_memory_resource(host_mr_options const& opts); } // namespace io -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/io/nvcomp_adapter.hpp b/cpp/include/cudf/io/nvcomp_adapter.hpp index ed50cc59334..1e9bdac257e 100644 --- a/cpp/include/cudf/io/nvcomp_adapter.hpp +++ b/cpp/include/cudf/io/nvcomp_adapter.hpp @@ -21,7 +21,6 @@ #include #include - namespace CUDF_EXPORT cudf { namespace io::nvcomp { @@ -29,16 +28,31 @@ enum class compression_type { SNAPPY, ZSTD, DEFLATE, LZ4 }; /** * @brief Set of parameters that impact whether the use nvCOMP features is enabled. + * */ struct feature_status_parameters { - int lib_major_version; - int lib_minor_version; - int lib_patch_version; - bool are_all_integrations_enabled; - bool are_stable_integrations_enabled; - int compute_capability_major; + int lib_major_version; ///< major version + int lib_minor_version; ///< minor version + int lib_patch_version; ///< patch version + bool are_all_integrations_enabled; ///< all integrations + bool are_stable_integrations_enabled; ///< stable integrations + int compute_capability_major; ///< cuda compute major version + /** + * @brief Default Constructor + */ feature_status_parameters(); + + /**pht + * @brief feature_status_parameters Constructor + * + * @param major positive integer representing major value + * @param minor positive integer representing minor value + * @param patch positive integer representing patch value + * @param all_enabled if all integrations are enabled + * @param stable_enabled if stable integrations are enabled + * @param cc_major cuda compute capability + */ feature_status_parameters( int major, int minor, int patch, bool all_enabled, bool stable_enabled, int cc_major) : lib_major_version{major}, @@ -89,4 +103,4 @@ inline bool operator==(feature_status_parameters const& lhs, feature_status_para compression_type compression, feature_status_parameters params = feature_status_parameters()); } // namespace io::nvcomp -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/io/orc.hpp b/cpp/include/cudf/io/orc.hpp index 872b6705a1b..48028d42c0d 100644 --- a/cpp/include/cudf/io/orc.hpp +++ b/cpp/include/cudf/io/orc.hpp @@ -1461,4 +1461,4 @@ class orc_chunked_writer { /** @} */ // end of group } // namespace io -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/io/orc_types.hpp b/cpp/include/cudf/io/orc_types.hpp index b9c757665ed..f6c03814c9b 100644 --- a/cpp/include/cudf/io/orc_types.hpp +++ b/cpp/include/cudf/io/orc_types.hpp @@ -108,4 +108,4 @@ enum ProtofType : uint8_t { /** @} */ // end of group } // namespace io::orc -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/io/parquet.hpp b/cpp/include/cudf/io/parquet.hpp index 88650e57a14..63e7728067e 100644 --- a/cpp/include/cudf/io/parquet.hpp +++ b/cpp/include/cudf/io/parquet.hpp @@ -1407,4 +1407,4 @@ class parquet_chunked_writer { /** @} */ // end of group } // namespace io -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/io/text/data_chunk_source_factories.hpp b/cpp/include/cudf/io/text/data_chunk_source_factories.hpp index 3a111bc4dd9..42d0540b386 100644 --- a/cpp/include/cudf/io/text/data_chunk_source_factories.hpp +++ b/cpp/include/cudf/io/text/data_chunk_source_factories.hpp @@ -87,4 +87,4 @@ std::unique_ptr make_source_from_bgzip_file(std::string_view std::unique_ptr make_source(cudf::string_scalar& data); } // namespace io::text -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/join.hpp b/cpp/include/cudf/join.hpp index b922216cbeb..6250b74a900 100644 --- a/cpp/include/cudf/join.hpp +++ b/cpp/include/cudf/join.hpp @@ -44,13 +44,24 @@ enum class has_nested : bool { YES, NO }; // forward declaration namespace hashing::detail { + +/** + * @brief Forward declaration for our Murmur Hash 3 implementation + */ template class CUDF_HIDDEN MurmurHash3_x86_32; } // namespace hashing::detail namespace detail { + +/** + * @brief Forward declaration for our hash join + */ template class CUDF_HIDDEN hash_join; +/** + * @brief Forward declaration for our distinct hash join + */ template class CUDF_HIDDEN distinct_hash_join; } // namespace detail @@ -1179,4 +1190,4 @@ std::size_t conditional_left_anti_join_size( ast::expression const& binary_predicate, rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); /** @} */ // end of group -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/lists/detail/scatter.cuh b/cpp/include/cudf/lists/detail/scatter.cuh index bcf40d73e0a..be76e456900 100644 --- a/cpp/include/cudf/lists/detail/scatter.cuh +++ b/cpp/include/cudf/lists/detail/scatter.cuh @@ -239,11 +239,11 @@ std::unique_ptr scatter(scalar const& slr, auto const num_rows = target.size(); if (num_rows == 0) { return cudf::empty_like(target); } - auto lv = static_cast(&slr); - bool slr_valid = slr.is_valid(stream); - rmm::device_buffer null_mask = - slr_valid ? cudf::create_null_mask(1, mask_state::UNALLOCATED, stream, mr) - : cudf::create_null_mask(1, mask_state::ALL_NULL, stream, mr); + auto lv = static_cast(&slr); + bool slr_valid = slr.is_valid(stream); + rmm::device_buffer null_mask = slr_valid + ? cudf::create_null_mask(1, mask_state::UNALLOCATED, stream, mr) + : cudf::create_null_mask(1, mask_state::ALL_NULL, stream, mr); auto offset_column = make_numeric_column(data_type{type_to_id()}, 2, mask_state::UNALLOCATED, stream, mr); thrust::sequence(rmm::exec_policy_nosync(stream), diff --git a/cpp/include/cudf/lists/filling.hpp b/cpp/include/cudf/lists/filling.hpp index 5b9714b036c..a1f3c37ad9e 100644 --- a/cpp/include/cudf/lists/filling.hpp +++ b/cpp/include/cudf/lists/filling.hpp @@ -115,4 +115,4 @@ std::unique_ptr sequences( /** @} */ // end of group } // namespace lists -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/lists/reverse.hpp b/cpp/include/cudf/lists/reverse.hpp index 440e95a506f..f00e6e5117a 100644 --- a/cpp/include/cudf/lists/reverse.hpp +++ b/cpp/include/cudf/lists/reverse.hpp @@ -57,4 +57,4 @@ std::unique_ptr reverse( /** @} */ // end of doxygen group } // namespace lists -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/lists/set_operations.hpp b/cpp/include/cudf/lists/set_operations.hpp index 5d255003001..e9d30ce3758 100644 --- a/cpp/include/cudf/lists/set_operations.hpp +++ b/cpp/include/cudf/lists/set_operations.hpp @@ -179,4 +179,4 @@ std::unique_ptr difference_distinct( /** @} */ // end of group } // namespace lists -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/lists/stream_compaction.hpp b/cpp/include/cudf/lists/stream_compaction.hpp index 2ebaef6875e..28ef13cd870 100644 --- a/cpp/include/cudf/lists/stream_compaction.hpp +++ b/cpp/include/cudf/lists/stream_compaction.hpp @@ -97,4 +97,4 @@ std::unique_ptr distinct( /** @} */ // end of group } // namespace lists -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/merge.hpp b/cpp/include/cudf/merge.hpp index 894abe556d5..1fc57a6ab72 100644 --- a/cpp/include/cudf/merge.hpp +++ b/cpp/include/cudf/merge.hpp @@ -110,4 +110,4 @@ std::unique_ptr merge( rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); /** @} */ // end of group -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/null_mask.hpp b/cpp/include/cudf/null_mask.hpp index e73e221873d..70ca6aa29c5 100644 --- a/cpp/include/cudf/null_mask.hpp +++ b/cpp/include/cudf/null_mask.hpp @@ -209,4 +209,4 @@ cudf::size_type null_count(bitmask_type const* bitmask, size_type stop, rmm::cuda_stream_view stream = cudf::get_default_stream()); /** @} */ // end of group -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/partitioning.hpp b/cpp/include/cudf/partitioning.hpp index 1d98c90ac32..6a53553063e 100644 --- a/cpp/include/cudf/partitioning.hpp +++ b/cpp/include/cudf/partitioning.hpp @@ -255,4 +255,4 @@ std::pair, std::vector> round_robi rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); /** @} */ // end of group -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/quantiles.hpp b/cpp/include/cudf/quantiles.hpp index 02231dca860..47eac2e72f9 100644 --- a/cpp/include/cudf/quantiles.hpp +++ b/cpp/include/cudf/quantiles.hpp @@ -130,4 +130,4 @@ std::unique_ptr percentile_approx( rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); /** @} */ // end of group -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/reduction.hpp b/cpp/include/cudf/reduction.hpp index 3b6038507c7..e42ff5df15d 100644 --- a/cpp/include/cudf/reduction.hpp +++ b/cpp/include/cudf/reduction.hpp @@ -233,4 +233,4 @@ std::pair, std::unique_ptr> minmax( /** @} */ // end of group -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/replace.hpp b/cpp/include/cudf/replace.hpp index 06acebce5da..43aabd6c6c6 100644 --- a/cpp/include/cudf/replace.hpp +++ b/cpp/include/cudf/replace.hpp @@ -309,4 +309,4 @@ void normalize_nans_and_zeros(mutable_column_view& in_out, rmm::cuda_stream_view stream = cudf::get_default_stream()); /** @} */ // end of group -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/reshape.hpp b/cpp/include/cudf/reshape.hpp index 3226f407cdf..a0a7fe694bb 100644 --- a/cpp/include/cudf/reshape.hpp +++ b/cpp/include/cudf/reshape.hpp @@ -106,4 +106,4 @@ std::unique_ptr byte_cast( /** @} */ // end of group -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/rolling.hpp b/cpp/include/cudf/rolling.hpp index 068c06021d3..5b3b7f661d4 100644 --- a/cpp/include/cudf/rolling.hpp +++ b/cpp/include/cudf/rolling.hpp @@ -596,4 +596,4 @@ std::unique_ptr rolling_window( rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); /** @} */ // end of group -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/round.hpp b/cpp/include/cudf/round.hpp index a260f498ec5..ef144b328f7 100644 --- a/cpp/include/cudf/round.hpp +++ b/cpp/include/cudf/round.hpp @@ -79,4 +79,4 @@ std::unique_ptr round( rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); /** @} */ // end of group -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/search.hpp b/cpp/include/cudf/search.hpp index c4b28e2c540..ad170ec726b 100644 --- a/cpp/include/cudf/search.hpp +++ b/cpp/include/cudf/search.hpp @@ -169,4 +169,4 @@ std::unique_ptr contains( rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); /** @} */ // end of group -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/sorting.hpp b/cpp/include/cudf/sorting.hpp index 8d96b043253..4cb265a2a0b 100644 --- a/cpp/include/cudf/sorting.hpp +++ b/cpp/include/cudf/sorting.hpp @@ -347,4 +347,4 @@ std::unique_ptr
stable_segmented_sort_by_key( rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); /** @} */ // end of group -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/stream_compaction.hpp b/cpp/include/cudf/stream_compaction.hpp index cea0d8a781a..18e63760c12 100644 --- a/cpp/include/cudf/stream_compaction.hpp +++ b/cpp/include/cudf/stream_compaction.hpp @@ -400,4 +400,4 @@ cudf::size_type distinct_count(table_view const& input, null_equality nulls_equal = null_equality::EQUAL); /** @} */ -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/strings/detail/merge.hpp b/cpp/include/cudf/strings/detail/merge.hpp index 35fd9c0593d..0ab221601fe 100644 --- a/cpp/include/cudf/strings/detail/merge.hpp +++ b/cpp/include/cudf/strings/detail/merge.hpp @@ -21,7 +21,7 @@ #include -namespace cudf ::strings ::detail { +namespace cudf::strings::detail { /** * @brief Merges two strings columns * diff --git a/cpp/include/cudf/strings/utilities.hpp b/cpp/include/cudf/strings/utilities.hpp index f1465ce91ab..1f899372534 100644 --- a/cpp/include/cudf/strings/utilities.hpp +++ b/cpp/include/cudf/strings/utilities.hpp @@ -42,4 +42,4 @@ int64_t get_offset64_threshold(); bool is_large_strings_enabled(); } // namespace strings -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/table/table_view.hpp b/cpp/include/cudf/table/table_view.hpp index 3bde83322db..0337889ce04 100644 --- a/cpp/include/cudf/table/table_view.hpp +++ b/cpp/include/cudf/table/table_view.hpp @@ -133,9 +133,7 @@ class table_view_base { * @param column_index The index of the desired column * @return A reference to the desired column */ - ColumnView const& column(size_type column_index) const { - return _columns.at(column_index); - } + ColumnView const& column(size_type column_index) const { return _columns.at(column_index); } /** * @brief Returns the number of columns @@ -179,7 +177,7 @@ class table_view_base { table_view_base& operator=(table_view_base&&) = default; }; -} // namespace detail +} // namespace CUDF_HIDDEN detail /** * @brief Determine if any nested columns exist in a given table. diff --git a/cpp/include/cudf/timezone.hpp b/cpp/include/cudf/timezone.hpp index 981823b672f..8329c64e24f 100644 --- a/cpp/include/cudf/timezone.hpp +++ b/cpp/include/cudf/timezone.hpp @@ -54,4 +54,4 @@ std::unique_ptr
make_timezone_transition_table( std::string_view timezone_name, rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/transform.hpp b/cpp/include/cudf/transform.hpp index ee73050a323..adc5bdb2af8 100644 --- a/cpp/include/cudf/transform.hpp +++ b/cpp/include/cudf/transform.hpp @@ -249,4 +249,4 @@ std::unique_ptr segmented_row_bit_count( rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); /** @} */ // end of group -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/transpose.hpp b/cpp/include/cudf/transpose.hpp index b62d1ee2cd6..f4433c46a06 100644 --- a/cpp/include/cudf/transpose.hpp +++ b/cpp/include/cudf/transpose.hpp @@ -49,4 +49,4 @@ std::pair, table_view> transpose( rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); /** @} */ // end of group -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/types.hpp b/cpp/include/cudf/types.hpp index 71e3667c5f6..409b8c825bb 100644 --- a/cpp/include/cudf/types.hpp +++ b/cpp/include/cudf/types.hpp @@ -346,4 +346,4 @@ inline bool operator!=(data_type const& lhs, data_type const& rhs) { return !(lh std::size_t size_of(data_type t); /** @} */ -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/unary.hpp b/cpp/include/cudf/unary.hpp index da5450e5c9e..d08d7d055ef 100644 --- a/cpp/include/cudf/unary.hpp +++ b/cpp/include/cudf/unary.hpp @@ -241,4 +241,4 @@ std::unique_ptr is_not_nan( rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); /** @} */ // end of group -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/utilities/logger.hpp b/cpp/include/cudf/utilities/logger.hpp index 3083ffd5281..45d5d1b12e1 100644 --- a/cpp/include/cudf/utilities/logger.hpp +++ b/cpp/include/cudf/utilities/logger.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. @@ -45,4 +45,4 @@ namespace CUDF_EXPORT cudf { */ spdlog::logger& logger(); -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf_test/base_fixture.hpp b/cpp/include/cudf_test/base_fixture.hpp index 60db164fe7a..e582d1f8860 100644 --- a/cpp/include/cudf_test/base_fixture.hpp +++ b/cpp/include/cudf_test/base_fixture.hpp @@ -100,4 +100,4 @@ class TempDirTestEnvironment : public ::testing::Environment { }; } // namespace test -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf_test/column_utilities.hpp b/cpp/include/cudf_test/column_utilities.hpp index 4e291ebbeec..944c6195afb 100644 --- a/cpp/include/cudf_test/column_utilities.hpp +++ b/cpp/include/cudf_test/column_utilities.hpp @@ -23,8 +23,8 @@ #include #include #include -#include #include +#include #include #include @@ -196,8 +196,7 @@ std::pair, std::vector> to_host(column_view * `column_view`'s data, and second is the column's bitmask. */ template ()>* = nullptr> -CUDF_EXPORT -std::pair, std::vector> to_host(column_view c); +CUDF_EXPORT std::pair, std::vector> to_host(column_view c); /** * @brief Copies the data and bitmask of a `column_view` of strings @@ -210,8 +209,8 @@ std::pair, std::vector> to_host(column_view * and second is the column's bitmask. */ template <> -CUDF_EXPORT -std::pair, std::vector> to_host(column_view c); +CUDF_EXPORT std::pair, std::vector> to_host( + column_view c); //! @endcond /** @@ -238,7 +237,7 @@ struct large_strings_enabler { }; } // namespace test -} // namespace cudf +} // namespace CUDF_EXPORT cudf // Macros for showing line of failure. #define CUDF_TEST_EXPECT_COLUMN_PROPERTIES_EQUAL(lhs, rhs) \ diff --git a/cpp/include/cudf_test/column_wrapper.hpp b/cpp/include/cudf_test/column_wrapper.hpp index 27d345e8438..6403f07cd5c 100644 --- a/cpp/include/cudf_test/column_wrapper.hpp +++ b/cpp/include/cudf_test/column_wrapper.hpp @@ -31,8 +31,8 @@ #include #include #include -#include #include +#include #include #include @@ -1953,4 +1953,4 @@ class structs_column_wrapper : public detail::column_wrapper { }; } // namespace test -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf_test/debug_utilities.hpp b/cpp/include/cudf_test/debug_utilities.hpp index 203dd6171be..049b4579316 100644 --- a/cpp/include/cudf_test/debug_utilities.hpp +++ b/cpp/include/cudf_test/debug_utilities.hpp @@ -47,4 +47,4 @@ std::vector to_strings(cudf::column_view const& col); void print(cudf::column_view const& col, std::ostream& os = std::cout); } // namespace test -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf_test/default_stream.hpp b/cpp/include/cudf_test/default_stream.hpp index b94ca62ae4f..4f63add3071 100644 --- a/cpp/include/cudf_test/default_stream.hpp +++ b/cpp/include/cudf_test/default_stream.hpp @@ -40,4 +40,4 @@ namespace test { rmm::cuda_stream_view const get_default_stream(); } // namespace test -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf_test/file_utilities.hpp b/cpp/include/cudf_test/file_utilities.hpp index 8a3081c4460..37347e563cd 100644 --- a/cpp/include/cudf_test/file_utilities.hpp +++ b/cpp/include/cudf_test/file_utilities.hpp @@ -16,8 +16,8 @@ #pragma once -#include #include +#include #include diff --git a/cpp/include/cudf_test/io_metadata_utilities.hpp b/cpp/include/cudf_test/io_metadata_utilities.hpp index f2ea4f0145d..c18d427d905 100644 --- a/cpp/include/cudf_test/io_metadata_utilities.hpp +++ b/cpp/include/cudf_test/io_metadata_utilities.hpp @@ -31,4 +31,4 @@ void expect_metadata_equal(cudf::io::table_input_metadata in_meta, void expect_metadata_equal(cudf::io::table_metadata lhs_meta, cudf::io::table_metadata rhs_meta); } // namespace test -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf_test/iterator_utilities.hpp b/cpp/include/cudf_test/iterator_utilities.hpp index 461fb8f4fe7..8db0275d2f4 100644 --- a/cpp/include/cudf_test/iterator_utilities.hpp +++ b/cpp/include/cudf_test/iterator_utilities.hpp @@ -137,4 +137,4 @@ template } // namespace iterators } // namespace test -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf_test/print_utilities.cuh b/cpp/include/cudf_test/print_utilities.cuh index d4e4ccb29c1..828188e65c3 100644 --- a/cpp/include/cudf_test/print_utilities.cuh +++ b/cpp/include/cudf_test/print_utilities.cuh @@ -26,7 +26,7 @@ #include -namespace CUDF_EXPORT { +namespace CUDF_EXPORT cudf { namespace test::print { constexpr int32_t hex_tag = 0; @@ -140,4 +140,4 @@ void print_array(std::size_t count, rmm::cuda_stream_view stream, Ts... args) } } // namespace test::print -} // namespace CUDF_EXPORT +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf_test/random.hpp b/cpp/include/cudf_test/random.hpp index d7df8ae95b8..fe1fb0a14bf 100644 --- a/cpp/include/cudf_test/random.hpp +++ b/cpp/include/cudf_test/random.hpp @@ -171,4 +171,4 @@ class UniformRandomGenerator { }; } // namespace test -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf_test/table_utilities.hpp b/cpp/include/cudf_test/table_utilities.hpp index d172f8dc70a..5e60419d679 100644 --- a/cpp/include/cudf_test/table_utilities.hpp +++ b/cpp/include/cudf_test/table_utilities.hpp @@ -60,7 +60,7 @@ void expect_tables_equal(cudf::table_view lhs, cudf::table_view rhs); void expect_tables_equivalent(cudf::table_view lhs, cudf::table_view rhs); } // namespace test::detail -} // namespace cudf +} // namespace CUDF_EXPORT cudf // Macros for showing line of failure. #define CUDF_TEST_EXPECT_TABLE_PROPERTIES_EQUAL(lhs, rhs) \ diff --git a/cpp/include/cudf_test/tdigest_utilities.cuh b/cpp/include/cudf_test/tdigest_utilities.cuh index 92d49e0980c..5fd2403b0f2 100644 --- a/cpp/include/cudf_test/tdigest_utilities.cuh +++ b/cpp/include/cudf_test/tdigest_utilities.cuh @@ -584,4 +584,4 @@ void tdigest_merge_empty(MergeFunc merge_op) } } // namespace test -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf_test/testing_main.hpp b/cpp/include/cudf_test/testing_main.hpp index 04da1e03dd1..452fc13e8ee 100644 --- a/cpp/include/cudf_test/testing_main.hpp +++ b/cpp/include/cudf_test/testing_main.hpp @@ -93,7 +93,7 @@ inline std::shared_ptr create_memory_resource( } } // namespace test -} // namespace cudf +} // namespace CUDF_EXPORT cudf /** * @brief Parses the cuDF test command line options. diff --git a/cpp/include/cudf_test/timestamp_utilities.cuh b/cpp/include/cudf_test/timestamp_utilities.cuh index 2bbaa5fd952..e0789210bf9 100644 --- a/cpp/include/cudf_test/timestamp_utilities.cuh +++ b/cpp/include/cudf_test/timestamp_utilities.cuh @@ -76,4 +76,4 @@ inline cudf::test::fixed_width_column_wrapper generate_timestamps(in } } // namespace test -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf_test/type_list_utilities.hpp b/cpp/include/cudf_test/type_list_utilities.hpp index 5f87cb6a774..1793a8ecce0 100644 --- a/cpp/include/cudf_test/type_list_utilities.hpp +++ b/cpp/include/cudf_test/type_list_utilities.hpp @@ -629,4 +629,4 @@ using Unique = typename UniqueImpl::type; } // namespace test -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf_test/type_lists.hpp b/cpp/include/cudf_test/type_lists.hpp index 54843228346..4cd01a09187 100644 --- a/cpp/include/cudf_test/type_lists.hpp +++ b/cpp/include/cudf_test/type_lists.hpp @@ -434,4 +434,4 @@ static constexpr std::array non_fixed_width_type_ids{cudf::typ cudf::type_id::STRING}; } // namespace test -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/nvtext/byte_pair_encoding.hpp b/cpp/include/nvtext/byte_pair_encoding.hpp index 38e609d7fc9..6559933f696 100644 --- a/cpp/include/nvtext/byte_pair_encoding.hpp +++ b/cpp/include/nvtext/byte_pair_encoding.hpp @@ -19,8 +19,8 @@ #include #include #include -#include #include +#include #include @@ -133,4 +133,4 @@ std::unique_ptr byte_pair_encoding( rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); /** @} */ // end of group -} // namespace nvtext +} // namespace CUDF_EXPORT nvtext diff --git a/cpp/include/nvtext/detail/generate_ngrams.hpp b/cpp/include/nvtext/detail/generate_ngrams.hpp index c34a130e21b..7c49421560d 100644 --- a/cpp/include/nvtext/detail/generate_ngrams.hpp +++ b/cpp/include/nvtext/detail/generate_ngrams.hpp @@ -35,4 +35,4 @@ std::unique_ptr hash_character_ngrams(cudf::strings_column_view co rmm::device_async_resource_ref mr); } // namespace detail -} // namespace nvtext +} // namespace CUDF_EXPORT nvtext diff --git a/cpp/include/nvtext/detail/load_hash_file.hpp b/cpp/include/nvtext/detail/load_hash_file.hpp index 0c58315ad62..438a4a9afdd 100644 --- a/cpp/include/nvtext/detail/load_hash_file.hpp +++ b/cpp/include/nvtext/detail/load_hash_file.hpp @@ -47,4 +47,4 @@ std::unique_ptr load_vocabulary_file( rmm::device_async_resource_ref mr); } // namespace detail -} // namespace nvtext +} // namespace CUDF_EXPORT nvtext diff --git a/cpp/include/nvtext/detail/tokenize.hpp b/cpp/include/nvtext/detail/tokenize.hpp index a64882efb0d..57ad008f1a9 100644 --- a/cpp/include/nvtext/detail/tokenize.hpp +++ b/cpp/include/nvtext/detail/tokenize.hpp @@ -70,4 +70,4 @@ std::unique_ptr count_tokens(cudf::strings_column_view const& stri rmm::device_async_resource_ref mr); } // namespace detail -} // namespace nvtext +} // namespace CUDF_EXPORT nvtext diff --git a/cpp/include/nvtext/edit_distance.hpp b/cpp/include/nvtext/edit_distance.hpp index e8e1a50e96f..102f2cffa18 100644 --- a/cpp/include/nvtext/edit_distance.hpp +++ b/cpp/include/nvtext/edit_distance.hpp @@ -105,4 +105,4 @@ std::unique_ptr edit_distance_matrix( rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); /** @} */ // end of group -} // namespace nvtext +} // namespace CUDF_EXPORT nvtext diff --git a/cpp/include/nvtext/generate_ngrams.hpp b/cpp/include/nvtext/generate_ngrams.hpp index 786af3c712c..ce79d985a49 100644 --- a/cpp/include/nvtext/generate_ngrams.hpp +++ b/cpp/include/nvtext/generate_ngrams.hpp @@ -129,4 +129,4 @@ std::unique_ptr hash_character_ngrams( rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); /** @} */ // end of group -} // namespace nvtext +} // namespace CUDF_EXPORT nvtext diff --git a/cpp/include/nvtext/jaccard.hpp b/cpp/include/nvtext/jaccard.hpp index f03944edfc5..3c3486c079e 100644 --- a/cpp/include/nvtext/jaccard.hpp +++ b/cpp/include/nvtext/jaccard.hpp @@ -79,4 +79,4 @@ std::unique_ptr jaccard_index( rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); /** @} */ // end of group -} // namespace nvtext +} // namespace CUDF_EXPORT nvtext diff --git a/cpp/include/nvtext/minhash.hpp b/cpp/include/nvtext/minhash.hpp index 5c3022f25fd..fc28ecfb199 100644 --- a/cpp/include/nvtext/minhash.hpp +++ b/cpp/include/nvtext/minhash.hpp @@ -152,4 +152,4 @@ std::unique_ptr minhash64( rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); /** @} */ // end of group -} // namespace nvtext +} // namespace CUDF_EXPORT nvtext diff --git a/cpp/include/nvtext/ngrams_tokenize.hpp b/cpp/include/nvtext/ngrams_tokenize.hpp index 829131102fd..1048cd4abad 100644 --- a/cpp/include/nvtext/ngrams_tokenize.hpp +++ b/cpp/include/nvtext/ngrams_tokenize.hpp @@ -87,4 +87,4 @@ std::unique_ptr ngrams_tokenize( rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); /** @} */ // end of group -} // namespace nvtext +} // namespace CUDF_EXPORT nvtext diff --git a/cpp/include/nvtext/normalize.hpp b/cpp/include/nvtext/normalize.hpp index d58559c23b1..ec0b8981f8f 100644 --- a/cpp/include/nvtext/normalize.hpp +++ b/cpp/include/nvtext/normalize.hpp @@ -109,4 +109,4 @@ std::unique_ptr normalize_characters( rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); /** @} */ // end of group -} // namespace nvtext +} // namespace CUDF_EXPORT nvtext diff --git a/cpp/include/nvtext/replace.hpp b/cpp/include/nvtext/replace.hpp index d30c0186c95..eedcd3976ca 100644 --- a/cpp/include/nvtext/replace.hpp +++ b/cpp/include/nvtext/replace.hpp @@ -143,4 +143,4 @@ std::unique_ptr filter_tokens( rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); /** @} */ // end of group -} // namespace nvtext +} // namespace CUDF_EXPORT nvtext diff --git a/cpp/include/nvtext/stemmer.hpp b/cpp/include/nvtext/stemmer.hpp index a65f33377dd..4607c42ceed 100644 --- a/cpp/include/nvtext/stemmer.hpp +++ b/cpp/include/nvtext/stemmer.hpp @@ -173,4 +173,4 @@ std::unique_ptr porter_stemmer_measure( rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); /** @} */ // end of group -} // namespace nvtext +} // namespace CUDF_EXPORT nvtext diff --git a/cpp/include/nvtext/subword_tokenize.hpp b/cpp/include/nvtext/subword_tokenize.hpp index 86488edc14f..b5636c8401b 100644 --- a/cpp/include/nvtext/subword_tokenize.hpp +++ b/cpp/include/nvtext/subword_tokenize.hpp @@ -161,4 +161,4 @@ tokenizer_result subword_tokenize( rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); /** @} */ // end of group -} // namespace nvtext +} // namespace CUDF_EXPORT nvtext diff --git a/cpp/include/nvtext/tokenize.hpp b/cpp/include/nvtext/tokenize.hpp index acd757e922d..fc0f45a648b 100644 --- a/cpp/include/nvtext/tokenize.hpp +++ b/cpp/include/nvtext/tokenize.hpp @@ -309,4 +309,4 @@ std::unique_ptr tokenize_with_vocabulary( rmm::device_async_resource_ref mr = rmm::mr::get_current_device_resource()); /** @} */ // end of tokenize group -} // namespace nvtext +} // namespace CUDF_EXPORT nvtext diff --git a/cpp/src/aggregation/aggregation.cpp b/cpp/src/aggregation/aggregation.cpp index 48b60508ab1..42a391883a2 100644 --- a/cpp/src/aggregation/aggregation.cpp +++ b/cpp/src/aggregation/aggregation.cpp @@ -414,9 +414,12 @@ std::unique_ptr make_sum_aggregation() return std::make_unique(); } template CUDF_EXPORT std::unique_ptr make_sum_aggregation(); -template CUDF_EXPORT std::unique_ptr make_sum_aggregation(); -template CUDF_EXPORT std::unique_ptr make_sum_aggregation(); -template CUDF_EXPORT std::unique_ptr make_sum_aggregation(); +template CUDF_EXPORT std::unique_ptr +make_sum_aggregation(); +template CUDF_EXPORT std::unique_ptr +make_sum_aggregation(); +template CUDF_EXPORT std::unique_ptr +make_sum_aggregation(); template CUDF_EXPORT std::unique_ptr make_sum_aggregation(); template CUDF_EXPORT std::unique_ptr make_sum_aggregation(); template CUDF_EXPORT std::unique_ptr @@ -429,10 +432,12 @@ std::unique_ptr make_product_aggregation() return std::make_unique(); } template CUDF_EXPORT std::unique_ptr make_product_aggregation(); -template CUDF_EXPORT std::unique_ptr make_product_aggregation(); +template CUDF_EXPORT std::unique_ptr +make_product_aggregation(); template CUDF_EXPORT std::unique_ptr make_product_aggregation(); -template CUDF_EXPORT std::unique_ptr make_product_aggregation(); +template CUDF_EXPORT std::unique_ptr +make_product_aggregation(); template CUDF_EXPORT std::unique_ptr make_product_aggregation(); template CUDF_EXPORT std::unique_ptr make_product_aggregation(); @@ -444,9 +449,12 @@ std::unique_ptr make_min_aggregation() return std::make_unique(); } template CUDF_EXPORT std::unique_ptr make_min_aggregation(); -template CUDF_EXPORT std::unique_ptr make_min_aggregation(); -template CUDF_EXPORT std::unique_ptr make_min_aggregation(); -template CUDF_EXPORT std::unique_ptr make_min_aggregation(); +template CUDF_EXPORT std::unique_ptr +make_min_aggregation(); +template CUDF_EXPORT std::unique_ptr +make_min_aggregation(); +template CUDF_EXPORT std::unique_ptr +make_min_aggregation(); template CUDF_EXPORT std::unique_ptr make_min_aggregation(); template CUDF_EXPORT std::unique_ptr make_min_aggregation(); template CUDF_EXPORT std::unique_ptr @@ -459,9 +467,12 @@ std::unique_ptr make_max_aggregation() return std::make_unique(); } template CUDF_EXPORT std::unique_ptr make_max_aggregation(); -template CUDF_EXPORT std::unique_ptr make_max_aggregation(); -template CUDF_EXPORT std::unique_ptr make_max_aggregation(); -template CUDF_EXPORT std::unique_ptr make_max_aggregation(); +template CUDF_EXPORT std::unique_ptr +make_max_aggregation(); +template CUDF_EXPORT std::unique_ptr +make_max_aggregation(); +template CUDF_EXPORT std::unique_ptr +make_max_aggregation(); template CUDF_EXPORT std::unique_ptr make_max_aggregation(); template CUDF_EXPORT std::unique_ptr make_max_aggregation(); template CUDF_EXPORT std::unique_ptr @@ -477,12 +488,12 @@ std::unique_ptr make_count_aggregation(null_policy null_handling) } template CUDF_EXPORT std::unique_ptr make_count_aggregation( null_policy null_handling); -template CUDF_EXPORT std::unique_ptr make_count_aggregation( - null_policy null_handling); -template CUDF_EXPORT std::unique_ptr make_count_aggregation( - null_policy null_handling); -template CUDF_EXPORT std::unique_ptr make_count_aggregation( - null_policy null_handling); +template CUDF_EXPORT std::unique_ptr +make_count_aggregation(null_policy null_handling); +template CUDF_EXPORT std::unique_ptr +make_count_aggregation(null_policy null_handling); +template CUDF_EXPORT std::unique_ptr +make_count_aggregation(null_policy null_handling); /// Factory to create a HISTOGRAM aggregation template @@ -491,8 +502,10 @@ std::unique_ptr make_histogram_aggregation() return std::make_unique(); } template CUDF_EXPORT std::unique_ptr make_histogram_aggregation(); -template CUDF_EXPORT std::unique_ptr make_histogram_aggregation(); -template CUDF_EXPORT std::unique_ptr make_histogram_aggregation(); +template CUDF_EXPORT std::unique_ptr +make_histogram_aggregation(); +template CUDF_EXPORT std::unique_ptr +make_histogram_aggregation(); /// Factory to create a ANY aggregation template @@ -525,7 +538,8 @@ std::unique_ptr make_sum_of_squares_aggregation() template CUDF_EXPORT std::unique_ptr make_sum_of_squares_aggregation(); template CUDF_EXPORT std::unique_ptr make_sum_of_squares_aggregation(); -template CUDF_EXPORT std::unique_ptr make_sum_of_squares_aggregation(); +template CUDF_EXPORT std::unique_ptr +make_sum_of_squares_aggregation(); template CUDF_EXPORT std::unique_ptr make_sum_of_squares_aggregation(); @@ -536,9 +550,12 @@ std::unique_ptr make_mean_aggregation() return std::make_unique(); } template CUDF_EXPORT std::unique_ptr make_mean_aggregation(); -template CUDF_EXPORT std::unique_ptr make_mean_aggregation(); -template CUDF_EXPORT std::unique_ptr make_mean_aggregation(); -template CUDF_EXPORT std::unique_ptr make_mean_aggregation(); +template CUDF_EXPORT std::unique_ptr +make_mean_aggregation(); +template CUDF_EXPORT std::unique_ptr +make_mean_aggregation(); +template CUDF_EXPORT std::unique_ptr +make_mean_aggregation(); template CUDF_EXPORT std::unique_ptr make_mean_aggregation(); @@ -549,7 +566,8 @@ std::unique_ptr make_m2_aggregation() return std::make_unique(); } template CUDF_EXPORT std::unique_ptr make_m2_aggregation(); -template CUDF_EXPORT std::unique_ptr make_m2_aggregation(); +template CUDF_EXPORT std::unique_ptr +make_m2_aggregation(); /// Factory to create a VARIANCE aggregation template @@ -557,13 +575,14 @@ std::unique_ptr make_variance_aggregation(size_type ddof) { return std::make_unique(ddof); } -template CUDF_EXPORT std::unique_ptr make_variance_aggregation(size_type ddof); -template CUDF_EXPORT std::unique_ptr make_variance_aggregation( - size_type ddof); -template CUDF_EXPORT std::unique_ptr make_variance_aggregation( - size_type ddof); -template CUDF_EXPORT std::unique_ptr make_variance_aggregation( +template CUDF_EXPORT std::unique_ptr make_variance_aggregation( size_type ddof); +template CUDF_EXPORT std::unique_ptr +make_variance_aggregation(size_type ddof); +template CUDF_EXPORT std::unique_ptr +make_variance_aggregation(size_type ddof); +template CUDF_EXPORT std::unique_ptr +make_variance_aggregation(size_type ddof); template CUDF_EXPORT std::unique_ptr make_variance_aggregation(size_type ddof); @@ -590,8 +609,10 @@ std::unique_ptr make_median_aggregation() return std::make_unique(); } template CUDF_EXPORT std::unique_ptr make_median_aggregation(); -template CUDF_EXPORT std::unique_ptr make_median_aggregation(); -template CUDF_EXPORT std::unique_ptr make_median_aggregation(); +template CUDF_EXPORT std::unique_ptr +make_median_aggregation(); +template CUDF_EXPORT std::unique_ptr +make_median_aggregation(); /// Factory to create a QUANTILE aggregation template @@ -602,10 +623,12 @@ std::unique_ptr make_quantile_aggregation(std::vector const& quant } template CUDF_EXPORT std::unique_ptr make_quantile_aggregation( std::vector const& quantiles, interpolation interp); -template CUDF_EXPORT std::unique_ptr make_quantile_aggregation( - std::vector const& quantiles, interpolation interp); -template CUDF_EXPORT std::unique_ptr make_quantile_aggregation( - std::vector const& quantiles, interpolation interp); +template CUDF_EXPORT std::unique_ptr +make_quantile_aggregation(std::vector const& quantiles, + interpolation interp); +template CUDF_EXPORT std::unique_ptr +make_quantile_aggregation(std::vector const& quantiles, + interpolation interp); /// Factory to create an ARGMAX aggregation template @@ -614,8 +637,10 @@ std::unique_ptr make_argmax_aggregation() return std::make_unique(); } template CUDF_EXPORT std::unique_ptr make_argmax_aggregation(); -template CUDF_EXPORT std::unique_ptr make_argmax_aggregation(); -template CUDF_EXPORT std::unique_ptr make_argmax_aggregation(); +template CUDF_EXPORT std::unique_ptr +make_argmax_aggregation(); +template CUDF_EXPORT std::unique_ptr +make_argmax_aggregation(); /// Factory to create an ARGMIN aggregation template @@ -624,8 +649,10 @@ std::unique_ptr make_argmin_aggregation() return std::make_unique(); } template CUDF_EXPORT std::unique_ptr make_argmin_aggregation(); -template CUDF_EXPORT std::unique_ptr make_argmin_aggregation(); -template CUDF_EXPORT std::unique_ptr make_argmin_aggregation(); +template CUDF_EXPORT std::unique_ptr +make_argmin_aggregation(); +template CUDF_EXPORT std::unique_ptr +make_argmin_aggregation(); /// Factory to create an NUNIQUE aggregation template @@ -635,10 +662,10 @@ std::unique_ptr make_nunique_aggregation(null_policy null_handling) } template CUDF_EXPORT std::unique_ptr make_nunique_aggregation( null_policy null_handling); -template CUDF_EXPORT std::unique_ptr make_nunique_aggregation( - null_policy null_handling); -template CUDF_EXPORT std::unique_ptr make_nunique_aggregation( - null_policy null_handling); +template CUDF_EXPORT std::unique_ptr +make_nunique_aggregation(null_policy null_handling); +template CUDF_EXPORT std::unique_ptr +make_nunique_aggregation(null_policy null_handling); template CUDF_EXPORT std::unique_ptr make_nunique_aggregation(null_policy null_handling); @@ -650,12 +677,12 @@ std::unique_ptr make_nth_element_aggregation(size_type n, null_policy null } template CUDF_EXPORT std::unique_ptr make_nth_element_aggregation( size_type n, null_policy null_handling); -template CUDF_EXPORT std::unique_ptr make_nth_element_aggregation( - size_type n, null_policy null_handling); -template CUDF_EXPORT std::unique_ptr make_nth_element_aggregation( - size_type n, null_policy null_handling); -template CUDF_EXPORT std::unique_ptr make_nth_element_aggregation( - size_type n, null_policy null_handling); +template CUDF_EXPORT std::unique_ptr +make_nth_element_aggregation(size_type n, null_policy null_handling); +template CUDF_EXPORT std::unique_ptr +make_nth_element_aggregation(size_type n, null_policy null_handling); +template CUDF_EXPORT std::unique_ptr +make_nth_element_aggregation(size_type n, null_policy null_handling); /// Factory to create a ROW_NUMBER aggregation template @@ -664,7 +691,8 @@ std::unique_ptr make_row_number_aggregation() return std::make_unique(); } template CUDF_EXPORT std::unique_ptr make_row_number_aggregation(); -template CUDF_EXPORT std::unique_ptr make_row_number_aggregation(); +template CUDF_EXPORT std::unique_ptr +make_row_number_aggregation(); /// Factory to create a RANK aggregation template @@ -683,12 +711,12 @@ template CUDF_EXPORT std::unique_ptr make_rank_aggregation make_rank_aggregation( - rank_method method, - order column_order, - null_policy null_handling, - null_order null_precedence, - rank_percentage percentage); +template CUDF_EXPORT std::unique_ptr +make_rank_aggregation(rank_method method, + order column_order, + null_policy null_handling, + null_order null_precedence, + rank_percentage percentage); template CUDF_EXPORT std::unique_ptr make_rank_aggregation( rank_method method, order column_order, @@ -704,12 +732,12 @@ std::unique_ptr make_collect_list_aggregation(null_policy null_handling) } template CUDF_EXPORT std::unique_ptr make_collect_list_aggregation( null_policy null_handling); -template CUDF_EXPORT std::unique_ptr make_collect_list_aggregation( - null_policy null_handling); -template CUDF_EXPORT std::unique_ptr make_collect_list_aggregation( - null_policy null_handling); -template CUDF_EXPORT std::unique_ptr make_collect_list_aggregation( - null_policy null_handling); +template CUDF_EXPORT std::unique_ptr +make_collect_list_aggregation(null_policy null_handling); +template CUDF_EXPORT std::unique_ptr +make_collect_list_aggregation(null_policy null_handling); +template CUDF_EXPORT std::unique_ptr +make_collect_list_aggregation(null_policy null_handling); /// Factory to create a COLLECT_SET aggregation template @@ -721,12 +749,18 @@ std::unique_ptr make_collect_set_aggregation(null_policy null_handling, } template CUDF_EXPORT std::unique_ptr make_collect_set_aggregation( null_policy null_handling, null_equality nulls_equal, nan_equality nans_equal); -template CUDF_EXPORT std::unique_ptr make_collect_set_aggregation( - null_policy null_handling, null_equality nulls_equal, nan_equality nans_equal); -template CUDF_EXPORT std::unique_ptr make_collect_set_aggregation( - null_policy null_handling, null_equality nulls_equal, nan_equality nans_equal); -template CUDF_EXPORT std::unique_ptr make_collect_set_aggregation( - null_policy null_handling, null_equality nulls_equal, nan_equality nans_equal); +template CUDF_EXPORT std::unique_ptr +make_collect_set_aggregation(null_policy null_handling, + null_equality nulls_equal, + nan_equality nans_equal); +template CUDF_EXPORT std::unique_ptr +make_collect_set_aggregation(null_policy null_handling, + null_equality nulls_equal, + nan_equality nans_equal); +template CUDF_EXPORT std::unique_ptr +make_collect_set_aggregation(null_policy null_handling, + null_equality nulls_equal, + nan_equality nans_equal); /// Factory to create a LAG aggregation template @@ -734,7 +768,8 @@ std::unique_ptr make_lag_aggregation(size_type offset) { return std::make_unique(aggregation::LAG, offset); } -template CUDF_EXPORT std::unique_ptr make_lag_aggregation(size_type offset); +template CUDF_EXPORT std::unique_ptr make_lag_aggregation( + size_type offset); template CUDF_EXPORT std::unique_ptr make_lag_aggregation( size_type offset); @@ -744,9 +779,10 @@ std::unique_ptr make_lead_aggregation(size_type offset) { return std::make_unique(aggregation::LEAD, offset); } -template CUDF_EXPORT std::unique_ptr make_lead_aggregation(size_type offset); -template CUDF_EXPORT std::unique_ptr make_lead_aggregation( +template CUDF_EXPORT std::unique_ptr make_lead_aggregation( size_type offset); +template CUDF_EXPORT std::unique_ptr +make_lead_aggregation(size_type offset); /// Factory to create a UDF aggregation template @@ -772,8 +808,10 @@ std::unique_ptr make_merge_lists_aggregation() return std::make_unique(); } template CUDF_EXPORT std::unique_ptr make_merge_lists_aggregation(); -template CUDF_EXPORT std::unique_ptr make_merge_lists_aggregation(); -template CUDF_EXPORT std::unique_ptr make_merge_lists_aggregation(); +template CUDF_EXPORT std::unique_ptr +make_merge_lists_aggregation(); +template CUDF_EXPORT std::unique_ptr +make_merge_lists_aggregation(); /// Factory to create a MERGE_SETS aggregation template @@ -782,12 +820,12 @@ std::unique_ptr make_merge_sets_aggregation(null_equality nulls_equal, { return std::make_unique(nulls_equal, nans_equal); } -template CUDF_EXPORT std::unique_ptr make_merge_sets_aggregation(null_equality, - nan_equality); -template CUDF_EXPORT std::unique_ptr make_merge_sets_aggregation( - null_equality, nan_equality); -template CUDF_EXPORT std::unique_ptr make_merge_sets_aggregation( +template CUDF_EXPORT std::unique_ptr make_merge_sets_aggregation( null_equality, nan_equality); +template CUDF_EXPORT std::unique_ptr + make_merge_sets_aggregation(null_equality, nan_equality); +template CUDF_EXPORT std::unique_ptr + make_merge_sets_aggregation(null_equality, nan_equality); /// Factory to create a MERGE_M2 aggregation template @@ -796,7 +834,8 @@ std::unique_ptr make_merge_m2_aggregation() return std::make_unique(); } template CUDF_EXPORT std::unique_ptr make_merge_m2_aggregation(); -template CUDF_EXPORT std::unique_ptr make_merge_m2_aggregation(); +template CUDF_EXPORT std::unique_ptr +make_merge_m2_aggregation(); /// Factory to create a MERGE_HISTOGRAM aggregation template @@ -807,7 +846,8 @@ std::unique_ptr make_merge_histogram_aggregation() template CUDF_EXPORT std::unique_ptr make_merge_histogram_aggregation(); template CUDF_EXPORT std::unique_ptr make_merge_histogram_aggregation(); -template CUDF_EXPORT std::unique_ptr make_merge_histogram_aggregation(); +template CUDF_EXPORT std::unique_ptr +make_merge_histogram_aggregation(); /// Factory to create a COVARIANCE aggregation template @@ -817,8 +857,8 @@ std::unique_ptr make_covariance_aggregation(size_type min_periods, size_ty } template CUDF_EXPORT std::unique_ptr make_covariance_aggregation( size_type min_periods, size_type ddof); -template CUDF_EXPORT std::unique_ptr make_covariance_aggregation( - size_type min_periods, size_type ddof); +template CUDF_EXPORT std::unique_ptr +make_covariance_aggregation(size_type min_periods, size_type ddof); /// Factory to create a CORRELATION aggregation template @@ -828,19 +868,20 @@ std::unique_ptr make_correlation_aggregation(correlation_type type, size_t } template CUDF_EXPORT std::unique_ptr make_correlation_aggregation( correlation_type type, size_type min_periods); -template CUDF_EXPORT std::unique_ptr make_correlation_aggregation( - correlation_type type, size_type min_periods); +template CUDF_EXPORT std::unique_ptr +make_correlation_aggregation(correlation_type type, size_type min_periods); template std::unique_ptr make_tdigest_aggregation(int max_centroids) { return std::make_unique(max_centroids); } -template CUDF_EXPORT std::unique_ptr make_tdigest_aggregation(int max_centroids); -template CUDF_EXPORT std::unique_ptr make_tdigest_aggregation( - int max_centroids); -template CUDF_EXPORT std::unique_ptr make_tdigest_aggregation( +template CUDF_EXPORT std::unique_ptr make_tdigest_aggregation( int max_centroids); +template CUDF_EXPORT std::unique_ptr +make_tdigest_aggregation(int max_centroids); +template CUDF_EXPORT std::unique_ptr +make_tdigest_aggregation(int max_centroids); template std::unique_ptr make_merge_tdigest_aggregation(int max_centroids) @@ -849,10 +890,10 @@ std::unique_ptr make_merge_tdigest_aggregation(int max_centroids) } template CUDF_EXPORT std::unique_ptr make_merge_tdigest_aggregation( int max_centroids); -template CUDF_EXPORT std::unique_ptr make_merge_tdigest_aggregation( - int max_centroids); -template CUDF_EXPORT std::unique_ptr make_merge_tdigest_aggregation( - int max_centroids); +template CUDF_EXPORT std::unique_ptr +make_merge_tdigest_aggregation(int max_centroids); +template CUDF_EXPORT std::unique_ptr +make_merge_tdigest_aggregation(int max_centroids); namespace detail { namespace { diff --git a/cpp/src/bitmask/is_element_valid.cpp b/cpp/src/bitmask/is_element_valid.cpp index 6e4d9c9e479..4806c7a94e8 100644 --- a/cpp/src/bitmask/is_element_valid.cpp +++ b/cpp/src/bitmask/is_element_valid.cpp @@ -1,6 +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. diff --git a/cpp/src/copying/concatenate.cu b/cpp/src/copying/concatenate.cu index 0b061eb9eff..2288ed266da 100644 --- a/cpp/src/copying/concatenate.cu +++ b/cpp/src/copying/concatenate.cu @@ -301,7 +301,7 @@ std::unique_ptr for_each_concatenate(host_span views, using mask_policy = cudf::mask_allocation_policy; auto const policy = has_nulls ? mask_policy::ALWAYS : mask_policy::NEVER; - auto col = cudf::allocate_like(views.front(), total_element_count, policy, stream, mr); + auto col = cudf::allocate_like(views.front(), total_element_count, policy, stream, mr); auto m_view = col->mutable_view(); diff --git a/cpp/src/copying/sample.cu b/cpp/src/copying/sample.cu index 2a04585b0f4..21226a93af7 100644 --- a/cpp/src/copying/sample.cu +++ b/cpp/src/copying/sample.cu @@ -74,9 +74,8 @@ std::unique_ptr
sample(table_view const& input, gather_map_mutable_view.begin(), thrust::default_random_engine(seed)); - auto gather_map_view = (n == num_rows) - ? gather_map->view() - : cudf::slice(gather_map->view(), {0, n}, stream)[0]; + auto gather_map_view = + (n == num_rows) ? gather_map->view() : cudf::slice(gather_map->view(), {0, n}, stream)[0]; return detail::gather(input, gather_map_view.begin(), gather_map_view.end(), diff --git a/cpp/src/dictionary/encode.cu b/cpp/src/dictionary/encode.cu index 306e741386b..12874daf114 100644 --- a/cpp/src/dictionary/encode.cu +++ b/cpp/src/dictionary/encode.cu @@ -55,8 +55,7 @@ std::unique_ptr encode(column_view const& input_column, if (keys_column->has_nulls()) { keys_column = std::make_unique( - cudf::slice( - keys_column->view(), std::vector{0, keys_column->size() - 1}, stream) + cudf::slice(keys_column->view(), std::vector{0, keys_column->size() - 1}, stream) .front(), stream, mr); diff --git a/cpp/src/io/comp/gpuinflate.hpp b/cpp/src/io/comp/gpuinflate.hpp index b9d77970eec..8bfca2b30df 100644 --- a/cpp/src/io/comp/gpuinflate.hpp +++ b/cpp/src/io/comp/gpuinflate.hpp @@ -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. diff --git a/cpp/src/io/comp/nvcomp_adapter.hpp b/cpp/src/io/comp/nvcomp_adapter.hpp index 9d43e1289de..43c79e32375 100644 --- a/cpp/src/io/comp/nvcomp_adapter.hpp +++ b/cpp/src/io/comp/nvcomp_adapter.hpp @@ -15,11 +15,11 @@ */ #pragma once -#include #include "gpuinflate.hpp" #include +#include #include #include diff --git a/cpp/src/io/functions.cpp b/cpp/src/io/functions.cpp index 39ca1112118..15f383a8b3c 100644 --- a/cpp/src/io/functions.cpp +++ b/cpp/src/io/functions.cpp @@ -42,8 +42,6 @@ namespace cudf::io { - - // Returns builder for csv_reader_options csv_reader_options_builder csv_reader_options::builder(source_info src) { diff --git a/cpp/src/io/orc/reader_impl.cu b/cpp/src/io/orc/reader_impl.cu index c47b95fa48d..e6da59c81ee 100644 --- a/cpp/src/io/orc/reader_impl.cu +++ b/cpp/src/io/orc/reader_impl.cu @@ -88,10 +88,10 @@ table_with_metadata reader_impl::make_output_chunk() // The range of rows in the decoded table to output. auto const out_range = _chunk_read_data.output_table_ranges[_chunk_read_data.curr_output_table_range++]; - auto const out_tview = cudf::slice( - _chunk_read_data.decoded_table->view(), - {static_cast(out_range.begin), static_cast(out_range.end)}, - _stream)[0]; + auto const out_tview = + cudf::slice(_chunk_read_data.decoded_table->view(), + {static_cast(out_range.begin), static_cast(out_range.end)}, + _stream)[0]; auto output = std::make_unique
(out_tview, _stream, _mr); // If this is the last slice, we also delete the decoded table to free up memory. diff --git a/cpp/src/io/parquet/compact_protocol_reader.hpp b/cpp/src/io/parquet/compact_protocol_reader.hpp index a53a9f33588..12c24e2b848 100644 --- a/cpp/src/io/parquet/compact_protocol_reader.hpp +++ b/cpp/src/io/parquet/compact_protocol_reader.hpp @@ -153,4 +153,4 @@ class CompactProtocolReader { }; } // namespace io::parquet::detail -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/src/io/text/bgzip_data_chunk_source.cu b/cpp/src/io/text/bgzip_data_chunk_source.cu index 65f4e9c6f14..2af2e102c77 100644 --- a/cpp/src/io/text/bgzip_data_chunk_source.cu +++ b/cpp/src/io/text/bgzip_data_chunk_source.cu @@ -20,9 +20,9 @@ #include #include #include +#include #include #include -#include #include #include diff --git a/cpp/src/io/utilities/base64_utilities.hpp b/cpp/src/io/utilities/base64_utilities.hpp index 411edf578ab..b1eb120c47f 100644 --- a/cpp/src/io/utilities/base64_utilities.hpp +++ b/cpp/src/io/utilities/base64_utilities.hpp @@ -88,4 +88,4 @@ std::string base64_encode(std::string_view string_to_encode); std::string base64_decode(std::string_view encoded_string); } // namespace io::detail -} +} // namespace CUDF_EXPORT cudf diff --git a/cpp/src/io/utilities/config_utils.cpp b/cpp/src/io/utilities/config_utils.cpp index 8b8d86ee78d..4a60033b783 100644 --- a/cpp/src/io/utilities/config_utils.cpp +++ b/cpp/src/io/utilities/config_utils.cpp @@ -14,7 +14,6 @@ * limitations under the License. */ - #include "getenv_or.hpp" #include diff --git a/cpp/src/io/utilities/file_io_utilities.cpp b/cpp/src/io/utilities/file_io_utilities.cpp index db01a52ef8a..e225027ab6b 100644 --- a/cpp/src/io/utilities/file_io_utilities.cpp +++ b/cpp/src/io/utilities/file_io_utilities.cpp @@ -4,7 +4,7 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at -* + * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software @@ -15,10 +15,11 @@ */ #include "file_io_utilities.hpp" + #include "getenv_or.hpp" -#include #include +#include #include #include diff --git a/cpp/src/io/utilities/row_selection.hpp b/cpp/src/io/utilities/row_selection.hpp index d77f2be426b..7c607099cdc 100644 --- a/cpp/src/io/utilities/row_selection.hpp +++ b/cpp/src/io/utilities/row_selection.hpp @@ -40,4 +40,4 @@ std::pair skip_rows_num_rows_from_options(int64_t skip_rows, int64_t num_source_rows); } // namespace io::detail -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/src/io/utilities/trie.cuh b/cpp/src/io/utilities/trie.cuh index d21c347be4f..caea8dabb88 100644 --- a/cpp/src/io/utilities/trie.cuh +++ b/cpp/src/io/utilities/trie.cuh @@ -68,7 +68,8 @@ inline trie_view make_trie_view(optional_trie const& t) * * @return A host vector of nodes representing the serialized trie */ -CUDF_EXPORT trie create_serialized_trie(std::vector const& keys, rmm::cuda_stream_view stream); +CUDF_EXPORT trie create_serialized_trie(std::vector const& keys, + rmm::cuda_stream_view stream); /* * @brief Searches for a string in a serialized trie. diff --git a/cpp/src/jit/parser.hpp b/cpp/src/jit/parser.hpp index cb181eb4b20..9915b706fa7 100644 --- a/cpp/src/jit/parser.hpp +++ b/cpp/src/jit/parser.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. @@ -241,4 +241,4 @@ inline std::string parse_single_function_ptx(std::string const& src, std::string parse_single_function_cuda(std::string const& src, std::string const& function_name); } // namespace jit -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/src/join/mixed_join_size_kernel.cuh b/cpp/src/join/mixed_join_size_kernel.cuh index 2d863b0cc4e..00a90f8273f 100644 --- a/cpp/src/join/mixed_join_size_kernel.cuh +++ b/cpp/src/join/mixed_join_size_kernel.cuh @@ -36,20 +36,19 @@ namespace cg = cooperative_groups; #pragma GCC diagnostic ignored "-Wattributes" template -CUDF_HIDDEN __launch_bounds__(block_size) __global__ - void compute_mixed_join_output_size( - table_device_view left_table, - table_device_view right_table, - table_device_view probe, - table_device_view build, - row_hash const hash_probe, - row_equality const equality_probe, - join_kind const join_type, - cudf::detail::mixed_multimap_type::device_view hash_table_view, - ast::detail::expression_device_view device_expression_data, - bool const swap_tables, - std::size_t* output_size, - cudf::device_span matches_per_row) +CUDF_HIDDEN __launch_bounds__(block_size) __global__ void compute_mixed_join_output_size( + table_device_view left_table, + table_device_view right_table, + table_device_view probe, + table_device_view build, + row_hash const hash_probe, + row_equality const equality_probe, + join_kind const join_type, + cudf::detail::mixed_multimap_type::device_view hash_table_view, + ast::detail::expression_device_view device_expression_data, + bool const swap_tables, + std::size_t* output_size, + cudf::device_span matches_per_row) { // The (required) extern storage of the shared memory array leads to // conflicting declarations between different templates. The easiest diff --git a/cpp/src/lists/copying/copying.cu b/cpp/src/lists/copying/copying.cu index 35f9307dbb3..fd3966f8c6d 100644 --- a/cpp/src/lists/copying/copying.cu +++ b/cpp/src/lists/copying/copying.cu @@ -79,9 +79,7 @@ std::unique_ptr copy_slice(lists_column_view const& lists, (lists.child().type() == cudf::data_type{type_id::LIST}) ? copy_slice(lists_column_view(lists.child()), start_offset, end_offset, stream, mr) : std::make_unique( - cudf::slice(lists.child(), {start_offset, end_offset}, stream).front(), - stream, - mr); + cudf::slice(lists.child(), {start_offset, end_offset}, stream).front(), stream, mr); // Compute the null mask of the result: auto null_mask = cudf::detail::copy_bitmask(lists.null_mask(), start, end, stream, mr); diff --git a/cpp/src/lists/copying/segmented_gather.cu b/cpp/src/lists/copying/segmented_gather.cu index 5e9798ab5a9..ea18a3ac92d 100644 --- a/cpp/src/lists/copying/segmented_gather.cu +++ b/cpp/src/lists/copying/segmented_gather.cu @@ -19,8 +19,8 @@ #include #include #include -#include #include +#include #include #include diff --git a/cpp/src/lists/interleave_columns.cu b/cpp/src/lists/interleave_columns.cu index fce217699be..7875f5d9a02 100644 --- a/cpp/src/lists/interleave_columns.cu +++ b/cpp/src/lists/interleave_columns.cu @@ -230,10 +230,10 @@ struct interleave_list_entries_impl( // The output child column. auto output = cudf::allocate_like(lists_column_view(*input.begin()).child(), - num_output_entries, - mask_allocation_policy::NEVER, - stream, - mr); + num_output_entries, + mask_allocation_policy::NEVER, + stream, + mr); auto output_dv_ptr = mutable_column_device_view::create(*output, stream); // The array of int8_t to store entry validities. diff --git a/cpp/src/lists/lists_column_view.cu b/cpp/src/lists/lists_column_view.cu index 068771cb259..912e741826b 100644 --- a/cpp/src/lists/lists_column_view.cu +++ b/cpp/src/lists/lists_column_view.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. diff --git a/cpp/src/lists/stream_compaction/apply_boolean_mask.cu b/cpp/src/lists/stream_compaction/apply_boolean_mask.cu index f9e9e39c404..ac5f0d66225 100644 --- a/cpp/src/lists/stream_compaction/apply_boolean_mask.cu +++ b/cpp/src/lists/stream_compaction/apply_boolean_mask.cu @@ -63,8 +63,7 @@ std::unique_ptr apply_boolean_mask(lists_column_view const& input, auto const make_output_offsets = [&] { auto boolean_mask_sliced_offsets = - cudf::slice( - boolean_mask.offsets(), {boolean_mask.offset(), boolean_mask.size() + 1}, stream) + cudf::slice(boolean_mask.offsets(), {boolean_mask.offset(), boolean_mask.size() + 1}, stream) .front(); auto const sizes = cudf::reduction::detail::segmented_sum(boolean_mask_sliced_child, diff --git a/cpp/src/merge/merge.cu b/cpp/src/merge/merge.cu index 6041c9dea92..e9a93147d07 100644 --- a/cpp/src/merge/merge.cu +++ b/cpp/src/merge/merge.cu @@ -367,10 +367,10 @@ struct column_merger { auto lsz = lcol.size(); auto merged_size = lsz + rcol.size(); auto merged_col = cudf::allocate_like(lcol.has_nulls() ? lcol : rcol, - merged_size, - cudf::mask_allocation_policy::RETAIN, - stream, - mr); + merged_size, + cudf::mask_allocation_policy::RETAIN, + stream, + mr); //"gather" data from lcol, rcol according to row_order_ "map" //(directly calling gather() won't work because @@ -554,8 +554,7 @@ table_ptr_type merge(cudf::table_view const& left_table, // extract merged row order according to indices: // auto const merged_indices = [&]() { - if (cudf::has_nested_columns(left_table) or - cudf::has_nested_columns(right_table)) { + if (cudf::has_nested_columns(left_table) or cudf::has_nested_columns(right_table)) { return generate_merged_indices_nested( index_left_view, index_right_view, column_order, null_precedence, nullable, stream); } else { diff --git a/cpp/src/quantiles/tdigest/tdigest_aggregation.cu b/cpp/src/quantiles/tdigest/tdigest_aggregation.cu index db46af202ce..136748a7841 100644 --- a/cpp/src/quantiles/tdigest/tdigest_aggregation.cu +++ b/cpp/src/quantiles/tdigest/tdigest_aggregation.cu @@ -1067,14 +1067,13 @@ std::unique_ptr merge_tdigests(tdigest_column_view const& tdv, std::vector unmerged_tdigests; unmerged_tdigests.reserve(num_tdigests); auto offset_iter = std::next(h_inner_offsets.begin(), tdigest_start); - std::transform( - offset_iter, - offset_iter + num_tdigests, - std::next(offset_iter), - std::back_inserter(unmerged_tdigests), - [&](size_type start, size_type end) { - return cudf::slice(tdigests_unsliced, {start, end}, stream); - }); + std::transform(offset_iter, + offset_iter + num_tdigests, + std::next(offset_iter), + std::back_inserter(unmerged_tdigests), + [&](size_type start, size_type end) { + return cudf::slice(tdigests_unsliced, {start, end}, stream); + }); // merge return cudf::detail::merge(unmerged_tdigests, diff --git a/cpp/src/reductions/scan/scan_inclusive.cu b/cpp/src/reductions/scan/scan_inclusive.cu index 72cb8bc08f4..930a8859c1d 100644 --- a/cpp/src/reductions/scan/scan_inclusive.cu +++ b/cpp/src/reductions/scan/scan_inclusive.cu @@ -77,8 +77,8 @@ struct scan_functor { rmm::cuda_stream_view stream, rmm::device_async_resource_ref mr) { - auto output_column = cudf::allocate_like( - input_view, input_view.size(), mask_allocation_policy::NEVER, stream, mr); + auto output_column = + cudf::allocate_like(input_view, input_view.size(), mask_allocation_policy::NEVER, stream, mr); mutable_column_view result = output_column->mutable_view(); auto d_input = column_device_view::create(input_view, stream); diff --git a/cpp/src/replace/clamp.cu b/cpp/src/replace/clamp.cu index ecea665ee0f..8367df97248 100644 --- a/cpp/src/replace/clamp.cu +++ b/cpp/src/replace/clamp.cu @@ -117,8 +117,7 @@ std::enable_if_t(), std::unique_ptr> clamp rmm::cuda_stream_view stream, rmm::device_async_resource_ref mr) { - auto output = - cudf::allocate_like(input, input.size(), mask_allocation_policy::NEVER, stream, mr); + auto output = cudf::allocate_like(input, input.size(), mask_allocation_policy::NEVER, stream, mr); // mask will not change if (input.nullable()) { output->set_null_mask(cudf::detail::copy_bitmask(input, stream, mr), input.null_count()); diff --git a/cpp/src/replace/nulls.cu b/cpp/src/replace/nulls.cu index 467f4c4a83c..9b3f28de1ef 100644 --- a/cpp/src/replace/nulls.cu +++ b/cpp/src/replace/nulls.cu @@ -120,13 +120,12 @@ struct replace_nulls_column_kernel_forwarder { cudf::size_type nrows = input.size(); cudf::detail::grid_1d grid{nrows, BLOCK_SIZE}; - auto output = - cudf::allocate_like(input, - input.size(), - replacement.has_nulls() ? cudf::mask_allocation_policy::ALWAYS - : cudf::mask_allocation_policy::NEVER, - stream, - mr); + auto output = cudf::allocate_like(input, + input.size(), + replacement.has_nulls() ? cudf::mask_allocation_policy::ALWAYS + : cudf::mask_allocation_policy::NEVER, + stream, + mr); auto output_view = output->mutable_view(); @@ -219,8 +218,8 @@ struct replace_nulls_scalar_kernel_forwarder { { CUDF_EXPECTS( cudf::have_same_types(input, replacement), "Data type mismatch", cudf::data_type_error); - std::unique_ptr output = cudf::allocate_like( - input, input.size(), cudf::mask_allocation_policy::NEVER, stream, mr); + std::unique_ptr output = + cudf::allocate_like(input, input.size(), cudf::mask_allocation_policy::NEVER, stream, mr); auto output_view = output->mutable_view(); using ScalarType = cudf::scalar_type_t; diff --git a/cpp/src/replace/replace.cu b/cpp/src/replace/replace.cu index 93bee057573..cd76bd9855d 100644 --- a/cpp/src/replace/replace.cu +++ b/cpp/src/replace/replace.cu @@ -198,8 +198,7 @@ struct replace_kernel_forwarder { auto const mask_allocation_policy = input_col.has_nulls() || replacement_values.has_nulls() ? cudf::mask_allocation_policy::ALWAYS : cudf::mask_allocation_policy::NEVER; - return cudf::allocate_like( - input_col, input_col.size(), mask_allocation_policy, stream, mr); + return cudf::allocate_like(input_col, input_col.size(), mask_allocation_policy, stream, mr); }(); auto output_view = output->mutable_view(); diff --git a/cpp/src/scalar/scalar.cpp b/cpp/src/scalar/scalar.cpp index 348898e0e92..83209c55c8a 100644 --- a/cpp/src/scalar/scalar.cpp +++ b/cpp/src/scalar/scalar.cpp @@ -306,7 +306,7 @@ template class fixed_width_scalar; template class fixed_width_scalar; template class fixed_width_scalar; -} // namespace detail +} // namespace CUDF_HIDDEN detail template numeric_scalar::numeric_scalar(T value, diff --git a/cpp/src/search/contains_scalar.cu b/cpp/src/search/contains_scalar.cu index ffb06bed481..25585c712cf 100644 --- a/cpp/src/search/contains_scalar.cu +++ b/cpp/src/search/contains_scalar.cu @@ -19,9 +19,9 @@ #include #include #include -#include #include #include +#include #include #include #include diff --git a/cpp/src/sort/is_sorted.cu b/cpp/src/sort/is_sorted.cu index ee19e90eed1..53f9fc9500d 100644 --- a/cpp/src/sort/is_sorted.cu +++ b/cpp/src/sort/is_sorted.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. diff --git a/cpp/src/sort/segmented_sort_impl.cuh b/cpp/src/sort/segmented_sort_impl.cuh index be09ef9c131..f7d49eae6d6 100644 --- a/cpp/src/sort/segmented_sort_impl.cuh +++ b/cpp/src/sort/segmented_sort_impl.cuh @@ -74,10 +74,10 @@ struct column_fast_sort_fn { // CUB's segmented sort functions cannot accept iterators. // We create a temporary column here for it to use. auto temp_col = cudf::allocate_like(input, - input.size(), - mask_allocation_policy::NEVER, - stream, - rmm::mr::get_current_device_resource()); + input.size(), + mask_allocation_policy::NEVER, + stream, + rmm::mr::get_current_device_resource()); mutable_column_view output_view = temp_col->mutable_view(); // DeviceSegmentedSort is faster than DeviceSegmentedRadixSort at this time diff --git a/cpp/src/stream_compaction/unique_count.cu b/cpp/src/stream_compaction/unique_count.cu index dc34427d33c..0879b78b930 100644 --- a/cpp/src/stream_compaction/unique_count.cu +++ b/cpp/src/stream_compaction/unique_count.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. diff --git a/cpp/src/strings/copying/copying.cu b/cpp/src/strings/copying/copying.cu index c5c8e4cf684..e09946e55d9 100644 --- a/cpp/src/strings/copying/copying.cu +++ b/cpp/src/strings/copying/copying.cu @@ -47,8 +47,7 @@ std::unique_ptr copy_slice(strings_column_view const& input, // slice the offsets child column auto offsets_column = std::make_unique( - cudf::slice( - input.offsets(), {offsets_offset, offsets_offset + strings_count + 1}, stream) + cudf::slice(input.offsets(), {offsets_offset, offsets_offset + strings_count + 1}, stream) .front(), stream, mr); diff --git a/cpp/src/strings/utilities.cu b/cpp/src/strings/utilities.cu index f6481d70072..76bec22ed44 100644 --- a/cpp/src/strings/utilities.cu +++ b/cpp/src/strings/utilities.cu @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include #include "strings/char_types/char_cases.h" #include "strings/char_types/char_flags.h" @@ -24,6 +23,7 @@ #include #include #include +#include #include #include @@ -161,7 +161,6 @@ int64_t get_offset_value(cudf::column_view const& offsets, } // namespace detail - int64_t get_offset64_threshold() { auto const threshold = std::getenv("LIBCUDF_LARGE_STRINGS_THRESHOLD"); diff --git a/cpp/src/table/row_operators.cu b/cpp/src/table/row_operators.cu index 5c634b706d0..0f0dd4ce230 100644 --- a/cpp/src/table/row_operators.cu +++ b/cpp/src/table/row_operators.cu @@ -587,14 +587,14 @@ transform_lists_of_structs(column_view const& lhs, stream, rmm::mr::get_current_device_resource()); - auto const ranks = compute_ranks(concatenated_children->view(), + auto const ranks = compute_ranks(concatenated_children->view(), column_null_order, stream, rmm::mr::get_current_device_resource()); - auto const ranks_slices = cudf::slice( - ranks->view(), - {0, child_lhs.size(), child_lhs.size(), child_lhs.size() + child_rhs.size()}, - stream); + auto const ranks_slices = + cudf::slice(ranks->view(), + {0, child_lhs.size(), child_lhs.size(), child_lhs.size() + child_rhs.size()}, + stream); out_cols_lhs.emplace_back(std::make_unique(ranks_slices.front(), stream, mr)); out_cols_rhs.emplace_back(std::make_unique(ranks_slices.back(), stream, mr)); diff --git a/cpp/src/unary/unary_ops.cuh b/cpp/src/unary/unary_ops.cuh index 5b531c2896b..9182bc6113c 100644 --- a/cpp/src/unary/unary_ops.cuh +++ b/cpp/src/unary/unary_ops.cuh @@ -49,8 +49,7 @@ struct launcher { input.null_count()); } else { - return cudf::allocate_like( - input, input.size(), mask_allocation_policy::NEVER, stream, mr); + return cudf::allocate_like(input, input.size(), mask_allocation_policy::NEVER, stream, mr); } }(); diff --git a/cpp/tests/copying/concatenate_tests.cpp b/cpp/tests/copying/concatenate_tests.cpp index 2f47b9363a6..289fff06798 100644 --- a/cpp/tests/copying/concatenate_tests.cpp +++ b/cpp/tests/copying/concatenate_tests.cpp @@ -69,8 +69,8 @@ struct TypedColumnTest : public cudf::test::BaseFixture { cudaMemcpyAsync(typed_data, h_data.data(), data.size(), cudaMemcpyDefault, stream.value())); CUDF_CUDA_TRY( cudaMemcpyAsync(typed_mask, h_mask.data(), mask.size(), cudaMemcpyDefault, stream.value())); - _null_count = cudf::null_count( - static_cast(mask.data()), 0, _num_elements, stream); + _null_count = + cudf::null_count(static_cast(mask.data()), 0, _num_elements, stream); stream.synchronize(); } @@ -84,8 +84,10 @@ struct TypedColumnTest : public cudf::test::BaseFixture { rmm::device_buffer data{}; rmm::device_buffer mask{}; cudf::size_type _null_count{}; - rmm::device_buffer all_valid_mask{cudf::create_null_mask(num_elements(), cudf::mask_state::ALL_VALID)}; - rmm::device_buffer all_null_mask{cudf::create_null_mask(num_elements(), cudf::mask_state::ALL_NULL)}; + rmm::device_buffer all_valid_mask{ + cudf::create_null_mask(num_elements(), cudf::mask_state::ALL_VALID)}; + rmm::device_buffer all_null_mask{ + cudf::create_null_mask(num_elements(), cudf::mask_state::ALL_NULL)}; }; TYPED_TEST_SUITE(TypedColumnTest, cudf::test::Types); diff --git a/cpp/tests/copying/gather_str_tests.cpp b/cpp/tests/copying/gather_str_tests.cpp index 1bd753fb96c..0140e009c92 100644 --- a/cpp/tests/copying/gather_str_tests.cpp +++ b/cpp/tests/copying/gather_str_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. diff --git a/cpp/tests/copying/purge_nonempty_nulls_tests.cpp b/cpp/tests/copying/purge_nonempty_nulls_tests.cpp index 01aabf9417e..375e1e1b755 100644 --- a/cpp/tests/copying/purge_nonempty_nulls_tests.cpp +++ b/cpp/tests/copying/purge_nonempty_nulls_tests.cpp @@ -54,8 +54,7 @@ TEST_F(HasNonEmptyNullsTest, TrivialTest) EXPECT_FALSE(cudf::has_nonempty_nulls(*input)); // Set nullmask, post construction. - cudf::set_null_mask( - input->mutable_view().null_mask(), 2, 3, false, cudf::get_default_stream()); + cudf::set_null_mask(input->mutable_view().null_mask(), 2, 3, false, cudf::get_default_stream()); input->set_null_count(1); EXPECT_TRUE(cudf::may_have_nonempty_nulls(*input)); EXPECT_TRUE(cudf::has_nonempty_nulls(*input)); @@ -105,8 +104,7 @@ TEST_F(PurgeNonEmptyNullsTest, SingleLevelList) .release(); // Set nullmask, post construction. - cudf::set_null_mask( - input->mutable_view().null_mask(), 2, 3, false, cudf::get_default_stream()); + cudf::set_null_mask(input->mutable_view().null_mask(), 2, 3, false, cudf::get_default_stream()); input->set_null_count(1); test_purge(*input); @@ -187,8 +185,7 @@ TEST_F(PurgeNonEmptyNullsTest, TwoLevelList) EXPECT_FALSE(cudf::has_nonempty_nulls(*input)); // Set nullmask, post construction. - cudf::set_null_mask( - input->mutable_view().null_mask(), 3, 4, false, cudf::get_default_stream()); + cudf::set_null_mask(input->mutable_view().null_mask(), 3, 4, false, cudf::get_default_stream()); input->set_null_count(1); EXPECT_TRUE(cudf::may_have_nonempty_nulls(*input)); EXPECT_TRUE(cudf::has_nonempty_nulls(*input)); @@ -243,8 +240,7 @@ TEST_F(PurgeNonEmptyNullsTest, ThreeLevelList) EXPECT_FALSE(cudf::has_nonempty_nulls(*input)); // Set nullmask, post construction. - cudf::set_null_mask( - input->mutable_view().null_mask(), 3, 4, false, cudf::get_default_stream()); + cudf::set_null_mask(input->mutable_view().null_mask(), 3, 4, false, cudf::get_default_stream()); input->set_null_count(1); EXPECT_TRUE(cudf::may_have_nonempty_nulls(*input)); EXPECT_TRUE(cudf::has_nonempty_nulls(*input)); @@ -298,8 +294,7 @@ TEST_F(PurgeNonEmptyNullsTest, ListOfStrings) EXPECT_FALSE(cudf::has_nonempty_nulls(*input)); // Set nullmask, post construction. - cudf::set_null_mask( - input->mutable_view().null_mask(), 2, 3, false, cudf::get_default_stream()); + cudf::set_null_mask(input->mutable_view().null_mask(), 2, 3, false, cudf::get_default_stream()); input->set_null_count(1); EXPECT_TRUE(cudf::may_have_nonempty_nulls(*input)); EXPECT_TRUE(cudf::has_nonempty_nulls(*input)); @@ -391,8 +386,7 @@ TEST_F(PurgeNonEmptyNullsTest, UnsanitizedListOfUnsanitizedStrings) EXPECT_FALSE(cudf::has_nonempty_nulls(*lists)); // Set lists nullmask, post construction. - cudf::set_null_mask( - lists->mutable_view().null_mask(), 2, 3, false, cudf::get_default_stream()); + cudf::set_null_mask(lists->mutable_view().null_mask(), 2, 3, false, cudf::get_default_stream()); lists->set_null_count(1); EXPECT_TRUE(cudf::may_have_nonempty_nulls(*lists)); EXPECT_TRUE(cudf::has_nonempty_nulls(*lists)); diff --git a/cpp/tests/lists/contains_tests.cpp b/cpp/tests/lists/contains_tests.cpp index 7dee66ae184..570ac4a30cd 100644 --- a/cpp/tests/lists/contains_tests.cpp +++ b/cpp/tests/lists/contains_tests.cpp @@ -224,9 +224,8 @@ TYPED_TEST(TypedContainsTest, SlicedLists) { // First Slice. - auto sliced_column_1 = - cudf::slice(search_space, {1, 8}, cudf::get_default_stream()).front(); - auto search_key_one = create_scalar_search_key(1); + auto sliced_column_1 = cudf::slice(search_space, {1, 8}, cudf::get_default_stream()).front(); + auto search_key_one = create_scalar_search_key(1); { // CONTAINS auto result = cudf::lists::contains(sliced_column_1, *search_key_one); @@ -257,9 +256,8 @@ TYPED_TEST(TypedContainsTest, SlicedLists) { // Second Slice. - auto sliced_column_2 = - cudf::slice(search_space, {3, 10}, cudf::get_default_stream()).front(); - auto search_key_one = create_scalar_search_key(1); + auto sliced_column_2 = cudf::slice(search_space, {3, 10}, cudf::get_default_stream()).front(); + auto search_key_one = create_scalar_search_key(1); { // CONTAINS auto result = cudf::lists::contains(sliced_column_2, *search_key_one); diff --git a/cpp/tests/streams/copying_test.cpp b/cpp/tests/streams/copying_test.cpp index d2d5714532b..2e565c8a9e5 100644 --- a/cpp/tests/streams/copying_test.cpp +++ b/cpp/tests/streams/copying_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. diff --git a/cpp/tests/structs/utilities_tests.cpp b/cpp/tests/structs/utilities_tests.cpp index 153ffa7874b..8d406ca87f0 100644 --- a/cpp/tests/structs/utilities_tests.cpp +++ b/cpp/tests/structs/utilities_tests.cpp @@ -527,8 +527,7 @@ TYPED_TEST(TypedSuperimposeTest, NestedStruct_ChildNullable_ParentNullable) // Modify STRUCT-of-STRUCT's null-mask. Mark second STRUCT row as null. auto structs_of_structs_view = structs_of_structs->mutable_view(); - cudf::set_null_mask( - structs_of_structs_view.null_mask(), 1, 2, false, cudf::get_default_stream()); + cudf::set_null_mask(structs_of_structs_view.null_mask(), 1, 2, false, cudf::get_default_stream()); auto [output, backing_data] = cudf::structs::detail::push_down_nulls( structs_of_structs->view(), cudf::get_default_stream(), rmm::mr::get_current_device_resource()); @@ -552,8 +551,7 @@ cudf::column_view slice_off_first_and_last_rows(cudf::column_view const& col) void mark_row_as_null(cudf::mutable_column_view const& col, cudf::size_type row_index) { - cudf::set_null_mask( - col.null_mask(), row_index, row_index + 1, false, cudf::get_default_stream()); + cudf::set_null_mask(col.null_mask(), row_index, row_index + 1, false, cudf::get_default_stream()); } TYPED_TEST(TypedSuperimposeTest, Struct_Sliced) diff --git a/cpp/tests/table/experimental_row_operator_tests.cu b/cpp/tests/table/experimental_row_operator_tests.cu index bfe200e8721..0d9e4e27f2c 100644 --- a/cpp/tests/table/experimental_row_operator_tests.cu +++ b/cpp/tests/table/experimental_row_operator_tests.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. @@ -109,15 +109,14 @@ TYPED_TEST(TypedTableViewTest, TestSortSameTableFromTwoTables) auto const lhs = cudf::table_view{{col1}}; auto const empty_rhs = cudf::table_view{{col2}}; - auto const stream = cudf::get_default_stream(); - auto const test_sort = [stream](auto const& preprocessed, - auto const& input, - auto const& comparator, - auto const& expected) { - auto const order = sorted_order( - preprocessed, input.num_rows(), cudf::has_nested_columns(input), comparator, stream); - CUDF_TEST_EXPECT_COLUMNS_EQUAL(expected, order->view()); - }; + auto const stream = cudf::get_default_stream(); + auto const test_sort = + [stream]( + auto const& preprocessed, auto const& input, auto const& comparator, auto const& expected) { + auto const order = sorted_order( + preprocessed, input.num_rows(), cudf::has_nested_columns(input), comparator, stream); + CUDF_TEST_EXPECT_COLUMNS_EQUAL(expected, order->view()); + }; auto const test_sort_two_tables = [&](auto const& preprocessed_lhs, auto const& preprocessed_empty_rhs) { @@ -188,15 +187,14 @@ TYPED_TEST(TypedTableViewTest, TestSortSameTableFromTwoTablesWithListsOfStructs) auto const lhs = cudf::table_view{{*col1}}; auto const empty_rhs = cudf::table_view{{*col2}}; - auto const stream = cudf::get_default_stream(); - auto const test_sort = [stream](auto const& preprocessed, - auto const& input, - auto const& comparator, - auto const& expected) { - auto const order = sorted_order( - preprocessed, input.num_rows(), cudf::has_nested_columns(input), comparator, stream); - CUDF_TEST_EXPECT_COLUMNS_EQUAL(expected, order->view()); - }; + auto const stream = cudf::get_default_stream(); + auto const test_sort = + [stream]( + auto const& preprocessed, auto const& input, auto const& comparator, auto const& expected) { + auto const order = sorted_order( + preprocessed, input.num_rows(), cudf::has_nested_columns(input), comparator, stream); + CUDF_TEST_EXPECT_COLUMNS_EQUAL(expected, order->view()); + }; auto const test_sort_two_tables = [&](auto const& preprocessed_lhs, auto const& preprocessed_empty_rhs) {