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

Explicitly call alpaka::detail to achieve SYCL compilation #2385

Merged
merged 2 commits into from
Sep 19, 2024
Merged

Explicitly call alpaka::detail to achieve SYCL compilation #2385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7aa795b
Explicitly call alpaka::detail to achieve SYCL compilation
MichaelVarvarin Sep 17, 2024
6c96e8d
Clean formatting
MichaelVarvarin Sep 17, 2024
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
4 changes: 2 additions & 2 deletions include/alpaka/mem/buf/sycl/Set.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,9 @@ namespace alpaka
{
template<typename TExtent, typename TView>
static auto createTaskMemset(TView& view, std::uint8_t const& byte, TExtent const& extent)
-> detail::TaskSetSycl<TDim, TView, TExtent>
-> alpaka::detail::TaskSetSycl<TDim, TView, TExtent>
{
return detail::TaskSetSycl<TDim, TView, TExtent>(view, byte, extent);
return alpaka::detail::TaskSetSycl<TDim, TView, TExtent>(view, byte, extent);
}
};

Expand Down
2 changes: 1 addition & 1 deletion include/alpaka/mem/fence/MemFenceGenericSycl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ namespace alpaka::trait
{
static auto mem_fence(MemFenceGenericSycl const&, TMemScope const&)
{
static constexpr auto scope = detail::SyclFenceProps<TMemScope>::scope;
static constexpr auto scope = alpaka::detail::SyclFenceProps<TMemScope>::scope;
sycl::atomic_fence(sycl::memory_order::acq_rel, scope);
}
};
Expand Down
27 changes: 15 additions & 12 deletions include/alpaka/queue/sycl/QueueGenericSyclBase.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,16 +213,16 @@ namespace alpaka
{
//! The SYCL blocking queue device type trait specialization.
template<typename TTag, bool TBlocking>
struct DevType<detail::QueueGenericSyclBase<TTag, TBlocking>>
struct DevType<alpaka::detail::QueueGenericSyclBase<TTag, TBlocking>>
{
using type = DevGenericSycl<TTag>;
};

//! The SYCL blocking queue device get trait specialization.
template<typename TTag, bool TBlocking>
struct GetDev<detail::QueueGenericSyclBase<TTag, TBlocking>>
struct GetDev<alpaka::detail::QueueGenericSyclBase<TTag, TBlocking>>
{
static auto getDev(detail::QueueGenericSyclBase<TTag, TBlocking> const& queue)
static auto getDev(alpaka::detail::QueueGenericSyclBase<TTag, TBlocking> const& queue)
{
ALPAKA_DEBUG_MINIMAL_LOG_SCOPE;
return queue.m_dev;
Expand All @@ -231,16 +231,17 @@ namespace alpaka

//! The SYCL blocking queue event type trait specialization.
template<typename TTag, bool TBlocking>
struct EventType<detail::QueueGenericSyclBase<TTag, TBlocking>>
struct EventType<alpaka::detail::QueueGenericSyclBase<TTag, TBlocking>>
{
using type = EventGenericSycl<TTag>;
};

//! The SYCL blocking queue enqueue trait specialization.
template<typename TTag, bool TBlocking, typename TTask>
struct Enqueue<detail::QueueGenericSyclBase<TTag, TBlocking>, TTask>
struct Enqueue<alpaka::detail::QueueGenericSyclBase<TTag, TBlocking>, TTask>
{
static auto enqueue(detail::QueueGenericSyclBase<TTag, TBlocking>& queue, TTask const& task) -> void
static auto enqueue(alpaka::detail::QueueGenericSyclBase<TTag, TBlocking>& queue, TTask const& task)
-> void
{
ALPAKA_DEBUG_MINIMAL_LOG_SCOPE;
queue.m_spQueueImpl->template enqueue<TBlocking>(task);
Expand All @@ -249,9 +250,9 @@ namespace alpaka

//! The SYCL blocking queue test trait specialization.
template<typename TTag, bool TBlocking>
struct Empty<detail::QueueGenericSyclBase<TTag, TBlocking>>
struct Empty<alpaka::detail::QueueGenericSyclBase<TTag, TBlocking>>
{
static auto empty(detail::QueueGenericSyclBase<TTag, TBlocking> const& queue) -> bool
static auto empty(alpaka::detail::QueueGenericSyclBase<TTag, TBlocking> const& queue) -> bool
{
ALPAKA_DEBUG_MINIMAL_LOG_SCOPE;
return queue.m_spQueueImpl->empty();
Expand All @@ -263,9 +264,10 @@ namespace alpaka
//! Blocks execution of the calling thread until the queue has finished processing all previously requested
//! tasks (kernels, data copies, ...)
template<typename TTag, bool TBlocking>
struct CurrentThreadWaitFor<detail::QueueGenericSyclBase<TTag, TBlocking>>
struct CurrentThreadWaitFor<alpaka::detail::QueueGenericSyclBase<TTag, TBlocking>>
{
static auto currentThreadWaitFor(detail::QueueGenericSyclBase<TTag, TBlocking> const& queue) -> void
static auto currentThreadWaitFor(alpaka::detail::QueueGenericSyclBase<TTag, TBlocking> const& queue)
-> void
{
ALPAKA_DEBUG_MINIMAL_LOG_SCOPE;
queue.m_spQueueImpl->wait();
Expand All @@ -274,9 +276,10 @@ namespace alpaka

//! The SYCL queue native handle trait specialization.
template<typename TTag, bool TBlocking>
struct NativeHandle<detail::QueueGenericSyclBase<TTag, TBlocking>>
struct NativeHandle<alpaka::detail::QueueGenericSyclBase<TTag, TBlocking>>
{
[[nodiscard]] static auto getNativeHandle(detail::QueueGenericSyclBase<TTag, TBlocking> const& queue)
[[nodiscard]] static auto getNativeHandle(
alpaka::detail::QueueGenericSyclBase<TTag, TBlocking> const& queue)
{
return queue.getNativeHandle();
}
Expand Down
Loading