diff options
| author |  Rasmus Munk Larsen <rmlarsen@google.com> | 2019-01-11 10:35:07 -0800 |
|---|---|---|
| committer | Rasmus Munk Larsen <rmlarsen@google.com> | 2019-01-11 10:35:07 -0800 |
| commit | 8e71ed4cc9f9dbc39dd00e15ae33dd777902a34c (patch) | |
| tree | 0b2bb8c7c5496e836c948a8a19e1659e1d2c7a7a /Eigen/src/Core/arch | |
| parent | fff5a5b5791d6ad0adeeff7049227680b858f884 (diff) | |
| parent | 9396ace46b4638a5946816cacccc565288e6a859 (diff) | |
Merge.
Diffstat (limited to 'Eigen/src/Core/arch')
| -rw-r--r-- | Eigen/src/Core/arch/GPU/PacketMathHalf.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Eigen/src/Core/arch/GPU/PacketMathHalf.h b/Eigen/src/Core/arch/GPU/PacketMathHalf.h index 00e40d40b..85a32a18d 100644 --- a/Eigen/src/Core/arch/GPU/PacketMathHalf.h +++ b/Eigen/src/Core/arch/GPU/PacketMathHalf.h @@ -143,7 +143,11 @@ template<> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE half2 pabs<half2>(const half2& return result; } +<<<<<<< working copy template<> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE half2 ptrue<half2>(const half2& a) { +======= +template<> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE half2 pones<half2>(const half2& a) { +>>>>>>> merge rev half2 result; *(reinterpret_cast<unsigned*>(&(result))) = 0xffffffffu; } @@ -648,8 +652,13 @@ template<> EIGEN_STRONG_INLINE Packet16h pnot(const Packet16h& a) { Packet16h r; r.x = _mm256_xor_si256(a.x, pcmp_eq(a.x, a.x)); return r; } +<<<<<<< working copy template<> EIGEN_STRONG_INLINE Packet16h ptrue(const Packet16h& a) { Packet16h r; r.x = Packet8i(ptrue(a.x)); return r; +======= +template<> EIGEN_STRONG_INLINE Packet16h pones(const Packet16h& a) { + Packet16h r; r.x = Packet8i(pones(a.x)); return r; +>>>>>>> merge rev } template<> EIGEN_STRONG_INLINE Packet16h por(const Packet16h& a,const Packet16h& b) { @@ -1097,7 +1106,11 @@ EIGEN_STRONG_INLINE Packet8h float2half(const Packet8f& a) { #endif } +<<<<<<< working copy template<> EIGEN_STRONG_INLINE Packet8h ptrue(const Packet8h& a) { +======= +template<> EIGEN_STRONG_INLINE Packet8h pones(const Packet8h& a) { +>>>>>>> merge rev Packet8h r; r.x = _mm_cmpeq_epi32(a.x, a.x); return r; } |