From 39186aefc424d93aa1bc508df711679f9da7169a Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Wed, 17 Jul 2024 13:29:35 -0400 Subject: [PATCH] Ensure include headers are marked with CUDF_EXPORT --- cpp/include/cudf/detail/datetime.hpp | 4 ++-- cpp/include/cudf/detail/groupby.hpp | 13 ++++--------- .../cudf/detail/groupby/group_replace_nulls.hpp | 4 ++-- cpp/include/cudf/detail/groupby/sort_helper.hpp | 12 ++++-------- cpp/include/cudf/detail/tdigest/tdigest.hpp | 10 ++++------ cpp/include/cudf/io/text/detail/bgzip_utils.hpp | 6 ++---- cpp/include/cudf/strings/detail/merge.hpp | 7 +++++-- 7 files changed, 23 insertions(+), 33 deletions(-) diff --git a/cpp/include/cudf/detail/datetime.hpp b/cpp/include/cudf/detail/datetime.hpp index a93c06d4371..95469de8ae6 100644 --- a/cpp/include/cudf/detail/datetime.hpp +++ b/cpp/include/cudf/detail/datetime.hpp @@ -23,7 +23,7 @@ #include -namespace cudf { +namespace CUDF_EXPORT cudf { namespace datetime { namespace detail { /** @@ -174,4 +174,4 @@ std::unique_ptr extract_quarter(cudf::column_view const& column, } // namespace detail } // namespace datetime -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/groupby.hpp b/cpp/include/cudf/detail/groupby.hpp index 5a8c9b0a27f..36eae05ce39 100644 --- a/cpp/include/cudf/detail/groupby.hpp +++ b/cpp/include/cudf/detail/groupby.hpp @@ -25,10 +25,8 @@ #include #include -namespace cudf { -namespace groupby { -namespace detail { -namespace hash { +namespace CUDF_EXPORT cudf { +namespace groupby::detail::hash { /** * @brief Indicates if a set of aggregation requests can be satisfied with a * hash-based groupby implementation. @@ -47,8 +45,5 @@ std::pair, std::vector> groupby( null_policy include_null_keys, rmm::cuda_stream_view stream, rmm::device_async_resource_ref mr); -} // namespace hash - -} // namespace detail -} // namespace groupby -} // namespace cudf +} // namespace groupby::detail::hash +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/groupby/group_replace_nulls.hpp b/cpp/include/cudf/detail/groupby/group_replace_nulls.hpp index 389c7952875..c0910b4d5ae 100644 --- a/cpp/include/cudf/detail/groupby/group_replace_nulls.hpp +++ b/cpp/include/cudf/detail/groupby/group_replace_nulls.hpp @@ -24,7 +24,7 @@ #include #include -namespace cudf { +namespace CUDF_EXPORT cudf { namespace groupby { namespace detail { @@ -45,4 +45,4 @@ std::unique_ptr group_replace_nulls(cudf::column_view const& grouped_val } // namespace detail } // namespace groupby -} // namespace cudf +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/groupby/sort_helper.hpp b/cpp/include/cudf/detail/groupby/sort_helper.hpp index 567efedb9b2..a411a890622 100644 --- a/cpp/include/cudf/detail/groupby/sort_helper.hpp +++ b/cpp/include/cudf/detail/groupby/sort_helper.hpp @@ -25,10 +25,8 @@ #include #include -namespace cudf { -namespace groupby { -namespace detail { -namespace sort { +namespace CUDF_EXPORT cudf { +namespace groupby::detail::sort { /** * @brief Helper class for computing sort-based groupby * @@ -229,7 +227,5 @@ struct sort_groupby_helper { std::vector _null_precedence; ///< How to sort NULLs }; -} // namespace sort -} // namespace detail -} // namespace groupby -} // namespace cudf +} // namespace groupby::detail::sort +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/detail/tdigest/tdigest.hpp b/cpp/include/cudf/detail/tdigest/tdigest.hpp index 44513b35026..10eb3d389c7 100644 --- a/cpp/include/cudf/detail/tdigest/tdigest.hpp +++ b/cpp/include/cudf/detail/tdigest/tdigest.hpp @@ -24,9 +24,8 @@ #include #include -namespace cudf { -namespace tdigest { -namespace detail { +namespace CUDF_EXPORT cudf { +namespace tdigest::detail { /** * @brief Generate a tdigest column from a grouped, sorted set of numeric input values. @@ -238,6 +237,5 @@ std::unique_ptr reduce_merge_tdigest(column_view const& input, rmm::cuda_stream_view stream, rmm::device_async_resource_ref mr); -} // namespace detail -} // namespace tdigest -} // namespace cudf +} // namespace tdigest::detail +} // namespace CUDF_EXPORT cudf diff --git a/cpp/include/cudf/io/text/detail/bgzip_utils.hpp b/cpp/include/cudf/io/text/detail/bgzip_utils.hpp index f7526223bda..11eb4518210 100644 --- a/cpp/include/cudf/io/text/detail/bgzip_utils.hpp +++ b/cpp/include/cudf/io/text/detail/bgzip_utils.hpp @@ -27,7 +27,7 @@ #include #include -namespace cudf { +namespace CUDF_EXPORT cudf { namespace io::text::detail::bgzip { struct header { @@ -91,7 +91,6 @@ void write_footer(std::ostream& output_stream, host_span data); * BGZIP block size subfield * @param post_size_subfields Any subfields to be placed after the BGZIP block size subfield */ -CUDF_EXPORT void write_uncompressed_block(std::ostream& output_stream, host_span data, host_span pre_size_subfields = {}, @@ -107,11 +106,10 @@ void write_uncompressed_block(std::ostream& output_stream, * BGZIP block size subfield * @param post_size_subfields Any subfields to be placed after the BGZIP block size subfield */ -CUDF_EXPORT void write_compressed_block(std::ostream& output_stream, host_span data, host_span pre_size_subfields = {}, host_span post_size_subfields = {}); } // namespace io::text::detail::bgzip -} // 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 0ab221601fe..0aa5c0c2899 100644 --- a/cpp/include/cudf/strings/detail/merge.hpp +++ b/cpp/include/cudf/strings/detail/merge.hpp @@ -18,10 +18,12 @@ #include #include #include +#include #include -namespace cudf::strings::detail { +namespace CUDF_EXPORT cudf { +namespace strings::detail { /** * @brief Merges two strings columns * @@ -38,4 +40,5 @@ std::unique_ptr merge(strings_column_view const& lhs, rmm::cuda_stream_view stream, rmm::device_async_resource_ref mr); -} // namespace cudf::strings::detail +} // namespace strings::detail +} // namespace CUDF_EXPORT cudf