From aec48143701446e22667549e34509875e42513f9 Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Wed, 29 Jul 2015 11:11:23 +0200 Subject: Many files were missing in previous changeset. --- test/dynalloc.cpp | 8 ++--- test/geo_hyperplane.cpp | 8 ++--- test/geo_parametrizedline.cpp | 8 ++--- test/geo_quaternion.cpp | 14 ++++----- test/geo_transformations.cpp | 8 ++--- test/mapped_matrix.cpp | 6 ++-- test/mapstride.cpp | 2 +- test/packetmath.cpp | 36 +++++++++++----------- unsupported/Eigen/CXX11/src/Tensor/Tensor.h | 2 +- .../Eigen/CXX11/src/Tensor/TensorBroadcasting.h | 4 +-- .../Eigen/CXX11/src/Tensor/TensorChipping.h | 8 ++--- .../Eigen/CXX11/src/Tensor/TensorConcatenation.h | 4 +-- .../Eigen/CXX11/src/Tensor/TensorContraction.h | 6 ++-- .../Eigen/CXX11/src/Tensor/TensorConversion.h | 2 +- .../Eigen/CXX11/src/Tensor/TensorConvolution.h | 2 +- .../Eigen/CXX11/src/Tensor/TensorFixedSize.h | 2 +- .../Eigen/CXX11/src/Tensor/TensorFunctors.h | 8 ++--- .../Eigen/CXX11/src/Tensor/TensorGenerator.h | 2 +- .../Eigen/CXX11/src/Tensor/TensorImagePatch.h | 2 +- .../Eigen/CXX11/src/Tensor/TensorInflation.h | 2 +- .../Eigen/CXX11/src/Tensor/TensorMorphing.h | 2 +- unsupported/Eigen/CXX11/src/Tensor/TensorPadding.h | 2 +- unsupported/Eigen/CXX11/src/Tensor/TensorPatch.h | 2 +- .../Eigen/CXX11/src/Tensor/TensorReduction.h | 2 +- unsupported/Eigen/CXX11/src/Tensor/TensorReverse.h | 4 +-- .../Eigen/CXX11/src/Tensor/TensorShuffling.h | 4 +-- unsupported/Eigen/CXX11/src/Tensor/TensorStorage.h | 2 +- .../Eigen/CXX11/src/Tensor/TensorStriding.h | 4 +-- unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h | 4 +-- .../Eigen/CXX11/src/Tensor/TensorVolumePatch.h | 2 +- unsupported/test/cxx11_tensor_random.cpp | 2 +- 31 files changed, 82 insertions(+), 82 deletions(-) diff --git a/test/dynalloc.cpp b/test/dynalloc.cpp index 1190eb9cd..3d895f2e0 100644 --- a/test/dynalloc.cpp +++ b/test/dynalloc.cpp @@ -9,8 +9,8 @@ #include "main.h" -#if EIGEN_ALIGN -#define ALIGNMENT EIGEN_ALIGN_BYTES +#if EIGEN_MAX_ALIGN_BYTES>0 +#define ALIGNMENT EIGEN_MAX_ALIGN_BYTES #else #define ALIGNMENT 1 #endif @@ -106,7 +106,7 @@ template void check_custom_new_delete() delete[] t; } -#ifdef EIGEN_ALIGN +#if EIGEN_MAX_ALIGN_BYTES>0 { T* t = static_cast((T::operator new)(sizeof(T))); (T::operator delete)(t, sizeof(T)); @@ -143,7 +143,7 @@ void test_dynalloc() } // check static allocation, who knows ? - #if EIGEN_ALIGN_STATICALLY + #if EIGEN_MAX_STATIC_ALIGN_BYTES { MyStruct foo0; VERIFY(size_t(foo0.avec.data())%ALIGNMENT==0); MyClassA fooA; VERIFY(size_t(fooA.avec.data())%ALIGNMENT==0); diff --git a/test/geo_hyperplane.cpp b/test/geo_hyperplane.cpp index e5522701e..c1cc691c9 100644 --- a/test/geo_hyperplane.cpp +++ b/test/geo_hyperplane.cpp @@ -155,9 +155,9 @@ template void hyperplane_alignment() typedef Hyperplane Plane3a; typedef Hyperplane Plane3u; - EIGEN_ALIGN_DEFAULT Scalar array1[4]; - EIGEN_ALIGN_DEFAULT Scalar array2[4]; - EIGEN_ALIGN_DEFAULT Scalar array3[4+1]; + EIGEN_ALIGN_MAX Scalar array1[4]; + EIGEN_ALIGN_MAX Scalar array2[4]; + EIGEN_ALIGN_MAX Scalar array3[4+1]; Scalar* array3u = array3+1; Plane3a *p1 = ::new(reinterpret_cast(array1)) Plane3a; @@ -171,7 +171,7 @@ template void hyperplane_alignment() VERIFY_IS_APPROX(p1->coeffs(), p2->coeffs()); VERIFY_IS_APPROX(p1->coeffs(), p3->coeffs()); - #if defined(EIGEN_VECTORIZE) && EIGEN_ALIGN_STATICALLY + #if defined(EIGEN_VECTORIZE) && EIGEN_MAX_STATIC_ALIGN_BYTES > 0 if(internal::packet_traits::Vectorizable && internal::packet_traits::size<=4) VERIFY_RAISES_ASSERT((::new(reinterpret_cast(array3u)) Plane3a)); #endif diff --git a/test/geo_parametrizedline.cpp b/test/geo_parametrizedline.cpp index 58d8eb7f5..9bf5f3c1d 100644 --- a/test/geo_parametrizedline.cpp +++ b/test/geo_parametrizedline.cpp @@ -66,9 +66,9 @@ template void parametrizedline_alignment() typedef ParametrizedLine Line4a; typedef ParametrizedLine Line4u; - EIGEN_ALIGN_DEFAULT Scalar array1[16]; - EIGEN_ALIGN_DEFAULT Scalar array2[16]; - EIGEN_ALIGN_DEFAULT Scalar array3[16+1]; + EIGEN_ALIGN_MAX Scalar array1[16]; + EIGEN_ALIGN_MAX Scalar array2[16]; + EIGEN_ALIGN_MAX Scalar array3[16+1]; Scalar* array3u = array3+1; Line4a *p1 = ::new(reinterpret_cast(array1)) Line4a; @@ -85,7 +85,7 @@ template void parametrizedline_alignment() VERIFY_IS_APPROX(p1->direction(), p2->direction()); VERIFY_IS_APPROX(p1->direction(), p3->direction()); - #if defined(EIGEN_VECTORIZE) && EIGEN_ALIGN_STATICALLY + #if defined(EIGEN_VECTORIZE) && EIGEN_MAX_STATIC_ALIGN_BYTES>0 if(internal::packet_traits::Vectorizable && internal::packet_traits::size<=4) VERIFY_RAISES_ASSERT((::new(reinterpret_cast(array3u)) Line4a)); #endif diff --git a/test/geo_quaternion.cpp b/test/geo_quaternion.cpp index 7d56c119c..17229be4a 100644 --- a/test/geo_quaternion.cpp +++ b/test/geo_quaternion.cpp @@ -181,9 +181,9 @@ template void mapQuaternion(void){ v1 = Vector3::Random(); Scalar a = internal::random(-Scalar(EIGEN_PI), Scalar(EIGEN_PI)); - EIGEN_ALIGN_DEFAULT Scalar array1[4]; - EIGEN_ALIGN_DEFAULT Scalar array2[4]; - EIGEN_ALIGN_DEFAULT Scalar array3[4+1]; + EIGEN_ALIGN_MAX Scalar array1[4]; + EIGEN_ALIGN_MAX Scalar array2[4]; + EIGEN_ALIGN_MAX Scalar array3[4+1]; Scalar* array3unaligned = array3+1; MQuaternionA mq1(array1); @@ -232,9 +232,9 @@ template void quaternionAlignment(void){ typedef Quaternion QuaternionA; typedef Quaternion QuaternionUA; - EIGEN_ALIGN_DEFAULT Scalar array1[4]; - EIGEN_ALIGN_DEFAULT Scalar array2[4]; - EIGEN_ALIGN_DEFAULT Scalar array3[4+1]; + EIGEN_ALIGN_MAX Scalar array1[4]; + EIGEN_ALIGN_MAX Scalar array2[4]; + EIGEN_ALIGN_MAX Scalar array3[4+1]; Scalar* arrayunaligned = array3+1; QuaternionA *q1 = ::new(reinterpret_cast(array1)) QuaternionA; @@ -247,7 +247,7 @@ template void quaternionAlignment(void){ VERIFY_IS_APPROX(q1->coeffs(), q2->coeffs()); VERIFY_IS_APPROX(q1->coeffs(), q3->coeffs()); - #if defined(EIGEN_VECTORIZE) && EIGEN_ALIGN_STATICALLY + #if defined(EIGEN_VECTORIZE) && EIGEN_MAX_STATIC_ALIGN_BYTES>0 if(internal::packet_traits::Vectorizable && internal::packet_traits::size<=4) VERIFY_RAISES_ASSERT((::new(reinterpret_cast(arrayunaligned)) QuaternionA)); #endif diff --git a/test/geo_transformations.cpp b/test/geo_transformations.cpp index e296267cf..d50c7c76a 100644 --- a/test/geo_transformations.cpp +++ b/test/geo_transformations.cpp @@ -470,9 +470,9 @@ template void transform_alignment() typedef Transform Projective3a; typedef Transform Projective3u; - EIGEN_ALIGN_DEFAULT Scalar array1[16]; - EIGEN_ALIGN_DEFAULT Scalar array2[16]; - EIGEN_ALIGN_DEFAULT Scalar array3[16+1]; + EIGEN_ALIGN_MAX Scalar array1[16]; + EIGEN_ALIGN_MAX Scalar array2[16]; + EIGEN_ALIGN_MAX Scalar array3[16+1]; Scalar* array3u = array3+1; Projective3a *p1 = ::new(reinterpret_cast(array1)) Projective3a; @@ -488,7 +488,7 @@ template void transform_alignment() VERIFY_IS_APPROX( (*p1) * (*p1), (*p2)*(*p3)); - #if defined(EIGEN_VECTORIZE) && EIGEN_ALIGN_STATICALLY + #if defined(EIGEN_VECTORIZE) && EIGEN_MAX_STATIC_ALIGN_BYTES>0 if(internal::packet_traits::Vectorizable) VERIFY_RAISES_ASSERT((::new(reinterpret_cast(array3u)) Projective3a)); #endif diff --git a/test/mapped_matrix.cpp b/test/mapped_matrix.cpp index 1f9da31ac..f080ca7ed 100644 --- a/test/mapped_matrix.cpp +++ b/test/mapped_matrix.cpp @@ -25,7 +25,7 @@ template void map_class_vector(const VectorType& m) Scalar* array1 = internal::aligned_new(size); Scalar* array2 = internal::aligned_new(size); Scalar* array3 = new Scalar[size+1]; - Scalar* array3unaligned = size_t(array3)%EIGEN_ALIGN_BYTES == 0 ? array3+1 : array3; + Scalar* array3unaligned = size_t(array3)%EIGEN_MAX_ALIGN_BYTES == 0 ? array3+1 : array3; Scalar array4[EIGEN_TESTMAP_MAX_SIZE]; Map(array1, size) = VectorType::Random(size); @@ -65,7 +65,7 @@ template void map_class_matrix(const MatrixType& m) // array3unaligned -> unaligned pointer to heap Scalar* array3 = new Scalar[size+1]; for(int i = 0; i < size+1; i++) array3[i] = Scalar(1); - Scalar* array3unaligned = size_t(array3)%EIGEN_ALIGN_BYTES == 0 ? array3+1 : array3; + Scalar* array3unaligned = size_t(array3)%EIGEN_MAX_ALIGN_BYTES == 0 ? array3+1 : array3; Scalar array4[256]; if(size<=256) for(int i = 0; i < size; i++) array4[i] = Scalar(1); @@ -129,7 +129,7 @@ template void map_static_methods(const VectorType& m) Scalar* array1 = internal::aligned_new(size); Scalar* array2 = internal::aligned_new(size); Scalar* array3 = new Scalar[size+1]; - Scalar* array3unaligned = size_t(array3)%EIGEN_ALIGN_BYTES == 0 ? array3+1 : array3; + Scalar* array3unaligned = size_t(array3)%EIGEN_MAX_ALIGN_BYTES == 0 ? array3+1 : array3; VectorType::MapAligned(array1, size) = VectorType::Random(size); VectorType::Map(array2, size) = VectorType::Map(array1, size); diff --git a/test/mapstride.cpp b/test/mapstride.cpp index 13523bb56..ee2414248 100644 --- a/test/mapstride.cpp +++ b/test/mapstride.cpp @@ -70,7 +70,7 @@ template void map_class_matrix(const MatrixTy if(Alignment!=Aligned) array2 = (Scalar*)(std::ptrdiff_t(a_array2) + (internal::packet_traits::AlignedOnScalar?sizeof(Scalar):sizeof(typename NumTraits::Real))); else - array2 = (Scalar*)(((std::size_t(a_array2)+EIGEN_ALIGN_BYTES-1)/EIGEN_ALIGN_BYTES)*EIGEN_ALIGN_BYTES); + array2 = (Scalar*)(((std::size_t(a_array2)+EIGEN_MAX_ALIGN_BYTES-1)/EIGEN_MAX_ALIGN_BYTES)*EIGEN_MAX_ALIGN_BYTES); Index maxsize2 = a_array2 - array2 + 256; // test no inner stride and some dynamic outer stride diff --git a/test/packetmath.cpp b/test/packetmath.cpp index 74b4d4279..3cf82eae0 100644 --- a/test/packetmath.cpp +++ b/test/packetmath.cpp @@ -106,10 +106,10 @@ template void packetmath() const int max_size = PacketSize > 4 ? PacketSize : 4; const int size = PacketSize*max_size; - EIGEN_ALIGN_DEFAULT Scalar data1[size]; - EIGEN_ALIGN_DEFAULT Scalar data2[size]; - EIGEN_ALIGN_DEFAULT Packet packets[PacketSize*2]; - EIGEN_ALIGN_DEFAULT Scalar ref[size]; + EIGEN_ALIGN_MAX Scalar data1[size]; + EIGEN_ALIGN_MAX Scalar data2[size]; + EIGEN_ALIGN_MAX Packet packets[PacketSize*2]; + EIGEN_ALIGN_MAX Scalar ref[size]; RealScalar refvalue = 0; for (int i=0; i void packetmath() if (internal::packet_traits::HasBlend) { Packet thenPacket = internal::pload(data1); Packet elsePacket = internal::pload(data2); - EIGEN_ALIGN_DEFAULT internal::Selector selector; + EIGEN_ALIGN_MAX internal::Selector selector; for (int i = 0; i < PacketSize; ++i) { selector.select[i] = i; } Packet blend = internal::pblend(selector, thenPacket, elsePacket); - EIGEN_ALIGN_DEFAULT Scalar result[size]; + EIGEN_ALIGN_MAX Scalar result[size]; internal::pstore(result, blend); for (int i = 0; i < PacketSize; ++i) { VERIFY(isApproxAbs(result[i], (selector.select[i] ? data1[i] : data2[i]), refvalue)); @@ -286,9 +286,9 @@ template void packetmath_real() const int PacketSize = internal::packet_traits::size; const int size = PacketSize*4; - EIGEN_ALIGN_DEFAULT Scalar data1[internal::packet_traits::size*4]; - EIGEN_ALIGN_DEFAULT Scalar data2[internal::packet_traits::size*4]; - EIGEN_ALIGN_DEFAULT Scalar ref[internal::packet_traits::size*4]; + EIGEN_ALIGN_MAX Scalar data1[internal::packet_traits::size*4]; + EIGEN_ALIGN_MAX Scalar data2[internal::packet_traits::size*4]; + EIGEN_ALIGN_MAX Scalar ref[internal::packet_traits::size*4]; for (int i=0; i void packetmath_notcomplex() typedef typename internal::packet_traits::type Packet; const int PacketSize = internal::packet_traits::size; - EIGEN_ALIGN_DEFAULT Scalar data1[internal::packet_traits::size*4]; - EIGEN_ALIGN_DEFAULT Scalar data2[internal::packet_traits::size*4]; - EIGEN_ALIGN_DEFAULT Scalar ref[internal::packet_traits::size*4]; + EIGEN_ALIGN_MAX Scalar data1[internal::packet_traits::size*4]; + EIGEN_ALIGN_MAX Scalar data2[internal::packet_traits::size*4]; + EIGEN_ALIGN_MAX Scalar ref[internal::packet_traits::size*4]; Array::Map(data1, internal::packet_traits::size*4).setRandom(); @@ -452,10 +452,10 @@ template void packetmath_complex() const int PacketSize = internal::packet_traits::size; const int size = PacketSize*4; - EIGEN_ALIGN_DEFAULT Scalar data1[PacketSize*4]; - EIGEN_ALIGN_DEFAULT Scalar data2[PacketSize*4]; - EIGEN_ALIGN_DEFAULT Scalar ref[PacketSize*4]; - EIGEN_ALIGN_DEFAULT Scalar pval[PacketSize*4]; + EIGEN_ALIGN_MAX Scalar data1[PacketSize*4]; + EIGEN_ALIGN_MAX Scalar data2[PacketSize*4]; + EIGEN_ALIGN_MAX Scalar ref[PacketSize*4]; + EIGEN_ALIGN_MAX Scalar pval[PacketSize*4]; for (int i=0; i void packetmath_scatter_gather() { typedef typename internal::packet_traits::type Packet; typedef typename NumTraits::Real RealScalar; const int PacketSize = internal::packet_traits::size; - EIGEN_ALIGN_DEFAULT Scalar data1[PacketSize]; + EIGEN_ALIGN_MAX Scalar data1[PacketSize]; RealScalar refvalue = 0; for (int i=0; i()/RealScalar(PacketSize); @@ -488,7 +488,7 @@ template void packetmath_scatter_gather() { int stride = internal::random(1,20); - EIGEN_ALIGN_DEFAULT Scalar buffer[PacketSize*20]; + EIGEN_ALIGN_MAX Scalar buffer[PacketSize*20]; memset(buffer, 0, 20*sizeof(Packet)); Packet packet = internal::pload(data1); internal::pscatter(buffer, packet, stride); diff --git a/unsupported/Eigen/CXX11/src/Tensor/Tensor.h b/unsupported/Eigen/CXX11/src/Tensor/Tensor.h index 32936d4be..6c16e0faa 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/Tensor.h +++ b/unsupported/Eigen/CXX11/src/Tensor/Tensor.h @@ -75,7 +75,7 @@ class Tensor : public TensorBase0) & !(Options_&DontAlign), PacketAccess = (internal::packet_traits::size > 1), Layout = Options_ & RowMajor ? RowMajor : ColMajor, CoordAccess = true, diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorBroadcasting.h b/unsupported/Eigen/CXX11/src/Tensor/TensorBroadcasting.h index 055a7d407..24a0df820 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorBroadcasting.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorBroadcasting.h @@ -262,7 +262,7 @@ struct TensorEvaluator, Device> if (innermostLoc + packetSize <= m_impl.dimensions()[0]) { return m_impl.template packet(inputIndex); } else { - EIGEN_ALIGN_DEFAULT typename internal::remove_const::type values[packetSize]; + EIGEN_ALIGN_MAX typename internal::remove_const::type values[packetSize]; values[0] = m_impl.coeff(inputIndex); for (int i = 1; i < packetSize; ++i) { values[i] = coeffColMajor(originalIndex+i); @@ -315,7 +315,7 @@ struct TensorEvaluator, Device> if (innermostLoc + packetSize <= m_impl.dimensions()[NumDims-1]) { return m_impl.template packet(inputIndex); } else { - EIGEN_ALIGN_DEFAULT typename internal::remove_const::type values[packetSize]; + EIGEN_ALIGN_MAX typename internal::remove_const::type values[packetSize]; values[0] = m_impl.coeff(inputIndex); for (int i = 1; i < packetSize; ++i) { values[i] = coeffRowMajor(originalIndex+i); diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorChipping.h b/unsupported/Eigen/CXX11/src/Tensor/TensorChipping.h index 2ef5ff205..c9fa39e51 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorChipping.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorChipping.h @@ -213,7 +213,7 @@ struct TensorEvaluator, Device> // m_stride is equal to 1, so let's avoid the integer division. eigen_assert(m_stride == 1); Index inputIndex = index * m_inputStride + m_inputOffset; - EIGEN_ALIGN_DEFAULT typename internal::remove_const::type values[packetSize]; + EIGEN_ALIGN_MAX typename internal::remove_const::type values[packetSize]; for (int i = 0; i < packetSize; ++i) { values[i] = m_impl.coeff(inputIndex); inputIndex += m_inputStride; @@ -233,7 +233,7 @@ struct TensorEvaluator, Device> return m_impl.template packet(inputIndex); } else { // Cross the stride boundary. Fallback to slow path. - EIGEN_ALIGN_DEFAULT typename internal::remove_const::type values[packetSize]; + EIGEN_ALIGN_MAX typename internal::remove_const::type values[packetSize]; for (int i = 0; i < packetSize; ++i) { values[i] = coeff(index); ++index; @@ -328,7 +328,7 @@ struct TensorEvaluator, Device> (static_cast(this->Layout) == static_cast(RowMajor) && this->m_dim.actualDim() == NumInputDims-1)) { // m_stride is equal to 1, so let's avoid the integer division. eigen_assert(this->m_stride == 1); - EIGEN_ALIGN_DEFAULT typename internal::remove_const::type values[packetSize]; + EIGEN_ALIGN_MAX typename internal::remove_const::type values[packetSize]; internal::pstore(values, x); Index inputIndex = index * this->m_inputStride + this->m_inputOffset; for (int i = 0; i < packetSize; ++i) { @@ -348,7 +348,7 @@ struct TensorEvaluator, Device> this->m_impl.template writePacket(inputIndex, x); } else { // Cross stride boundary. Fallback to slow path. - EIGEN_ALIGN_DEFAULT typename internal::remove_const::type values[packetSize]; + EIGEN_ALIGN_MAX typename internal::remove_const::type values[packetSize]; internal::pstore(values, x); for (int i = 0; i < packetSize; ++i) { this->coeffRef(index) = values[i]; diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorConcatenation.h b/unsupported/Eigen/CXX11/src/Tensor/TensorConcatenation.h index 759e8208f..fa05cab30 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorConcatenation.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorConcatenation.h @@ -253,7 +253,7 @@ struct TensorEvaluator 1, YOU_MADE_A_PROGRAMMING_MISTAKE) eigen_assert(index + packetSize - 1 < dimensions().TotalSize()); - EIGEN_ALIGN_DEFAULT CoeffReturnType values[packetSize]; + EIGEN_ALIGN_MAX CoeffReturnType values[packetSize]; for (int i = 0; i < packetSize; ++i) { values[i] = coeff(index+i); } @@ -333,7 +333,7 @@ template 1, YOU_MADE_A_PROGRAMMING_MISTAKE) eigen_assert(index + packetSize - 1 < this->dimensions().TotalSize()); - EIGEN_ALIGN_DEFAULT CoeffReturnType values[packetSize]; + EIGEN_ALIGN_MAX CoeffReturnType values[packetSize]; internal::pstore(values, x); for (int i = 0; i < packetSize; ++i) { coeffRef(index+i) = values[i]; diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorContraction.h b/unsupported/Eigen/CXX11/src/Tensor/TensorContraction.h index 85ae9dd6a..8a04f7d34 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorContraction.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorContraction.h @@ -291,7 +291,7 @@ class TensorContractionInputMapper return this->m_tensor.template packet(first); } - EIGEN_ALIGN_DEFAULT Scalar data[packet_size]; + EIGEN_ALIGN_MAX Scalar data[packet_size]; data[0] = this->m_tensor.coeff(first); for (Index k = 1; k < packet_size - 1; k += 2) { @@ -313,7 +313,7 @@ class TensorContractionInputMapper if (half_packet_size == packet_size) { return loadPacket(i, j); } - EIGEN_ALIGN_DEFAULT Scalar data[half_packet_size]; + EIGEN_ALIGN_MAX Scalar data[half_packet_size]; for (Index k = 0; k < half_packet_size; k++) { data[k] = operator()(i + k, j); } @@ -355,7 +355,7 @@ class TensorContractionInputMapper::type Packet; EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Packet loadPacket(Index i, Index j) const { - EIGEN_ALIGN_DEFAULT Scalar data[1]; + EIGEN_ALIGN_MAX Scalar data[1]; data[0] = this->m_tensor.coeff(this->computeIndex(i, j)); return pload::type>(data); } diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorConversion.h b/unsupported/Eigen/CXX11/src/Tensor/TensorConversion.h index fb1f1f6ea..4ca978ab4 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorConversion.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorConversion.h @@ -101,7 +101,7 @@ struct PacketConverter { return internal::pcast(m_impl.template packet(index)); } else { const int TgtPacketSize = internal::unpacket_traits::size; - EIGEN_ALIGN_DEFAULT typename internal::unpacket_traits::type values[TgtPacketSize]; + EIGEN_ALIGN_MAX typename internal::unpacket_traits::type values[TgtPacketSize]; for (int i = 0; i < TgtPacketSize; ++i) { values[i] = m_impl.coeff(index+i); } diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorConvolution.h b/unsupported/Eigen/CXX11/src/Tensor/TensorConvolution.h index 64b0315ee..23500e138 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorConvolution.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorConvolution.h @@ -438,7 +438,7 @@ struct TensorEvaluator0), PacketAccess = (internal::packet_traits::size > 1), Layout = Options_ & RowMajor ? RowMajor : ColMajor, CoordAccess = true, diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h b/unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h index 1a23a9fa0..9f8819720 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h @@ -265,7 +265,7 @@ template class UniformRandomGenerator { template typename internal::packet_traits::type packetOp(Index, Index = 0) const { const int packetSize = internal::packet_traits::size; - EIGEN_ALIGN_DEFAULT T values[packetSize]; + EIGEN_ALIGN_MAX T values[packetSize]; for (int i = 0; i < packetSize; ++i) { values[i] = random(); } @@ -298,7 +298,7 @@ template <> class UniformRandomGenerator { template typename internal::packet_traits::type packetOp(Index i, Index j = 0) const { const int packetSize = internal::packet_traits::size; - EIGEN_ALIGN_DEFAULT float values[packetSize]; + EIGEN_ALIGN_MAX float values[packetSize]; for (int k = 0; k < packetSize; ++k) { values[k] = this->operator()(i, j); } @@ -335,7 +335,7 @@ template <> class UniformRandomGenerator { template typename internal::packet_traits::type packetOp(Index i, Index j = 0) const { const int packetSize = internal::packet_traits::size; - EIGEN_ALIGN_DEFAULT double values[packetSize]; + EIGEN_ALIGN_MAX double values[packetSize]; for (int k = 0; k < packetSize; ++k) { values[k] = this->operator()(i, j); } @@ -495,7 +495,7 @@ template class NormalRandomGenerator { template typename internal::packet_traits::type packetOp(Index, Index = 0) const { const int packetSize = internal::packet_traits::size; - EIGEN_ALIGN_DEFAULT T values[packetSize]; + EIGEN_ALIGN_MAX T values[packetSize]; for (int i = 0; i < packetSize; ++i) { values[i] = m_distribution(m_generator); } diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorGenerator.h b/unsupported/Eigen/CXX11/src/Tensor/TensorGenerator.h index 3a181d6c3..9316c9831 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorGenerator.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorGenerator.h @@ -141,7 +141,7 @@ struct TensorEvaluator, Device> EIGEN_STATIC_ASSERT(packetSize > 1, YOU_MADE_A_PROGRAMMING_MISTAKE) eigen_assert(index+packetSize-1 < dimensions().TotalSize()); - EIGEN_ALIGN_DEFAULT typename internal::remove_const::type values[packetSize]; + EIGEN_ALIGN_MAX typename internal::remove_const::type values[packetSize]; for (int i = 0; i < packetSize; ++i) { values[i] = coeff(index+i); } diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorImagePatch.h b/unsupported/Eigen/CXX11/src/Tensor/TensorImagePatch.h index f2c56a9ac..11e510414 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorImagePatch.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorImagePatch.h @@ -493,7 +493,7 @@ struct TensorEvaluator, Device> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE PacketReturnType packetWithPossibleZero(Index index) const { const int packetSize = internal::unpacket_traits::size; - EIGEN_ALIGN_DEFAULT typename internal::remove_const::type values[packetSize]; + EIGEN_ALIGN_MAX typename internal::remove_const::type values[packetSize]; for (int i = 0; i < packetSize; ++i) { values[i] = coeff(index+i); } diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorInflation.h b/unsupported/Eigen/CXX11/src/Tensor/TensorInflation.h index 40a50e466..ae9e9f751 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorInflation.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorInflation.h @@ -195,7 +195,7 @@ struct TensorEvaluator, Device> EIGEN_STATIC_ASSERT(packetSize > 1, YOU_MADE_A_PROGRAMMING_MISTAKE) eigen_assert(index+packetSize-1 < dimensions().TotalSize()); - EIGEN_ALIGN_DEFAULT typename internal::remove_const::type values[packetSize]; + EIGEN_ALIGN_MAX typename internal::remove_const::type values[packetSize]; for (int i = 0; i < packetSize; ++i) { values[i] = coeff(index+i); } diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h b/unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h index 29bc6ca21..dad656313 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h @@ -595,7 +595,7 @@ struct TensorEvaluator, Device> this->m_impl.template writePacket(inputIndices[0], x); } else { - EIGEN_ALIGN_DEFAULT CoeffReturnType values[packetSize]; + EIGEN_ALIGN_MAX CoeffReturnType values[packetSize]; internal::pstore(values, x); this->m_impl.coeffRef(inputIndices[0]) = values[0]; this->m_impl.coeffRef(inputIndices[1]) = values[packetSize-1]; diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorPadding.h b/unsupported/Eigen/CXX11/src/Tensor/TensorPadding.h index 5a165dab0..07a6e8d4c 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorPadding.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorPadding.h @@ -342,7 +342,7 @@ struct TensorEvaluator, Device EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE PacketReturnType packetWithPossibleZero(Index index) const { const int packetSize = internal::unpacket_traits::size; - EIGEN_ALIGN_DEFAULT typename internal::remove_const::type values[packetSize]; + EIGEN_ALIGN_MAX typename internal::remove_const::type values[packetSize]; for (int i = 0; i < packetSize; ++i) { values[i] = coeff(index+i); } diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorPatch.h b/unsupported/Eigen/CXX11/src/Tensor/TensorPatch.h index 513f1e83f..8fb53f4f2 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorPatch.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorPatch.h @@ -236,7 +236,7 @@ struct TensorEvaluator, Device> return rslt; } else { - EIGEN_ALIGN_DEFAULT CoeffReturnType values[packetSize]; + EIGEN_ALIGN_MAX CoeffReturnType values[packetSize]; values[0] = m_impl.coeff(inputIndices[0]); values[packetSize-1] = m_impl.coeff(inputIndices[1]); for (int i = 1; i < packetSize-1; ++i) { diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h b/unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h index 3b3955094..1d22843af 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h @@ -694,7 +694,7 @@ struct TensorEvaluator, Device> EIGEN_STATIC_ASSERT(packetSize > 1, YOU_MADE_A_PROGRAMMING_MISTAKE) eigen_assert(index + packetSize - 1 < dimensions().TotalSize()); - EIGEN_ALIGN_DEFAULT typename internal::remove_const::type values[packetSize]; + EIGEN_ALIGN_MAX typename internal::remove_const::type values[packetSize]; if (ReducingInnerMostDims) { const Index num_values_to_reduce = (static_cast(Layout) == static_cast(ColMajor)) ? m_preservedStrides[0] : m_preservedStrides[NumOutputDims - 1]; diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorReverse.h b/unsupported/Eigen/CXX11/src/Tensor/TensorReverse.h index 52f95b2a2..e092c0e04 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorReverse.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorReverse.h @@ -200,7 +200,7 @@ struct TensorEvaluator, Device // TODO(ndjaitly): write a better packing routine that uses // local structure. - EIGEN_ALIGN_DEFAULT typename internal::remove_const::type + EIGEN_ALIGN_MAX typename internal::remove_const::type values[packetSize]; for (int i = 0; i < packetSize; ++i) { values[i] = coeff(index+i); @@ -259,7 +259,7 @@ struct TensorEvaluator, Device> eigen_assert(index+packetSize-1 < dimensions().TotalSize()); // This code is pilfered from TensorMorphing.h - EIGEN_ALIGN_DEFAULT CoeffReturnType values[packetSize]; + EIGEN_ALIGN_MAX CoeffReturnType values[packetSize]; internal::pstore(values, x); for (int i = 0; i < packetSize; ++i) { this->coeffRef(index+i) = values[i]; diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorShuffling.h b/unsupported/Eigen/CXX11/src/Tensor/TensorShuffling.h index 02f73dd37..c45530098 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorShuffling.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorShuffling.h @@ -172,7 +172,7 @@ struct TensorEvaluator, Device> EIGEN_STATIC_ASSERT(packetSize > 1, YOU_MADE_A_PROGRAMMING_MISTAKE) eigen_assert(index+packetSize-1 < dimensions().TotalSize()); - EIGEN_ALIGN_DEFAULT typename internal::remove_const::type values[packetSize]; + EIGEN_ALIGN_MAX typename internal::remove_const::type values[packetSize]; for (int i = 0; i < packetSize; ++i) { values[i] = coeff(index+i); } @@ -245,7 +245,7 @@ struct TensorEvaluator, Device> static const int packetSize = internal::unpacket_traits::size; EIGEN_STATIC_ASSERT(packetSize > 1, YOU_MADE_A_PROGRAMMING_MISTAKE) - EIGEN_ALIGN_DEFAULT typename internal::remove_const::type values[packetSize]; + EIGEN_ALIGN_MAX typename internal::remove_const::type values[packetSize]; internal::pstore(values, x); for (int i = 0; i < packetSize; ++i) { this->coeffRef(index+i) = values[i]; diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorStorage.h b/unsupported/Eigen/CXX11/src/Tensor/TensorStorage.h index 33670e36e..9e4cf039d 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorStorage.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorStorage.h @@ -41,7 +41,7 @@ class TensorStorage private: static const std::size_t Size = FixedDimensions::total_size; - EIGEN_ALIGN_DEFAULT T m_data[Size]; + EIGEN_ALIGN_MAX T m_data[Size]; FixedDimensions m_dimensions; public: diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorStriding.h b/unsupported/Eigen/CXX11/src/Tensor/TensorStriding.h index dd913fbae..97b6168a9 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorStriding.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorStriding.h @@ -200,7 +200,7 @@ struct TensorEvaluator, Device> return rslt; } else { - EIGEN_ALIGN_DEFAULT typename internal::remove_const::type values[packetSize]; + EIGEN_ALIGN_MAX typename internal::remove_const::type values[packetSize]; values[0] = m_impl.coeff(inputIndices[0]); values[packetSize-1] = m_impl.coeff(inputIndices[1]); for (int i = 1; i < packetSize-1; ++i) { @@ -308,7 +308,7 @@ struct TensorEvaluator, Device> this->m_impl.template writePacket(inputIndices[0], x); } else { - EIGEN_ALIGN_DEFAULT Scalar values[packetSize]; + EIGEN_ALIGN_MAX Scalar values[packetSize]; internal::pstore(values, x); this->m_impl.coeffRef(inputIndices[0]) = values[0]; this->m_impl.coeffRef(inputIndices[1]) = values[packetSize-1]; diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h b/unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h index 2e6b93bfb..8f1c02ea4 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h @@ -23,13 +23,13 @@ class compute_tensor_flags aligned_bit = ( ((Options&DontAlign)==0) && ( -#if EIGEN_ALIGN_STATICALLY +#if EIGEN_MAX_STATIC_ALIGN_BYTES>0 (!is_dynamic_size_storage) #else 0 #endif || -#if EIGEN_ALIGN +#if EIGEN_MAX_ALIGN_BYTES>0 is_dynamic_size_storage #else 0 diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorVolumePatch.h b/unsupported/Eigen/CXX11/src/Tensor/TensorVolumePatch.h index 00eabdf5a..6625c66d5 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorVolumePatch.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorVolumePatch.h @@ -594,7 +594,7 @@ struct TensorEvaluator, D EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE PacketReturnType packetWithPossibleZero(Index index) const { const int packetSize = internal::unpacket_traits::size; - EIGEN_ALIGN_DEFAULT typename internal::remove_const::type values[packetSize]; + EIGEN_ALIGN_MAX typename internal::remove_const::type values[packetSize]; for (int i = 0; i < packetSize; ++i) { values[i] = coeff(index+i); } diff --git a/unsupported/test/cxx11_tensor_random.cpp b/unsupported/test/cxx11_tensor_random.cpp index 85937ec77..389896c54 100644 --- a/unsupported/test/cxx11_tensor_random.cpp +++ b/unsupported/test/cxx11_tensor_random.cpp @@ -51,7 +51,7 @@ struct MyGenerator { typename internal::packet_traits::type packetOp( Eigen::DenseIndex packet_location, Eigen::DenseIndex /*unused*/ = 0) const { const int packetSize = internal::packet_traits::size; - EIGEN_ALIGN_DEFAULT int values[packetSize]; + EIGEN_ALIGN_MAX int values[packetSize]; for (int i = 0; i < packetSize; ++i) { values[i] = static_cast(3 * (packet_location + i)); } -- cgit v1.2.3