aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Benoit Steiner <benoit.steiner.goog@gmail.com>2016-05-25 08:27:26 -0700
committerGravatar Benoit Steiner <benoit.steiner.goog@gmail.com>2016-05-25 08:27:26 -0700
commited783872ab9040bab52f7b142458f168f662e3f0 (patch)
tree63b57c2da2636dace8af2e7b66d69cc8997ec2a1
parentbcfff64f9e0c6973345f6f2d1c378f22ad685ead (diff)
Disable the use of MMX instructions on x86_64 since too many compilers only support them in 32bit mode
-rw-r--r--Eigen/src/Core/arch/CUDA/PacketMathHalf.h3
-rw-r--r--Eigen/src/Core/arch/CUDA/TypeCasting.h2
2 files changed, 2 insertions, 3 deletions
diff --git a/Eigen/src/Core/arch/CUDA/PacketMathHalf.h b/Eigen/src/Core/arch/CUDA/PacketMathHalf.h
index 75873d0ef..7fb62cbaf 100644
--- a/Eigen/src/Core/arch/CUDA/PacketMathHalf.h
+++ b/Eigen/src/Core/arch/CUDA/PacketMathHalf.h
@@ -36,7 +36,6 @@ template<> struct packet_traits<Eigen::half> : default_packet_traits
};
};
-
template<> struct unpacket_traits<half2> { typedef Eigen::half type; enum {size=2, alignment=Aligned16}; typedef half2 half; };
template<> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE half2 pset1<half2>(const Eigen::half& from) {
@@ -530,7 +529,7 @@ ptranspose(PacketBlock<Packet8h,4>& kernel) {
}
-#elif defined EIGEN_VECTORIZE_SSE && !EIGEN_COMP_MSVC
+#elif defined(EIGEN_VECTORIZE_SSE) && !EIGEN_ARCH_x86_64
typedef struct {
__m64 x;
diff --git a/Eigen/src/Core/arch/CUDA/TypeCasting.h b/Eigen/src/Core/arch/CUDA/TypeCasting.h
index ca4e2e9f4..07d272ea6 100644
--- a/Eigen/src/Core/arch/CUDA/TypeCasting.h
+++ b/Eigen/src/Core/arch/CUDA/TypeCasting.h
@@ -128,7 +128,7 @@ template<> EIGEN_STRONG_INLINE Packet8h pcast<Packet8f, Packet8h>(const Packet8f
return float2half(a);
}
-#elif defined EIGEN_VECTORIZE_SSE && !EIGEN_COMP_MSVC
+#elif defined(EIGEN_VECTORIZE_SSE) && !EIGEN_ARCH_x86_64
template <>
struct type_casting_traits<Eigen::half, float> {