diff options
author | Antonio Sanchez <cantonios@google.com> | 2020-05-28 10:41:28 -0700 |
---|---|---|
committer | Antonio Sánchez <cantonios@google.com> | 2020-06-11 17:26:56 +0000 |
commit | a7d2552af8b34f6befba9988c36fe5d9723892e6 (patch) | |
tree | 3ca16204e91819de1b8bdf0b9307081b3789de20 /Eigen | |
parent | 463ec866483806640c0a589afa427193a4599e8e (diff) |
Remove HasCast and fix packetmath cast tests.
The use of the `packet_traits<>::HasCast` field is currently inconsistent with
`type_casting_traits<>`, and is unused apart from within
`test/packetmath.cpp`. In addition, those packetmath cast tests do not
currently reflect how casts are performed in practice: they ignore the
`SrcCoeffRatio` and `TgtCoeffRatio` fields, assuming a 1:1 ratio.
Here we remove the unsed `HasCast`, and modify the packet cast tests to
better reflect their usage.
Diffstat (limited to 'Eigen')
-rw-r--r-- | Eigen/src/Core/GenericPacketMath.h | 5 | ||||
-rw-r--r-- | Eigen/src/Core/arch/NEON/PacketMath.h | 10 |
2 files changed, 2 insertions, 13 deletions
diff --git a/Eigen/src/Core/GenericPacketMath.h b/Eigen/src/Core/GenericPacketMath.h index 7f35b3114..cb8848731 100644 --- a/Eigen/src/Core/GenericPacketMath.h +++ b/Eigen/src/Core/GenericPacketMath.h @@ -96,7 +96,6 @@ struct default_packet_traits HasRint = 0, HasFloor = 0, HasCeil = 0, - HasCast = 0, HasSign = 0 }; }; @@ -325,7 +324,7 @@ pcmp_eq(const Packet& a, const Packet& b) { return a==b ? ptrue(a) : pzero(a); } /** \internal \returns a < b or a==NaN or b==NaN as a bit mask */ template<typename Packet> EIGEN_DEVICE_FUNC inline Packet -pcmp_lt_or_nan(const Packet& a, const Packet& b) { return a>=b ? pzero(a) : ptrue(a); } +pcmp_lt_or_nan(const Packet& a, const Packet& b) { return a>=b ? pzero(a) : ptrue(a); } /** \internal \returns \a or \b for each field in packet according to \mask */ template<typename Packet> EIGEN_DEVICE_FUNC inline Packet @@ -392,7 +391,7 @@ ploaddup(const typename unpacket_traits<Packet>::type* from) { return *from; } * For instance, for a packet of 8 elements, 2 scalars will be read from \a *from and * replicated to form: {from[0],from[0],from[0],from[0],from[1],from[1],from[1],from[1]} * Currently, this function is only used in matrix products. - * For packet-size smaller or equal to 4, this function is equivalent to pload1 + * For packet-size smaller or equal to 4, this function is equivalent to pload1 */ template<typename Packet> EIGEN_DEVICE_FUNC inline Packet ploadquad(const typename unpacket_traits<Packet>::type* from) diff --git a/Eigen/src/Core/arch/NEON/PacketMath.h b/Eigen/src/Core/arch/NEON/PacketMath.h index 065c8100f..ddd43c377 100644 --- a/Eigen/src/Core/arch/NEON/PacketMath.h +++ b/Eigen/src/Core/arch/NEON/PacketMath.h @@ -121,7 +121,6 @@ struct packet_traits<float> : default_packet_traits size = 4, HasHalfPacket = 1, - HasCast = 1, HasAdd = 1, HasSub = 1, HasShift = 1, @@ -162,7 +161,6 @@ struct packet_traits<int8_t> : default_packet_traits size = 16, HasHalfPacket = 1, - HasCast = 1, HasAdd = 1, HasSub = 1, HasShift = 1, @@ -192,7 +190,6 @@ struct packet_traits<uint8_t> : default_packet_traits size = 16, HasHalfPacket = 1, - HasCast = 1, HasAdd = 1, HasSub = 1, HasShift = 1, @@ -224,7 +221,6 @@ struct packet_traits<int16_t> : default_packet_traits size = 8, HasHalfPacket = 1, - HasCast = 1, HasAdd = 1, HasSub = 1, HasShift = 1, @@ -254,7 +250,6 @@ struct packet_traits<uint16_t> : default_packet_traits size = 8, HasHalfPacket = 1, - HasCast = 1, HasAdd = 1, HasSub = 1, HasShift = 1, @@ -285,7 +280,6 @@ struct packet_traits<int32_t> : default_packet_traits size = 4, HasHalfPacket = 1, - HasCast = 1, HasAdd = 1, HasSub = 1, HasShift = 1, @@ -315,7 +309,6 @@ struct packet_traits<uint32_t> : default_packet_traits size = 4, HasHalfPacket = 1, - HasCast = 1, HasAdd = 1, HasSub = 1, HasShift = 1, @@ -347,7 +340,6 @@ struct packet_traits<int64_t> : default_packet_traits size = 2, HasHalfPacket = 1, - HasCast = 1, HasCmp = 1, HasAdd = 1, HasSub = 1, @@ -378,7 +370,6 @@ struct packet_traits<uint64_t> : default_packet_traits size = 2, HasHalfPacket = 1, - HasCast = 1, HasCmp = 1, HasAdd = 1, HasSub = 1, @@ -3185,7 +3176,6 @@ template<> struct packet_traits<double> : default_packet_traits size = 2, HasHalfPacket = 0, - HasCast = 1, HasCmp = 1, HasAdd = 1, HasSub = 1, |