Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 15 additions & 4 deletions src/alpaka/AlpakaCore/alpakaConfigAcc.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ namespace alpaka_cuda_async {
using namespace alpaka_common;
using Acc1D = alpaka::AccGpuCudaRt<Dim1D, Extent>;
using Acc2D = alpaka::AccGpuCudaRt<Dim2D, Extent>;
using Acc3D = alpaka::AccGpuCudaRt<Dim3D, Extent>;
using Queue = alpaka::QueueCudaRtNonBlocking;
} // namespace alpaka_cuda_async

Expand All @@ -25,6 +26,7 @@ namespace alpaka_serial_sync {
using namespace alpaka_common;
using Acc1D = alpaka::AccCpuSerial<Dim1D, Extent>;
using Acc2D = alpaka::AccCpuSerial<Dim2D, Extent>;
using Acc3D = alpaka::AccCpuSerial<Dim3D, Extent>;
using Queue = alpaka::QueueCpuBlocking;
} // namespace alpaka_serial_sync

Expand All @@ -41,6 +43,7 @@ namespace alpaka_tbb_async {
using namespace alpaka_common;
using Acc1D = alpaka::AccCpuTbbBlocks<Dim1D, Extent>;
using Acc2D = alpaka::AccCpuTbbBlocks<Dim2D, Extent>;
using Acc3D = alpaka::AccCpuTbbBlocks<Dim3D, Extent>;
using Queue = alpaka::QueueCpuNonBlocking;
} // namespace alpaka_tbb_async

Expand All @@ -57,6 +60,7 @@ namespace alpaka_omp2_async {
using namespace alpaka_common;
using Acc1D = alpaka::AccCpuOmp2Blocks<Dim1D, Extent>;
using Acc2D = alpaka::AccCpuOmp2Blocks<Dim2D, Extent>;
using Acc3D = alpaka::AccCpuOmp2Blocks<Dim3D, Extent>;
using Queue = alpaka::QueueCpuNonBlocking;
} // namespace alpaka_omp2_async

Expand All @@ -73,6 +77,7 @@ namespace alpaka_omp4_async {
using namespace alpaka_common;
using Acc1D = alpaka::AccCpuOmp4<Dim1D, Extent>;
using Acc2D = alpaka::AccCpuOmp4<Dim2D, Extent>;
using Acc3D = alpaka::AccCpuOmp4<Dim3D, Extent>;
using Queue = alpaka::QueueCpuNonBlocking;
} // namespace alpaka_omp4_async

Expand All @@ -92,11 +97,17 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
using Device = alpaka::Dev<Acc1D>;
using Platform = alpaka::Pltf<Device>;
static_assert(std::is_same_v<Device, alpaka::Dev<Acc2D>>,
STRINGIFY(alpaka::Dev<::ALPAKA_ACCELERATOR_NAMESPACE::Acc1D>) " and " STRINGIFY(
alpaka::Dev<::ALPAKA_ACCELERATOR_NAMESPACE::Acc2D>) " are different types.");
STRINGIFY(alpaka::Dev<ALPAKA_ACCELERATOR_NAMESPACE::Acc1D>) " and " STRINGIFY(
alpaka::Dev<ALPAKA_ACCELERATOR_NAMESPACE::Acc2D>) " are different types.");
static_assert(std::is_same_v<Device, alpaka::Dev<Acc3D>>,
STRINGIFY(alpaka::Dev<ALPAKA_ACCELERATOR_NAMESPACE::Acc1D>) " and " STRINGIFY(
alpaka::Dev<ALPAKA_ACCELERATOR_NAMESPACE::Acc3D>) " are different types.");
static_assert(std::is_same_v<Platform, alpaka::Pltf<alpaka::Dev<Acc2D>>>,
STRINGIFY(alpaka::Pltf<alpaka::Dev<::ALPAKA_ACCELERATOR_NAMESPACE::Acc1D>>) " and " STRINGIFY(
alpaka::Pltf<alpaka::Dev<::ALPAKA_ACCELERATOR_NAMESPACE::Acc2D>>) " are different types.");
STRINGIFY(alpaka::Pltf<alpaka::Dev<ALPAKA_ACCELERATOR_NAMESPACE::Acc1D>>) " and " STRINGIFY(
alpaka::Pltf<alpaka::Dev<ALPAKA_ACCELERATOR_NAMESPACE::Acc2D>>) " are different types.");
static_assert(std::is_same_v<Platform, alpaka::Pltf<alpaka::Dev<Acc3D>>>,
STRINGIFY(alpaka::Pltf<alpaka::Dev<ALPAKA_ACCELERATOR_NAMESPACE::Acc1D>>) " and " STRINGIFY(
alpaka::Pltf<alpaka::Dev<ALPAKA_ACCELERATOR_NAMESPACE::Acc3D>>) " are different types.");

using Event = alpaka::Event<Queue>;

Expand Down
3 changes: 3 additions & 0 deletions src/alpaka/AlpakaCore/alpakaConfigCommon.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,19 @@ namespace alpaka_common {

using Dim1D = alpaka::DimInt<1u>;
using Dim2D = alpaka::DimInt<2u>;
using Dim3D = alpaka::DimInt<3u>;

template <typename TDim>
using Vec = alpaka::Vec<TDim, Idx>;
using Vec1D = Vec<Dim1D>;
using Vec2D = Vec<Dim2D>;
using Vec3D = Vec<Dim3D>;

template <typename TDim>
using WorkDiv = alpaka::WorkDivMembers<TDim, Idx>;
using WorkDiv1D = WorkDiv<Dim1D>;
using WorkDiv2D = WorkDiv<Dim2D>;
using WorkDiv3D = WorkDiv<Dim3D>;

template <typename TData>
using AlpakaHostBuf = alpaka::Buf<DevHost, TData, Dim1D, Idx>;
Expand Down
613 changes: 533 additions & 80 deletions src/alpaka/AlpakaCore/alpakaWorkDivHelper.h

Large diffs are not rendered by default.

Loading