Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix solver kernel documentation and add memory estimates #691

Merged
merged 16 commits into from
Mar 2, 2021
Merged

Fix solver kernel documentation and add memory estimates #691

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
8093a6f
move solver kernel comments before calls
upsj Jan 7, 2021
e43843d
use C++ headers for time.h
upsj Jan 7, 2021
707b305
add memory movement estimates to solvers
upsj Jan 7, 2021
4ef2645
update GMRES estimates to include precise counts
upsj Jan 10, 2021
6597f0e
count SpMV operations as iterations in IDR
upsj Jan 10, 2021
99933f2
update IDR counts
upsj Jan 10, 2021
5108f86
Review updates
upsj Jan 11, 2021
927c201
exact gmres restart estimate
upsj Jan 11, 2021
b7be195
update GMRES estimates
upsj Jan 20, 2021
df86217
update IDR estimates
upsj Jan 22, 2021
bb8bb2e
Revert "count SpMV operations as iterations in IDR"
upsj Feb 5, 2021
b88b9fb
add stopping criterion norm2 call
upsj Feb 5, 2021
95a2f06
fix bicg iteration count in estimate
upsj Feb 5, 2021
05a0ee6
make cgs iterations match stopping checks
upsj Feb 5, 2021
61693d2
fix BiCGSTAB half iteration log
upsj Feb 5, 2021
d11ec4a
replace BiCGSTAB half-iteration by full iteration
upsj Mar 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions core/solver/bicgstab.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,6 @@ void Bicgstab<ValueType>::apply_impl(const LinOp *b, LinOp *x) const
int iter = -1;

/* Memory movement summary:
* Per iteration:
* 15.5n * values + matrix/preconditioner storage
* Two iterations:
* 31n * values + 2 * matrix/preconditioner storage
* 2x SpMV: 4n * values + 2 * storage
* 2x Preconditioner: 4n * values + 2 * storage
Expand Down Expand Up @@ -181,7 +178,6 @@ void Bicgstab<ValueType>::apply_impl(const LinOp *b, LinOp *x) const
exec->run(bicgstab::make_step_2(r.get(), s.get(), v.get(), rho.get(),
alpha.get(), beta.get(), &stop_status));

++iter;
auto all_converged =
stop_criterion->update()
.num_iterations(iter)
Expand All @@ -193,8 +189,6 @@ void Bicgstab<ValueType>::apply_impl(const LinOp *b, LinOp *x) const
exec->run(bicgstab::make_finalize(dense_x, y.get(), alpha.get(),
&stop_status));
}
this->template log<log::Logger::iteration_complete>(this, iter,
s.get());
if (all_converged) {
break;
}
Expand Down