Skip to content

Use same matrix list in benchmark and warmup/repetitions in solver #366

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

Merged
yhmtsai merged 11 commits into from
Oct 18, 2019
Merged

Use same matrix list in benchmark and warmup/repetitions in solver #366

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f5bd868
move the spmv and add the solver name
yhmtsai Oct 14, 2019
acc1f32
keep the same format as spmv's
yhmtsai Oct 14, 2019
8d16aa7
fix compile error
yhmtsai Oct 14, 2019
05b1d3c
split residual computation and timing component
yhmtsai Oct 15, 2019
e8c53a4
keep same matrix format argument
yhmtsai Oct 15, 2019
a03e81b
add warmup and repetitions in solver
yhmtsai Oct 15, 2019
5ae78a2
delete gflags declare
yhmtsai Oct 16, 2019
a72aeae
fix warning
yhmtsai Oct 17, 2019
18df523
fix sonar issues
yhmtsai Oct 17, 2019
a28219c
create func to handle duplication and rm disable
yhmtsai Oct 17, 2019
76cb7c1
fix throw in destructor
yhmtsai Oct 17, 2019
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
Prev Previous commit
Next Next commit
add warmup and repetitions in solver
  • Loading branch information
@yhmtsai
yhmtsai committed Oct 17, 2019
commit a03e81bf9385db48eeff4092e31f6f336f037ec2
41 changes: 31 additions & 10 deletions benchmark/solver/solver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ DEFINE_uint32(
nrhs, 1,
"The number of right hand sides. Record the residual only when nrhs == 1.");

DECLARE_uint32(repetitions);
Comment thread
pratikvn marked this conversation as resolved.
Outdated

// input validation
[[noreturn]] void print_config_error_and_exit() {
std::cerr << "Input has to be a JSON array of matrix configurations:\n"
Expand Down Expand Up @@ -258,6 +260,17 @@ void solve_system(const std::string &solver_name,
allocator);
}

// warm run
for (unsigned int i = 0; i < FLAGS_warmup; i++) {
auto x_clone = clone(x);
auto precond = precond_factory.at(precond_name)(exec);
auto solver = solver_factory.at(solver_name)(exec, give(precond))
->generate(system_matrix);
solver->apply(lend(b), lend(x_clone));
exec->synchronize();
}

// detail run
if (FLAGS_detailed) {
// slow run, get the time of each functions
auto x_clone = clone(x);
Expand Down Expand Up @@ -306,7 +319,9 @@ void solve_system(const std::string &solver_name,
}

// timed run
{
std::chrono::nanoseconds apply_time(0);
std::chrono::nanoseconds generate_time(0);
for (unsigned int i = 0; i < FLAGS_repetitions; i++) {
auto x_clone = clone(x);

exec->synchronize();
Expand All @@ -318,11 +333,9 @@ void solve_system(const std::string &solver_name,

exec->synchronize();
auto g_tac = std::chrono::steady_clock::now();
auto generate_time =
generate_time +=
std::chrono::duration_cast<std::chrono::nanoseconds>(g_tac -
g_tic);
add_or_set_member(solver_json["generate"], "time",
generate_time.count(), allocator);

exec->synchronize();
auto a_tic = std::chrono::steady_clock::now();
Expand All @@ -331,18 +344,24 @@ void solve_system(const std::string &solver_name,

exec->synchronize();
auto a_tac = std::chrono::steady_clock::now();
auto apply_time =
std::chrono::duration_cast<std::chrono::nanoseconds>(a_tac -
a_tic);
add_or_set_member(solver_json["apply"], "time", apply_time.count(),
allocator);
if (FLAGS_nrhs == 1) {
apply_time += std::chrono::duration_cast<std::chrono::nanoseconds>(
a_tac - a_tic);

if (FLAGS_nrhs == 1 && i == FLAGS_repetitions - 1) {
auto residual = compute_residual_norm(lend(system_matrix),
lend(b), lend(x_clone));
add_or_set_member(solver_json, "residual_norm", residual,
allocator);
}
}
add_or_set_member(
solver_json["generate"], "time",
static_cast<double>(generate_time.count()) / FLAGS_repetitions,
allocator);
add_or_set_member(
solver_json["apply"], "time",
static_cast<double>(apply_time.count()) / FLAGS_repetitions,
allocator);

// compute and write benchmark data
add_or_set_member(solver_json, "completed", true, allocator);
Expand All @@ -357,6 +376,8 @@ void solve_system(const std::string &solver_name,

int main(int argc, char *argv[])
{
// Set the default repetitions = 1.
FLAGS_repetitions = 1;
Comment thread
pratikvn marked this conversation as resolved.
std::string header =
"A benchmark for measuring performance of Ginkgo's solvers.\n";
std::string format =
Expand Down