mirror/eigen
2
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2024-12-15 07:10:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

introduce copyCoeff and copyPacket methods in MatrixBase, used by

Browse Source 
Assign, in preparation for new Swap impl reusing Assign code.
remove last remnant of old Inverse class in Transform.
This commit is contained in:
Benoit Jacob 2008-08-05 18:00:23 +00:00
parent 09ef7db9d9
commit c94be35bc8
4 changed files with 59 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Eigen/src/Core/Assign.h
View File

@ -106,7 +106,7 @@ struct ei_assign_novec_CompleteUnrolling
inline static void run(Derived1 &dst, const Derived2 &src)
{
dst.coeffRef(row, col) = src.coeff(row, col);
dst.copyCoeff(row, col, src);
ei_assign_novec_CompleteUnrolling<Derived1, Derived2, Index+1, Stop>::run(dst, src);
}
};
@ -125,7 +125,7 @@ struct ei_assign_novec_InnerUnrolling
const bool rowMajor = int(Derived1::Flags)&RowMajorBit;
const int row = rowMajor ? row_or_col : Index;
const int col = rowMajor ? Index : row_or_col;
dst.coeffRef(row, col) = src.coeff(row, col);
dst.copyCoeff(row, col, src);
ei_assign_novec_InnerUnrolling<Derived1, Derived2, Index+1, Stop>::run(dst, src, row_or_col);
}
};
@ -154,7 +154,7 @@ struct ei_assign_innervec_CompleteUnrolling
inline static void run(Derived1 &dst, const Derived2 &src)
{
dst.template writePacket<Aligned>(row, col, src.template packet<Aligned>(row, col));
dst.template copyPacket<Derived2, Aligned>(row, col, src);
ei_assign_innervec_CompleteUnrolling<Derived1, Derived2,
Index+ei_packet_traits<typename Derived1::Scalar>::size, Stop>::run(dst, src);
}
@ -173,7 +173,7 @@ struct ei_assign_innervec_InnerUnrolling
{
const int row = int(Derived1::Flags)&RowMajorBit ? row_or_col : Index;
const int col = int(Derived1::Flags)&RowMajorBit ? Index : row_or_col;
dst.template writePacket<Aligned>(row, col, src.template packet<Aligned>(row, col));
dst.template copyPacket<Derived2, Aligned>(row, col, src);
ei_assign_innervec_InnerUnrolling<Derived1, Derived2,
Index+ei_packet_traits<typename Derived1::Scalar>::size, Stop>::run(dst, src, row_or_col);
}
@ -209,9 +209,9 @@ struct ei_assign_impl<Derived1, Derived2, NoVectorization, NoUnrolling>
for(int i = 0; i < innerSize; i++)
{
if(int(Derived1::Flags)&RowMajorBit)
dst.coeffRef(j, i) = src.coeff(j, i);
dst.copyCoeff(j, i, src);
else
dst.coeffRef(i, j) = src.coeff(i, j);
dst.copyCoeff(i, j, src);
}
}
};
@ -256,9 +256,9 @@ struct ei_assign_impl<Derived1, Derived2, InnerVectorization, NoUnrolling>
for(int i = 0; i < innerSize; i+=packetSize)
{
if(int(Derived1::Flags)&RowMajorBit)
dst.template writePacket<Aligned>(j, i, src.template packet<Aligned>(j, i));
dst.template copyPacket<Derived2, Aligned>(j, i, src);
else
dst.template writePacket<Aligned>(i, j, src.template packet<Aligned>(i, j));
dst.template copyPacket<Derived2, Aligned>(i, j, src);
}
}
};
@ -302,11 +302,11 @@ struct ei_assign_impl<Derived1, Derived2, LinearVectorization, NoUnrolling>
for(int index = 0; index < alignedSize; index += packetSize)
{
dst.template writePacket<Aligned>(index, src.template packet<Aligned>(index));
dst.template copyPacket<Derived2, Aligned>(index, src);
}
for(int index = alignedSize; index < size; index++)
dst.coeffRef(index) = src.coeff(index);
dst.copyCoeff(index, src);
}
};
@ -344,18 +344,18 @@ struct ei_assign_impl<Derived1, Derived2, SliceVectorization, NoUnrolling>
for (int index = 0; index<alignedInnerSize ; index+=packetSize)
{
if(Derived1::Flags&RowMajorBit)
dst.template writePacket<Unaligned>(i, index, src.template packet<Unaligned>(i, index));
dst.template copyPacket<Derived2, Unaligned>(i, index, src);
else
dst.template writePacket<Unaligned>(index, i, src.template packet<Unaligned>(index, i));
dst.template copyPacket<Derived2, Unaligned>(index, i, src);
}
// do the non-vectorizable part of the assignment
for (int index = alignedInnerSize; index<innerSize ; index++)
{
if(Derived1::Flags&RowMajorBit)
dst.coeffRef(i, index) = src.coeff(i, index);
dst.copyCoeff(i, index, src);
else
dst.coeffRef(index, i) = src.coeff(index, i);
dst.copyCoeff(index, i, src);
}
}
}

35
Eigen/src/Core/Coeffs.h
View File

@ -280,5 +280,40 @@ inline void MatrixBase<Derived>::writePacket
derived().template writePacket<StoreMode>(index,x);
}
template<typename Derived>
template<typename OtherDerived>
inline void MatrixBase<Derived>::copyCoeff(int row, int col, const MatrixBase<OtherDerived>& other)
{
ei_internal_assert(row >= 0 && row < rows()
&& col >= 0 && col < cols());
derived().coeffRef(row, col) = other.derived().coeff(row, col);
}
template<typename Derived>
template<typename OtherDerived>
inline void MatrixBase<Derived>::copyCoeff(int index, const MatrixBase<OtherDerived>& other)
{
ei_internal_assert(index >= 0 && index < size());
derived().coeffRef(index) = other.derived().coeff(index);
}
template<typename Derived>
template<typename OtherDerived, int LoadStoreMode>
inline void MatrixBase<Derived>::copyPacket(int row, int col, const MatrixBase<OtherDerived>& other)
{
ei_internal_assert(row >= 0 && row < rows()
&& col >= 0 && col < cols());
derived().template writePacket<LoadStoreMode>(row, col,
other.derived().template packet<LoadStoreMode>(row, col));
}
template<typename Derived>
template<typename OtherDerived, int LoadStoreMode>
inline void MatrixBase<Derived>::copyPacket(int index, const MatrixBase<OtherDerived>& other)
{
ei_internal_assert(index >= 0 && index < size());
derived().template writePacket<LoadStoreMode>(index,
other.derived().template packet<LoadStoreMode>(index));
}
#endif // EIGEN_COEFFS_H

9
Eigen/src/Core/MatrixBase.h
View File

@ -253,6 +253,15 @@ template<typename Derived> class MatrixBase
Scalar& coeffRef(int index);
Scalar& operator[](int index);
template<typename OtherDerived>
void copyCoeff(int row, int col, const MatrixBase<OtherDerived>& other);
template<typename OtherDerived>
void copyCoeff(int index, const MatrixBase<OtherDerived>& other);
template<typename OtherDerived, int LoadStoreMode>
void copyPacket(int row, int col, const MatrixBase<OtherDerived>& other);
template<typename OtherDerived, int LoadStoreMode>
void copyPacket(int index, const MatrixBase<OtherDerived>& other);
template<int LoadMode>
PacketScalar packet(int row, int col) const;
template<int StoreMode>

2
Eigen/src/Geometry/Transform.h
View File

@ -170,7 +170,7 @@ public:
const OrientationType& orientation, const MatrixBase<ScaleDerived> &scale);
/** \sa MatrixBase::inverse() */
const Inverse<MatrixType, false> inverse() const
const MatrixType inverse() const
{ return m_matrix.inverse(); }
protected: