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

Show file tree
Hide file tree
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
fix compile error
  • Loading branch information
@yhmtsai
yhmtsai committed Oct 17, 2019
commit 8d16aa7b4c784362c1b46700ad0d920ff373a416
12 changes: 1 addition & 11 deletions benchmark/conversions/conversions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <typeinfo>


#include "benchmark/utils/common.hpp"
#include "benchmark/utils/general.hpp"
#include "benchmark/utils/loggers.hpp"
#include "benchmark/utils/spmv_common.hpp"
Expand All @@ -64,17 +65,6 @@ DEFINE_string(
"sellp: Sliced Ellpack format.\n");


const std::map<std::string, std::function<std::unique_ptr<gko::LinOp>(
std::shared_ptr<const gko::Executor>,
const gko::matrix_data<> &)>>
matrix_factory{
{"csr", READ_MATRIX(csr, std::make_shared<csr::automatical>())},
{"coo", read_matrix_from_data<gko::matrix::Coo<>>},
{"ell", read_matrix_from_data<gko::matrix::Ell<>>},
{"hybrid", read_matrix_from_data<hybrid>},
{"sellp", read_matrix_from_data<gko::matrix::Sellp<>>}};


// This function supposes that management of `FLAGS_overwrite` is done before
// calling it
void convert_matrix(const gko::LinOp *matrix_from, const char *format_to,
Expand Down
47 changes: 30 additions & 17 deletions benchmark/solver/solver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ DEFINE_string(preconditioners, "none",
"A comma-separated list of preconditioners to use."
"Supported values are: none, jacobi, adaptive-jacobi");

DEFINE_uint32(
nrhs, 1,
"The number of right hand sides. Record the residual only when nrhs == 1.");

// input validation
[[noreturn]] void print_config_error_and_exit() {
Expand Down Expand Up @@ -107,6 +110,7 @@ std::unique_ptr<gko::LinOpFactory> create_solver(
.on(exec);
}


const std::map<std::string, std::function<std::unique_ptr<gko::LinOpFactory>(
std::shared_ptr<const gko::Executor>,
std::shared_ptr<const gko::LinOpFactory>)>>
Expand Down Expand Up @@ -239,8 +243,10 @@ void solve_system(const std::string &solver_name,
rapidjson::Value(rapidjson::kArrayType), allocator);
add_or_set_member(solver_json, "true_residuals",
rapidjson::Value(rapidjson::kArrayType), allocator);
// auto rhs_norm = compute_norm(lend(b));
// add_or_set_member(solver_json, "rhs_norm", rhs_norm, allocator);
if (FLAGS_nrhs == 1) {
auto rhs_norm = compute_norm(lend(b));
add_or_set_member(solver_json, "rhs_norm", rhs_norm, allocator);
}
for (auto stage : {"generate", "apply"}) {
add_or_set_member(solver_json, stage,
rapidjson::Value(rapidjson::kObjectType),
Expand Down Expand Up @@ -277,11 +283,13 @@ void solve_system(const std::string &solver_name,

auto apply_logger = std::make_shared<OperationLogger>(exec);
exec->add_logger(apply_logger);
// auto res_logger = std::make_shared<ResidualLogger<etype>>(
// exec, lend(system_matrix), b,
// solver_json["recurrent_residuals"],
// solver_json["true_residuals"], allocator);
// solver->add_logger(res_logger);
if (FLAGS_nrhs == 1) {
auto res_logger = std::make_shared<ResidualLogger<etype>>(
exec, lend(system_matrix), b,
solver_json["recurrent_residuals"],
solver_json["true_residuals"], allocator);
solver->add_logger(res_logger);
}

solver->apply(lend(b), lend(x_clone));

Expand Down Expand Up @@ -321,12 +329,12 @@ void solve_system(const std::string &solver_name,
a_tic);
add_or_set_member(solver_json["apply"], "time", apply_time.count(),
allocator);

// auto residual = compute_residual_norm(lend(system_matrix),
// lend(b),
// lend(x_clone));
// add_or_set_member(solver_json, "residual_norm", residual,
// allocator);
if (FLAGS_nrhs == 1) {
auto residual = compute_residual_norm(lend(system_matrix),
lend(b), lend(x_clone));
add_or_set_member(solver_json, "residual_norm", residual,
allocator);
}
}

// compute and write benchmark data
Expand Down Expand Up @@ -358,7 +366,9 @@ int main(int argc, char *argv[])
std::string extra_information = "Running " + FLAGS_solvers + " with " +
std::to_string(FLAGS_max_iters) +
" iterations and residual goal of " +
std::to_string(FLAGS_rel_res_goal) + "\n";
std::to_string(FLAGS_rel_res_goal) +
"\nThe number of right hand sides is " +
std::to_string(FLAGS_nrhs) + "\n";
print_general_information(extra_information);

auto exec = get_executor();
Expand Down Expand Up @@ -399,13 +409,16 @@ int main(int argc, char *argv[])
continue;
}
std::clog << "Running test case: " << test_case << std::endl;
std::ifstream mtx_fd(test_case["filename"].GetString());
auto data = gko::read_raw<etype>(mtx_fd);

auto system_matrix = share(matrix_factory.at(
test_case["optimal"]["spmv"].GetString())(exec, test_case));
test_case["optimal"]["spmv"].GetString())(exec, data));
auto b = create_matrix<etype>(
exec, gko::dim<2>{system_matrix->get_size()[0], 1}, engine);
exec, gko::dim<2>{system_matrix->get_size()[0], FLAGS_nrhs},
engine);
auto x = create_matrix<etype>(
exec, gko::dim<2>{system_matrix->get_size()[0], 1});
exec, gko::dim<2>{system_matrix->get_size()[0], FLAGS_nrhs});

std::clog << "Matrix is of size (" << system_matrix->get_size()[0]
<< ", " << system_matrix->get_size()[1] << ")"
Expand Down