Skip to content

Update the signature of allocMappedBuf #47119

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

Merged
cmsbuild merged 1 commit into from
Jan 21, 2025
Merged

Update the signature of allocMappedBuf #47119

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion HeterogeneousCore/AlpakaInterface/interface/CachingAllocator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ namespace cms::alpakatools {
} else if constexpr (std::is_same_v<Device, alpaka::DevCpu>) {
// allocate pinned host memory accessible by the queue's platform
using Platform = alpaka::Platform<alpaka::Dev<Queue>>;
return alpaka::allocMappedBuf<Platform, std::byte, size_t>(device_, platform<Platform>(), bytes);
return alpaka::allocMappedBuf<std::byte, size_t>(device_, platform<Platform>(), bytes);
} else {
// unsupported combination
static_assert(std::is_same_v<Device, alpaka::Dev<Queue>> or std::is_same_v<Device, alpaka::DevCpu>,
Expand Down
14 changes: 6 additions & 8 deletions HeterogeneousCore/AlpakaInterface/interface/memory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,22 +84,21 @@ namespace cms::alpakatools {
template <typename T, typename TPlatform>
std::enable_if_t<not std::is_array_v<T>, host_buffer<T>> make_host_buffer() {
using Platform = TPlatform;
return alpaka::allocMappedBuf<Platform, T, Idx>(host(), platform<Platform>(), Scalar{});
return alpaka::allocMappedBuf<T, Idx>(host(), platform<Platform>(), Scalar{});
}

template <typename T, typename TPlatform>
std::enable_if_t<cms::is_unbounded_array_v<T> and not std::is_array_v<std::remove_extent_t<T>>, host_buffer<T>>
make_host_buffer(Extent extent) {
using Platform = TPlatform;
return alpaka::allocMappedBuf<Platform, std::remove_extent_t<T>, Idx>(host(), platform<Platform>(), Vec1D{extent});
return alpaka::allocMappedBuf<std::remove_extent_t<T>, Idx>(host(), platform<Platform>(), Vec1D{extent});
}

template <typename T, typename TPlatform>
std::enable_if_t<cms::is_bounded_array_v<T> and not std::is_array_v<std::remove_extent_t<T>>, host_buffer<T>>
make_host_buffer() {
using Platform = TPlatform;
return alpaka::allocMappedBuf<Platform, std::remove_extent_t<T>, Idx>(
host(), platform<Platform>(), Vec1D{std::extent_v<T>});
return alpaka::allocMappedBuf<std::remove_extent_t<T>, Idx>(host(), platform<Platform>(), Vec1D{std::extent_v<T>});
}

// potentially cached, pinned, scalar and 1-dimensional host buffers, associated to a work queue
Expand All @@ -112,7 +111,7 @@ namespace cms::alpakatools {
return allocCachedBuf<T, Idx>(host(), queue, Scalar{});
} else {
using Platform = alpaka::Platform<alpaka::Dev<TQueue>>;
return alpaka::allocMappedBuf<Platform, T, Idx>(host(), platform<Platform>(), Scalar{});
return alpaka::allocMappedBuf<T, Idx>(host(), platform<Platform>(), Scalar{});
}
}

Expand All @@ -125,8 +124,7 @@ namespace cms::alpakatools {
return allocCachedBuf<std::remove_extent_t<T>, Idx>(host(), queue, Vec1D{extent});
} else {
using Platform = alpaka::Platform<alpaka::Dev<TQueue>>;
return alpaka::allocMappedBuf<Platform, std::remove_extent_t<T>, Idx>(
host(), platform<Platform>(), Vec1D{extent});
return alpaka::allocMappedBuf<std::remove_extent_t<T>, Idx>(host(), platform<Platform>(), Vec1D{extent});
}
}

Expand All @@ -139,7 +137,7 @@ namespace cms::alpakatools {
return allocCachedBuf<std::remove_extent_t<T>, Idx>(host(), queue, Vec1D{std::extent_v<T>});
} else {
using Platform = alpaka::Platform<alpaka::Dev<TQueue>>;
return alpaka::allocMappedBuf<Platform, std::remove_extent_t<T>, Idx>(
return alpaka::allocMappedBuf<std::remove_extent_t<T>, Idx>(
host(), platform<Platform>(), Vec1D{std::extent_v<T>});
}
}
Expand Down