Unverified Commit 42fc8edd authored by Bartłomiej Kocot's avatar Bartłomiej Kocot Committed by GitHub
Browse files

Fix warnings during wrapper docs generation (#1192)

* Fix warnings during wrapper docs generation

* Fixes
parent 1837040a
...@@ -45,3 +45,5 @@ for sphinx_var in ROCmDocs.SPHINX_VARS: ...@@ -45,3 +45,5 @@ for sphinx_var in ROCmDocs.SPHINX_VARS:
extensions += ['sphinxcontrib.bibtex'] extensions += ['sphinxcontrib.bibtex']
bibtex_bibfiles = ['refs.bib'] bibtex_bibfiles = ['refs.bib']
cpp_id_attributes = ["__global__", "__device__", "__host__"]
...@@ -64,31 +64,31 @@ Advanced examples: ...@@ -64,31 +64,31 @@ Advanced examples:
Layout Layout
------------------------------------- -------------------------------------
.. doxygenstruct:: ck::wrapper::Layout .. doxygenstruct:: Layout
------------------------------------- -------------------------------------
Layout helpers Layout helpers
------------------------------------- -------------------------------------
.. doxygenfile:: layout_utils.hpp .. doxygenfile:: include/ck/wrapper/utils/layout_utils.hpp
------------------------------------- -------------------------------------
Tensor Tensor
------------------------------------- -------------------------------------
.. doxygenstruct:: ck::wrapper::Tensor .. doxygenstruct:: Tensor
------------------------------------- -------------------------------------
Tensor helpers Tensor helpers
------------------------------------- -------------------------------------
.. doxygenfile:: tensor_utils.hpp .. doxygenfile:: include/ck/wrapper/utils/tensor_utils.hpp
.. doxygenfile:: tensor_partition.hpp .. doxygenfile:: include/ck/wrapper/utils/tensor_partition.hpp
------------------------------------- -------------------------------------
Operations Operations
------------------------------------- -------------------------------------
.. doxygenfile:: copy.hpp .. doxygenfile:: include/ck/wrapper/operations/copy.hpp
.. doxygenfile:: gemm.hpp .. doxygenfile:: include/ck/wrapper/operations/gemm.hpp
...@@ -5,8 +5,11 @@ ...@@ -5,8 +5,11 @@
#include "ck/wrapper/utils/layout_utils.hpp" #include "ck/wrapper/utils/layout_utils.hpp"
// Disable from doxygen docs generation
/// @cond INTERNAL
namespace ck { namespace ck {
namespace wrapper { namespace wrapper {
/// @endcond
/** /**
* \brief Layout wrapper that performs the tensor descriptor logic. * \brief Layout wrapper that performs the tensor descriptor logic.
...@@ -19,6 +22,8 @@ namespace wrapper { ...@@ -19,6 +22,8 @@ namespace wrapper {
template <typename Shape, typename UnrolledDescriptorType> template <typename Shape, typename UnrolledDescriptorType>
struct Layout struct Layout
{ {
// Disable from doxygen docs generation
/// @cond INTERNAL
private: private:
static constexpr auto I0 = Number<0>{}; static constexpr auto I0 = Number<0>{};
static constexpr auto I1 = Number<1>{}; static constexpr auto I1 = Number<1>{};
...@@ -246,6 +251,7 @@ struct Layout ...@@ -246,6 +251,7 @@ struct Layout
using Descriptor1dType = using Descriptor1dType =
remove_cvref_t<decltype(MakeMerge1d(Shape{}, UnrolledDescriptorType{}))>; remove_cvref_t<decltype(MakeMerge1d(Shape{}, UnrolledDescriptorType{}))>;
using DefaultIdxsTupleType = remove_cvref_t<decltype(GenerateDefaultIdxsTuple(Shape{}))>; using DefaultIdxsTupleType = remove_cvref_t<decltype(GenerateDefaultIdxsTuple(Shape{}))>;
/// @endcond
public: public:
using LayoutShape = Shape; using LayoutShape = Shape;
...@@ -457,6 +463,8 @@ struct Layout ...@@ -457,6 +463,8 @@ struct Layout
return unrolled_descriptor_; return unrolled_descriptor_;
} }
// Disable from doxygen docs generation
/// @cond INTERNAL
private: private:
// All dimensions are unrolled // All dimensions are unrolled
UnrolledDescriptorType unrolled_descriptor_; UnrolledDescriptorType unrolled_descriptor_;
...@@ -469,6 +477,7 @@ struct Layout ...@@ -469,6 +477,7 @@ struct Layout
// Descriptor1dType lengths: (8) // Descriptor1dType lengths: (8)
// MergedNestsDescriptorType lengths: (4, 2) // MergedNestsDescriptorType lengths: (4, 2)
const Shape shape_; const Shape shape_;
/// @endcond
}; };
} // namespace wrapper } // namespace wrapper
......
...@@ -12,8 +12,11 @@ ...@@ -12,8 +12,11 @@
#include "ck/tensor_operation/gpu/element/element_wise_operation.hpp" #include "ck/tensor_operation/gpu/element/element_wise_operation.hpp"
#include "ck/tensor_description/tensor_space_filling_curve.hpp" #include "ck/tensor_description/tensor_space_filling_curve.hpp"
// Disable from doxygen docs generation
/// @cond INTERNAL
namespace ck { namespace ck {
namespace wrapper { namespace wrapper {
/// @endcond
/** /**
* \brief Perform optimized copy between two tensors partitions (threadwise copy). * \brief Perform optimized copy between two tensors partitions (threadwise copy).
......
...@@ -9,9 +9,14 @@ ...@@ -9,9 +9,14 @@
#include "ck/host_utility/device_prop.hpp" #include "ck/host_utility/device_prop.hpp"
#include "ck/tensor_operation/gpu/block/blockwise_gemm_xdlops.hpp" #include "ck/tensor_operation/gpu/block/blockwise_gemm_xdlops.hpp"
// Disable from doxygen docs generation
/// @cond INTERNAL
namespace ck { namespace ck {
namespace wrapper { namespace wrapper {
/// @endcond
// Disable from doxygen docs generation
/// @cond INTERNAL
namespace { namespace {
namespace detail { namespace detail {
/** /**
...@@ -45,6 +50,7 @@ __device__ constexpr auto GetBlockDescriptor() ...@@ -45,6 +50,7 @@ __device__ constexpr auto GetBlockDescriptor()
} // namespace detail } // namespace detail
} // namespace } // namespace
/// @endcond
/** /**
* \brief Perform blockwise gemm xdl on tensors stored in lds. Result will be * \brief Perform blockwise gemm xdl on tensors stored in lds. Result will be
......
...@@ -7,9 +7,14 @@ ...@@ -7,9 +7,14 @@
#include "utils/tensor_partition.hpp" #include "utils/tensor_partition.hpp"
#include "utils/layout_utils.hpp" #include "utils/layout_utils.hpp"
// Disable from doxygen docs generation
/// @cond INTERNAL
namespace ck { namespace ck {
namespace wrapper { namespace wrapper {
/// @endcond
// Disable from doxygen docs generation
/// @cond INTERNAL
namespace { namespace {
namespace detail { namespace detail {
/** /**
...@@ -189,6 +194,7 @@ __host__ __device__ constexpr auto GenerateSlicedDescriptor(const Tuple<Ts...>& ...@@ -189,6 +194,7 @@ __host__ __device__ constexpr auto GenerateSlicedDescriptor(const Tuple<Ts...>&
} }
} // namespace detail } // namespace detail
} // namespace } // namespace
/// @endcond
/** /**
* \brief Tensor wrapper that performs static and dynamic buffer logic. * \brief Tensor wrapper that performs static and dynamic buffer logic.
...@@ -394,6 +400,8 @@ struct Tensor ...@@ -394,6 +400,8 @@ struct Tensor
} }
private: private:
// Disable from doxygen docs generation
/// @cond INTERNAL
using DynamicBufferType = DynamicBuffer<BufferAddressSpace, using DynamicBufferType = DynamicBuffer<BufferAddressSpace,
ElementType, ElementType,
ElementSpaceSize, ElementSpaceSize,
...@@ -428,6 +436,7 @@ struct Tensor ...@@ -428,6 +436,7 @@ struct Tensor
// tensor descriptor (thus all it's transforms) and is linear (1D). // tensor descriptor (thus all it's transforms) and is linear (1D).
// We store base_offset_ to avoid multiple recalculations. // We store base_offset_ to avoid multiple recalculations.
index_t base_offset_; index_t base_offset_;
/// @endcond
}; };
} // namespace wrapper } // namespace wrapper
......
...@@ -5,8 +5,11 @@ ...@@ -5,8 +5,11 @@
#include "ck/ck.hpp" #include "ck/ck.hpp"
// Disable from doxygen docs generation
/// @cond INTERNAL
namespace ck { namespace ck {
namespace wrapper { namespace wrapper {
/// @endcond
/** /**
* \brief Traits for blockwise gemm xdl. * \brief Traits for blockwise gemm xdl.
......
...@@ -5,8 +5,11 @@ ...@@ -5,8 +5,11 @@
#include "ck/ck.hpp" #include "ck/ck.hpp"
// Disable from doxygen docs generation
/// @cond INTERNAL
namespace ck { namespace ck {
namespace wrapper { namespace wrapper {
/// @endcond
#define __CK_WRAPPER_LAUNCH_BOUNDS__ __launch_bounds__(CK_MAX_THREAD_PER_BLOCK, CK_MIN_BLOCK_PER_CU) #define __CK_WRAPPER_LAUNCH_BOUNDS__ __launch_bounds__(CK_MAX_THREAD_PER_BLOCK, CK_MIN_BLOCK_PER_CU)
......
...@@ -17,11 +17,14 @@ ...@@ -17,11 +17,14 @@
#include "ck/tensor_description/multi_index_transform_helper.hpp" #include "ck/tensor_description/multi_index_transform_helper.hpp"
#include "ck/tensor_operation/gpu/device/matrix_padder.hpp" #include "ck/tensor_operation/gpu/device/matrix_padder.hpp"
// Disable from doxygen docs generation
/// @cond INTERNAL
namespace ck { namespace ck {
namespace wrapper { namespace wrapper {
/// @endcond
// Disable from doxygen docs generation // Disable from doxygen docs generation
/// @cond /// @cond INTERNAL
// forward declaration // forward declaration
template <typename Shape, typename UnrolledDescriptorType> template <typename Shape, typename UnrolledDescriptorType>
struct Layout; struct Layout;
......
...@@ -9,9 +9,14 @@ ...@@ -9,9 +9,14 @@
#include "ck/tensor_operation/gpu/grid/block_to_ctile_map.hpp" #include "ck/tensor_operation/gpu/grid/block_to_ctile_map.hpp"
#include "ck/tensor_description/cluster_descriptor.hpp" #include "ck/tensor_description/cluster_descriptor.hpp"
// Disable from doxygen docs generation
/// @cond INTERNAL
namespace ck { namespace ck {
namespace wrapper { namespace wrapper {
/// @endcond
// Disable from doxygen docs generation
/// @cond INTERNAL
namespace { namespace {
namespace detail { namespace detail {
...@@ -236,6 +241,7 @@ __host__ __device__ constexpr auto CalculateThreadMultiIdx( ...@@ -236,6 +241,7 @@ __host__ __device__ constexpr auto CalculateThreadMultiIdx(
} }
} // namespace detail } // namespace detail
} // namespace } // namespace
/// @endcond
/** /**
* \brief Create local partition for thread (At now only packed partition * \brief Create local partition for thread (At now only packed partition
......
...@@ -13,8 +13,11 @@ ...@@ -13,8 +13,11 @@
#include "ck/utility/amd_address_space.hpp" #include "ck/utility/amd_address_space.hpp"
#include "ck/utility/multi_index.hpp" #include "ck/utility/multi_index.hpp"
// Disable from doxygen docs generation
/// @cond INTERNAL
namespace ck { namespace ck {
namespace wrapper { namespace wrapper {
/// @endcond
/** /**
* \brief Memory type, allowed members: * \brief Memory type, allowed members:
...@@ -27,7 +30,7 @@ namespace wrapper { ...@@ -27,7 +30,7 @@ namespace wrapper {
using MemoryTypeEnum = AddressSpaceEnum; using MemoryTypeEnum = AddressSpaceEnum;
// Disable from doxygen docs generation // Disable from doxygen docs generation
/// @cond /// @cond INTERNAL
// forward declarations // forward declarations
template <typename Shape, typename UnrolledDescriptorType> template <typename Shape, typename UnrolledDescriptorType>
struct Layout; struct Layout;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment