add CG timer and remove print statement

rcclay · Sep 9, 2024 · 9ec87a4 · 9ec87a4
1 parent f299cf1
commit 9ec87a4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/QMCDrivers/WFOpt/ConjugateGradient.cpp b/src/QMCDrivers/WFOpt/ConjugateGradient.cpp
@@ -17,11 +17,12 @@ namespace qmcplusplus
 {
 
 ConjugateGradient::ConjugateGradient(Real threshold, Real regularization)
-    : threshold_(threshold), regularization_(regularization)
+    : threshold_(threshold), regularization_(regularization), conjugate_gradient_timer_(createGlobalTimer("ConjugateGradient::run", timer_level_fine))
 {}
 
 int ConjugateGradient::run(QMCCostFunctionBase& optTarget, const std::vector<Real>& bvec, std::vector<Real>& solution)
 {
+  ScopedTimer local(conjugate_gradient_timer_);
   int numParams = optTarget.getNumParams();
   int kmax      = numParams;
   int k         = 0;

diff --git a/src/QMCDrivers/WFOpt/ConjugateGradient.h b/src/QMCDrivers/WFOpt/ConjugateGradient.h
@@ -14,7 +14,7 @@
 
 
 #include <Configuration.h>
-
+#include <NewTimer.h>
 
 namespace qmcplusplus
 {
@@ -41,6 +41,7 @@ class ConjugateGradient
   //to be used for nonlinear rescale
   std::vector<Real> Axsol_;
   std::vector<Real> xsol_;
+  NewTimer& conjugate_gradient_timer_;
 
   // obtain the range of non-linear parameters
   void getNonLinearRange(int& first, int& last, const QMCCostFunctionBase& optTarget) const;

diff --git a/src/QMCDrivers/WFOpt/QMCCostFunctionBatched.cpp b/src/QMCDrivers/WFOpt/QMCCostFunctionBatched.cpp
@@ -429,7 +429,6 @@ void QMCCostFunctionBatched::checkConfigurations(EngineHandle& handle)
 
 void QMCCostFunctionBatched::checkConfigurationsSR(EngineHandle& handle)
 {
-  std::cout << "checkConfigurationsSR" << std::endl;
   ScopedTimer tmp_timer(check_config_timer_);
 
   RealType et_tot = 0.0;