From c8b19702bc25b64b5ac9ab8f590a4706c3f46208 Mon Sep 17 00:00:00 2001 From: Christoph Hertzberg Date: Fri, 13 Apr 2018 20:36:58 +0200 Subject: [PATCH] Limit test size for sparse Cholesky solvers to EIGEN_TEST_MAX_SIZE --- test/simplicial_cholesky.cpp | 4 ++-- test/sparse_solver.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/simplicial_cholesky.cpp b/test/simplicial_cholesky.cpp index 649c817b4..5bb1e0d6c 100644 --- a/test/simplicial_cholesky.cpp +++ b/test/simplicial_cholesky.cpp @@ -35,8 +35,8 @@ template void test_simplicial_cholesky_T() check_sparse_spd_determinant(ldlt_colmajor_lower_amd); check_sparse_spd_determinant(ldlt_colmajor_upper_amd); - check_sparse_spd_solving(ldlt_colmajor_lower_nat, 300, 1000); - check_sparse_spd_solving(ldlt_colmajor_upper_nat, 300, 1000); + check_sparse_spd_solving(ldlt_colmajor_lower_nat, (std::min)(300,EIGEN_TEST_MAX_SIZE), 1000); + check_sparse_spd_solving(ldlt_colmajor_upper_nat, (std::min)(300,EIGEN_TEST_MAX_SIZE), 1000); } void test_simplicial_cholesky() diff --git a/test/sparse_solver.h b/test/sparse_solver.h index 5145bc3eb..19416ed5d 100644 --- a/test/sparse_solver.h +++ b/test/sparse_solver.h @@ -266,7 +266,7 @@ std::string solver_stats(const SparseSolverBase &/*solver*/) } #endif -template void check_sparse_spd_solving(Solver& solver, int maxSize = 300, int maxRealWorldSize = 100000) +template void check_sparse_spd_solving(Solver& solver, int maxSize = (std::min)(300,EIGEN_TEST_MAX_SIZE), int maxRealWorldSize = 100000) { typedef typename Solver::MatrixType Mat; typedef typename Mat::Scalar Scalar;