Fix conflicts and merge

1 files changed, 4 insertions, 2 deletions

diff --git a/Eigen/src/Core/arch/AVX512/Complex.h b/Eigen/src/Core/arch/AVX512/Complex.h
index 7ea72c509..9a89dd01f 100644
--- a/Eigen/src/Core/arch/AVX512/Complex.h
+++ b/Eigen/src/Core/arch/AVX512/Complex.h
@@ -50,7 +50,8 @@ template<> struct unpacket_traits<Packet8cf> {
   typedef std::complex<float> type;
   enum {
     size = 8,
-    alignment=unpacket_traits<Packet16f>::alignment
+    alignment=unpacket_traits<Packet16f>::alignment,
+    vectorizable=true
   };
   typedef Packet4cf half;
 };
@@ -245,7 +246,8 @@ template<> struct unpacket_traits<Packet4cd> {
   typedef std::complex<double> type;
   enum {
     size = 4,
-    alignment = unpacket_traits<Packet8d>::alignment
+    alignment = unpacket_traits<Packet8d>::alignment,
+    vectorizable=true
   };
   typedef Packet2cd half;
 };