Skip to content

Commit

Permalink
Mark more detail functions as public
Browse files Browse the repository at this point in the history
  • Loading branch information
robertmaynard committed Jul 9, 2024
1 parent 322de17 commit 6b62d0c
Show file tree
Hide file tree
Showing 31 changed files with 82 additions and 63 deletions.
4 changes: 2 additions & 2 deletions cpp/include/cudf/detail/aggregation/aggregation.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include <numeric>
#include <utility>

namespace cudf {
namespace CUDF_EXPORT cudf {
namespace detail {

// Visitor pattern
Expand Down Expand Up @@ -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
6 changes: 3 additions & 3 deletions cpp/include/cudf/detail/aggregation/result_cache.hpp
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -23,7 +23,7 @@

#include <unordered_map>

namespace cudf {
namespace CUDF_EXPORT cudf {
namespace detail {
struct pair_column_aggregation_equal_to {
bool operator()(std::pair<column_view, aggregation const&> const& lhs,
Expand Down Expand Up @@ -66,4 +66,4 @@ class result_cache {
};

} // namespace detail
} // namespace cudf
} // namespace CUDF_EXPORT cudf
5 changes: 3 additions & 2 deletions cpp/include/cudf/detail/binaryop.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@

#include <cudf/binaryop.hpp>
#include <cudf/utilities/default_stream.hpp>
#include <cudf/utilities/export.hpp>

#include <rmm/cuda_stream_view.hpp>
#include <rmm/resource_ref.hpp>

namespace cudf {
namespace CUDF_EXPORT cudf {
//! Inner interfaces and implementations
namespace detail {

Expand Down Expand Up @@ -77,4 +78,4 @@ std::unique_ptr<column> 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
5 changes: 3 additions & 2 deletions cpp/include/cudf/detail/concatenate.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,15 @@
#include <cudf/concatenate.hpp>
#include <cudf/table/table_view.hpp>
#include <cudf/utilities/default_stream.hpp>
#include <cudf/utilities/export.hpp>
#include <cudf/utilities/span.hpp>

#include <rmm/cuda_stream_view.hpp>
#include <rmm/resource_ref.hpp>

#include <vector>

namespace cudf {
namespace CUDF_EXPORT cudf {
//! Inner interfaces and implementations
namespace detail {
/**
Expand All @@ -48,4 +49,4 @@ std::unique_ptr<table> concatenate(host_span<table_view const> tables_to_concat,
rmm::device_async_resource_ref mr);

} // namespace detail
} // namespace cudf
} // namespace CUDF_EXPORT cudf
5 changes: 3 additions & 2 deletions cpp/include/cudf/detail/concatenate_masks.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,15 @@

#include <cudf/column/column_device_view.cuh>
#include <cudf/column/column_view.hpp>
#include <cudf/utilities/export.hpp>
#include <cudf/utilities/span.hpp>

#include <rmm/cuda_stream_view.hpp>
#include <rmm/device_buffer.hpp>
#include <rmm/mr/device/device_memory_resource.hpp>
#include <rmm/resource_ref.hpp>

namespace cudf {
namespace CUDF_EXPORT cudf {
//! Inner interfaces and implementations
namespace detail {

Expand Down Expand Up @@ -69,4 +70,4 @@ rmm::device_buffer concatenate_masks(host_span<column_view const> views,
rmm::device_async_resource_ref mr);

} // namespace detail
} // namespace cudf
} // namespace CUDF_EXPORT cudf
4 changes: 2 additions & 2 deletions cpp/include/cudf/detail/contiguous_split.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <rmm/cuda_stream_view.hpp>
#include <rmm/resource_ref.hpp>

namespace cudf {
namespace CUDF_EXPORT cudf {
namespace detail {

/**
Expand Down Expand Up @@ -125,4 +125,4 @@ std::vector<uint8_t> pack_metadata(table_view const& table,
metadata_builder& builder);

} // namespace detail
} // namespace cudf
} // namespace CUDF_EXPORT cudf
4 changes: 2 additions & 2 deletions cpp/include/cudf/detail/copy.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

#include <initializer_list>

namespace cudf {
namespace CUDF_EXPORT cudf {
namespace detail {
/**
* @brief Constructs a zero-copy `column_view`/`mutable_column_view` of the
Expand Down Expand Up @@ -280,4 +280,4 @@ std::unique_ptr<column> purge_nonempty_nulls(column_view const& input,
rmm::device_async_resource_ref mr);

} // namespace detail
} // namespace cudf
} // namespace CUDF_EXPORT cudf
4 changes: 2 additions & 2 deletions cpp/include/cudf/detail/fill.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

#include <memory>

namespace cudf {
namespace CUDF_EXPORT cudf {
namespace detail {

/**
Expand All @@ -52,4 +52,4 @@ std::unique_ptr<column> fill(column_view const& input,
rmm::device_async_resource_ref mr);

} // namespace detail
} // namespace cudf
} // namespace CUDF_EXPORT cudf
5 changes: 3 additions & 2 deletions cpp/include/cudf/detail/interop.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,13 @@
#include <cudf/interop.hpp>
#include <cudf/utilities/default_stream.hpp>
#include <cudf/utilities/error.hpp>
#include <cudf/utilities/export.hpp>

#include <rmm/cuda_stream_view.hpp>

#include <string>

namespace cudf {
namespace CUDF_EXPORT cudf {
namespace detail {

/**
Expand Down Expand Up @@ -156,4 +157,4 @@ constexpr std::size_t max_precision()
}

} // namespace detail
} // namespace cudf
} // namespace CUDF_EXPORT cudf
6 changes: 3 additions & 3 deletions cpp/include/cudf/detail/join.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -188,4 +188,4 @@ struct hash_join {
rmm::device_async_resource_ref mr) const;
};
} // namespace detail
} // namespace cudf
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/detail/label_bins.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,4 @@ std::unique_ptr<column> label_bins(column_view const& input,

/** @} */ // end of group
} // namespace detail
} // namespace cudf
} // namespace CUDF_EXPORT cudf
6 changes: 4 additions & 2 deletions cpp/include/cudf/detail/merge.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@

#pragma once

#include <cudf/utilities/export.hpp>

#include <rmm/device_uvector.hpp>
#include <rmm/resource_ref.hpp>

#include <thrust/pair.h>

namespace cudf {
namespace CUDF_EXPORT cudf {
namespace detail {

/**
Expand Down Expand Up @@ -59,4 +61,4 @@ std::unique_ptr<cudf::table> merge(std::vector<table_view> const& tables_to_merg
rmm::device_async_resource_ref mr);

} // namespace detail
} // namespace cudf
} // namespace CUDF_EXPORT cudf
2 changes: 1 addition & 1 deletion cpp/include/cudf/detail/null_mask.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

#include <vector>

namespace cudf {
namespace CUDF_EXPORT cudf {
namespace detail {

/**
Expand Down
5 changes: 3 additions & 2 deletions cpp/include/cudf/detail/quantiles.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@
#include <cudf/quantiles.hpp>
#include <cudf/tdigest/tdigest_column_view.hpp>
#include <cudf/utilities/default_stream.hpp>
#include <cudf/utilities/export.hpp>

#include <rmm/cuda_stream_view.hpp>
#include <rmm/resource_ref.hpp>

namespace cudf {
namespace CUDF_EXPORT cudf {
namespace detail {

/**
Expand Down Expand Up @@ -64,4 +65,4 @@ std::unique_ptr<column> percentile_approx(tdigest::tdigest_column_view const& in
rmm::device_async_resource_ref mr);

} // namespace detail
} // namespace cudf
} // namespace CUDF_EXPORT cudf
4 changes: 2 additions & 2 deletions cpp/include/cudf/detail/repeat.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include <memory>

namespace cudf {
namespace CUDF_EXPORT cudf {
namespace detail {

/**
Expand All @@ -51,4 +51,4 @@ std::unique_ptr<table> repeat(table_view const& input_table,
rmm::device_async_resource_ref mr);

} // namespace detail
} // namespace cudf
} // namespace CUDF_EXPORT cudf
4 changes: 2 additions & 2 deletions cpp/include/cudf/detail/replace.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include <memory>

namespace cudf {
namespace CUDF_EXPORT cudf {
namespace detail {
/**
* @copydoc cudf::replace_nulls(column_view const&, column_view const&,
Expand Down Expand Up @@ -102,4 +102,4 @@ std::unique_ptr<column> normalize_nans_and_zeros(column_view const& input,
rmm::device_async_resource_ref mr);

} // namespace detail
} // namespace cudf
} // namespace CUDF_EXPORT cudf
4 changes: 2 additions & 2 deletions cpp/include/cudf/detail/reshape.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include <memory>

namespace cudf {
namespace CUDF_EXPORT cudf {
namespace detail {
/**
* @copydoc cudf::tile
Expand All @@ -46,4 +46,4 @@ std::unique_ptr<column> interleave_columns(table_view const& input,
rmm::device_async_resource_ref mr);

} // namespace detail
} // namespace cudf
} // namespace CUDF_EXPORT cudf
4 changes: 2 additions & 2 deletions cpp/include/cudf/detail/rolling.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#include <memory>

namespace cudf {
namespace CUDF_EXPORT cudf {
namespace detail {

/**
Expand All @@ -49,4 +49,4 @@ std::unique_ptr<column> rolling_window(column_view const& input,
rmm::device_async_resource_ref mr);

} // namespace detail
} // namespace cudf
} // namespace CUDF_EXPORT cudf
4 changes: 2 additions & 2 deletions cpp/include/cudf/detail/round.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <rmm/cuda_stream_view.hpp>
#include <rmm/resource_ref.hpp>

namespace cudf {
namespace CUDF_EXPORT cudf {
//! Inner interfaces and implementations
namespace detail {

Expand All @@ -39,4 +39,4 @@ std::unique_ptr<column> round(column_view const& input,
rmm::device_async_resource_ref mr);

} // namespace detail
} // namespace cudf
} // namespace CUDF_EXPORT cudf
4 changes: 2 additions & 2 deletions cpp/include/cudf/detail/scan.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <rmm/cuda_stream_view.hpp>
#include <rmm/resource_ref.hpp>

namespace cudf {
namespace CUDF_EXPORT cudf {
namespace detail {

/**
Expand Down Expand Up @@ -120,4 +120,4 @@ std::unique_ptr<column> 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
5 changes: 3 additions & 2 deletions cpp/include/cudf/detail/scatter.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,15 @@
#include <cudf/table/table.hpp>
#include <cudf/table/table_view.hpp>
#include <cudf/utilities/default_stream.hpp>
#include <cudf/utilities/export.hpp>
#include <cudf/utilities/span.hpp>

#include <rmm/cuda_stream_view.hpp>
#include <rmm/resource_ref.hpp>

#include <memory>

namespace cudf {
namespace CUDF_EXPORT cudf {
namespace detail {
/**
* @brief Scatters the rows of the source table into a copy of the target table
Expand Down Expand Up @@ -144,4 +145,4 @@ std::unique_ptr<table> boolean_mask_scatter(
rmm::device_async_resource_ref mr);

} // namespace detail
} // namespace cudf
} // namespace CUDF_EXPORT cudf
4 changes: 2 additions & 2 deletions cpp/include/cudf/detail/sequence.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <rmm/cuda_stream_view.hpp>
#include <rmm/resource_ref.hpp>

namespace cudf {
namespace CUDF_EXPORT cudf {
namespace detail {
/**
* @copydoc cudf::sequence(size_type size, scalar const& init, scalar const& step,
Expand Down Expand Up @@ -65,4 +65,4 @@ std::unique_ptr<cudf::column> calendrical_month_sequence(size_type size,
rmm::device_async_resource_ref mr);

} // namespace detail
} // namespace cudf
} // namespace CUDF_EXPORT cudf
4 changes: 2 additions & 2 deletions cpp/include/cudf/detail/sorting.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include <memory>
#include <vector>

namespace cudf {
namespace CUDF_EXPORT cudf {
namespace detail {

/**
Expand Down Expand Up @@ -163,4 +163,4 @@ std::unique_ptr<table> stable_sort(table_view const& values,
rmm::device_async_resource_ref mr);

} // namespace detail
} // namespace cudf
} // namespace CUDF_EXPORT cudf
Loading

0 comments on commit 6b62d0c

Please sign in to comment.