Skip to content

Commit

Permalink
Merge branch 'fix-doxygen-warnings' into 'develop_stream_2023_10_18'
Browse files Browse the repository at this point in the history
Resolve doxygen warnings for upstream PR

See merge request amd/libraries/rocPRIM!561
  • Loading branch information
Naraenda committed Oct 20, 2023
2 parents f760858 + d07c302 commit 31f12a4
Show file tree
Hide file tree
Showing 8 changed files with 142 additions and 118 deletions.
2 changes: 1 addition & 1 deletion docs/device_ops/sort.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Configuring the kernel
merge_sort
..........

.. doxygentypedef:: rocprim::merge_sort_config
.. doxygenstruct:: rocprim::merge_sort_config

radix_sort
..........
Expand Down
2 changes: 1 addition & 1 deletion docs/device_ops/transform.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Transform
Configuring the kernel
~~~~~~~~~~~~~~~~~~~~~~

.. doxygentypedef:: rocprim::transform_config
.. doxygenstruct:: rocprim::transform_config

transform
~~~~~~~~~
Expand Down
4 changes: 2 additions & 2 deletions docs/intrinsics.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ Warp size
---------

.. doxygenfunction:: rocprim::warp_size()
.. doxygenfunction:: rocprim::host_warp_size(const int device_id)
.. doxygenfunction:: rocprim::host_warp_size(const hipStream_t stream)
.. doxygenfunction:: rocprim::host_warp_size(const int device_id, unsigned int& warp_size)
.. doxygenfunction:: rocprim::host_warp_size(const hipStream_t stream, unsigned int& warp_size)
.. doxygenfunction:: rocprim::device_warp_size()

Lane and Warp ID
Expand Down
2 changes: 2 additions & 0 deletions rocprim/include/rocprim/block/block_radix_sort.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -884,6 +884,7 @@ class block_radix_sort
}
};

#ifndef DOXYGEN_SHOULD_SKIP_THIS
template<class Key,
unsigned int BlockSizeX,
unsigned int ItemsPerThread,
Expand All @@ -893,6 +894,7 @@ template<class Key,
constexpr unsigned int
block_radix_sort<Key, BlockSizeX, ItemsPerThread, Value, BlockSizeY, BlockSizeZ>::
radix_bits_per_pass;
#endif

END_ROCPRIM_NAMESPACE

Expand Down
9 changes: 8 additions & 1 deletion rocprim/include/rocprim/block/block_run_length_decode.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,14 @@ class block_run_length_decode
uint32_t linear_tid;

public:
/// \brief Struct used to allocate a temporary memory that is required for thread
/// communication during operations provided by related parallel primitive.
///
/// Depending on the implemention the operations exposed by parallel primitive may
/// require a temporary storage for thread communication. The storage should be allocated
/// using keywords <tt>__shared__</tt>. It can be aliased to
/// an externally allocated memory, or be a part of a union type with other storage types
/// to increase shared memory reusability.
using storage_type = detail::raw_storage<storage_type_>;

/**
Expand Down Expand Up @@ -290,7 +298,6 @@ class block_run_length_decode
* \p item_offsets can be used to retrieve each run-length decoded item's relative index within its run. E.g., the
* run-length encoded array of `3, 1, 4` with the respective run lengths of `2, 1, 3` would yield the run-length
* decoded array of `3, 3, 1, 4, 4, 4` with the relative offsets of `0, 1, 0, 0, 1, 2`.
* \smemreuse
*
* \param[out] decoded_items The run-length decoded items to be returned in a blocked arrangement
* \param[out] item_offsets The run-length decoded items' relative offset within the run they belong to
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ template<unsigned int BlockSize = 256,
unsigned int SizeLimit = ROCPRIM_GRID_SIZE_LIMIT>
struct reduce_config : rocprim::detail::reduce_config_params
{
/// \brief Identifies the algorithm associated to the config.
using tag = detail::reduce_config_tag;
constexpr reduce_config()
: rocprim::detail::reduce_config_params{
Expand Down Expand Up @@ -299,6 +300,7 @@ template<unsigned int BlockSize,
unsigned int SizeLimit = ROCPRIM_GRID_SIZE_LIMIT>
struct scan_config : ::rocprim::detail::scan_config_params
{
/// \brief Identifies the algorithm associated to the config.
using tag = detail::scan_config_tag;
#ifndef DOXYGEN_SHOULD_SKIP_THIS
// Requirement dictated by init_lookback_scan_state_kernel.
Expand Down Expand Up @@ -379,6 +381,7 @@ template<unsigned int BlockSize,
unsigned int SizeLimit = ROCPRIM_GRID_SIZE_LIMIT>
struct scan_by_key_config : ::rocprim::detail::scan_by_key_config_params
{
/// \brief Identifies the algorithm associated to the config.
using tag = detail::scan_by_key_config_tag;
#ifndef DOXYGEN_SHOULD_SKIP_THIS
// Requirement dictated by init_lookback_scan_state_kernel.
Expand Down Expand Up @@ -448,6 +451,7 @@ template<unsigned int BlockSize,
unsigned int SizeLimit = ROCPRIM_GRID_SIZE_LIMIT>
struct transform_config : public detail::transform_config_params
{
/// \brief Identifies the algorithm associated to the config.
using tag = detail::transform_config_tag;
#ifndef DOXYGEN_SHOULD_SKIP_THIS

Expand Down Expand Up @@ -502,6 +506,7 @@ template<unsigned int BlockSize,
unsigned int SizeLimit = ROCPRIM_GRID_SIZE_LIMIT>
struct binary_search_config : transform_config<BlockSize, ItemsPerThread, SizeLimit>
{
/// \brief Identifies the algorithm associated to the config.
using tag = detail::binary_search_config_tag;
};

Expand All @@ -514,6 +519,7 @@ template<unsigned int BlockSize,
unsigned int SizeLimit = ROCPRIM_GRID_SIZE_LIMIT>
struct upper_bound_config : transform_config<BlockSize, ItemsPerThread, SizeLimit>
{
/// \brief Identifies the algorithm associated to the config.
using tag = detail::upper_bound_config_tag;
};

Expand All @@ -526,6 +532,7 @@ template<unsigned int BlockSize,
unsigned int SizeLimit = ROCPRIM_GRID_SIZE_LIMIT>
struct lower_bound_config : transform_config<BlockSize, ItemsPerThread, SizeLimit>
{
/// \brief Identifies the algorithm associated to the config.
using tag = detail::lower_bound_config_tag;
};

Expand Down Expand Up @@ -571,6 +578,7 @@ template<class HistogramConfig,
unsigned int SharedImplHistograms = 3>
struct histogram_config : detail::histogram_config_params
{
/// \brief Identifies the algorithm associated to the config.
using tag = detail::histogram_config_tag;
#ifndef DOXYGEN_SHOULD_SKIP_THIS
using histogram = HistogramConfig;
Expand Down Expand Up @@ -628,6 +636,7 @@ template<unsigned int BlockSize,
unsigned int SizeLimit = ROCPRIM_GRID_SIZE_LIMIT>
struct adjacent_difference_config : public detail::adjacent_difference_config_params
{
/// \brief Identifies the algorithm associated to the config.
using tag = detail::adjacent_difference_config_tag;
#ifndef DOXYGEN_SHOULD_SKIP_THIS
static constexpr ::rocprim::block_load_method block_load_method = BlockLoadMethod;
Expand Down
Loading

0 comments on commit 31f12a4

Please sign in to comment.