fix bug of timer in functions

Author: PeizeLin

source/source_base/test/timer_test.cpp

@@ -110,7 +110,7 @@ TEST_F(TimerTest, PrintAll)
 	// call print_all
 	ofs.open("tmp");
 	testing::internal::CaptureStdout();
-	ModuleBase::timer::print_all(ofs);
+	ModuleBase::timer::print_all(ofs, true);
 	output = testing::internal::GetCapturedStdout();
 	ofs.close();
 

source/source_base/timer.cpp

@@ -30,11 +30,11 @@ bool timer::disabled = false;
 size_t timer::n_now = 0;
 std::map<std::string,std::map<std::string,timer::Timer_One>> timer::timer_pool;
 
-void timer::finish(std::ofstream &ofs,const bool print_flag)
+void timer::finish(std::ofstream &ofs, const bool print_flag, const bool check_end)
 {
 	timer::end("","total");
 	if(print_flag)
-		{ print_all( ofs ); }
+		{ print_all( ofs, check_end ); }
 }
 
 //----------------------------------------------------------
@@ -43,7 +43,8 @@ void timer::finish(std::ofstream &ofs,const bool print_flag)
 void timer::start()
 {
 	// first init ,then we can use tick
-	timer::start("","total");
+	if(timer_pool[""]["total"].start_flag)
+		{ timer::start("","total"); }
 }
 
 double timer::cpu_time()
@@ -262,7 +263,7 @@ void timer::write_to_json(std::string file_name)
 	ofs.close();
 }
 
-void timer::print_all(std::ofstream &ofs)
+void timer::print_all(std::ofstream &ofs, const bool check_end)
 {
 	constexpr double small = 0.1; // cpu = 10^6
 	// if want to print > 1s , set small = 10^6
@@ -275,7 +276,7 @@ void timer::print_all(std::ofstream &ofs)
 		{
 			const std::string name = timer_pool_B.first;
 			const Timer_One &timer_one = timer_pool_B.second;
-			if(!timer_one.start_flag)
+			if(check_end && !timer_one.start_flag)
 				{ throw std::runtime_error("timer::print_all " + class_name + "::" + name); }
 			if(timer_pool_order.size() < timer_one.order+1)
 			{

source/source_base/timer.h

@@ -52,7 +52,7 @@ class timer
      * @param ofs The output file for print out timings
      * @param print_flag Print timings or not
      */
-    static void finish(std::ofstream &ofs, const bool print_flag = 1);
+    static void finish(std::ofstream &ofs, const bool print_flag = true, const bool check_end = true);
 
     /**
      * @brief Enable time computation
@@ -84,7 +84,7 @@ class timer
      *
      * @param ofs The output file for print out timings
      */
-    static void print_all(std::ofstream &ofs);
+    static void print_all(std::ofstream &ofs, const bool check_end);
 
     /**
      * @brief Stop total time calculation, print total time until now,

source/source_base/tool_quit.cpp

@@ -46,12 +46,9 @@ void QUIT(int ret)
 {
 
 #ifdef __NORMAL
-
 #else
-    ModuleBase::timer::finish(GlobalV::ofs_running , !GlobalV::MY_RANK);
-
+    ModuleBase::timer::finish(GlobalV::ofs_running , !GlobalV::MY_RANK, false);
     ModuleBase::Global_File::close_all_log(GlobalV::MY_RANK);
-
     std::cout<<" See output information in : "<<PARAM.globalv.global_out_dir<<std::endl;
 #endif
 

source/source_estate/module_charge/charge_init.cpp

@@ -369,7 +369,7 @@ void Charge::set_rho_core(const UnitCell& ucell,
     // The term was present in previous versions of the code but it shouldn't
     delete [] rhocg;
     delete [] vg;
-    ModuleBase::timer::start("Charge","set_rho_core");
+    ModuleBase::timer::end("Charge","set_rho_core");
     return;
 } // end subroutine set_rhoc
 

source/source_hsolver/diago_dav_subspace.cpp

@@ -260,7 +260,7 @@ int Diago_DavSubspace<T, Device>::diag_once(const HPsiFunc& hpsi_func,
                               this->scc,
                               this->vcc);
 
-                ModuleBase::timer::start("Diago_DavSubspace", "last");
+                ModuleBase::timer::end("Diago_DavSubspace", "last");
             }
         }
 

source/source_io/module_ctrl/ctrl_runner_lcao.cpp

@@ -127,6 +127,7 @@ void ctrl_runner_lcao(UnitCell& ucell,      // unitcell
        );
     }
 
+    ModuleBase::timer::end("ModuleIO", "ctrl_runner_lcao");
 }
 
 

source/source_lcao/FORCE_STRESS.cpp

@@ -795,7 +795,7 @@ void Force_Stress_LCAO<T>::getForceStress(UnitCell& ucell,
         }
     } // end of stress calculation
 
-    ModuleBase::timer::start("Force_Stress_LCAO", "getForceStress");
+    ModuleBase::timer::end("Force_Stress_LCAO", "getForceStress");
     return;
 }
 

source/source_lcao/center2_orb.cpp

@@ -332,6 +332,4 @@ void Center2_Orb::cal_ST_Phi12_R(const int& job,
     }
 
     ModuleBase::timer::end("Center2_Orb", "cal_ST_Phi12_R");
-
-    return;
 }

source/source_lcao/module_operator_lcao/operator_lcao.cpp

@@ -236,7 +236,9 @@ void OperatorLCAO<TK, TR>::init(const int ik_in) {
                 = this->hr_done;
         }
         // call init() function of next node
+        ModuleBase::timer::end("OperatorLCAO", "init");
         this->next_op->init(ik_in);
+        ModuleBase::timer::start("OperatorLCAO", "init");
     } else { // it is the last node, update HK with the current total HR
         OperatorLCAO<TK, TR>::contributeHk(ik_in);
     }