review updates

* -input and -input_matrix are incompatible
* use R-strings for JSON

Co-authored-by: Marcel Koch <marcel.koch@kit.edu>
Co-authored-by: Yuhsiang M. Tsai <yhmtsai@gmail.com>

benchmark/solver/distributed/solver.cpp

@@ -98,7 +98,7 @@ int main(int argc, char* argv[])
   "<local_format>-<non_local_format>", 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);
 

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);
 

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<std::stringstream>(input_json);
     }
 }
 
 
-#endif  // GKO_BENCHMARK_UTILS_GENERAL_MATRIX_HPP_
+#endif  // GKO_BENCHMARK_UTILS_GENERAL_MATRIX_HPP_