Skip to content

Commit ba2f417

Browse files
Merge pull request #287 from chillenzer/interface-takes-tag-over-acc
Allocator takes Acc by tag
2 parents bde4b6f + b88d2b0 commit ba2f417

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

examples/getAvailableSlots/source/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ template<
106106
auto example03() -> int
107107
{
108108
using Allocator = mallocMC::Allocator<
109-
Acc,
109+
alpaka::AccToTag<Acc>,
110110
T_CreationPolicy,
111111
mallocMC::DistributionPolicies::Noop,
112112
mallocMC::OOMPolicies::ReturnNull,

examples/vectorAdd/source/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ template<
8484
auto example01() -> int
8585
{
8686
using Allocator = mallocMC::Allocator<
87-
Acc,
87+
alpaka::AccToTag<Acc>,
8888
T_CreationPolicy,
8989
mallocMC::DistributionPolicies::Noop,
9090
mallocMC::OOMPolicies::ReturnNull,

include/mallocMC/allocator.hpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ namespace mallocMC
9696
* @tparam T_AlignmentPolicy The desired type of a AlignmentPolicy
9797
*/
9898
template<
99-
typename AlpakaAcc,
99+
typename T_AccTag,
100100
typename T_CreationPolicy,
101101
typename T_DistributionPolicy,
102102
typename T_OOMPolicy,
@@ -113,6 +113,9 @@ namespace mallocMC
113113
using uint32 = std::uint32_t;
114114

115115
public:
116+
using Dim = alpaka::DimInt<1>;
117+
using Idx = std::uint32_t;
118+
using AlpakaAcc = alpaka::TagToAcc<T_AccTag, Dim, Idx>;
116119
using DistributionPolicy = T_DistributionPolicy;
117120
using OOMPolicy = T_OOMPolicy;
118121
using ReservePoolPolicy = T_ReservePoolPolicy;

0 commit comments

Comments
 (0)