GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-06-04 18:54:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix arm builds.

Browse Source
This commit is contained in:
Antonio Sánchez 2023-03-20 16:59:38 +00:00
parent fd8f410bbe
commit 2c8011c2dd
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Eigen/src/Core/arch/NEON/PacketMath.h
View File

@ -150,7 +150,7 @@ EIGEN_STRONG_INLINE Packet4f vec4f_unpackhi(const Packet4f& a, const Packet4f& b
return shuffle2<true>(a,b,eigen_neon_shuffle_mask(2, 2, 3, 3)); return shuffle2<true>(a,b,eigen_neon_shuffle_mask(2, 2, 3, 3));
} }
#define vec4f_duplane(a, p) \ #define vec4f_duplane(a, p) \
vdupq_lane_f32(vget_low_f32(a), p) Packet4f(vdupq_lane_f32(vget_low_f32(a), p))
#define EIGEN_DECLARE_CONST_Packet4f(NAME,X) \ #define EIGEN_DECLARE_CONST_Packet4f(NAME,X) \
const Packet4f p4f_##NAME = pset1<Packet4f>(X) const Packet4f p4f_##NAME = pset1<Packet4f>(X)
@ -3773,7 +3773,7 @@ EIGEN_STRONG_INLINE Packet2d vec2d_unpackhi(const Packet2d& a,const Packet2d& b)
return shuffle(a, b, 3); return shuffle(a, b, 3);
} }
#define vec2d_duplane(a, p) \ #define vec2d_duplane(a, p) \
vdupq_laneq_f64(a, p) Packet2d(vdupq_laneq_f64(a, p))
template<> struct packet_traits<double> : default_packet_traits template<> struct packet_traits<double> : default_packet_traits
{ {

6
Eigen/src/Core/util/Macros.h
View File

@ -347,7 +347,7 @@
/// \internal EIGEN_HAS_ARM64_FP16 set to 1 if the architecture provides an IEEE /// \internal EIGEN_HAS_ARM64_FP16 set to 1 if the architecture provides an IEEE
/// compliant Arm fp16 type /// compliant Arm fp16 type
#if EIGEN_ARCH_ARM64 #if EIGEN_ARCH_ARM_OR_ARM64
#ifndef EIGEN_HAS_ARM64_FP16 #ifndef EIGEN_HAS_ARM64_FP16
#if defined(__ARM_FP16_FORMAT_IEEE) #if defined(__ARM_FP16_FORMAT_IEEE)
#define EIGEN_HAS_ARM64_FP16 1 #define EIGEN_HAS_ARM64_FP16 1
@ -359,7 +359,7 @@
/// \internal EIGEN_HAS_ARM64_FP16_VECTOR_ARITHMETIC set to 1 if the architecture /// \internal EIGEN_HAS_ARM64_FP16_VECTOR_ARITHMETIC set to 1 if the architecture
/// supports Neon vector intrinsics for fp16. /// supports Neon vector intrinsics for fp16.
#if EIGEN_ARCH_ARM64 #if EIGEN_ARCH_ARM_OR_ARM64
#ifndef EIGEN_HAS_ARM64_FP16_VECTOR_ARITHMETIC #ifndef EIGEN_HAS_ARM64_FP16_VECTOR_ARITHMETIC
#if defined(__ARM_FEATURE_FP16_VECTOR_ARITHMETIC) #if defined(__ARM_FEATURE_FP16_VECTOR_ARITHMETIC)
#define EIGEN_HAS_ARM64_FP16_VECTOR_ARITHMETIC 1 #define EIGEN_HAS_ARM64_FP16_VECTOR_ARITHMETIC 1
@ -371,7 +371,7 @@
/// \internal EIGEN_HAS_ARM64_FP16_SCALAR_ARITHMETIC set to 1 if the architecture /// \internal EIGEN_HAS_ARM64_FP16_SCALAR_ARITHMETIC set to 1 if the architecture
/// supports Neon scalar intrinsics for fp16. /// supports Neon scalar intrinsics for fp16.
#if EIGEN_ARCH_ARM64 #if EIGEN_ARCH_ARM_OR_ARM64
#ifndef EIGEN_HAS_ARM64_FP16_SCALAR_ARITHMETIC #ifndef EIGEN_HAS_ARM64_FP16_SCALAR_ARITHMETIC
#if defined(__ARM_FEATURE_FP16_SCALAR_ARITHMETIC) #if defined(__ARM_FEATURE_FP16_SCALAR_ARITHMETIC)
#define EIGEN_HAS_ARM64_FP16_SCALAR_ARITHMETIC 1 #define EIGEN_HAS_ARM64_FP16_SCALAR_ARITHMETIC 1

2
unsupported/Eigen/CXX11/src/Tensor/TensorMeta.h
View File

@ -269,7 +269,7 @@ namespace internal {
template<typename IndexType, typename Index, Index First, Index... Is> template<typename IndexType, typename Index, Index First, Index... Is>
EIGEN_CONSTEXPR EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE EIGEN_CONSTEXPR EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE
array<Index, 1 + sizeof...(Is)> customIndices2Array(IndexType& idx, numeric_list<Index, First, Is...>) { array<Index, 1 + sizeof...(Is)> customIndices2Array(IndexType& idx, numeric_list<Index, First, Is...>) {
return { idx[First], idx[Is]... }; return { static_cast<Index>(idx[First]), static_cast<Index>(idx[Is])... };
} }
template<typename IndexType, typename Index> template<typename IndexType, typename Index>
EIGEN_CONSTEXPR EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE EIGEN_CONSTEXPR EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE