From 6b62d0cdbd6b16b183c1e8864d2bcd8e8e90f8bd Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Tue, 9 Jul 2024 16:24:04 -0400 Subject: [PATCH] Mark more detail functions as public --- cpp/include/cudf/detail/aggregation/aggregation.hpp | 4 ++-- cpp/include/cudf/detail/aggregation/result_cache.hpp | 6 +++--- cpp/include/cudf/detail/binaryop.hpp | 5 +++-- cpp/include/cudf/detail/concatenate.hpp | 5 +++-- cpp/include/cudf/detail/concatenate_masks.hpp | 5 +++-- cpp/include/cudf/detail/contiguous_split.hpp | 4 ++-- cpp/include/cudf/detail/copy.hpp | 4 ++-- cpp/include/cudf/detail/fill.hpp | 4 ++-- cpp/include/cudf/detail/interop.hpp | 5 +++-- cpp/include/cudf/detail/join.hpp | 6 +++--- cpp/include/cudf/detail/label_bins.hpp | 2 +- cpp/include/cudf/detail/merge.hpp | 6 ++++-- cpp/include/cudf/detail/null_mask.hpp | 2 +- cpp/include/cudf/detail/quantiles.hpp | 5 +++-- cpp/include/cudf/detail/repeat.hpp | 4 ++-- cpp/include/cudf/detail/replace.hpp | 4 ++-- cpp/include/cudf/detail/reshape.hpp | 4 ++-- cpp/include/cudf/detail/rolling.hpp | 4 ++-- cpp/include/cudf/detail/round.hpp | 4 ++-- cpp/include/cudf/detail/scan.hpp | 4 ++-- cpp/include/cudf/detail/scatter.hpp | 5 +++-- cpp/include/cudf/detail/sequence.hpp | 4 ++-- cpp/include/cudf/detail/sorting.hpp | 4 ++-- cpp/include/cudf/detail/stream_compaction.hpp | 4 ++-- cpp/include/cudf/detail/transform.hpp | 5 +++-- cpp/include/cudf/detail/transpose.hpp | 5 +++-- cpp/include/cudf/detail/unary.hpp | 5 +++-- cpp/include/cudf/detail/utilities/alignment.hpp | 6 +++--- cpp/include/cudf/detail/utilities/cuda_memcpy.hpp | 8 ++++++-- cpp/include/cudf/detail/utilities/linked_column.hpp | 9 ++++++--- cpp/include/cudf/detail/utilities/vector_factories.hpp | 3 ++- 31 files changed, 82 insertions(+), 63 deletions(-) diff --git a/cpp/include/cudf/detail/aggregation/aggregation.hpp b/cpp/include/cudf/detail/aggregation/aggregation.hpp index 843414817e3..b257eef1e9e 100644 --- a/cpp/include/cudf/detail/aggregation/aggregation.hpp +++ b/cpp/include/cudf/detail/aggregation/aggregation.hpp @@ -26,7 +26,7 @@ #include #include -namespace cudf { +namespace CUDF_EXPORT cudf { namespace detail { // Visitor pattern @@ -1674,4 +1674,4 @@ constexpr inline bool is_valid_aggregation() bool is_valid_aggregation(data_type source, aggregation::Kind k); } // namespace detail -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/aggregation/result_cache.hpp b/cpp/include/cudf/detail/aggregation/result_cache.hpp index 41eec156c47..ec5a511bb7c 100644 --- a/cpp/include/cudf/detail/aggregation/result_cache.hpp +++ b/cpp/include/cudf/detail/aggregation/result_cache.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. @@ -23,7 +23,7 @@ #include -namespace cudf { +namespace CUDF_EXPORT cudf { namespace detail { struct pair_column_aggregation_equal_to { bool operator()(std::pair const& lhs, @@ -66,4 +66,4 @@ class result_cache { }; } // namespace detail -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/binaryop.hpp b/cpp/include/cudf/detail/binaryop.hpp index de1fde8bc96..fe739327a08 100644 --- a/cpp/include/cudf/detail/binaryop.hpp +++ b/cpp/include/cudf/detail/binaryop.hpp @@ -17,11 +17,12 @@ #include #include +#include #include #include -namespace cudf { +namespace CUDF_EXPORT cudf { //! Inner interfaces and implementations namespace detail { @@ -77,4 +78,4 @@ std::unique_ptr binary_operation(column_view const& lhs, rmm::cuda_stream_view stream, rmm::device_async_resource_ref mr); } // namespace detail -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/concatenate.hpp b/cpp/include/cudf/detail/concatenate.hpp index 3e039175542..1be269710b2 100644 --- a/cpp/include/cudf/detail/concatenate.hpp +++ b/cpp/include/cudf/detail/concatenate.hpp @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -26,7 +27,7 @@ #include -namespace cudf { +namespace CUDF_EXPORT cudf { //! Inner interfaces and implementations namespace detail { /** @@ -48,4 +49,4 @@ std::unique_ptr concatenate(host_span tables_to_concat, rmm::device_async_resource_ref mr); } // namespace detail -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/concatenate_masks.hpp b/cpp/include/cudf/detail/concatenate_masks.hpp index dd2fb471a7d..fc829361fde 100644 --- a/cpp/include/cudf/detail/concatenate_masks.hpp +++ b/cpp/include/cudf/detail/concatenate_masks.hpp @@ -17,6 +17,7 @@ #include #include +#include #include #include @@ -24,7 +25,7 @@ #include #include -namespace cudf { +namespace CUDF_EXPORT cudf { //! Inner interfaces and implementations namespace detail { @@ -69,4 +70,4 @@ rmm::device_buffer concatenate_masks(host_span views, rmm::device_async_resource_ref mr); } // namespace detail -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/contiguous_split.hpp b/cpp/include/cudf/detail/contiguous_split.hpp index 1467ed1aa67..52c51daa917 100644 --- a/cpp/include/cudf/detail/contiguous_split.hpp +++ b/cpp/include/cudf/detail/contiguous_split.hpp @@ -23,7 +23,7 @@ #include #include -namespace cudf { +namespace CUDF_EXPORT cudf { namespace detail { /** @@ -125,4 +125,4 @@ std::vector pack_metadata(table_view const& table, metadata_builder& builder); } // namespace detail -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/copy.hpp b/cpp/include/cudf/detail/copy.hpp index f7430eb090d..2be432c0825 100644 --- a/cpp/include/cudf/detail/copy.hpp +++ b/cpp/include/cudf/detail/copy.hpp @@ -28,7 +28,7 @@ #include -namespace cudf { +namespace CUDF_EXPORT cudf { namespace detail { /** * @brief Constructs a zero-copy `column_view`/`mutable_column_view` of the @@ -280,4 +280,4 @@ std::unique_ptr purge_nonempty_nulls(column_view const& input, rmm::device_async_resource_ref mr); } // namespace detail -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/fill.hpp b/cpp/include/cudf/detail/fill.hpp index 6996cda6974..82c6af8b611 100644 --- a/cpp/include/cudf/detail/fill.hpp +++ b/cpp/include/cudf/detail/fill.hpp @@ -25,7 +25,7 @@ #include -namespace cudf { +namespace CUDF_EXPORT cudf { namespace detail { /** @@ -52,4 +52,4 @@ std::unique_ptr fill(column_view const& input, rmm::device_async_resource_ref mr); } // namespace detail -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/interop.hpp b/cpp/include/cudf/detail/interop.hpp index 5b2b9b5e69d..0b9319ba663 100644 --- a/cpp/include/cudf/detail/interop.hpp +++ b/cpp/include/cudf/detail/interop.hpp @@ -34,12 +34,13 @@ #include #include #include +#include #include #include -namespace cudf { +namespace CUDF_EXPORT cudf { namespace detail { /** @@ -156,4 +157,4 @@ constexpr std::size_t max_precision() } } // namespace detail -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/join.hpp b/cpp/include/cudf/detail/join.hpp index aabfff746ea..47d72f18f44 100644 --- a/cpp/include/cudf/detail/join.hpp +++ b/cpp/include/cudf/detail/join.hpp @@ -34,10 +34,10 @@ // Forward declaration namespace cudf::experimental::row::equality { -class preprocessed_table; +class CUDF_EXPORT preprocessed_table; } -namespace cudf { +namespace CUDF_EXPORT cudf { namespace detail { // Forward declaration @@ -188,4 +188,4 @@ struct hash_join { rmm::device_async_resource_ref mr) const; }; } // namespace detail -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/label_bins.hpp b/cpp/include/cudf/detail/label_bins.hpp index 9f6dcce448d..3fc11f59dcc 100644 --- a/cpp/include/cudf/detail/label_bins.hpp +++ b/cpp/include/cudf/detail/label_bins.hpp @@ -55,4 +55,4 @@ std::unique_ptr label_bins(column_view const& input, /** @} */ // end of group } // namespace detail -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/merge.hpp b/cpp/include/cudf/detail/merge.hpp index 56ac0554403..72e34b76158 100644 --- a/cpp/include/cudf/detail/merge.hpp +++ b/cpp/include/cudf/detail/merge.hpp @@ -16,12 +16,14 @@ #pragma once +#include + #include #include #include -namespace cudf { +namespace CUDF_EXPORT cudf { namespace detail { /** @@ -59,4 +61,4 @@ std::unique_ptr merge(std::vector const& tables_to_merg rmm::device_async_resource_ref mr); } // namespace detail -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/null_mask.hpp b/cpp/include/cudf/detail/null_mask.hpp index a31f9b90ace..8fa28f84423 100644 --- a/cpp/include/cudf/detail/null_mask.hpp +++ b/cpp/include/cudf/detail/null_mask.hpp @@ -25,7 +25,7 @@ #include -namespace cudf { +namespace CUDF_EXPORT cudf { namespace detail { /** diff --git a/cpp/include/cudf/detail/quantiles.hpp b/cpp/include/cudf/detail/quantiles.hpp index 6c188d2ca68..23d5fb73ba3 100644 --- a/cpp/include/cudf/detail/quantiles.hpp +++ b/cpp/include/cudf/detail/quantiles.hpp @@ -18,11 +18,12 @@ #include #include #include +#include #include #include -namespace cudf { +namespace CUDF_EXPORT cudf { namespace detail { /** @@ -64,4 +65,4 @@ std::unique_ptr percentile_approx(tdigest::tdigest_column_view const& in rmm::device_async_resource_ref mr); } // namespace detail -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/repeat.hpp b/cpp/include/cudf/detail/repeat.hpp index abb9e45a95c..e17f1b7c5fd 100644 --- a/cpp/include/cudf/detail/repeat.hpp +++ b/cpp/include/cudf/detail/repeat.hpp @@ -24,7 +24,7 @@ #include -namespace cudf { +namespace CUDF_EXPORT cudf { namespace detail { /** @@ -51,4 +51,4 @@ std::unique_ptr
repeat(table_view const& input_table, rmm::device_async_resource_ref mr); } // namespace detail -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/replace.hpp b/cpp/include/cudf/detail/replace.hpp index 46203bdf2f0..e2bd729861b 100644 --- a/cpp/include/cudf/detail/replace.hpp +++ b/cpp/include/cudf/detail/replace.hpp @@ -24,7 +24,7 @@ #include -namespace cudf { +namespace CUDF_EXPORT cudf { namespace detail { /** * @copydoc cudf::replace_nulls(column_view const&, column_view const&, @@ -102,4 +102,4 @@ std::unique_ptr normalize_nans_and_zeros(column_view const& input, rmm::device_async_resource_ref mr); } // namespace detail -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/reshape.hpp b/cpp/include/cudf/detail/reshape.hpp index 7a1c3d6c4f0..30f8b88b116 100644 --- a/cpp/include/cudf/detail/reshape.hpp +++ b/cpp/include/cudf/detail/reshape.hpp @@ -24,7 +24,7 @@ #include -namespace cudf { +namespace CUDF_EXPORT cudf { namespace detail { /** * @copydoc cudf::tile @@ -46,4 +46,4 @@ std::unique_ptr interleave_columns(table_view const& input, rmm::device_async_resource_ref mr); } // namespace detail -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/rolling.hpp b/cpp/include/cudf/detail/rolling.hpp index ea6f38c421c..5bfa5679531 100644 --- a/cpp/include/cudf/detail/rolling.hpp +++ b/cpp/include/cudf/detail/rolling.hpp @@ -26,7 +26,7 @@ #include -namespace cudf { +namespace CUDF_EXPORT cudf { namespace detail { /** @@ -49,4 +49,4 @@ std::unique_ptr rolling_window(column_view const& input, rmm::device_async_resource_ref mr); } // namespace detail -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/round.hpp b/cpp/include/cudf/detail/round.hpp index 1a9c5c82c65..ba3ef1c1ce7 100644 --- a/cpp/include/cudf/detail/round.hpp +++ b/cpp/include/cudf/detail/round.hpp @@ -22,7 +22,7 @@ #include #include -namespace cudf { +namespace CUDF_EXPORT cudf { //! Inner interfaces and implementations namespace detail { @@ -39,4 +39,4 @@ std::unique_ptr round(column_view const& input, rmm::device_async_resource_ref mr); } // namespace detail -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/scan.hpp b/cpp/include/cudf/detail/scan.hpp index cbe0132c138..bd60309c5c3 100644 --- a/cpp/include/cudf/detail/scan.hpp +++ b/cpp/include/cudf/detail/scan.hpp @@ -22,7 +22,7 @@ #include #include -namespace cudf { +namespace CUDF_EXPORT cudf { namespace detail { /** @@ -120,4 +120,4 @@ std::unique_ptr inclusive_one_normalized_percent_rank_scan( column_view const& order_by, rmm::cuda_stream_view stream, rmm::device_async_resource_ref mr); } // namespace detail -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/scatter.hpp b/cpp/include/cudf/detail/scatter.hpp index 95ed6af8c3c..6691ddc5c09 100644 --- a/cpp/include/cudf/detail/scatter.hpp +++ b/cpp/include/cudf/detail/scatter.hpp @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -26,7 +27,7 @@ #include -namespace cudf { +namespace CUDF_EXPORT cudf { namespace detail { /** * @brief Scatters the rows of the source table into a copy of the target table @@ -144,4 +145,4 @@ std::unique_ptr
boolean_mask_scatter( rmm::device_async_resource_ref mr); } // namespace detail -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/sequence.hpp b/cpp/include/cudf/detail/sequence.hpp index a18a9d3b200..a08010a610f 100644 --- a/cpp/include/cudf/detail/sequence.hpp +++ b/cpp/include/cudf/detail/sequence.hpp @@ -23,7 +23,7 @@ #include #include -namespace cudf { +namespace CUDF_EXPORT cudf { namespace detail { /** * @copydoc cudf::sequence(size_type size, scalar const& init, scalar const& step, @@ -65,4 +65,4 @@ std::unique_ptr calendrical_month_sequence(size_type size, rmm::device_async_resource_ref mr); } // namespace detail -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/sorting.hpp b/cpp/include/cudf/detail/sorting.hpp index 4ddba38a7e9..08cf329f199 100644 --- a/cpp/include/cudf/detail/sorting.hpp +++ b/cpp/include/cudf/detail/sorting.hpp @@ -26,7 +26,7 @@ #include #include -namespace cudf { +namespace CUDF_EXPORT cudf { namespace detail { /** @@ -163,4 +163,4 @@ std::unique_ptr
stable_sort(table_view const& values, rmm::device_async_resource_ref mr); } // namespace detail -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/stream_compaction.hpp b/cpp/include/cudf/detail/stream_compaction.hpp index e3ef4190fd2..05194148a70 100644 --- a/cpp/include/cudf/detail/stream_compaction.hpp +++ b/cpp/include/cudf/detail/stream_compaction.hpp @@ -25,7 +25,7 @@ #include #include -namespace cudf { +namespace CUDF_EXPORT cudf { namespace detail { /** * @copydoc cudf::drop_nulls(table_view const&, std::vector const&, @@ -148,4 +148,4 @@ cudf::size_type distinct_count(table_view const& input, rmm::cuda_stream_view stream); } // namespace detail -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/transform.hpp b/cpp/include/cudf/detail/transform.hpp index 47e13fa2e5e..02849ef023c 100644 --- a/cpp/include/cudf/detail/transform.hpp +++ b/cpp/include/cudf/detail/transform.hpp @@ -19,11 +19,12 @@ #include #include #include +#include #include #include -namespace cudf { +namespace CUDF_EXPORT cudf { namespace detail { /** * @copydoc cudf::transform @@ -112,4 +113,4 @@ std::unique_ptr segmented_row_bit_count(table_view const& t, rmm::device_async_resource_ref mr); } // namespace detail -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/transpose.hpp b/cpp/include/cudf/detail/transpose.hpp index 1f8effc8103..559b2c32996 100644 --- a/cpp/include/cudf/detail/transpose.hpp +++ b/cpp/include/cudf/detail/transpose.hpp @@ -18,11 +18,12 @@ #include #include #include +#include #include #include -namespace cudf { +namespace CUDF_EXPORT cudf { namespace detail { /** * @copydoc cudf::transpose @@ -34,4 +35,4 @@ std::pair, table_view> transpose(table_view const& input rmm::device_async_resource_ref mr); } // namespace detail -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/unary.hpp b/cpp/include/cudf/detail/unary.hpp index 5245cfdf079..bb05138bc8c 100644 --- a/cpp/include/cudf/detail/unary.hpp +++ b/cpp/include/cudf/detail/unary.hpp @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -26,7 +27,7 @@ #include -namespace cudf { +namespace CUDF_EXPORT cudf { namespace detail { /** * @brief Creates a column of `type_id::BOOL8` elements by applying a predicate to every element @@ -101,4 +102,4 @@ std::unique_ptr is_not_nan(cudf::column_view const& input, rmm::device_async_resource_ref mr); } // namespace detail -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/utilities/alignment.hpp b/cpp/include/cudf/detail/utilities/alignment.hpp index e52032fe104..2677eca34db 100644 --- a/cpp/include/cudf/detail/utilities/alignment.hpp +++ b/cpp/include/cudf/detail/utilities/alignment.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ #include -namespace cudf { +namespace CUDF_EXPORT cudf { namespace detail { /** @@ -43,4 +43,4 @@ T* align_ptr_for_type(void* destination) } } // namespace detail -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/utilities/cuda_memcpy.hpp b/cpp/include/cudf/detail/utilities/cuda_memcpy.hpp index b66c461ab12..632d5a732ec 100644 --- a/cpp/include/cudf/detail/utilities/cuda_memcpy.hpp +++ b/cpp/include/cudf/detail/utilities/cuda_memcpy.hpp @@ -16,9 +16,12 @@ #pragma once +#include + #include -namespace cudf::detail { +namespace CUDF_EXPORT cudf { +namespace detail { enum class host_memory_kind : uint8_t { PINNED, PAGEABLE }; @@ -50,4 +53,5 @@ void cuda_memcpy_async( void cuda_memcpy( void* dst, void const* src, size_t size, host_memory_kind kind, rmm::cuda_stream_view stream); -} // namespace cudf::detail +} // namespace detail +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/utilities/linked_column.hpp b/cpp/include/cudf/detail/utilities/linked_column.hpp index 0feef0f1a44..959f184a09b 100644 --- a/cpp/include/cudf/detail/utilities/linked_column.hpp +++ b/cpp/include/cudf/detail/utilities/linked_column.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,11 +18,13 @@ #include #include +#include #include #include -namespace cudf::detail { +namespace CUDF_EXPORT cudf { +namespace detail { struct linked_column_view; @@ -68,4 +70,5 @@ struct linked_column_view : public column_view_base { */ LinkedColVector table_to_linked_columns(table_view const& table); -} // namespace cudf::detail +} // namespace detail +} // namespace CUDF_EXPORT cudf \ No newline at end of file diff --git a/cpp/include/cudf/detail/utilities/vector_factories.hpp b/cpp/include/cudf/detail/utilities/vector_factories.hpp index 20cb55bb1c7..077be3a8f9f 100644 --- a/cpp/include/cudf/detail/utilities/vector_factories.hpp +++ b/cpp/include/cudf/detail/utilities/vector_factories.hpp @@ -23,6 +23,7 @@ #include #include +#include #include #include #include @@ -36,7 +37,7 @@ #include -namespace cudf { +namespace CUDF_EXPORT cudf { namespace detail { /**