Skip to content

Commit b593be9

Browse files
authored
Remove unneeded CUDF_EXPORT from some cudf/detail headers (rapidsai#21693)
Removes the `CUDF_EXPORT` decorator from many headers in the `cpp/include/cudf/detail` folder. All of these have public interfaces and are not longer called outside of libcudf. Also fixes the doxygen for some of the detail functions as appropriate. Authors: - David Wendt (https://github.com/davidwendt) Approvers: - Bradley Dice (https://github.com/bdice) - Nghia Truong (https://github.com/ttnghia) URL: rapidsai#21693
1 parent 2f5ce9d commit b593be9

63 files changed

Lines changed: 208 additions & 293 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

cpp/include/cudf/detail/aggregation/aggregation.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <numeric>
1919
#include <utility>
2020

21-
namespace CUDF_EXPORT cudf {
21+
namespace cudf {
2222
namespace detail {
2323

2424
/**
@@ -1375,4 +1375,4 @@ void initialize_with_identity(mutable_table_view const& table,
13751375
rmm::cuda_stream_view stream);
13761376

13771377
} // namespace detail
1378-
} // namespace CUDF_EXPORT cudf
1378+
} // namespace cudf

cpp/include/cudf/detail/aggregation/result_cache.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: Copyright (c) 2019-2024, NVIDIA CORPORATION.
2+
* SPDX-FileCopyrightText: Copyright (c) 2019-2026, NVIDIA CORPORATION.
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

@@ -11,7 +11,7 @@
1111

1212
#include <unordered_map>
1313

14-
namespace CUDF_EXPORT cudf {
14+
namespace cudf {
1515
namespace detail {
1616
struct pair_column_aggregation_equal_to {
1717
bool operator()(std::pair<column_view, aggregation const&> const& lhs,
@@ -54,4 +54,4 @@ class result_cache {
5454
};
5555

5656
} // namespace detail
57-
} // namespace CUDF_EXPORT cudf
57+
} // namespace cudf
Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
11
/*
2-
* SPDX-FileCopyrightText: Copyright (c) 2018-2024, NVIDIA CORPORATION.
2+
* SPDX-FileCopyrightText: Copyright (c) 2018-2026, NVIDIA CORPORATION.
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55
#pragma once
66

77
#include <cudf/binaryop.hpp>
88
#include <cudf/utilities/default_stream.hpp>
9-
#include <cudf/utilities/export.hpp>
109
#include <cudf/utilities/memory_resource.hpp>
1110

1211
#include <rmm/cuda_stream_view.hpp>
1312

14-
namespace CUDF_EXPORT cudf {
13+
namespace cudf {
1514
//! Inner interfaces and implementations
1615
namespace detail {
1716

1817
/**
1918
* @copydoc cudf::binary_operation(column_view const&, column_view const&,
20-
* std::string const&, data_type, rmm::device_async_resource_ref)
21-
*
22-
* @param stream CUDA stream used for device memory operations and kernel launches.
19+
* std::string const&, data_type, rmm::cuda_stream_view, rmm::device_async_resource_ref)
2320
*/
2421
std::unique_ptr<column> binary_operation(column_view const& lhs,
2522
column_view const& rhs,
@@ -30,9 +27,7 @@ std::unique_ptr<column> binary_operation(column_view const& lhs,
3027

3128
/**
3229
* @copydoc cudf::binary_operation(scalar const&, column_view const&, binary_operator,
33-
* data_type, rmm::device_async_resource_ref)
34-
*
35-
* @param stream CUDA stream used for device memory operations and kernel launches.
30+
* data_type, rmm::cuda_stream_view, rmm::device_async_resource_ref)
3631
*/
3732
std::unique_ptr<column> binary_operation(scalar const& lhs,
3833
column_view const& rhs,
@@ -43,9 +38,7 @@ std::unique_ptr<column> binary_operation(scalar const& lhs,
4338

4439
/**
4540
* @copydoc cudf::binary_operation(column_view const&, scalar const&, binary_operator,
46-
* data_type, rmm::device_async_resource_ref)
47-
*
48-
* @param stream CUDA stream used for device memory operations and kernel launches.
41+
* data_type, rmm::cuda_stream_view, rmm::device_async_resource_ref)
4942
*/
5043
std::unique_ptr<column> binary_operation(column_view const& lhs,
5144
scalar const& rhs,
@@ -56,9 +49,7 @@ std::unique_ptr<column> binary_operation(column_view const& lhs,
5649

5750
/**
5851
* @copydoc cudf::binary_operation(column_view const&, column_view const&,
59-
* binary_operator, data_type, rmm::device_async_resource_ref)
60-
*
61-
* @param stream CUDA stream used for device memory operations and kernel launches.
52+
* binary_operator, data_type, rmm::cuda_stream_view, rmm::device_async_resource_ref)
6253
*/
6354
std::unique_ptr<column> binary_operation(column_view const& lhs,
6455
column_view const& rhs,
@@ -67,4 +58,4 @@ std::unique_ptr<column> binary_operation(column_view const& lhs,
6758
rmm::cuda_stream_view stream,
6859
rmm::device_async_resource_ref mr);
6960
} // namespace detail
70-
} // namespace CUDF_EXPORT cudf
61+
} // namespace cudf
Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: Copyright (c) 2020-2024, NVIDIA CORPORATION.
2+
* SPDX-FileCopyrightText: Copyright (c) 2020-2026, NVIDIA CORPORATION.
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55
#pragma once
@@ -8,34 +8,31 @@
88
#include <cudf/concatenate.hpp>
99
#include <cudf/table/table_view.hpp>
1010
#include <cudf/utilities/default_stream.hpp>
11-
#include <cudf/utilities/export.hpp>
1211
#include <cudf/utilities/memory_resource.hpp>
1312
#include <cudf/utilities/span.hpp>
1413

1514
#include <rmm/cuda_stream_view.hpp>
1615

1716
#include <vector>
1817

19-
namespace CUDF_EXPORT cudf {
18+
namespace cudf {
2019
//! Inner interfaces and implementations
2120
namespace detail {
2221
/**
23-
* @copydoc cudf::concatenate(host_span<column_view const>,rmm::device_async_resource_ref)
24-
*
25-
* @param stream CUDA stream used for device memory operations and kernel launches.
22+
* @copydoc cudf::concatenate(host_span<column_view
23+
* const>,rmm::cuda_stream_view,rmm::device_async_resource_ref)
2624
*/
2725
std::unique_ptr<column> concatenate(host_span<column_view const> columns_to_concat,
2826
rmm::cuda_stream_view stream,
2927
rmm::device_async_resource_ref mr);
3028

3129
/**
32-
* @copydoc cudf::concatenate(host_span<table_view const>,rmm::device_async_resource_ref)
33-
*
34-
* @param stream CUDA stream used for device memory operations and kernel launches.
30+
* @copydoc cudf::concatenate(host_span<table_view
31+
* const>,rmm::cuda_stream_view,rmm::device_async_resource_ref)
3532
*/
3633
std::unique_ptr<table> concatenate(host_span<table_view const> tables_to_concat,
3734
rmm::cuda_stream_view stream,
3835
rmm::device_async_resource_ref mr);
3936

4037
} // namespace detail
41-
} // namespace CUDF_EXPORT cudf
38+
} // namespace cudf

cpp/include/cudf/detail/concatenate_masks.hpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
/*
2-
* SPDX-FileCopyrightText: Copyright (c) 2020-2025, NVIDIA CORPORATION.
2+
* SPDX-FileCopyrightText: Copyright (c) 2020-2026, NVIDIA CORPORATION.
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55
#pragma once
66

77
#include <cudf/column/column_device_view.cuh>
88
#include <cudf/column/column_view.hpp>
9-
#include <cudf/utilities/export.hpp>
109
#include <cudf/utilities/memory_resource.hpp>
1110
#include <cudf/utilities/span.hpp>
1211

1312
#include <rmm/cuda_stream_view.hpp>
1413
#include <rmm/device_buffer.hpp>
1514
#include <rmm/mr/device_memory_resource.hpp>
1615

17-
namespace CUDF_EXPORT cudf {
16+
namespace cudf {
1817
//! Inner interfaces and implementations
1918
namespace detail {
2019

@@ -59,4 +58,4 @@ rmm::device_buffer concatenate_masks(host_span<column_view const> views,
5958
rmm::device_async_resource_ref mr);
6059

6160
} // namespace detail
62-
} // namespace CUDF_EXPORT cudf
61+
} // namespace cudf

cpp/include/cudf/detail/contiguous_split.hpp

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: Copyright (c) 2023-2024, NVIDIA CORPORATION.
2+
* SPDX-FileCopyrightText: Copyright (c) 2023-2026, NVIDIA CORPORATION.
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

@@ -12,13 +12,11 @@
1212

1313
#include <rmm/cuda_stream_view.hpp>
1414

15-
namespace CUDF_EXPORT cudf {
15+
namespace cudf {
1616
namespace detail {
1717

1818
/**
1919
* @copydoc cudf::contiguous_split
20-
*
21-
* @param stream CUDA stream used for device memory operations and kernel launches.
2220
**/
2321
std::vector<packed_table> contiguous_split(cudf::table_view const& input,
2422
std::vector<size_type> const& splits,
@@ -27,8 +25,6 @@ std::vector<packed_table> contiguous_split(cudf::table_view const& input,
2725

2826
/**
2927
* @copydoc cudf::pack
30-
*
31-
* @param stream Optional CUDA stream on which to execute kernels
3228
**/
3329
packed_columns pack(cudf::table_view const& input,
3430
rmm::cuda_stream_view stream,
@@ -114,4 +110,4 @@ std::vector<uint8_t> pack_metadata(table_view const& table,
114110
metadata_builder& builder);
115111

116112
} // namespace detail
117-
} // namespace CUDF_EXPORT cudf
113+
} // namespace cudf

cpp/include/cudf/detail/datetime.hpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
/*
2-
* SPDX-FileCopyrightText: Copyright (c) 2021-2025, NVIDIA CORPORATION.
2+
* SPDX-FileCopyrightText: Copyright (c) 2021-2026, NVIDIA CORPORATION.
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

66
#pragma once
77

8+
#include <cudf/datetime.hpp>
89
#include <cudf/types.hpp>
910
#include <cudf/utilities/default_stream.hpp>
1011
#include <cudf/utilities/memory_resource.hpp>
1112

1213
#include <memory>
1314

14-
namespace CUDF_EXPORT cudf {
15+
namespace cudf {
1516
namespace datetime {
1617
namespace detail {
1718
/**
@@ -77,4 +78,4 @@ std::unique_ptr<cudf::column> extract_quarter(cudf::column_view const& column,
7778

7879
} // namespace detail
7980
} // namespace datetime
80-
} // namespace CUDF_EXPORT cudf
81+
} // namespace cudf

cpp/include/cudf/detail/fill.hpp

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: Copyright (c) 2019-2024, NVIDIA CORPORATION.
2+
* SPDX-FileCopyrightText: Copyright (c) 2019-2026, NVIDIA CORPORATION.
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

@@ -14,13 +14,11 @@
1414

1515
#include <memory>
1616

17-
namespace CUDF_EXPORT cudf {
17+
namespace cudf {
1818
namespace detail {
1919

2020
/**
2121
* @copydoc cudf::fill_in_place
22-
*
23-
* @param stream CUDA stream used for device memory operations and kernel launches.
2422
*/
2523
void fill_in_place(mutable_column_view& destination,
2624
size_type begin,
@@ -30,8 +28,6 @@ void fill_in_place(mutable_column_view& destination,
3028

3129
/**
3230
* @copydoc cudf::fill
33-
*
34-
* @param stream CUDA stream used for device memory operations and kernel launches.
3531
*/
3632
std::unique_ptr<column> fill(column_view const& input,
3733
size_type begin,
@@ -41,4 +37,4 @@ std::unique_ptr<column> fill(column_view const& input,
4137
rmm::device_async_resource_ref mr);
4238

4339
} // namespace detail
44-
} // namespace CUDF_EXPORT cudf
40+
} // namespace cudf

cpp/include/cudf/detail/groupby.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: Copyright (c) 2019-2024, NVIDIA CORPORATION.
2+
* SPDX-FileCopyrightText: Copyright (c) 2019-2026, NVIDIA CORPORATION.
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55
#pragma once
@@ -14,7 +14,7 @@
1414
#include <memory>
1515
#include <utility>
1616

17-
namespace CUDF_EXPORT cudf {
17+
namespace cudf {
1818
namespace groupby::detail::hash {
1919
/**
2020
* @brief Indicates if a set of aggregation requests can be satisfied with a
@@ -35,4 +35,4 @@ std::pair<std::unique_ptr<table>, std::vector<aggregation_result>> groupby(
3535
rmm::cuda_stream_view stream,
3636
rmm::device_async_resource_ref mr);
3737
} // namespace groupby::detail::hash
38-
} // namespace CUDF_EXPORT cudf
38+
} // namespace cudf

cpp/include/cudf/detail/groupby/group_replace_nulls.hpp

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: Copyright (c) 2021-2024, NVIDIA CORPORATION.
2+
* SPDX-FileCopyrightText: Copyright (c) 2021-2026, NVIDIA CORPORATION.
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

@@ -13,18 +13,19 @@
1313
#include <cudf/utilities/span.hpp>
1414

1515
#include <rmm/exec_policy.hpp>
16-
namespace CUDF_EXPORT cudf {
16+
17+
namespace cudf {
1718
namespace groupby {
1819
namespace detail {
1920

2021
/**
2122
* @brief Internal API to replace nulls with preceding/following non-null values in @p value
2223
*
23-
* @param[in] grouped_value A column whose null values will be replaced.
24-
* @param[in] group_labels Group labels for @p grouped_value, corresponding to group keys.
25-
* @param[in] replace_policy Specify the position of replacement values relative to null values.
24+
* @param grouped_value A column whose null values will be replaced.
25+
* @param group_labels Group labels for @p grouped_value, corresponding to group keys.
26+
* @param replace_policy Specify the position of replacement values relative to null values.
2627
* @param stream CUDA stream used for device memory operations and kernel launches.
27-
* @param[in] mr Device memory resource used to allocate device memory of the returned column.
28+
* @param mr Device memory resource used to allocate device memory of the returned column.
2829
*/
2930
std::unique_ptr<column> group_replace_nulls(cudf::column_view const& grouped_value,
3031
device_span<size_type const> group_labels,
@@ -34,4 +35,4 @@ std::unique_ptr<column> group_replace_nulls(cudf::column_view const& grouped_val
3435

3536
} // namespace detail
3637
} // namespace groupby
37-
} // namespace CUDF_EXPORT cudf
38+
} // namespace cudf

0 commit comments

Comments
 (0)