mirror of
https://gitlab.com/libeigen/eigen.git
synced 2026-04-10 11:34:33 +08:00
Fix conflicts and merge
This commit is contained in:
@@ -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;
|
||||
};
|
||||
|
||||
@@ -102,19 +102,19 @@ struct unpacket_traits<Packet16f> {
|
||||
typedef float type;
|
||||
typedef Packet8f half;
|
||||
typedef Packet16i integer_packet;
|
||||
enum { size = 16, alignment=Aligned64 };
|
||||
enum { size = 16, alignment=Aligned64, vectorizable=true };
|
||||
};
|
||||
template <>
|
||||
struct unpacket_traits<Packet8d> {
|
||||
typedef double type;
|
||||
typedef Packet4d half;
|
||||
enum { size = 8, alignment=Aligned64 };
|
||||
enum { size = 8, alignment=Aligned64, vectorizable=true };
|
||||
};
|
||||
template <>
|
||||
struct unpacket_traits<Packet16i> {
|
||||
typedef int type;
|
||||
typedef Packet8i half;
|
||||
enum { size = 16, alignment=Aligned64 };
|
||||
enum { size = 16, alignment=Aligned64, vectorizable=false };
|
||||
};
|
||||
|
||||
template <>
|
||||
|
||||
Reference in New Issue
Block a user