diff --git a/Eigen/src/Array/PartialRedux.h b/Eigen/src/Array/PartialRedux.h index 0f868677c..ee956bb1f 100644 --- a/Eigen/src/Array/PartialRedux.h +++ b/Eigen/src/Array/PartialRedux.h @@ -280,22 +280,22 @@ template class PartialRedux { return Reverse( _expression() ); } - + + const Replicate + replicate(int factor) const; + template - const Replicate + const Replicate replicate(int factor = Factor) const; - + /////////// Geometry module /////////// const Homogeneous homogeneous() const; - - const Replicate - replicate(int factor) const; typedef typename ExpressionType::PlainMatrixType CrossReturnType; template const CrossReturnType cross(const MatrixBase& other) const; - + enum { HNormalized_Size = Direction==Vertical ? ei_traits::RowsAtCompileTime : ei_traits::ColsAtCompileTime, @@ -311,13 +311,13 @@ template class PartialRedux Direction==Vertical ? 1 : int(ei_traits::RowsAtCompileTime), Direction==Horizontal ? 1 : int(ei_traits::ColsAtCompileTime)> HNormalized_Factors; - typedef CwiseBinaryOp::Scalar>, + typedef CwiseBinaryOp::Scalar>, NestByValue, NestByValue, Direction==Vertical ? HNormalized_SizeMinusOne : 1, Direction==Horizontal ? HNormalized_SizeMinusOne : 1> > > HNormalizedReturnType; - + const HNormalizedReturnType hnormalized() const; protected: diff --git a/Eigen/src/Array/Replicate.h b/Eigen/src/Array/Replicate.h index d3220c154..87ff5eaa8 100644 --- a/Eigen/src/Array/Replicate.h +++ b/Eigen/src/Array/Replicate.h @@ -25,7 +25,7 @@ #ifndef EIGEN_REPLICATE_H #define EIGEN_REPLICATE_H -/** \nonstableyet +/** \nonstableyet * \class Replicate * * \brief Expression of the multiple replication of a matrix or vector @@ -70,11 +70,11 @@ template class Replicate EIGEN_GENERIC_PUBLIC_INTERFACE(Replicate) inline Replicate(const MatrixType& matrix) - : m_matrix(matrix) + : m_matrix(matrix), m_rowFactor(RowFactor), m_colFactor(ColFactor) { ei_assert(RowFactor!=Dynamic && ColFactor!=Dynamic); } - + inline Replicate(const MatrixType& matrix, int rowFactor, int colFactor) : m_matrix(matrix), m_rowFactor(rowFactor), m_colFactor(colFactor) {} @@ -93,9 +93,9 @@ template class Replicate const ei_int_if_dynamic m_colFactor; }; -/** \nonstableyet +/** \nonstableyet * \return an expression of the replication of \c *this - * + * * Example: \include MatrixBase_replicate.cpp * Output: \verbinclude MatrixBase_replicate.out * @@ -109,9 +109,9 @@ MatrixBase::replicate() const return derived(); } -/** \nonstableyet +/** \nonstableyet * \return an expression of the replication of \c *this - * + * * Example: \include MatrixBase_replicate_int_int.cpp * Output: \verbinclude MatrixBase_replicate_int_int.out * @@ -124,9 +124,9 @@ MatrixBase::replicate(int rowFactor,int colFactor) const return Replicate(derived(),rowFactor,colFactor); } -/** \nonstableyet +/** \nonstableyet * \return an expression of the replication of each column (or row) of \c *this - * + * * Example: \include DirectionWise_replicate_int.cpp * Output: \verbinclude DirectionWise_replicate_int.out * @@ -140,9 +140,9 @@ PartialRedux::replicate(int factor) const (_expression(),Direction==Vertical?factor:1,Direction==Horizontal?factor:1); } -/** \nonstableyet +/** \nonstableyet * \return an expression of the replication of each column (or row) of \c *this - * + * * Example: \include DirectionWise_replicate.cpp * Output: \verbinclude DirectionWise_replicate.out * @@ -156,5 +156,5 @@ PartialRedux::replicate(int factor) const return Replicate (_expression(),Direction==Vertical?factor:1,Direction==Horizontal?factor:1); } - + #endif // EIGEN_REPLICATE_H diff --git a/Eigen/src/Core/SolveTriangular.h b/Eigen/src/Core/SolveTriangular.h index 12fb0e1d1..f8fe74310 100644 --- a/Eigen/src/Core/SolveTriangular.h +++ b/Eigen/src/Core/SolveTriangular.h @@ -33,8 +33,8 @@ template::value ? -1 // this is to solve ambiguous specializations + : 0xffffff, + int StorageOrder = ei_is_part::value ? 0xffffff // this is to solve ambiguous specializations : int(Lhs::Flags) & (RowMajorBit|SparseBit) > struct ei_solve_triangular_selector; diff --git a/Eigen/src/Core/products/GeneralMatrixMatrix.h b/Eigen/src/Core/products/GeneralMatrixMatrix.h index 3543de9b8..9dedb7f14 100644 --- a/Eigen/src/Core/products/GeneralMatrixMatrix.h +++ b/Eigen/src/Core/products/GeneralMatrixMatrix.h @@ -69,7 +69,7 @@ static void ei_cache_friendly_product( typedef typename ei_packet_traits::type PacketType; - + #ifndef EIGEN_USE_ALT_PRODUCT @@ -83,31 +83,31 @@ static void ei_cache_friendly_product( // register block size along the N direction nr = HalfRegisterCount/2, - + // register block size along the M direction mr = 2 * PacketSize, - + // max cache block size along the K direction Max_kc = ei_L2_block_traits::width, - + // max cache block size along the M direction Max_mc = 2*Max_kc }; int kc = std::min(Max_kc,depth); // cache block size along the K direction int mc = std::min(Max_mc,rows); // cache block size along the M direction - + Scalar* blockA = ei_aligned_stack_new(Scalar, kc*mc); Scalar* blockB = ei_aligned_stack_new(Scalar, kc*cols*PacketSize); - + // number of columns which can be processed by packet of nr columns int packet_cols = (cols/nr)*nr; - + // GEMM_VAR1 for(int k2=0; k2 GEPP_VAR1 for(int i2=0; i2::width }; - + const bool resIsAligned = (PacketSize==1) || (((resStride%PacketSize) == 0) && (size_t(res)%16==0)); const int remainingSize = depth % PacketSize; const int size = depth - remainingSize; // third dimension of the product clamped to packet boundaries - + const int l2BlockRows = MaxL2BlockSize > rows ? rows : 512; const int l2BlockCols = MaxL2BlockSize > cols ? cols : 128; const int l2BlockSize = MaxL2BlockSize > size ? size : 256; const int l2BlockSizeAligned = (1 + std::max(l2BlockSize,l2BlockCols)/PacketSize)*PacketSize; const bool needRhsCopy = (PacketSize>1) && ((rhsStride%PacketSize!=0) || (size_t(rhs)%16!=0)); - + Scalar* EIGEN_RESTRICT block = new Scalar[l2BlockRows*size]; // for(int i=0; i &position, const OrientationType& orientation, const MatrixBase &scale); - inline const MatrixType inverse(TransformTraits traits = Mode) const; + inline const MatrixType inverse(TransformTraits traits = (TransformTraits)Mode) const; /** \returns a const pointer to the column major internal matrix */ const Scalar* data() const { return m_matrix.data(); }