Changeset 23222

Timestamp:

09/05/18 10:11:01 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: moved core profiling to md.debug.profiling

Location:

issm/trunk-jpl/src/c/classes

Files:

• FemModel.cpp (modified) (3 diffs)
• Profiler.h (modified) (1 diff)

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -259 +259 @@
         /*Total times*/
         _printf0_("   "<<setw(40)<<left<<"Total Core solution elapsed time:"<<setw(7)<<profiler->TotalTime(CORE) << "\n");
-        /*Individual cores*/
-        if(profiler->Used(STRESSBALANCECORE)) _printf0_("   "<<setw(40)<<left<<"Stress balance core elapsed time:"<<setw(7)<<profiler->TotalTime(STRESSBALANCECORE) << "\n");
-        if(profiler->Used(MASSTRANSPORTCORE)) _printf0_("   "<<setw(40)<<left<<"Mass transport core elapsed time:"<<setw(7)<<profiler->TotalTime(MASSTRANSPORTCORE) << "\n");
+
         /*Linear solver only*/
         _printf0_("   "<<setw(40)<<left<<"Linear solver elapsed time:"<<setw(7)<<profiler->TotalTime(SOLVER) << " ("<<setprecision(2)<<profiler->TotalTime(SOLVER)/profiler->TotalTime(CORE)*100.<<"%)\n");
@@ -859 +857 @@
                 solution_memory=profiler->Memory(CORE);
 
-                _printf0_("Core solution elapsed time    : " << solution_time   << " Seconds\n");
-                _printf0_("Core solution number of flops : " << solution_flops  << " Flops\n");
-                _printf0_("Core solution memory used     : " << solution_memory << " Bytes\n");
+                _printf0_("\nCore solution profiling\n");
+                _printf0_("   elapsed time    : " << solution_time   << " Seconds\n");
+                _printf0_("   number of flops : " << solution_flops  << " Flops\n");
+                _printf0_("   memory used     : " << solution_memory << " Bytes\n");
+
+                /*Individual cores*/
+                _printf0_("Individual core profiling\n");
+                if(profiler->Used(STRESSBALANCECORE)) _printf0_("   "<<setw(40)<<left<<"Stress balance core elapsed time:"<<setw(7)<<setprecision(6)<<profiler->TotalTime(STRESSBALANCECORE) << " sec\n");
+                if(profiler->Used(MASSTRANSPORTCORE)) _printf0_("   "<<setw(40)<<left<<"Mass transport core elapsed time:"<<setw(7)<<setprecision(6)<<profiler->TotalTime(MASSTRANSPORTCORE) << " sec\n");
 
                 /*Add to results: */
@@ -869 +873 @@
 
                 #ifdef _HAVE_ADOLC_
-                solution_time=profiler->TotalTime(ADCORE);
-                solution_flops=profiler->TotalFlops(ADCORE);
-                solution_memory=profiler->Memory(ADCORE);
-
-                _printf0_("AD Solution elapsed time    : " << solution_time   << " Seconds\n");
-                _printf0_("AD Solution number of flops : " << solution_flops  << " Flops\n");
-                _printf0_("AD Solution memory used     : " << solution_memory << " Bytes\n");
+                solution_time   = profiler->TotalTime(ADCORE);
+                solution_flops  = profiler->TotalFlops(ADCORE);
+                solution_memory = profiler->Memory(ADCORE);
+
+                _printf0_("AD profiling\n");
+                _printf0_("   elapsed time    : " << solution_time   << " Seconds\n");
+                _printf0_("   number of flops : " << solution_flops  << " Flops\n");
+                _printf0_("   memory used     : " << solution_memory << " Bytes\n");
                 #endif
+                _printf0_("\n");
 
         }

issm/trunk-jpl/src/c/classes/Profiler.h

@@ -51 +51 @@
                 int          TotalTimeModSec(int tag);
                 IssmPDouble  Memory(int tag);
-                void         Start(int tagenum,bool dontmpisync=false);
-                void         Stop(int tagenum,bool dontmpisync=false);
+                void         Start(int tagenum,bool dontmpisync=true); /*Do not call MPI barrier by default to save some ms*/
+                void         Stop(int tagenum, bool dontmpisync=true); /*Do not call MPI barrier by default to save some ms*/
                 bool         Used(int tagenum);
 };