Simplified the code that dispatches vectorized reductions on GPU

This commit is contained in:
Benoit Steiner 2016-06-09 10:29:52 -07:00
parent 66796e843d
commit 37638dafd7
3 changed files with 31 additions and 19 deletions

View File

@ -131,7 +131,7 @@ template <typename T, typename Device>
struct reducer_traits<SumReducer<T>, Device> {
enum {
Cost = NumTraits<T>::AddCost,
PacketAccess = packet_traits<typename PacketType<T, Device>::type>::HasAdd
PacketAccess = PacketType<T, Device>::HasAdd
};
};
@ -183,7 +183,7 @@ template <typename T, typename Device>
struct reducer_traits<MeanReducer<T>, Device> {
enum {
Cost = NumTraits<T>::AddCost,
PacketAccess = packet_traits<typename PacketType<T, Device>::type>::HasAdd
PacketAccess = PacketType<T, Device>::HasAdd
};
};
@ -225,7 +225,7 @@ template <typename T, typename Device>
struct reducer_traits<MaxReducer<T>, Device> {
enum {
Cost = NumTraits<T>::AddCost,
PacketAccess = packet_traits<typename PacketType<T, Device>::type>::HasMax
PacketAccess = PacketType<T, Device>::HasMax
};
};
@ -267,7 +267,7 @@ template <typename T, typename Device>
struct reducer_traits<MinReducer<T>, Device> {
enum {
Cost = NumTraits<T>::AddCost,
PacketAccess = packet_traits<typename PacketType<T, Device>::type>::HasMin
PacketAccess = PacketType<T, Device>::HasMin
};
};
@ -310,7 +310,7 @@ template <typename T, typename Device>
struct reducer_traits<ProdReducer<T>, Device> {
enum {
Cost = NumTraits<T>::MulCost,
PacketAccess = packet_traits<typename PacketType<T, Device>::type>::HasMul
PacketAccess = PacketType<T, Device>::HasMul
};
};

View File

@ -47,9 +47,8 @@ template <> struct max_n_1<0> {
// Default packet types
template <typename Scalar, typename Device>
struct PacketType {
struct PacketType : internal::packet_traits<Scalar> {
typedef typename internal::packet_traits<Scalar>::type type;
enum { size = internal::unpacket_traits<type>::size };
};
// For CUDA packet types when using a GpuDevice
@ -58,16 +57,29 @@ template <>
struct PacketType<half, GpuDevice> {
typedef half2 type;
static const int size = 2;
enum {
HasAdd = 1,
HasSub = 1,
HasMul = 1,
HasNegate = 1,
HasAbs = 1,
HasArg = 0,
HasAbs2 = 0,
HasMin = 1,
HasMax = 1,
HasConj = 0,
HasSetLinear = 0,
HasBlend = 0,
HasDiv = 1,
HasSqrt = 1,
HasRsqrt = 1,
HasExp = 1,
HasLog = 1,
HasLog1p = 0,
HasLog10 = 0,
HasPow = 1,
};
template <>
struct PacketType<float, GpuDevice> {
typedef float4 type;
static const int size = 4;
};
template <>
struct PacketType<double, GpuDevice> {
typedef double2 type;
static const int size = 2;
};
#endif