Spgemm perf test enhancements

perf_test/KokkosKernels_perf_test_utilities.hpp

@@ -67,6 +67,26 @@ void process_arg_int(char const* str_val, int& val) {
   }
 }
 
+void process_arg_double(char const* str_val, double& val) {
+  errno = 0;
+  char* ptr_end;
+  val = std::strtod(str_val, &ptr_end);
+
+  if (str_val == ptr_end) {
+    std::stringstream ss;
+    ss << "Error: cannot convert command line argument '" << str_val
+       << "' to a double.\n";
+    throw std::invalid_argument(ss.str());
+  }
+
+  if (errno == ERANGE) {
+    std::stringstream ss;
+    ss << "Error: converted value for command line argument '" << str_val
+       << "' falls out of range.\n";
+    throw std::invalid_argument(ss.str());
+  }
+}
+
 bool check_arg_int(int const i, int const argc, char** argv, char const* name,
                    int& val) {
   if (0 != Test::string_compare_no_case(argv[i], name)) {
@@ -83,6 +103,22 @@ bool check_arg_int(int const i, int const argc, char** argv, char const* name,
   return true;
 }
 
+bool check_arg_double(int const i, int const argc, char** argv,
+                      char const* name, double& val) {
+  if (0 != Test::string_compare_no_case(argv[i], name)) {
+    return false;
+  }
+
+  if (i < argc - 1) {
+    process_arg_double(argv[i + 1], val);
+  } else {
+    std::stringstream msg;
+    msg << name << " input argument needs to be followed by a real number";
+    throw std::invalid_argument(msg.str());
+  }
+  return true;
+}
+
 bool check_arg_bool(int const i, int const /*argc*/, char** argv,
                     char const* name, bool& val) {
   if (0 != Test::string_compare_no_case(argv[i], name)) {

perf_test/graph/KokkosGraph_color.cpp

@@ -379,7 +379,7 @@ void run_experiment(crsGraph_t crsGraph, int num_cols, Parameters params) {
       }
     }
 
-    if (params.coloring_output_file != NULL) {
+    if (params.coloring_output_file != "") {
       std::ofstream os(params.coloring_output_file, std::ofstream::out);
       KokkosKernels::Impl::print_1Dview(os, colors, true, "\n");
     }
@@ -420,7 +420,7 @@ void run_multi_mem_experiment(Parameters params) {
   // typedef typename slow_graph_t::entries_type::const_type
   // const_slow_cols_view_t;
 
-  char *a_mat_file = params.a_mtx_bin_file;
+  const char *a_mat_file = params.a_mtx_bin_file.c_str();
   // char *b_mat_file = params.b_mtx_bin_file;
   // char *c_mat_file = params.c_mtx_bin_file;
 
@@ -581,7 +581,7 @@ int main(int argc, char **argv) {
   if (parse_inputs(params, argc, argv)) {
     return 1;
   }
-  if (params.a_mtx_bin_file == NULL) {
+  if (params.a_mtx_bin_file == "") {
     std::cerr << "Provide a matrix file" << std::endl;
     return 0;
   }

perf_test/graph/KokkosGraph_run_triangle.hpp

@@ -64,7 +64,7 @@ bool is_same_graph(crsGraph_t output_mat1, crsGraph_t output_mat2) {
   if (!is_identical) return false;
 
   if (!is_identical) {
-    std::cout << "Incorret values" << std::endl;
+    std::cout << "Incorrect values" << std::endl;
   }
   return true;
 }