diff options
author | Miao Wang <miaowang@google.com> | 2017-07-06 22:39:32 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-07-06 22:39:32 +0000 |
commit | 52289ab445e4f09a541e9845e46c3898c992e2f3 (patch) | |
tree | 28a6fbea7c5a1e9a0f1a209f8d33e6d72f1df851 /Eigen/src/Core/arch/CUDA/PacketMath.h | |
parent | 72e1882e228b865f9ee672ee57491b335f4249c6 (diff) | |
parent | cc83c2bf46386c327536f22605f241e5ff91ee00 (diff) | |
download | eigen-52289ab445e4f09a541e9845e46c3898c992e2f3.tar.gz |
Merge "Rebase Eigen to 3.3.4" am: c905f05b1b am: 63687fa8cb am: 2468c2ff45
am: cc83c2bf46
Change-Id: I94effa3550a5999583ded568a3cc1ba5f8c3325a
Diffstat (limited to 'Eigen/src/Core/arch/CUDA/PacketMath.h')
-rw-r--r-- | Eigen/src/Core/arch/CUDA/PacketMath.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Eigen/src/Core/arch/CUDA/PacketMath.h b/Eigen/src/Core/arch/CUDA/PacketMath.h index ad66399e0..4dda63188 100644 --- a/Eigen/src/Core/arch/CUDA/PacketMath.h +++ b/Eigen/src/Core/arch/CUDA/PacketMath.h @@ -291,7 +291,7 @@ template<> EIGEN_DEVICE_FUNC inline double2 pabs<double2>(const double2& a) { EIGEN_DEVICE_FUNC inline void ptranspose(PacketBlock<float4,4>& kernel) { - double tmp = kernel.packet[0].y; + float tmp = kernel.packet[0].y; kernel.packet[0].y = kernel.packet[1].x; kernel.packet[1].x = tmp; |