diff --git a/Eigen/src/Core/arch/AVX/PacketMath.h b/Eigen/src/Core/arch/AVX/PacketMath.h index b1dfb07ff..c243bb51c 100644 --- a/Eigen/src/Core/arch/AVX/PacketMath.h +++ b/Eigen/src/Core/arch/AVX/PacketMath.h @@ -179,7 +179,6 @@ struct packet_traits : default_packet_traits { HasCos = EIGEN_FAST_MATH, HasNegate = 1, HasAbs = 1, - HasAbs2 = 0, HasMin = 1, HasMax = 1, HasConj = 1, @@ -218,7 +217,6 @@ struct packet_traits : default_packet_traits { HasCos = EIGEN_FAST_MATH, HasNegate = 1, HasAbs = 1, - HasAbs2 = 0, HasMin = 1, HasMax = 1, HasConj = 1, diff --git a/Eigen/src/Core/arch/AVX512/PacketMath.h b/Eigen/src/Core/arch/AVX512/PacketMath.h index b76c8a77f..932352e4c 100644 --- a/Eigen/src/Core/arch/AVX512/PacketMath.h +++ b/Eigen/src/Core/arch/AVX512/PacketMath.h @@ -84,7 +84,6 @@ struct packet_traits : default_packet_traits { HasDiv = 1, HasNegate = 1, HasAbs = 1, - HasAbs2 = 0, HasMin = 1, HasMax = 1, HasConj = 1, diff --git a/Eigen/src/Core/arch/AVX512/PacketMathFP16.h b/Eigen/src/Core/arch/AVX512/PacketMathFP16.h index a040bbead..b8fa208d2 100644 --- a/Eigen/src/Core/arch/AVX512/PacketMathFP16.h +++ b/Eigen/src/Core/arch/AVX512/PacketMathFP16.h @@ -42,7 +42,6 @@ struct packet_traits : default_packet_traits { HasDiv = 1, HasNegate = 1, HasAbs = 1, - HasAbs2 = 0, HasMin = 1, HasMax = 1, HasConj = 1, diff --git a/Eigen/src/Core/arch/HVX/PacketMath.h b/Eigen/src/Core/arch/HVX/PacketMath.h index 9b6ceb320..36253c540 100644 --- a/Eigen/src/Core/arch/HVX/PacketMath.h +++ b/Eigen/src/Core/arch/HVX/PacketMath.h @@ -152,7 +152,6 @@ struct packet_traits : default_packet_traits { HasNegate = 1, HasAbs = 1, HasArg = 0, - HasAbs2 = 0, HasAbsDiff = 0, HasMin = 1, HasMax = 1, diff --git a/Eigen/src/Core/arch/LSX/PacketMath.h b/Eigen/src/Core/arch/LSX/PacketMath.h index 87232aa29..2926036ae 100644 --- a/Eigen/src/Core/arch/LSX/PacketMath.h +++ b/Eigen/src/Core/arch/LSX/PacketMath.h @@ -169,7 +169,6 @@ struct packet_traits : default_packet_traits { AlignedOnScalar = 1, size = 16, - HasAbs2 = 0, HasSetLinear = 0, HasCmp = 1, HasBlend = 0 @@ -185,7 +184,6 @@ struct packet_traits : default_packet_traits { AlignedOnScalar = 1, size = 8, - HasAbs2 = 0, HasSetLinear = 0, HasCmp = 1, HasDiv = 1, @@ -202,7 +200,6 @@ struct packet_traits : default_packet_traits { AlignedOnScalar = 1, size = 4, - HasAbs2 = 0, HasSetLinear = 0, HasCmp = 1, HasDiv = 1, @@ -219,7 +216,6 @@ struct packet_traits : default_packet_traits { AlignedOnScalar = 1, size = 2, - HasAbs2 = 0, HasSetLinear = 0, HasCmp = 1, HasDiv = 1, @@ -236,7 +232,6 @@ struct packet_traits : default_packet_traits { AlignedOnScalar = 1, size = 16, - HasAbs2 = 0, HasSetLinear = 0, HasNegate = 0, HasCmp = 1, @@ -253,7 +248,6 @@ struct packet_traits : default_packet_traits { AlignedOnScalar = 1, size = 8, - HasAbs2 = 0, HasSetLinear = 0, HasNegate = 0, HasCmp = 1, @@ -271,7 +265,6 @@ struct packet_traits : default_packet_traits { AlignedOnScalar = 1, size = 4, - HasAbs2 = 0, HasSetLinear = 0, HasNegate = 0, HasCmp = 1, @@ -289,7 +282,6 @@ struct packet_traits : default_packet_traits { AlignedOnScalar = 1, size = 2, - HasAbs2 = 0, HasSetLinear = 0, HasNegate = 0, HasCmp = 1, @@ -307,7 +299,6 @@ struct packet_traits : default_packet_traits { AlignedOnScalar = 1, size = 4, - HasAbs2 = 0, HasSetLinear = 0, HasBlend = 0, HasSign = 0, @@ -328,7 +319,6 @@ struct packet_traits : default_packet_traits { AlignedOnScalar = 1, size = 2, - HasAbs2 = 0, HasSetLinear = 0, HasBlend = 0, HasSign = 0, diff --git a/Eigen/src/Core/arch/NEON/PacketMath.h b/Eigen/src/Core/arch/NEON/PacketMath.h index bea50a3ef..418f6995b 100644 --- a/Eigen/src/Core/arch/NEON/PacketMath.h +++ b/Eigen/src/Core/arch/NEON/PacketMath.h @@ -189,7 +189,6 @@ struct packet_traits : default_packet_traits { HasNegate = 1, HasAbs = 1, HasArg = 0, - HasAbs2 = 1, HasAbsDiff = 1, HasMin = 1, HasMax = 1, @@ -235,7 +234,6 @@ struct packet_traits : default_packet_traits { HasAbs = 1, HasAbsDiff = 1, HasArg = 0, - HasAbs2 = 1, HasMin = 1, HasMax = 1, HasConj = 1, @@ -262,7 +260,6 @@ struct packet_traits : default_packet_traits { HasAbs = 1, HasAbsDiff = 1, HasArg = 0, - HasAbs2 = 1, HasMin = 1, HasMax = 1, HasConj = 1, @@ -291,7 +288,6 @@ struct packet_traits : default_packet_traits { HasAbs = 1, HasAbsDiff = 1, HasArg = 0, - HasAbs2 = 1, HasMin = 1, HasMax = 1, HasConj = 1, @@ -318,7 +314,6 @@ struct packet_traits : default_packet_traits { HasAbs = 1, HasAbsDiff = 1, HasArg = 0, - HasAbs2 = 1, HasMin = 1, HasMax = 1, HasConj = 1, @@ -345,7 +340,6 @@ struct packet_traits : default_packet_traits { HasNegate = 1, HasAbs = 1, HasArg = 0, - HasAbs2 = 1, HasAbsDiff = 1, HasMin = 1, HasMax = 1, @@ -372,7 +366,6 @@ struct packet_traits : default_packet_traits { HasNegate = 0, HasAbs = 1, HasArg = 0, - HasAbs2 = 1, HasAbsDiff = 1, HasMin = 1, HasMax = 1, @@ -401,7 +394,6 @@ struct packet_traits : default_packet_traits { HasNegate = 1, HasAbs = 1, HasArg = 0, - HasAbs2 = 1, HasAbsDiff = 1, HasMin = 1, HasMax = 1, @@ -428,7 +420,6 @@ struct packet_traits : default_packet_traits { HasNegate = 0, HasAbs = 1, HasArg = 0, - HasAbs2 = 1, HasAbsDiff = 1, HasMin = 1, HasMax = 1, @@ -4663,7 +4654,6 @@ struct packet_traits : default_packet_traits { HasNegate = 1, HasAbs = 1, HasArg = 0, - HasAbs2 = 1, HasAbsDiff = 1, HasMin = 1, HasMax = 1, @@ -5048,7 +5038,6 @@ struct packet_traits : default_packet_traits { HasNegate = 1, HasAbs = 1, HasArg = 0, - HasAbs2 = 1, HasAbsDiff = 1, HasMin = 1, HasMax = 1, @@ -5424,7 +5413,6 @@ struct packet_traits : default_packet_traits { HasNegate = 1, HasAbs = 1, HasArg = 0, - HasAbs2 = 1, HasAbsDiff = 0, HasMin = 1, HasMax = 1, diff --git a/Eigen/src/Core/arch/SSE/PacketMath.h b/Eigen/src/Core/arch/SSE/PacketMath.h index a5e4902c3..64f35edd2 100644 --- a/Eigen/src/Core/arch/SSE/PacketMath.h +++ b/Eigen/src/Core/arch/SSE/PacketMath.h @@ -290,7 +290,6 @@ struct packet_traits : default_packet_traits { HasCmp = 1, HasShift = 0, HasAbs = 0, - HasAbs2 = 0, HasMin = 0, HasMax = 0, HasConj = 0, @@ -2194,7 +2193,6 @@ struct packet_traits : default_packet_traits { HasDiv = 1, HasNegate = 0, HasAbs = 0, - HasAbs2 = 0, HasMin = 0, HasMax = 0, HasConj = 0, diff --git a/Eigen/src/Core/arch/SVE/PacketMath.h b/Eigen/src/Core/arch/SVE/PacketMath.h index 6115d1d35..0370ab14b 100644 --- a/Eigen/src/Core/arch/SVE/PacketMath.h +++ b/Eigen/src/Core/arch/SVE/PacketMath.h @@ -49,7 +49,6 @@ struct packet_traits : default_packet_traits { HasNegate = 1, HasAbs = 1, HasArg = 0, - HasAbs2 = 1, HasMin = 1, HasMax = 1, HasConj = 1, @@ -344,7 +343,6 @@ struct packet_traits : default_packet_traits { HasNegate = 1, HasAbs = 1, HasArg = 0, - HasAbs2 = 1, HasMin = 1, HasMax = 1, HasConj = 1, diff --git a/Eigen/src/Core/functors/UnaryFunctors.h b/Eigen/src/Core/functors/UnaryFunctors.h index ba7d97a03..202995ff0 100644 --- a/Eigen/src/Core/functors/UnaryFunctors.h +++ b/Eigen/src/Core/functors/UnaryFunctors.h @@ -100,7 +100,10 @@ struct scalar_abs2_op { }; template struct functor_traits> { - enum { Cost = NumTraits::MulCost, PacketAccess = packet_traits::HasAbs2 }; + enum { + Cost = NumTraits::MulCost, + PacketAccess = packet_traits::HasMul && !NumTraits::IsComplex + }; }; template ::IsComplex>