diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2015-08-07 17:40:39 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2015-08-07 17:40:39 +0200 |
| commit | e68c7b8368f49f77429ef02e7a99080a3f3de6fb (patch) | |
| tree | d8672f61963630b39ad5f033a49446a0e5a0ddb4 | |
| parent | 65bfa5fce7d660c39b3df375f0caa0ed4f6d6482 (diff) | |
Include SSE packetmath when AVX is enabled, and enable AVX's sine function only in fast-math mode (as SSE)
| -rw-r--r-- | Eigen/Core | 1 | ||||
| -rw-r--r-- | Eigen/src/Core/arch/AVX/PacketMath.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Eigen/Core b/Eigen/Core index 143affc76..45ab7f5d3 100644 --- a/Eigen/Core +++ b/Eigen/Core @@ -306,6 +306,7 @@ using std::ptrdiff_t; // Use AVX for floats and doubles, SSE for integers #include "src/Core/arch/SSE/PacketMath.h" #include "src/Core/arch/SSE/Complex.h" + #include "src/Core/arch/SSE/MathFunctions.h" #include "src/Core/arch/AVX/PacketMath.h" #include "src/Core/arch/AVX/MathFunctions.h" #include "src/Core/arch/AVX/Complex.h" diff --git a/Eigen/src/Core/arch/AVX/PacketMath.h b/Eigen/src/Core/arch/AVX/PacketMath.h index 4dda35b41..9f275a380 100644 --- a/Eigen/src/Core/arch/AVX/PacketMath.h +++ b/Eigen/src/Core/arch/AVX/PacketMath.h @@ -60,7 +60,7 @@ template<> struct packet_traits<float> : default_packet_traits HasHalfPacket = 1, HasDiv = 1, - HasSin = 1, + HasSin = EIGEN_FAST_MATH, HasCos = 0, HasLog = 1, HasExp = 1, |