ginkgo-project · upsj · Jun 29, 2024 · May 18, 2024 · May 18, 2024 · May 18, 2024
diff --git a/benchmark/blas/blas.cpp b/benchmark/blas/blas.cpp
@@ -104,8 +104,8 @@ Parameters for a benchmark case are:
     initialize_argument_parsing(&argc, &argv, header, format);
 
     std::string extra_information = "The operations are " + FLAGS_operations;
-    print_general_information(extra_information);
     auto exec = executor_factory.at(FLAGS_executor)(FLAGS_gpu_timer);
+    print_general_information(extra_information, exec);
 
     auto test_cases = json::parse(get_input_stream());
 

diff --git a/benchmark/blas/distributed/multi_vector.cpp b/benchmark/blas/distributed/multi_vector.cpp
@@ -41,14 +41,14 @@ Parameters for a benchmark case are:
     std::string format = Generator::get_example_config();
     initialize_argument_parsing(&argc, &argv, header, format, do_print);
 
+    auto exec = executor_factory_mpi.at(FLAGS_executor)(comm.get());
+
     if (do_print) {
         std::string extra_information =
             "The operations are " + FLAGS_operations;
-        print_general_information(extra_information);
+        print_general_information(extra_information, exec);
     }
 
-    auto exec = executor_factory_mpi.at(FLAGS_executor)(comm.get());
-
     std::string json_input = broadcast_json_input(get_input_stream(), comm);
     auto test_cases = json::parse(json_input);
 

diff --git a/benchmark/conversion/conversion.cpp b/benchmark/conversion/conversion.cpp
@@ -163,9 +163,9 @@ int main(int argc, char* argv[])
 
     std::string extra_information =
         std::string() + "The formats are " + FLAGS_formats;
-    print_general_information(extra_information);
 
     auto exec = executor_factory.at(FLAGS_executor)(FLAGS_gpu_timer);
+    print_general_information(extra_information, exec);
     auto formats = split(FLAGS_formats, ',');
 
     auto test_cases = json::parse(get_input_stream());

diff --git a/benchmark/preconditioner/preconditioner.cpp b/benchmark/preconditioner/preconditioner.cpp
@@ -275,9 +275,9 @@ int main(int argc, char* argv[])
 
     std::string extra_information =
         "Running with preconditioners: " + FLAGS_preconditioners;
-    print_general_information(extra_information);
 
     auto exec = get_executor(FLAGS_gpu_timer);
+    print_general_information(extra_information, exec);
     auto& engine = get_engine();
 
     auto preconditioners = split(FLAGS_preconditioners, ',');

diff --git a/benchmark/solver/distributed/solver.cpp b/benchmark/solver/distributed/solver.cpp
@@ -91,7 +91,7 @@ int main(int argc, char* argv[])
         ss_rel_res_goal.str() + "\nThe number of right hand sides is " +
         std::to_string(FLAGS_nrhs);
     if (do_print) {
-        print_general_information(extra_information);
+        print_general_information(extra_information, exec);
     }
 
     std::set<std::string> supported_solvers = {"cg", "fcg", "cgs", "bicgstab",

diff --git a/benchmark/solver/solver.cpp b/benchmark/solver/solver.cpp
@@ -43,9 +43,9 @@ int main(int argc, char* argv[])
         std::to_string(FLAGS_max_iters) + " iterations and residual goal of " +
         ss_rel_res_goal.str() + "\nThe number of right hand sides is " +
         std::to_string(FLAGS_nrhs);
-    print_general_information(extra_information);
 
     auto exec = get_executor(FLAGS_gpu_timer);
+    print_general_information(extra_information, exec);
 
     json test_cases;
     if (!FLAGS_overhead) {

diff --git a/benchmark/sparse_blas/sparse_blas.cpp b/benchmark/sparse_blas/sparse_blas.cpp
@@ -166,7 +166,7 @@ int main(int argc, char* argv[])
     auto test_cases = json::parse(get_input_stream());
 
     std::string extra_information = "The operations are " + FLAGS_operations;
-    print_general_information(extra_information);
+    print_general_information(extra_information, exec);
 
     run_test_cases(SparseBlasBenchmark{}, exec,
                    get_timer(exec, FLAGS_gpu_timer), test_cases);

diff --git a/benchmark/spmv/distributed/spmv.cpp b/benchmark/spmv/distributed/spmv.cpp
@@ -49,16 +49,16 @@ int main(int argc, char* argv[])
     initialize_argument_parsing_matrix(&argc, &argv, header, format, "",
                                        do_print);
 
+    auto exec = executor_factory_mpi.at(FLAGS_executor)(comm.get());
+
     if (do_print) {
         std::string extra_information =
             "The formats are [" + FLAGS_local_formats + "]x[" +
             FLAGS_non_local_formats + "]\n" +
             "The number of right hand sides is " + std::to_string(FLAGS_nrhs);
-        print_general_information(extra_information);
+        print_general_information(extra_information, exec);
     }
 
-    auto exec = executor_factory_mpi.at(FLAGS_executor)(comm.get());
-
     auto local_formats = split(FLAGS_local_formats, ',');
     auto non_local_formats = split(FLAGS_non_local_formats, ',');
     std::vector<std::string> formats;

diff --git a/benchmark/spmv/spmv.cpp b/benchmark/spmv/spmv.cpp
@@ -26,10 +26,11 @@ int main(int argc, char* argv[])
     std::string extra_information = "The formats are " + FLAGS_formats +
                                     "\nThe number of right hand sides is " +
                                     std::to_string(FLAGS_nrhs);
-    print_general_information(extra_information);
 
     auto exec = executor_factory.at(FLAGS_executor)(FLAGS_gpu_timer);
 
+    print_general_information(extra_information, exec);
+
     auto test_cases = json::parse(get_input_stream());
 
     run_test_cases(SpmvBenchmark<Generator>{Generator{}, split(FLAGS_formats)},

diff --git a/benchmark/test/reference/blas.profile.stderr b/benchmark/test/reference/blas.profile.stderr
@@ -1,4 +1,4 @@
-Running on reference(0)
+Running on ReferenceExecutor
 Running with 0 warm iterations and 1 running iterations
 The random seed for right hand sides is 42
 The operations are copy,axpy,scal

diff --git a/benchmark/test/reference/blas.simple.stderr b/benchmark/test/reference/blas.simple.stderr
@@ -1,4 +1,4 @@
-Running on reference(0)
+Running on ReferenceExecutor
 Running with 2 warm iterations and 10 running iterations
 The random seed for right hand sides is 42
 The operations are copy,axpy,scal

diff --git a/benchmark/test/reference/conversion.all.stderr b/benchmark/test/reference/conversion.all.stderr
@@ -1,4 +1,4 @@
-Running on reference(0)
+Running on ReferenceExecutor
 Running with 2 warm iterations and 10 running iterations
 The random seed for right hand sides is 42
 The formats are coo,csr,ell,sellp,hybrid

diff --git a/benchmark/test/reference/conversion.matrix.stderr b/benchmark/test/reference/conversion.matrix.stderr
@@ -1,4 +1,4 @@
-Running on reference(0)
+Running on ReferenceExecutor
 Running with 2 warm iterations and 10 running iterations
 The random seed for right hand sides is 42
 The formats are coo,csr

diff --git a/benchmark/test/reference/conversion.profile.stderr b/benchmark/test/reference/conversion.profile.stderr
@@ -1,4 +1,4 @@
-Running on reference(0)
+Running on ReferenceExecutor
 Running with 0 warm iterations and 1 running iterations
 The random seed for right hand sides is 42
 The formats are coo,csr

diff --git a/benchmark/test/reference/conversion.simple.stderr b/benchmark/test/reference/conversion.simple.stderr
@@ -1,4 +1,4 @@
-Running on reference(0)
+Running on ReferenceExecutor
 Running with 2 warm iterations and 10 running iterations
 The random seed for right hand sides is 42
 The formats are coo,csr

diff --git a/benchmark/test/reference/distributed_solver.matrix.stderr b/benchmark/test/reference/distributed_solver.matrix.stderr
@@ -1,4 +1,4 @@
-Running on reference(0)
+Running on ReferenceExecutor
 Running with 2 warm iterations and 1 running iterations
 The random seed for right hand sides is 42
 Running cg with 1000 iterations and residual goal of 1.000000e-06

diff --git a/benchmark/test/reference/distributed_solver.profile.stderr b/benchmark/test/reference/distributed_solver.profile.stderr
@@ -1,4 +1,4 @@
-Running on reference(0)
+Running on ReferenceExecutor
 Running with 0 warm iterations and 1 running iterations
 The random seed for right hand sides is 42
 Running cg with 1000 iterations and residual goal of 1.000000e-06

diff --git a/benchmark/test/reference/distributed_solver.simple.stderr b/benchmark/test/reference/distributed_solver.simple.stderr
@@ -1,4 +1,4 @@
-Running on reference(0)
+Running on ReferenceExecutor
 Running with 2 warm iterations and 1 running iterations
 The random seed for right hand sides is 42
 Running cg with 1000 iterations and residual goal of 1.000000e-06

diff --git a/benchmark/test/reference/multi_vector_distributed.profile.stderr b/benchmark/test/reference/multi_vector_distributed.profile.stderr
@@ -1,4 +1,4 @@
-Running on reference(0)
+Running on ReferenceExecutor
 Running with 0 warm iterations and 1 running iterations
 The random seed for right hand sides is 42
 The operations are copy,axpy,scal

diff --git a/benchmark/test/reference/multi_vector_distributed.simple.stderr b/benchmark/test/reference/multi_vector_distributed.simple.stderr
@@ -1,4 +1,4 @@
-Running on reference(0)
+Running on ReferenceExecutor
 Running with 2 warm iterations and 10 running iterations
 The random seed for right hand sides is 42
 The operations are copy,axpy,scal

diff --git a/benchmark/test/reference/preconditioner.matrix.stderr b/benchmark/test/reference/preconditioner.matrix.stderr
@@ -1,4 +1,4 @@
-Running on reference(0)
+Running on ReferenceExecutor
 Running with 2 warm iterations and 10 running iterations
 The random seed for right hand sides is 42
 Running with preconditioners: none

diff --git a/benchmark/test/reference/preconditioner.precond.stderr b/benchmark/test/reference/preconditioner.precond.stderr
@@ -1,4 +1,4 @@
-Running on reference(0)
+Running on ReferenceExecutor
 Running with 2 warm iterations and 10 running iterations
 The random seed for right hand sides is 42
 Running with preconditioners: jacobi

diff --git a/benchmark/test/reference/preconditioner.profile.stderr b/benchmark/test/reference/preconditioner.profile.stderr
@@ -1,4 +1,4 @@
-Running on reference(0)
+Running on ReferenceExecutor
 Running with 0 warm iterations and 1 running iterations
 The random seed for right hand sides is 42
 Running with preconditioners: none

diff --git a/benchmark/test/reference/preconditioner.reordered.stderr b/benchmark/test/reference/preconditioner.reordered.stderr
@@ -1,4 +1,4 @@
-Running on reference(0)
+Running on ReferenceExecutor
 Running with 2 warm iterations and 10 running iterations
 The random seed for right hand sides is 42
 Running with preconditioners: none

diff --git a/benchmark/test/reference/preconditioner.simple.stderr b/benchmark/test/reference/preconditioner.simple.stderr
@@ -1,4 +1,4 @@
-Running on reference(0)
+Running on ReferenceExecutor
 Running with 2 warm iterations and 10 running iterations
 The random seed for right hand sides is 42
 Running with preconditioners: none

diff --git a/benchmark/test/reference/solver.matrix.stderr b/benchmark/test/reference/solver.matrix.stderr
@@ -1,4 +1,4 @@
-Running on reference(0)
+Running on ReferenceExecutor
 Running with 2 warm iterations and 1 running iterations
 The random seed for right hand sides is 42
 Running cg with 1000 iterations and residual goal of 1.000000e-06

diff --git a/benchmark/test/reference/solver.profile.stderr b/benchmark/test/reference/solver.profile.stderr
@@ -1,4 +1,4 @@
-Running on reference(0)
+Running on ReferenceExecutor
 Running with 0 warm iterations and 1 running iterations
 The random seed for right hand sides is 42
 Running cg with 1000 iterations and residual goal of 1.000000e-06

diff --git a/benchmark/test/reference/solver.reordered.stderr b/benchmark/test/reference/solver.reordered.stderr
@@ -1,4 +1,4 @@
-Running on reference(0)
+Running on ReferenceExecutor
 Running with 2 warm iterations and 1 running iterations
 The random seed for right hand sides is 42
 Running cg with 1000 iterations and residual goal of 1.000000e-06

diff --git a/benchmark/test/reference/solver.simple.stderr b/benchmark/test/reference/solver.simple.stderr
@@ -1,4 +1,4 @@
-Running on reference(0)
+Running on ReferenceExecutor
 Running with 2 warm iterations and 1 running iterations
 The random seed for right hand sides is 42
 Running cg with 1000 iterations and residual goal of 1.000000e-06

diff --git a/benchmark/test/reference/sparse_blas.matrix.stderr b/benchmark/test/reference/sparse_blas.matrix.stderr
@@ -1,4 +1,4 @@
-Running on reference(0)
+Running on ReferenceExecutor
 Running with 2 warm iterations and 10 running iterations
 The random seed for right hand sides is 42
 The operations are transpose

diff --git a/benchmark/test/reference/sparse_blas.profile.stderr b/benchmark/test/reference/sparse_blas.profile.stderr
@@ -1,4 +1,4 @@
-Running on reference(0)
+Running on ReferenceExecutor
 Running with 0 warm iterations and 1 running iterations
 The random seed for right hand sides is 42
 The operations are transpose

diff --git a/benchmark/test/reference/sparse_blas.reordered.stderr b/benchmark/test/reference/sparse_blas.reordered.stderr
@@ -1,4 +1,4 @@
-Running on reference(0)
+Running on ReferenceExecutor
 Running with 2 warm iterations and 10 running iterations
 The random seed for right hand sides is 42
 The operations are symbolic_cholesky

diff --git a/benchmark/test/reference/sparse_blas.simple.stderr b/benchmark/test/reference/sparse_blas.simple.stderr
@@ -1,4 +1,4 @@
-Running on reference(0)
+Running on ReferenceExecutor
 Running with 2 warm iterations and 10 running iterations
 The random seed for right hand sides is 42
 The operations are transpose

diff --git a/benchmark/test/reference/spmv.matrix.stderr b/benchmark/test/reference/spmv.matrix.stderr
@@ -1,4 +1,4 @@
-Running on reference(0)
+Running on ReferenceExecutor
 Running with 2 warm iterations and 10 running iterations
 The random seed for right hand sides is 42
 The formats are coo

diff --git a/benchmark/test/reference/spmv.profile.stderr b/benchmark/test/reference/spmv.profile.stderr
@@ -1,4 +1,4 @@
-Running on reference(0)
+Running on ReferenceExecutor
 Running with 0 warm iterations and 1 running iterations
 The random seed for right hand sides is 42
 The formats are coo

diff --git a/benchmark/test/reference/spmv.reordered.stderr b/benchmark/test/reference/spmv.reordered.stderr
@@ -1,4 +1,4 @@
-Running on reference(0)
+Running on ReferenceExecutor
 Running with 2 warm iterations and 10 running iterations
 The random seed for right hand sides is 42
 The formats are coo

diff --git a/benchmark/test/reference/spmv.simple.stderr b/benchmark/test/reference/spmv.simple.stderr
@@ -1,4 +1,4 @@
-Running on reference(0)
+Running on ReferenceExecutor
 Running with 2 warm iterations and 10 running iterations
 The random seed for right hand sides is 42
 The formats are coo

diff --git a/benchmark/test/reference/spmv_distributed.profile.stderr b/benchmark/test/reference/spmv_distributed.profile.stderr
@@ -1,4 +1,4 @@
-Running on reference(0)
+Running on ReferenceExecutor
 Running with 0 warm iterations and 1 running iterations
 The random seed for right hand sides is 42
 The formats are [csr]x[csr]

diff --git a/benchmark/test/reference/spmv_distributed.simple.stderr b/benchmark/test/reference/spmv_distributed.simple.stderr
@@ -1,4 +1,4 @@
-Running on reference(0)
+Running on ReferenceExecutor
 Running with 2 warm iterations and 10 running iterations
 The random seed for right hand sides is 42
 The formats are [csr]x[csr]

diff --git a/benchmark/utils/general.hpp b/benchmark/utils/general.hpp
@@ -168,11 +168,11 @@ void initialize_argument_parsing(int* argc, char** argv[], std::string& header,
  *
  * @param extra  describes benchmark specific extra parameters to output
  */
-void print_general_information(const std::string& extra)
+void print_general_information(const std::string& extra,
+                               std::shared_ptr<const gko::Executor> exec)
 {
     std::clog << gko::version_info::get() << std::endl
-              << "Running on " << FLAGS_executor << "(" << FLAGS_device_id
-              << ")\n"
+              << "Running on " << exec->get_description() << std::endl
               << "Running with " << FLAGS_warmup << " warm iterations and ";
     if (FLAGS_repetitions == "auto") {
         std::clog << "adaptively determined repetititions with "

diff --git a/core/device_hooks/cuda_hooks.cpp b/core/device_hooks/cuda_hooks.cpp
@@ -148,6 +148,9 @@ scoped_device_id_guard CudaExecutor::get_scoped_device_id_guard() const
     GKO_NOT_COMPILED(cuda);
 
 
+std::string CudaExecutor::get_description() const GKO_NOT_COMPILED(cuda);
+
+
 std::string CudaError::get_error(int64)
 {
     return "ginkgo CUDA module is not compiled";

diff --git a/core/device_hooks/dpcpp_hooks.cpp b/core/device_hooks/dpcpp_hooks.cpp
@@ -91,6 +91,9 @@ scoped_device_id_guard DpcppExecutor::get_scoped_device_id_guard() const
     GKO_NOT_COMPILED(dpcpp);
 
 
+std::string DpcppExecutor::get_description() const GKO_NOT_COMPILED(dpcpp);
+
+
 int DpcppExecutor::get_num_devices(std::string) { return 0; }
 
 

diff --git a/core/device_hooks/hip_hooks.cpp b/core/device_hooks/hip_hooks.cpp
@@ -147,6 +147,9 @@ scoped_device_id_guard HipExecutor::get_scoped_device_id_guard() const
     GKO_NOT_COMPILED(hip);
 
 
+std::string HipExecutor::get_description() const GKO_NOT_COMPILED(hip);
+
+
 std::string HipError::get_error(int64)
 {
     return "ginkgo HIP module is not compiled";

diff --git a/core/device_hooks/omp_hooks.cpp b/core/device_hooks/omp_hooks.cpp
@@ -24,6 +24,9 @@ scoped_device_id_guard::scoped_device_id_guard(const OmpExecutor* exec,
     GKO_NOT_COMPILED(omp);
 
 
+std::string OmpExecutor::get_description() const GKO_NOT_COMPILED(omp);
+
+
 int OmpExecutor::get_num_omp_threads() { return 1; }