Drop the solver-specific avg_iter column from the comparison benchmark

Author: cheerly-pku

source/source_hsolver/test/diago_compare_test.cpp

@@ -210,7 +210,6 @@ static void rr_subspace(const T* H, int n, T* psi_in, T* psi_out, int ld, int nb
 struct Result
 {
     double wall_s = 0.0;
-    double avg_iter = -1.0; // -1 when the solver does not report it
     double max_err = 0.0;   // max |eval_i - ref_i| over the requested bands
     long mem_bytes = 0;     // peak heap memory allocated by the solver
     bool ok = false;
@@ -229,10 +228,9 @@ static Result run_ppcg(const std::vector<T>& H, int n, int nband, const std::vec
                                                                    hsolver::PpcgStrategy::BLOCK_SUBSPACE);
     auto h_op = [&H, n](T* in, T* out, int ld, int nc) { dense_h_multiply(H.data(), n, in, out, ld, nc); };
     auto t0 = std::chrono::high_resolution_clock::now();
-    double avg = solver.diag(h_op, nullptr, n, nband, n, psi.data(), eval.data(), ethr, prec.data());
+    solver.diag(h_op, nullptr, n, nband, n, psi.data(), eval.data(), ethr, prec.data());
     auto t1 = std::chrono::high_resolution_clock::now();
     r.wall_s = std::chrono::duration<double>(t1 - t0).count();
-    r.avg_iter = avg;
     r.mem_bytes = heap_bytes() - mem0;
     for (int i = 0; i < nband; ++i)
     {
@@ -256,10 +254,9 @@ static Result run_cg(const std::vector<T>& H, int n, int nband, const std::vecto
     auto h_op = [&H, n](T* in, T* out, int ld, int nc) { dense_h_multiply(H.data(), n, in, out, ld, nc); };
     auto s_op = [](T* in, T* out, int ld, int nc) { identity_s(in, out, ld, nc); };
     auto t0 = std::chrono::high_resolution_clock::now();
-    double avg = cg.diag(h_op, s_op, n, nband, n, psi.data(), eval.data(), ethr, prec.data());
+    cg.diag(h_op, s_op, n, nband, n, psi.data(), eval.data(), ethr, prec.data());
     auto t1 = std::chrono::high_resolution_clock::now();
     r.wall_s = std::chrono::duration<double>(t1 - t0).count();
-    r.avg_iter = avg;
     r.mem_bytes = heap_bytes() - mem0;
     for (int i = 0; i < nband; ++i)
     {
@@ -297,7 +294,6 @@ static Result run_bpcg(const std::vector<T>& H, int n, int nband, const std::vec
     }
     auto t1 = std::chrono::high_resolution_clock::now();
     r.wall_s = std::chrono::duration<double>(t1 - t0).count();
-    r.avg_iter = it;
     r.mem_bytes = heap_bytes() - mem0;
     for (int i = 0; i < nband; ++i)
     {
@@ -319,10 +315,9 @@ static Result run_dav(const std::vector<T>& H, int n, int nband, const std::vect
     auto h_op = [&H, n](T* in, T* out, int ld, int nc) { dense_h_multiply(H.data(), n, in, out, ld, nc); };
     auto s_op = [](T* in, T* out, int ld, int nc) { identity_s(in, out, ld, nc); };
     auto t0 = std::chrono::high_resolution_clock::now();
-    int it = dav.diag(h_op, s_op, n, psi.data(), eval.data(), ethr, 500);
+    dav.diag(h_op, s_op, n, psi.data(), eval.data(), ethr, 500);
     auto t1 = std::chrono::high_resolution_clock::now();
     r.wall_s = std::chrono::duration<double>(t1 - t0).count();
-    r.avg_iter = it;
     r.mem_bytes = heap_bytes() - mem0;
     for (int i = 0; i < nband; ++i)
     {
@@ -369,9 +364,9 @@ int main(int argc, char** argv)
     }
 
     std::printf("\n=== Solver comparison (identical H, psi0, ethr) ===\n");
-    std::printf("%-5s %-5s %-6s %-10s %-14s %-12s %-10s %-12s\n", "n", "nband", "spars", "solver", "wall_time(s)", "avg_iter",
+    std::printf("%-5s %-5s %-6s %-10s %-14s %-10s %-12s\n", "n", "nband", "spars", "solver", "wall_time(s)",
                 "max_err", "mem(MB)");
-    std::printf("---------------------------------------------------------------------------\n");
+    std::printf("-----------------------------------------------------------------\n");
 
     for (const auto& c : cases)
     {
@@ -389,15 +384,15 @@ int main(int argc, char** argv)
         Result r_bpcg = run_bpcg(H, c.n, c.nband, prec, psi0, ethr, ref.data());
         Result r_dav = run_dav(H, c.n, c.nband, prec, psi0, ethr, ref.data());
 
-        std::printf("%-5d %-5d %-6d %-10s %-14.5f %-12.1f %-10.2e %-12.2f\n", c.n, c.nband, c.sparsity, "PPCG", r_ppcg.wall_s,
-                    r_ppcg.avg_iter, r_ppcg.max_err, r_ppcg.mem_bytes / 1048576.0);
-        std::printf("%-5s %-5s %-6s %-10s %-14.5f %-12.1f %-10.2e %-12.2f\n", "", "", "", "CG", r_cg.wall_s, r_cg.avg_iter,
+        std::printf("%-5d %-5d %-6d %-10s %-14.5f %-10.2e %-12.2f\n", c.n, c.nband, c.sparsity, "PPCG", r_ppcg.wall_s,
+                    r_ppcg.max_err, r_ppcg.mem_bytes / 1048576.0);
+        std::printf("%-5s %-5s %-6s %-10s %-14.5f %-10.2e %-12.2f\n", "", "", "", "CG", r_cg.wall_s,
                     r_cg.max_err, r_cg.mem_bytes / 1048576.0);
-        std::printf("%-5s %-5s %-6s %-10s %-14.5f %-12.1f %-10.2e %-12.2f\n", "", "", "", "BPCG", r_bpcg.wall_s,
-                    r_bpcg.avg_iter, r_bpcg.max_err, r_bpcg.mem_bytes / 1048576.0);
-        std::printf("%-5s %-5s %-6s %-10s %-14.5f %-12.1f %-10.2e %-12.2f\n", "", "", "", "Davidson", r_dav.wall_s,
-                    r_dav.avg_iter, r_dav.max_err, r_dav.mem_bytes / 1048576.0);
-        std::printf("---------------------------------------------------------------------------\n");
+        std::printf("%-5s %-5s %-6s %-10s %-14.5f %-10.2e %-12.2f\n", "", "", "", "BPCG", r_bpcg.wall_s,
+                    r_bpcg.max_err, r_bpcg.mem_bytes / 1048576.0);
+        std::printf("%-5s %-5s %-6s %-10s %-14.5f %-10.2e %-12.2f\n", "", "", "", "Davidson", r_dav.wall_s,
+                    r_dav.max_err, r_dav.mem_bytes / 1048576.0);
+        std::printf("-----------------------------------------------------------------\n");
     }
 
     MPI_Finalize();