From 4def7b1fa5ca3b92fe09bee4c2a0fff39d92379a Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Fri, 25 Apr 2014 11:15:13 +0200 Subject: Fix ptranspose overload prototypes for NEON --- Eigen/src/Core/arch/NEON/Complex.h | 2 +- Eigen/src/Core/arch/NEON/PacketMath.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'Eigen/src/Core/arch') diff --git a/Eigen/src/Core/arch/NEON/Complex.h b/Eigen/src/Core/arch/NEON/Complex.h index 3c60735a9..259f2e7b8 100644 --- a/Eigen/src/Core/arch/NEON/Complex.h +++ b/Eigen/src/Core/arch/NEON/Complex.h @@ -263,7 +263,7 @@ template<> EIGEN_STRONG_INLINE Packet2cf pdiv(const Packet2cf& a, con return Packet2cf(pdiv(res.v, vaddq_f32(s,rev_s))); } -template<> EIGEN_DEVICE_FUNC inline void +EIGEN_DEVICE_FUNC inline void ptranspose(PacketBlock& kernel) { float32x4_t tmp = vcombine_f32(vget_high_f32(kernel.packet[0].v), vget_high_f32(kernel.packet[1].v)); kernel.packet[0].v = vcombine_f32(vget_low_f32(kernel.packet[0].v), vget_low_f32(kernel.packet[1].v)); diff --git a/Eigen/src/Core/arch/NEON/PacketMath.h b/Eigen/src/Core/arch/NEON/PacketMath.h index 37fb840d4..e5eb06f36 100644 --- a/Eigen/src/Core/arch/NEON/PacketMath.h +++ b/Eigen/src/Core/arch/NEON/PacketMath.h @@ -451,7 +451,7 @@ PALIGN_NEON(3,Packet4i,vextq_s32) #undef PALIGN_NEON -template<> EIGEN_DEVICE_FUNC inline void +EIGEN_DEVICE_FUNC inline void ptranspose(PacketBlock& kernel) { float32x4x2_t tmp1 = vzipq_f32(kernel.packet[0], kernel.packet[1]); float32x4x2_t tmp2 = vzipq_f32(kernel.packet[2], kernel.packet[3]); @@ -462,7 +462,7 @@ ptranspose(PacketBlock& kernel) { kernel.packet[3] = vcombine_f32(vget_high_f32(tmp1.val[1]), vget_high_f32(tmp2.val[1])); } -template<> EIGEN_DEVICE_FUNC inline void +EIGEN_DEVICE_FUNC inline void ptranspose(PacketBlock& kernel) { int32x4x2_t tmp1 = vzipq_s32(kernel.packet[0], kernel.packet[1]); int32x4x2_t tmp2 = vzipq_s32(kernel.packet[2], kernel.packet[3]); -- cgit v1.2.3