From 93226e096ec316e6feb0893e4f6d7bd78cc7065c Mon Sep 17 00:00:00 2001 From: Tobias Ribizel Date: Fri, 5 Feb 2021 13:01:54 +0100 Subject: [PATCH] Revert "count SpMV operations as iterations in IDR" This reverts commit b59befece0db8b3abc34b1e28709c50bf83a6f53. --- core/solver/idr.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/core/solver/idr.cpp b/core/solver/idr.cpp index ed95058aa36..0621517908a 100644 --- a/core/solver/idr.cpp +++ b/core/solver/idr.cpp @@ -172,9 +172,7 @@ void Idr::iterate(const LinOp *b, LinOp *x) const /* Memory movement summary for iteration with subspace dimension s * Per iteration: - * (11/2s+10+7/(s+1))n * values + matrix/preconditioner storage - * For (s+1) iterations: - * (11/2s^2+31/2s+17)n * values + (s+1) * matrix/preconditioner storage + * (11/2s^2+31/2s+18)n * values + (s+1) * matrix/preconditioner storage * (s+1)x SpMV: 2(s+1)n * values + (s+1) * storage * (s+1)x Preconditioner: 2(s+1)n * values + (s+1) * storage * 1x multidot (gemv) (s+1)n @@ -188,6 +186,7 @@ void Idr::iterate(const LinOp *b, LinOp *x) const * 2x norm2 2n * 1x scale 2n * 2x axpy 6n + * 1x norm2 residual n */ while (true) { ++total_iter; @@ -206,10 +205,6 @@ void Idr::iterate(const LinOp *b, LinOp *x) const subspace_vectors->apply(residual.get(), f.get()); for (size_type k = 0; k < subspace_dim_; k++) { - ++total_iter; - this->template log( - this, total_iter, residual.get(), dense_x); - // c = M \ f = (c_1, ..., c_s)^T // v = residual - sum i=[k,s) of (c_i * g_i) exec->run(idr::make_step_1(nrhs, k, m.get(), f.get(),