diff options
| -rwxr-xr-x | Eigen/src/Core/ProductEvaluators.h | 31 | ||||
| -rw-r--r-- | test/nesting_ops.cpp | 21 | ||||
| -rw-r--r-- | test/product.h | 9 | ||||
| -rw-r--r-- | test/product_notemporary.cpp | 4 | ||||
| -rw-r--r-- | test/redux.cpp | 1 |
5 files changed, 47 insertions, 19 deletions
diff --git a/Eigen/src/Core/ProductEvaluators.h b/Eigen/src/Core/ProductEvaluators.h index 7099d1fdc..eebd1a9d4 100755 --- a/Eigen/src/Core/ProductEvaluators.h +++ b/Eigen/src/Core/ProductEvaluators.h @@ -187,6 +187,37 @@ struct Assignment<DstXprType, CwiseUnaryOp<internal::scalar_multiple_op<ScalarBi } }; +//---------------------------------------- +// Catch "Dense ?= xpr + Product<>" expression to save one temporary +// FIXME we could probably enable these rules for any product, i.e., not only Dense and DefaultProduct + +template<typename DstXprType, typename OtherXpr, typename ProductType, typename Scalar, typename Func1, typename Func2> +struct assignment_from_xpr_plus_product +{ + typedef CwiseBinaryOp<internal::scalar_sum_op<Scalar>, const OtherXpr, const ProductType> SrcXprType; + static void run(DstXprType &dst, const SrcXprType &src, const Func1& func) + { + call_assignment_no_alias(dst, src.lhs(), func); + call_assignment_no_alias(dst, src.rhs(), Func2()); + } +}; + +template< typename DstXprType, typename OtherXpr, typename Lhs, typename Rhs, typename Scalar> +struct Assignment<DstXprType, CwiseBinaryOp<internal::scalar_sum_op<Scalar>, const OtherXpr, + const Product<Lhs,Rhs,DefaultProduct> >, internal::assign_op<Scalar>, Dense2Dense> + : assignment_from_xpr_plus_product<DstXprType, OtherXpr, Product<Lhs,Rhs,DefaultProduct>, Scalar, internal::assign_op<Scalar>, internal::add_assign_op<Scalar> > +{}; +template< typename DstXprType, typename OtherXpr, typename Lhs, typename Rhs, typename Scalar> +struct Assignment<DstXprType, CwiseBinaryOp<internal::scalar_sum_op<Scalar>, const OtherXpr, + const Product<Lhs,Rhs,DefaultProduct> >, internal::add_assign_op<Scalar>, Dense2Dense> + : assignment_from_xpr_plus_product<DstXprType, OtherXpr, Product<Lhs,Rhs,DefaultProduct>, Scalar, internal::add_assign_op<Scalar>, internal::add_assign_op<Scalar> > +{}; +template< typename DstXprType, typename OtherXpr, typename Lhs, typename Rhs, typename Scalar> +struct Assignment<DstXprType, CwiseBinaryOp<internal::scalar_sum_op<Scalar>, const OtherXpr, + const Product<Lhs,Rhs,DefaultProduct> >, internal::sub_assign_op<Scalar>, Dense2Dense> + : assignment_from_xpr_plus_product<DstXprType, OtherXpr, Product<Lhs,Rhs,DefaultProduct>, Scalar, internal::sub_assign_op<Scalar>, internal::sub_assign_op<Scalar> > +{}; +//---------------------------------------- template<typename Lhs, typename Rhs> struct generic_product_impl<Lhs,Rhs,DenseShape,DenseShape,InnerProduct> diff --git a/test/nesting_ops.cpp b/test/nesting_ops.cpp index 1e96075f8..76a63400c 100644 --- a/test/nesting_ops.cpp +++ b/test/nesting_ops.cpp @@ -54,25 +54,8 @@ template <typename MatrixType> void run_nesting_ops_2(const MatrixType& _m) if((MatrixType::SizeAtCompileTime==Dynamic)) { - - VERIFY_EVALUATION_COUNT( use_n_times<10>(m1), 0 ); - if(!NumTraits<Scalar>::IsComplex) - { - VERIFY_EVALUATION_COUNT( use_n_times<3>(2*m1), 0 ); - VERIFY_EVALUATION_COUNT( use_n_times<4>(2*m1), 1 ); - } - else - { - VERIFY_EVALUATION_COUNT( use_n_times<1>(2*m1), 0 ); - VERIFY_EVALUATION_COUNT( use_n_times<2>(2*m1), 1 ); - } - VERIFY_EVALUATION_COUNT( use_n_times<2>(m1+m1), 0 ); - VERIFY_EVALUATION_COUNT( use_n_times<3>(m1+m1), 1 ); - VERIFY_EVALUATION_COUNT( use_n_times<1>(m1*m1.transpose()), 1 ); - VERIFY_EVALUATION_COUNT( use_n_times<2>(m1*m1.transpose()), 1 ); - - VERIFY_EVALUATION_COUNT( use_n_times<1>(m1 + m1*m1), 2 ); // FIXME should already be 1 thanks the already existing rule - VERIFY_EVALUATION_COUNT( use_n_times<10>(m1 + m1*m1), 2 ); + VERIFY_EVALUATION_COUNT( use_n_times<1>(m1 + m1*m1), 1 ); + VERIFY_EVALUATION_COUNT( use_n_times<10>(m1 + m1*m1), 1 ); VERIFY_EVALUATION_COUNT( use_n_times<1>(m1.template triangularView<Lower>().solve(m1.col(0))), 1 ); VERIFY_EVALUATION_COUNT( use_n_times<10>(m1.template triangularView<Lower>().solve(m1.col(0))), 1 ); diff --git a/test/product.h b/test/product.h index 672d0cee9..9dfff9303 100644 --- a/test/product.h +++ b/test/product.h @@ -111,6 +111,15 @@ template<typename MatrixType> void product(const MatrixType& m) vcres.noalias() -= m1.transpose() * v1; VERIFY_IS_APPROX(vcres, vc2 - m1.transpose() * v1); + // test d ?= a+b*c rules + res.noalias() = square + m1 * m2.transpose(); + VERIFY_IS_APPROX(res, square + m1 * m2.transpose()); + res.noalias() += square + m1 * m2.transpose(); + VERIFY_IS_APPROX(res, 2*(square + m1 * m2.transpose())); + res.noalias() -= square + m1 * m2.transpose(); + VERIFY_IS_APPROX(res, square + m1 * m2.transpose()); + + tm1 = m1; VERIFY_IS_APPROX(tm1.transpose() * v1, m1.transpose() * v1); VERIFY_IS_APPROX(v1.transpose() * tm1, v1.transpose() * m1); diff --git a/test/product_notemporary.cpp b/test/product_notemporary.cpp index 16f6266f7..ff93cb881 100644 --- a/test/product_notemporary.cpp +++ b/test/product_notemporary.cpp @@ -47,6 +47,10 @@ template<typename MatrixType> void product_notemporary(const MatrixType& m) VERIFY_EVALUATION_COUNT( m3.noalias() = s1 * (m1 * m2.transpose()), 0); + VERIFY_EVALUATION_COUNT( m3.noalias() = m3 + m1 * m2.transpose(), 0); + VERIFY_EVALUATION_COUNT( m3.noalias() += m3 + m1 * m2.transpose(), 0); + VERIFY_EVALUATION_COUNT( m3.noalias() -= m3 + m1 * m2.transpose(), 0); + VERIFY_EVALUATION_COUNT( m3.noalias() = s1 * m1 * s2 * m2.adjoint(), 0); VERIFY_EVALUATION_COUNT( m3.noalias() = s1 * m1 * s2 * (m1*s3+m2*s2).adjoint(), 1); VERIFY_EVALUATION_COUNT( m3.noalias() = (s1 * m1).adjoint() * s2 * m2, 0); diff --git a/test/redux.cpp b/test/redux.cpp index f3e7cc2a7..9b0767c73 100644 --- a/test/redux.cpp +++ b/test/redux.cpp @@ -2,6 +2,7 @@ // for linear algebra. // // Copyright (C) 2008 Benoit Jacob <jacob.benoit.1@gmail.com> +// Copyright (C) 2015 Gael Guennebaud <gael.guennebaud@inria.fr> // // This Source Code Form is subject to the terms of the Mozilla // Public License v. 2.0. If a copy of the MPL was not distributed |