GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-09-22 22:33:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup because trait<CwiseBinaryOp>::Flags now expose the correct storage order

Browse Source
This commit is contained in:
Gael Guennebaud 2016-12-27 16:55:47 +01:00
parent d32a43e33a
commit ab69a7f6d1
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Eigen/src/SparseCore/SparseCwiseBinaryOp.h
View File

@ -212,8 +212,7 @@ public:
enum { enum {
CoeffReadCost = evaluator<Lhs>::CoeffReadCost + evaluator<Rhs>::CoeffReadCost + functor_traits<BinaryOp>::Cost, CoeffReadCost = evaluator<Lhs>::CoeffReadCost + evaluator<Rhs>::CoeffReadCost + functor_traits<BinaryOp>::Cost,
// Expose storage order of the sparse expression Flags = XprType::Flags
Flags = (XprType::Flags & ~RowMajorBit) | (int(Rhs::Flags)&RowMajorBit)
}; };
explicit binary_evaluator(const XprType& xpr) explicit binary_evaluator(const XprType& xpr)
@ -300,8 +299,7 @@ public:
enum { enum {
CoeffReadCost = evaluator<Lhs>::CoeffReadCost + evaluator<Rhs>::CoeffReadCost + functor_traits<BinaryOp>::Cost, CoeffReadCost = evaluator<Lhs>::CoeffReadCost + evaluator<Rhs>::CoeffReadCost + functor_traits<BinaryOp>::Cost,
// Expose storage order of the sparse expression Flags = XprType::Flags
Flags = (XprType::Flags & ~RowMajorBit) | (int(Lhs::Flags)&RowMajorBit)
}; };
explicit binary_evaluator(const XprType& xpr) explicit binary_evaluator(const XprType& xpr)
@ -523,8 +521,7 @@ public:
enum { enum {
CoeffReadCost = evaluator<LhsArg>::CoeffReadCost + evaluator<RhsArg>::CoeffReadCost + functor_traits<BinaryOp>::Cost, CoeffReadCost = evaluator<LhsArg>::CoeffReadCost + evaluator<RhsArg>::CoeffReadCost + functor_traits<BinaryOp>::Cost,
// Expose storage order of the sparse expression Flags = XprType::Flags
Flags = (XprType::Flags & ~RowMajorBit) | (int(RhsArg::Flags)&RowMajorBit)
}; };
explicit sparse_conjunction_evaluator(const XprType& xpr) explicit sparse_conjunction_evaluator(const XprType& xpr)
@ -598,8 +595,7 @@ public:
enum { enum {
CoeffReadCost = evaluator<LhsArg>::CoeffReadCost + evaluator<RhsArg>::CoeffReadCost + functor_traits<BinaryOp>::Cost, CoeffReadCost = evaluator<LhsArg>::CoeffReadCost + evaluator<RhsArg>::CoeffReadCost + functor_traits<BinaryOp>::Cost,
// Expose storage order of the sparse expression Flags = XprType::Flags
Flags = (XprType::Flags & ~RowMajorBit) | (int(LhsArg::Flags)&RowMajorBit)
}; };
explicit sparse_conjunction_evaluator(const XprType& xpr) explicit sparse_conjunction_evaluator(const XprType& xpr)