diff options
author | RJ Ryan <rjryan@google.com> | 2016-10-06 10:49:48 -0700 |
---|---|---|
committer | RJ Ryan <rjryan@google.com> | 2016-10-06 10:49:48 -0700 |
commit | e2e9cdd16970914cf0a892fea5e7c4402b3ede41 (patch) | |
tree | ed5b3557c1c2b5dcdd3b66434f8408e7da2d7fd2 /unsupported/Eigen/CXX11 | |
parent | 80b513378948f78bc7729c431eb68ca5513a1d62 (diff) |
Fully support complex types in SumReducer and MeanReducer when building for CUDA by using scalar_sum_op and scalar_product_op instead of operator+ and operator*.
Diffstat (limited to 'unsupported/Eigen/CXX11')
-rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h b/unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h index 7164e8d60..d73f6dc68 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h @@ -124,7 +124,8 @@ template <typename T> struct SumReducer } template <typename Packet> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE T finalizeBoth(const T saccum, const Packet& vaccum) const { - return saccum + predux(vaccum); + internal::scalar_sum_op<T> sum_op; + return sum_op(saccum, predux(vaccum)); } }; @@ -173,7 +174,8 @@ template <typename T> struct MeanReducer } template <typename Packet> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE T finalizeBoth(const T saccum, const Packet& vaccum) const { - return (saccum + predux(vaccum)) / (scalarCount_ + packetCount_ * unpacket_traits<Packet>::size); + internal::scalar_sum_op<T> sum_op; + return sum_op(saccum, predux(vaccum)) / (scalarCount_ + packetCount_ * unpacket_traits<Packet>::size); } protected: @@ -304,7 +306,8 @@ template <typename T> struct ProdReducer static const bool IsStateful = false; EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE void reduce(const T t, T* accum) const { - (*accum) *= t; + internal::scalar_product_op<T> prod_op; + (*accum) = prod_op(*accum, t); } template <typename Packet> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE void reducePacket(const Packet& p, Packet* accum) const { @@ -328,7 +331,8 @@ template <typename T> struct ProdReducer } template <typename Packet> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE T finalizeBoth(const T saccum, const Packet& vaccum) const { - return saccum * predux_mul(vaccum); + internal::scalar_product_op<T> prod_op; + return prod_op(saccum, predux_mul(vaccum)); } }; |