diff options
| -rw-r--r-- | Eigen/src/Core/products/TriangularSolverMatrix.h | 10 | ||||
| -rw-r--r-- | test/product_symm.cpp | 8 | ||||
| -rw-r--r-- | test/product_syrk.cpp | 4 | ||||
| -rw-r--r-- | test/product_trsolve.cpp | 11 |
4 files changed, 20 insertions, 13 deletions
diff --git a/Eigen/src/Core/products/TriangularSolverMatrix.h b/Eigen/src/Core/products/TriangularSolverMatrix.h index e32a9929c..1774081a2 100644 --- a/Eigen/src/Core/products/TriangularSolverMatrix.h +++ b/Eigen/src/Core/products/TriangularSolverMatrix.h @@ -74,6 +74,7 @@ struct ei_triangular_solve_matrix<Scalar,OnTheLeft,Mode,Conjugate,TriStorageOrde ei_conj_if<Conjugate> conj; ei_gebp_kernel<Scalar, Blocking::mr, Blocking::nr, ei_conj_helper<Conjugate,false> > gebp_kernel; ei_gemm_pack_lhs<Scalar,Blocking::mr,TriStorageOrder> pack_lhs; + ei_gemm_pack_rhs<Scalar, Blocking::nr, ColMajor, true> pack_rhs; for(int k2=IsLower ? 0 : size; IsLower ? k2<size : k2>0; @@ -137,8 +138,7 @@ struct ei_triangular_solve_matrix<Scalar,OnTheLeft,Mode,Conjugate,TriStorageOrde int blockBOffset = IsLower ? k1 : lengthTarget; // update the respective rows of B from other - ei_gemm_pack_rhs<Scalar, Blocking::nr, ColMajor, true>() - (blockB, _other+startBlock, otherStride, -1, actualPanelWidth, cols, actual_kc, blockBOffset); + pack_rhs(blockB, _other+startBlock, otherStride, -1, actualPanelWidth, cols, actual_kc, blockBOffset); // GEBP if (lengthTarget>0) @@ -267,7 +267,8 @@ struct ei_triangular_solve_matrix<Scalar,OnTheRight,Mode,Conjugate,TriStorageOrd blockA, blockB+j2*actual_kc, actual_mc, panelLength, actualPanelWidth, actual_kc, actual_kc, // strides - panelOffset, panelOffset); // offsets + panelOffset, panelOffset, // offsets + allocatedBlockB); // workspace } // unblocked triangular solve @@ -297,7 +298,8 @@ struct ei_triangular_solve_matrix<Scalar,OnTheRight,Mode,Conjugate,TriStorageOrd if (rs>0) gebp_kernel(_other+i2+startPanel*otherStride, otherStride, blockA, geb, - actual_mc, actual_kc, rs); + actual_mc, actual_kc, rs, + -1, -1, 0, 0, allocatedBlockB); } } diff --git a/test/product_symm.cpp b/test/product_symm.cpp index a0d80080f..4ff1735d6 100644 --- a/test/product_symm.cpp +++ b/test/product_symm.cpp @@ -109,9 +109,11 @@ void test_product_symm() for(int i = 0; i < g_repeat ; i++) { CALL_SUBTEST_1(( symm<float,Dynamic,Dynamic>(ei_random<int>(10,320),ei_random<int>(10,320)) )); - CALL_SUBTEST_2(( symm<std::complex<double>,Dynamic,Dynamic>(ei_random<int>(10,320),ei_random<int>(10,320)) )); + CALL_SUBTEST_2(( symm<double,Dynamic,Dynamic>(ei_random<int>(10,320),ei_random<int>(10,320)) )); + CALL_SUBTEST_3(( symm<std::complex<double>,Dynamic,Dynamic>(ei_random<int>(10,320),ei_random<int>(10,320)) )); - CALL_SUBTEST_3(( symm<float,Dynamic,1>(ei_random<int>(10,320)) )); - CALL_SUBTEST_4(( symm<std::complex<double>,Dynamic,1>(ei_random<int>(10,320)) )); + CALL_SUBTEST_4(( symm<float,Dynamic,1>(ei_random<int>(10,320)) )); + CALL_SUBTEST_5(( symm<double,Dynamic,1>(ei_random<int>(10,320)) )); + CALL_SUBTEST_6(( symm<std::complex<double>,Dynamic,1>(ei_random<int>(10,320)) )); } } diff --git a/test/product_syrk.cpp b/test/product_syrk.cpp index e597ac88a..ec93056a9 100644 --- a/test/product_syrk.cpp +++ b/test/product_syrk.cpp @@ -77,6 +77,8 @@ void test_product_syrk() s = ei_random<int>(10,320); CALL_SUBTEST_1( syrk(MatrixXf(s, s)) ); s = ei_random<int>(10,320); - CALL_SUBTEST_2( syrk(MatrixXcd(s, s)) ); + CALL_SUBTEST_2( syrk(MatrixXd(s, s)) ); + s = ei_random<int>(10,320); + CALL_SUBTEST_3( syrk(MatrixXcd(s, s)) ); } } diff --git a/test/product_trsolve.cpp b/test/product_trsolve.cpp index 6e916230e..7a8068c35 100644 --- a/test/product_trsolve.cpp +++ b/test/product_trsolve.cpp @@ -79,12 +79,13 @@ void test_product_trsolve() { // matrices CALL_SUBTEST_1((trsolve<float,Dynamic,Dynamic>(ei_random<int>(1,320),ei_random<int>(1,320)))); - CALL_SUBTEST_2((trsolve<std::complex<double>,Dynamic,Dynamic>(ei_random<int>(1,320),ei_random<int>(1,320)))); + CALL_SUBTEST_2((trsolve<double,Dynamic,Dynamic>(ei_random<int>(1,320),ei_random<int>(1,320)))); + CALL_SUBTEST_3((trsolve<std::complex<double>,Dynamic,Dynamic>(ei_random<int>(1,320),ei_random<int>(1,320)))); // vectors - CALL_SUBTEST_3((trsolve<std::complex<double>,Dynamic,1>(ei_random<int>(1,320)))); - CALL_SUBTEST_4((trsolve<float,1,1>())); - CALL_SUBTEST_5((trsolve<float,1,2>())); - CALL_SUBTEST_6((trsolve<std::complex<float>,4,1>())); + CALL_SUBTEST_4((trsolve<std::complex<double>,Dynamic,1>(ei_random<int>(1,320)))); + CALL_SUBTEST_5((trsolve<float,1,1>())); + CALL_SUBTEST_6((trsolve<float,1,2>())); + CALL_SUBTEST_7((trsolve<std::complex<float>,4,1>())); } } |