Changeset 12696

Timestamp:

07/23/12 16:24:52 (13 years ago)

Author:

Eric.Larour

Message:

Generalized profiling in issm.cpp to be applicable even when Petsc is not available.
Concentrated all profiling stuff in two routines, ProfilingStart and ProfilingEnd.

Location:

issm/trunk-jpl/src

Files:

• c/EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• c/Makefile.am (modified) (1 diff)
• c/modules/EnumToStringx/EnumToStringx.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• c/modules/StringToEnumx/StringToEnumx.cpp (modified) (1 diff)
• c/shared/Sys/ProfilingEnd.cpp (added)
• c/shared/Sys/ProfilingStart.cpp (added)
• c/shared/Sys/sys.h (added)
• c/shared/shared.h (modified) (1 diff)
• c/solutions/issm.cpp (modified) (4 diffs)
• m/classes/debug.m (modified) (2 diffs)
• m/enum/DebugPetscProfilingEnum.m (deleted)
• m/enum/DebugProfilingEnum.m (added)
• m/enum/EnumDefinitions.py (modified) (1 diff)
• m/enum/PetscProfilingCurrentFlopsEnum.m (deleted)
• m/enum/PetscProfilingCurrentMemEnum.m (deleted)
• m/enum/PetscProfilingSolutionTimeEnum.m (deleted)
• m/enum/ProfilingCurrentFlopsEnum.m (added)
• m/enum/ProfilingCurrentMemEnum.m (added)
• m/enum/ProfilingSolutionTimeEnum.m (added)

issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h

@@ -149 +149 @@
         SettingsResultsAsPatchesEnum,
         SettingsWaitonlockEnum,
-        DebugPetscProfilingEnum,
-        PetscProfilingCurrentMemEnum,
-        PetscProfilingCurrentFlopsEnum,
-        PetscProfilingSolutionTimeEnum,
+        DebugProfilingEnum,
+        ProfilingCurrentMemEnum,
+        ProfilingCurrentFlopsEnum,
+        ProfilingSolutionTimeEnum,
         MaxIterationConvergenceFlagEnum,
         SteadystateMaxiterEnum,

issm/trunk-jpl/src/c/Makefile.am

@@ -209 +209 @@
                                         ./shared/Wrapper/ModuleBoot.cpp\
                                         ./shared/Wrapper/ModuleEnd.cpp\
+                                        ./shared/Sys/sys.h\
+                                        ./shared/Sys/ProfilingStart.cpp\
+                                        ./shared/Sys/ProfilingEnd.cpp\
                                         ./toolkits/metis/metisincludes.h\
                                         ./toolkits/issm/issmtoolkit.h\

issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp

@@ -154 +154 @@
                 case SettingsResultsAsPatchesEnum : return "SettingsResultsAsPatches";
                 case SettingsWaitonlockEnum : return "SettingsWaitonlock";
-                case DebugPetscProfilingEnum : return "DebugPetscProfiling";
-                case PetscProfilingCurrentMemEnum : return "PetscProfilingCurrentMem";
-                case PetscProfilingCurrentFlopsEnum : return "PetscProfilingCurrentFlops";
-                case PetscProfilingSolutionTimeEnum : return "PetscProfilingSolutionTime";
+                case DebugProfilingEnum : return "DebugProfiling";
+                case ProfilingCurrentMemEnum : return "ProfilingCurrentMem";
+                case ProfilingCurrentFlopsEnum : return "ProfilingCurrentFlops";
+                case ProfilingSolutionTimeEnum : return "ProfilingSolutionTime";
                 case MaxIterationConvergenceFlagEnum : return "MaxIterationConvergenceFlag";
                 case SteadystateMaxiterEnum : return "SteadystateMaxiter";

issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp

@@ -57 +57 @@
         parameters->AddObject(iomodel->CopyConstantObject(ThermalPenaltyFactorEnum));
         parameters->AddObject(iomodel->CopyConstantObject(SettingsLowmemEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(DebugPetscProfilingEnum));
+        parameters->AddObject(iomodel->CopyConstantObject(DebugProfilingEnum));
         parameters->AddObject(iomodel->CopyConstantObject(MeshAverageVertexConnectivityEnum));
         parameters->AddObject(iomodel->CopyConstantObject(ConstantsReferencetemperatureEnum));

issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp

@@ -158 +158 @@
               else if (strcmp(name,"SettingsResultsAsPatches")==0) return SettingsResultsAsPatchesEnum;
               else if (strcmp(name,"SettingsWaitonlock")==0) return SettingsWaitonlockEnum;
-              else if (strcmp(name,"DebugPetscProfiling")==0) return DebugPetscProfilingEnum;
-              else if (strcmp(name,"PetscProfilingCurrentMem")==0) return PetscProfilingCurrentMemEnum;
-              else if (strcmp(name,"PetscProfilingCurrentFlops")==0) return PetscProfilingCurrentFlopsEnum;
-              else if (strcmp(name,"PetscProfilingSolutionTime")==0) return PetscProfilingSolutionTimeEnum;
+              else if (strcmp(name,"DebugProfiling")==0) return DebugProfilingEnum;
+              else if (strcmp(name,"ProfilingCurrentMem")==0) return ProfilingCurrentMemEnum;
+              else if (strcmp(name,"ProfilingCurrentFlops")==0) return ProfilingCurrentFlopsEnum;
+              else if (strcmp(name,"ProfilingSolutionTime")==0) return ProfilingSolutionTimeEnum;
               else if (strcmp(name,"MaxIterationConvergenceFlag")==0) return MaxIterationConvergenceFlagEnum;
               else if (strcmp(name,"SteadystateMaxiter")==0) return SteadystateMaxiterEnum;

issm/trunk-jpl/src/c/shared/shared.h

@@ -9 +9 @@
 #include "Alloc/alloc_module.h"
 #include "Alloc/xNewDelete.h"
-#include "MemOps/xMemCpy.h"
+#include "Bamg/shared.h"
+#include "Elements/elements.h"
 #include "Exceptions/exceptions.h"
 #include "Exp/exp.h"
+#include "Matrix/matrix.h"
+#include "MemOps/xMemCpy.h"
+#include "Numerics/numerics.h"
+#include "Sorting/sorting.h"
+#include "Sys/sys.h"
+#include "Threads/issm_threads.h"
 #include "TriMesh/trimesh.h"
-#include "Sorting/sorting.h"
-#include "Elements/elements.h"
-#include "Matrix/matrix.h"
-#include "Numerics/numerics.h"
-#include "Threads/issm_threads.h"
-#include "Bamg/shared.h"
 #include "Wrapper/wrappershared.h"
 

issm/trunk-jpl/src/c/solutions/issm.cpp

@@ -35 +35 @@
         int      ierr;
 
-        /*PETSc profiling*/   
-        bool petsc_profiling = false;
-        PetscLogDouble petscTime_start, petscTime_finish;
-        PetscLogDouble petsc_memUse, petscFlops_start, petscFlops_finish;
+        /*profiling*/   
+        bool profiling = false;
+        IssmPDouble Time_start, Flops_start;
+        IssmPDouble Solution_time, Memory_use, Current_flops;
 
         ISSMBOOT();
@@ -99 +99 @@
         femmodel->parameters->FindParam(&control_analysis,InversionIscontrolEnum);
         femmodel->parameters->FindParam(&tao_analysis,InversionTaoEnum);
-   femmodel->parameters->FindParam(&petsc_profiling,DebugPetscProfilingEnum); 
+        femmodel->parameters->FindParam(&profiling,DebugProfilingEnum); 
 
         #ifdef _HAVE_MPI_
@@ -114 +114 @@
         #endif
         
-        if(petsc_profiling){
-                PetscGetTime(&petscTime_start);
-                PetscGetFlops(&petscFlops_start);
-        }
+        if(profiling)ProfilingStart(&Time_start,&Flops_start);
 
         if(dakota_analysis){
@@ -140 +137 @@
         }
 
-        if(petsc_profiling){
-                PetscGetTime(&petscTime_finish);
-                PetscGetFlops(&petscFlops_finish);
-                PetscMemoryGetCurrentUsage(&petsc_memUse);
-
-                _pprintLine_("PETSc elapsed time  : " << (petscTime_finish-petscTime_start) << "  Seconds");
-                _pprintLine_("PETSc elapsed flops : " << (petscFlops_finish-petscFlops_start) << "  Flops");
-                _pprintLine_("PETSc memory used   : " << petsc_memUse << "  Bytes");
-                
-                femmodel->results->AddObject(new DoubleExternalResult(femmodel->results->Size()+1, PetscProfilingSolutionTimeEnum, (petscTime_finish-petscTime_start), 1, 0));
-                femmodel->results->AddObject(new DoubleExternalResult(femmodel->results->Size()+1, PetscProfilingCurrentMemEnum, petsc_memUse, 1, 0));
-                femmodel->results->AddObject(new DoubleExternalResult(femmodel->results->Size()+1, PetscProfilingCurrentFlopsEnum, (petscFlops_finish-petscFlops_start), 1, 0));
-        }
+        if(profiling){
+                ProfilingEnd(&Solution_time,&Memory_use,&Current_flops,Time_start,Flops_start);
+                femmodel->results->AddObject(new DoubleExternalResult(femmodel->results->Size()+1, ProfilingSolutionTimeEnum, Solution_time, 1, 0));
+                femmodel->results->AddObject(new DoubleExternalResult(femmodel->results->Size()+1, ProfilingCurrentMemEnum, Memory_use, 1, 0));
+                femmodel->results->AddObject(new DoubleExternalResult(femmodel->results->Size()+1, ProfilingCurrentFlopsEnum, Current_flops, 1, 0));
+        }
+
 
         #ifdef _HAVE_MPI_

issm/trunk-jpl/src/m/classes/debug.m

@@ -8 +8 @@
                 valgrind = false;
                 gprof    = false;
-                petsc_profiling = false;
+                profiling = false;
         end
         methods
@@ -27 +27 @@
                         fielddisplay(obj,'valgrind','use Valgrind to debug (0 or 1)');
                         fielddisplay(obj,'gprof','use gnu-profiler to find out where the time is spent');
-                        fielddisplay(obj,'petsc_profiling','enables PETSc profiling (memory, flops, time)');
+                        fielddisplay(obj,'profiling','enables profiling (memory, flops, time)');
 
                 end % }}}
                 function marshall(obj,fid) % {{{
-                        WriteData(fid,'object',obj,'fieldname','petsc_profiling','format','Boolean');
+                        WriteData(fid,'object',obj,'fieldname','profiling','format','Boolean');
                 end % }}}
         end

issm/trunk-jpl/src/m/enum/EnumDefinitions.py

@@ -1377 +1377 @@
         return StringToEnum('SettingsWaitonlock')
 
-def DebugPetscProfilingEnum():
-        """
-        DEBUGPETSCPROFILINGENUM - Enum of DebugPetscProfiling
-
-           Usage:
-              macro=DebugPetscProfilingEnum()
-        """
-
-        return StringToEnum('DebugPetscProfiling')
-
-def PetscProfilingCurrentMemEnum():
-        """
-        PETSCPROFILINGCURRENTMEMENUM - Enum of PetscProfilingCurrentMem
-
-           Usage:
-              macro=PetscProfilingCurrentMemEnum()
-        """
-
-        return StringToEnum('PetscProfilingCurrentMem')
-
-def PetscProfilingCurrentFlopsEnum():
-        """
-        PETSCPROFILINGCURRENTFLOPSENUM - Enum of PetscProfilingCurrentFlops
-
-           Usage:
-              macro=PetscProfilingCurrentFlopsEnum()
-        """
-
-        return StringToEnum('PetscProfilingCurrentFlops')
-
-def PetscProfilingSolutionTimeEnum():
-        """
-        PETSCPROFILINGSOLUTIONTIMEENUM - Enum of PetscProfilingSolutionTime
-
-           Usage:
-              macro=PetscProfilingSolutionTimeEnum()
-        """
-
-        return StringToEnum('PetscProfilingSolutionTime')
+def DebugProfilingEnum():
+        """
+        DEBUGPROFILINGENUM - Enum of DebugProfiling
+
+           Usage:
+              macro=DebugProfilingEnum()
+        """
+
+        return StringToEnum('DebugProfiling')
+
+def ProfilingCurrentMemEnum():
+        """
+        PROFILINGCURRENTMEMENUM - Enum of ProfilingCurrentMem
+
+           Usage:
+              macro=ProfilingCurrentMemEnum()
+        """
+
+        return StringToEnum('ProfilingCurrentMem')
+
+def ProfilingCurrentFlopsEnum():
+        """
+        PROFILINGCURRENTFLOPSENUM - Enum of ProfilingCurrentFlops
+
+           Usage:
+              macro=ProfilingCurrentFlopsEnum()
+        """
+
+        return StringToEnum('ProfilingCurrentFlops')
+
+def ProfilingSolutionTimeEnum():
+        """
+        PROFILINGSOLUTIONTIMEENUM - Enum of ProfilingSolutionTime
+
+           Usage:
+              macro=ProfilingSolutionTimeEnum()
+        """
+
+        return StringToEnum('ProfilingSolutionTime')
 
 def MaxIterationConvergenceFlagEnum():