From 4a8ea1b113849d1366e2936e7f2a2d9d559a39ce Mon Sep 17 00:00:00 2001 From: Tobias Ribizel Date: Thu, 17 Aug 2023 10:01:34 +0200 Subject: [PATCH] review updates * -input and -input_matrix are incompatible * use R-strings for JSON Co-authored-by: Marcel Koch Co-authored-by: Yuhsiang M. Tsai --- benchmark/solver/distributed/solver.cpp | 2 +- benchmark/solver/solver.cpp | 2 +- benchmark/utils/general_matrix.hpp | 9 +++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/benchmark/solver/distributed/solver.cpp b/benchmark/solver/distributed/solver.cpp index 8b285e343ce..a9b1f9c1c93 100644 --- a/benchmark/solver/distributed/solver.cpp +++ b/benchmark/solver/distributed/solver.cpp @@ -98,7 +98,7 @@ int main(int argc, char* argv[]) "-", where both "local_format" and "non_local_format" can be any of the recognized spmv formats. )"; - std::string additional_json = ",\"optimal\":{\"spmv\":\"csr-csr\"}"; + std::string additional_json = R"(,"optimal":{"spmv":"csr-csr"})"; initialize_argument_parsing_matrix(&argc, &argv, header, format, additional_json); diff --git a/benchmark/solver/solver.cpp b/benchmark/solver/solver.cpp index 910bb54d89a..4efc5558a8e 100644 --- a/benchmark/solver/solver.cpp +++ b/benchmark/solver/solver.cpp @@ -61,7 +61,7 @@ int main(int argc, char* argv[]) std::string format = example_config + R"( "optimal":"spmv" can be one of the recognized spmv formats )"; - std::string additional_json = ",\"optimal\":{\"spmv\":\"csr\"}"; + std::string additional_json = R"(,"optimal":{"spmv":"csr"})"; initialize_argument_parsing_matrix(&argc, &argv, header, format, additional_json); diff --git a/benchmark/utils/general_matrix.hpp b/benchmark/utils/general_matrix.hpp index 3791976e3ab..e499d5d9326 100644 --- a/benchmark/utils/general_matrix.hpp +++ b/benchmark/utils/general_matrix.hpp @@ -62,11 +62,16 @@ void initialize_argument_parsing_matrix( initialize_argument_parsing(argc, argv, header, format); std::string input_matrix_str{FLAGS_input_matrix}; if (!input_matrix_str.empty()) { - auto input_json = "[{\"filename\":\"" + input_matrix_str + "\"" + + if (input_stream) { + std::cerr + << "-input and -input_matrix cannot be used simultaneously\n"; + std::exit(1); + } + auto input_json = R"([{"filename":")" + input_matrix_str + "\"" + additional_matrix_file_json + "}]"; input_stream = std::make_unique(input_json); } } -#endif // GKO_BENCHMARK_UTILS_GENERAL_MATRIX_HPP_ \ No newline at end of file +#endif // GKO_BENCHMARK_UTILS_GENERAL_MATRIX_HPP_