slightly improve the log info

Author: brunowu

CMakeLists.txt

@@ -84,10 +84,6 @@ endif()
 # GPU-resident Lanczos (fused kernels + NCCL) is required for GPU Lanczos paths.
 set(CHASE_ENABLE_GPU_RESIDENT_LANCZOS ON)
 
-if(NOT CMAKE_BUILD_TYPE STREQUAL "Release")
-    message(WARNING "For prodution, please consider CMAKE_BUILD_TYPE to be Release or RelWithDebInfo")
-endif()
-
 if( CHASE_OUTPUT )
   target_compile_definitions( chase_algorithm  INTERFACE "-DCHASE_OUTPUT" )
 endif()

algorithm/algorithm.inc

@@ -2047,7 +2047,7 @@ void Algorithm<T>::solve_pseudo(ChaseBase<T>* single)
 #ifdef CHASE_OUTPUT
         {
             std::ostringstream oss;
-            oss << "[QR-HANG-TRACE][solve_pseudo] before QR: iter=" << iteration
+            oss << "[QR-TRACE][solve_pseudo] before QR: iter=" << iteration
                 << " locked=" << locked
                 << " unconverged=" << unconverged
                 << " cond=" << std::scientific << std::setprecision(6) << cond
@@ -2062,7 +2062,7 @@ void Algorithm<T>::solve_pseudo(ChaseBase<T>* single)
 #ifdef CHASE_OUTPUT
         {
             std::ostringstream oss;
-            oss << "[QR-HANG-TRACE][solve_pseudo] after QR: iter=" << iteration
+            oss << "[QR-TRACE][solve_pseudo] after QR: iter=" << iteration
                 << " locked=" << locked
                 << " unconverged=" << unconverged
                 << '\n';
@@ -2083,19 +2083,27 @@ void Algorithm<T>::solve_pseudo(ChaseBase<T>* single)
 #ifdef CHASE_OUTPUT
         {
             // Residual table at Info level
-            std::ostringstream oss_res;
-            oss_res << "unconverged = " << "\t" << unconverged << "\t"
-                    << "new_converged" << "\t" << prev_new_converged << "\n";
-            oss_res << "index\tdegrees\tresid\tresidLast\tritzv\n";
-
-            for (std::size_t i = 0; i < unconverged; ++i)
+            auto level = config.GetLogLevel();
+            if (!(level == LogLevel::Warn || level == LogLevel::Error)) 
             {
-                oss_res << index[i] << "\t" << degrees[index[i]] << "\t"
-                        << resid[index[i]] << "\t" << residLast[i] << "\t"
-                        << ritzv[index[i]] << "\n";
-            }
+                std::size_t max_to_print =
+                    (level == LogLevel::Debug || level == LogLevel::Trace)
+                        ? unconverged
+                        : std::min<std::size_t>(20, unconverged);
+                
+                std::ostringstream oss_res;
+                oss_res << "unconverged = " << "\t" << unconverged << "\t"
+                        << "new_converged" << "\t" << prev_new_converged << "\n";
+                oss_res << "index\tdegrees\tresid\tresidLast\tritzv\n";
 
-            single->Output(LogLevel::Info, oss_res.str(), "algorithm");
+                for (std::size_t i = 0; i < max_to_print; ++i)
+                {
+                    oss_res << index[i] << "\t" << degrees[index[i]] << "\t"
+                            << resid[index[i]] << "\t" << residLast[i] << "\t"
+                            << ritzv[index[i]] << "\n";
+                }
+                single->Output(level, oss_res.str(), "algorithm");
+            }
 
             // Symmetry check at Debug level
             std::ostringstream oss_sym;
@@ -2105,6 +2113,7 @@ void Algorithm<T>::solve_pseudo(ChaseBase<T>* single)
                     << "\n";
 
             single->Output(LogLevel::Debug, oss_sym.str(), "algorithm");
+            
         }
 #endif
         std::iota(index_temp.begin(), index_temp.begin() + unconverged, 0);

interface/chase_c_interface.cpp

@@ -468,22 +468,25 @@ void ChASE_SEQ_Solve(int* deg,
     chase::Base<T>* ritzv = single->GetRitzv();
     chase::Base<T>* resid = single->GetResid();
 #ifdef CHASE_OUTPUT
-    performanceDecorator.GetPerfData().print();
-    std::cout << "\n\n";
-    std::cout << "Printing first 5 eigenvalues and residuals\n";
-    std::cout << "| Index |       Eigenvalue      |         Residual      |\n"
-              << "|-------|-----------------------|-----------------------|"
-                 "\n";
+    if (chase::GetLogger().GetLevel() >= chase::LogLevel::Info)
+    {
+        performanceDecorator.GetPerfData().print();
+    }
+
+    std::ostringstream oss;
+    oss << "\n\nPrinting first 20 eigenvalues and residuals\n"
+    << "| Index |       Eigenvalue      |         Residual      |\n"
+    << "|-------|-----------------------|-----------------------|\n";
     std::size_t width = 20;
-    std::cout << std::setprecision(12);
-    std::cout << std::setfill(' ');
-    std::cout << std::scientific;
-    std::cout << std::right;
-    for (auto i = 0; i < std::min(single->GetNev(), std::size_t(5)); ++i)
-        std::cout << "|  " << std::setw(4) << i + 1 << " | " << std::setw(width)
-                  << ritzv[i] << "  | " << std::setw(width) << resid[i]
-                  << "  |\n";
-    std::cout << "\n\n\n";
+    oss << std::setprecision(12) << std::setfill(' ') << std::scientific
+        << std::right;
+    for (auto i = 0; i < std::min(single->GetNev(), std::size_t(20)); ++i)
+        oss << "|  " << std::setw(4) << i + 1 << " | " << std::setw(width)
+            << ritzv[i] << "  | " << std::setw(width) << resid[i]
+            << "  |\n";
+    oss << "\n\n\n";
+    chase::GetLogger().Log(chase::LogLevel::Info, "interface", oss.str(),
+                        single->get_rank());
 #endif
 }
 
@@ -1894,7 +1897,10 @@ void ChASE_DIST<MatrixType>::Solve(
 #ifdef CHASE_OUTPUT
     if (single->get_rank() == 0)
     {
-        performanceDecorator.GetPerfData().print();
+        if (chase::GetLogger().GetLevel() >= chase::LogLevel::Info)
+        {
+            performanceDecorator.GetPerfData().print();
+        }
 
         std::ostringstream oss;
         oss << "\n\nPrinting first 20 eigenvalues and residuals\n"
@@ -1908,7 +1914,7 @@ void ChASE_DIST<MatrixType>::Solve(
                 << ritzv[i] << "  | " << std::setw(width) << resid[i]
                 << "  |\n";
         oss << "\n\n\n";
-        chase::GetLogger().Log(chase::LogLevel::Debug, "interface", oss.str(),
+        chase::GetLogger().Log(chase::LogLevel::Info, "interface", oss.str(),
                               single->get_rank());
     }
 #endif