Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor template order allocMappedBuf #2270

Merged
merged 1 commit into from
May 28, 2024
Merged

refactor template order allocMappedBuf #2270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 5 additions & 4 deletions docs/source/dev/backends.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ Depending on the cmake argument ``ALPAKA_ACC_GPU_CUDA_ONLY_MODE`` the function a
+----------+-------------------------------------+
| CUDA | alpaka |
+==========+=====================================+
| ``dim3`` | ``alpaka::Vec< TDim, TVal >`` |
| ``dim3`` | ``alpaka::Vec< TDim, TVal >`` |
+----------+-------------------------------------+


Expand Down Expand Up @@ -353,7 +353,7 @@ The following tables list the functions available in the `CUDA Runtime API <http
+----------------------------+--------------------------------------------------------------------------------------------+
| cudaFreeAsync | n/a (automatic memory management with reference counted memory handles) |
+----------------------------+--------------------------------------------------------------------------------------------+
| cudaFreeHost | n/a (automatic memory management with reference counted memory handles) |
| cudaFreeHost | n/a (automatic memory management with reference counted memory handles) |
+----------------------------+--------------------------------------------------------------------------------------------+
| cudaFreeMipmappedArray | -- |
+----------------------------+--------------------------------------------------------------------------------------------+
Expand All @@ -363,7 +363,7 @@ The following tables list the functions available in the `CUDA Runtime API <http
+----------------------------+--------------------------------------------------------------------------------------------+
| cudaGetSymbolSize | -- |
+----------------------------+--------------------------------------------------------------------------------------------+
| cudaHostAlloc | alpaka::allocMappedBuf<TPlatform, TElement>(host, extents) 1D, 2D, 3D supported! |
| cudaHostAlloc | alpaka::allocMappedBuf<TElement, TIdx>(host, platform, extents) 1D, 2D, 3D supported! [1] |
+----------------------------+--------------------------------------------------------------------------------------------+
| cudaHostGetDevicePointer | -- |
+----------------------------+--------------------------------------------------------------------------------------------+
Expand All @@ -383,7 +383,7 @@ The following tables list the functions available in the `CUDA Runtime API <http
+----------------------------+--------------------------------------------------------------------------------------------+
| cudaMallocAsync | alpaka::allocAsyncBuf<TElement>(queue, extents1D) |
+----------------------------+--------------------------------------------------------------------------------------------+
| cudaMallocHost | alpaka::allocMappedBuf<TPlatform, TElement>(host, extents) 1D, 2D, 3D supported! |
| cudaMallocHost | alpaka::allocMappedBuf<TElement, TIdx>(host, platform, extents) 1D, 2D, 3D supported! [1] |
+----------------------------+--------------------------------------------------------------------------------------------+
| cudaMallocManaged | -- |
+----------------------------+--------------------------------------------------------------------------------------------+
Expand Down Expand Up @@ -473,6 +473,7 @@ The following tables list the functions available in the `CUDA Runtime API <http
| cudaMemcpyDeviceToHost | n/a (direction of copy is determined automatically) |
+----------------------------+--------------------------------------------------------------------------------------------+

[1] Not every platform supports mapped buffers, so `alpaka::allocMappedBufIfSupported<TElement, TIdx>(host, platform, extents)` should be used instead to support these platforms as well.

*Execution Control*

Expand Down
6 changes: 3 additions & 3 deletions include/alpaka/mem/buf/Traits.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,14 +127,14 @@ namespace alpaka

//! Allocates pinned/mapped host memory, accessible by all devices in the given platform.
//!
//! \tparam TPlatform The platform from which the buffer is accessible.
//! \tparam TElem The element type of the returned buffer.
//! \tparam TIdx The linear index type of the buffer.
//! \tparam TExtent The extent type of the buffer.
//! \tparam TPlatform The platform from which the buffer is accessible.
//! \param host The host device to allocate the buffer on.
//! \param extent The extent of the buffer.
//! \return The newly allocated buffer.
template<typename TPlatform, typename TElem, typename TIdx, typename TExtent>
template<typename TElem, typename TIdx, typename TExtent, typename TPlatform>
ALPAKA_FN_HOST auto allocMappedBuf(
DevCpu const& host,
TPlatform const& platform,
Expand Down Expand Up @@ -180,7 +180,7 @@ namespace alpaka
using Platform = alpaka::Platform<TPlatform>;
if constexpr(hasMappedBufSupport<Platform>)
{
return allocMappedBuf<Platform, TElem, TIdx>(host, platform, extent);
return allocMappedBuf<TElem, TIdx>(host, platform, extent);
}
else
{
Expand Down