Changeset 1862

Timestamp:

09/03/12 19:18:22 (12 years ago)

Author:

gpincka

Message:

simplification mesure du temps de calcul

Location:

TOOLS/PACK_IPSL

Files:

• launch_and_measureTime.sh (modified) (2 diffs)
• launch_ipsl_enlarge.sh (modified) (3 diffs)
• parallelPack.sh (modified) (1 diff)
• showPackProgress.sh (modified) (4 diffs)

TOOLS/PACK_IPSL/launch_and_measureTime.sh

@@ -306 +306 @@
 #fi
 ###################################################
-startTime=$( getDateMilliSeconds )
-echo "start time:$startTime" >> $timeHandlingFile
+# startTime=$( getDateMilliSeconds ) # suppr
+# echo "start time:$startTime" >> $timeHandlingFile # suppr
+> $timeEndFile # added
 
 ccc_mprun  ./glost_launch -R $timeLimitBeforeEnd ${inputCmd} 2>${output}
@@ -317 +318 @@
 ###    mpirun -n 4 ./cmd_launch.exe myIO/inputCmd10.list 2>myIO/output.log
 
-meantime=$( getTimeDiffSeconds $startTime )
+# meantime=$( getTimeDiffSeconds $startTime ) # suppr
 
 endExecutionTime=$( getDateMilliSeconds )
-echo "end time:$endExecutionTime" >> $timeHandlingFile
-
-echo "meantime ncrcat = $meantime"
+echo "end time:$endExecutionTime" >> $timeEndFile
+
+
+
+# echo "meantime ncrcat = $meantime"
 
 # exit 0 # a virer

TOOLS/PACK_IPSL/launch_ipsl_enlarge.sh

@@ -40 +40 @@
 # export IGCM_TMP=${SCRATCHDIR}/IGCM_DEM/tmp # gpdebug : suppr
 
-# On renseigne les variables d'environnement 
+# On renseigne les variables d'environnement
+export scriptCallingLoad=$SCRIPT_NAME # sert a renseigner "load_ipslPack_env.sh" sur le script l'appelant
 . load_ipslPack_env.sh
 export IGCM_TMP="${IGCM_DEM}/tmp"  # gpdebug : added
@@ -91 +92 @@
 # gpdebug : end
 
+export timeLaunchStartFile="${USER_OUTPUT_PROGRESS}/timeLaunchStartFile.txt"
+> $timeLaunchStartFile
+startTime=$( getDateMilliSeconds )
+echo "launch time:$startTime" > $timeLaunchStartFile
+
+
 for CONFIG in $( awk '{print $1}' ${IGCM_DEM}/config_card.liste ) ; do 
 
@@ -115 +122 @@
 done
 
+export timeEndFile="${USER_OUTPUT_PROGRESS}/timeEndFile.txt"
+> $timeEndFile
+
 DEM_log -0 "Fin de ${SCRIPT_NAME}"

TOOLS/PACK_IPSL/parallelPack.sh

@@ -209 +209 @@
 
 
-export timeHandlingFile="${USER_OUTPUT_PROGRESS}/timeHandlingFile.txt"
-> $timeHandlingFile
+export timeLaunchStartFile="${USER_OUTPUT_PROGRESS}/timeLaunchStartFile.txt"
+> $timeLaunchStartFile
 startTime=$( getDateMilliSeconds )
-echo "launch time:$startTime" >> $timeHandlingFile
+echo "launch time:$startTime" > $timeLaunchStartFile
+
+export timeEndFile="${USER_OUTPUT_PROGRESS}/timeEndFile.txt"
+> $timeEndFile
 
 SCRIPT_NAME=$(basename ${0} )

TOOLS/PACK_IPSL/showPackProgress.sh

@@ -16 +16 @@
 
 export timeHandlingFile="${USER_OUTPUT_PROGRESS}/timeHandlingFile.txt"
+export timeLaunchStartFile="${USER_OUTPUT_PROGRESS}/timeLaunchStartFile.txt"
+export timeEndFile="${USER_OUTPUT_PROGRESS}/timeEndFile.txt"
 
 
@@ -183 +185 @@
 }
 
+function getTimeSinceLaunchStart
+{
+    timeNow_=$1
+    stillWaiting_=1
+    
+    launchTimeString=`cat $timeLaunchStartFile | grep -e 'launch time:[[:digit:].]*$' `
+    if [ "x${launchTimeString}" == "x" ]
+    then
+        echo "no launch time"
+        return
+    fi
+    launchTime_=`echo $launchTimeString | awk -F":" '{print $2}' `
+    
+    
+    endTimeString=`cat $timeEndFile | grep -e 'end time:[[:digit:].]*$' `
+    if [ "x${endTimeString}" == "x" ]
+    then
+        endTime_=${timeNow_}
+    else
+        endTime_=`echo $endTimeString | awk -F":" '{print $2}' `
+        stillWaiting_=0
+    fi
+    
+    timeSinceLaunch_=$( awk 'BEGIN { print '${endTime_}'-'${launchTime_}' }' )
+    timeSinceLaunch_=$( awk 'BEGIN { print '${timeSinceLaunch_}'/'1000' }' )
+    if [ "x$stillWaiting_" == "x1" ]
+    then
+       timeSinceLaunch_="${timeSinceLaunch_}, still executing..."
+    fi
+    
+    echo $timeSinceLaunch_
+
+}
 
 
@@ -274 +309 @@
 
 # Recuperation des temps d'attente et ecoule depuis de demarrage des traitements en batch
-if [ -e $timeHandlingFile ]
+if [ -e $timeLaunchStartFile ]
 then
     timeNow=$( getDateMilliSeconds )
-    waitingTime=$( getWaitingTime $timeNow )
-    timeSinceExecutionStart=$( getTimeSinceExecutionStart $timeNow )
+    # waitingTime=$( getWaitingTime $timeNow ) # supprime pour le moment : pb si +sieurs instances ==> on simplifie
+    # timeSinceExecutionStart=$( getTimeSinceExecutionStart $timeNow ) # supprime pour le moment : pb si +sieurs instances ==> on simplifie
+    timeSinceLaunchStart=$( getTimeSinceLaunchStart $timeNow ) # added
 else
-    waitingTime="no handling time file available."
-    timeFromExecutionStart="no handling time file available."
+    # waitingTime="no handling time file available." # supprime pour le moment : pb si +sieurs instances ==> on simplifie
+    # timeFromExecutionStart="no handling time file available." # supprime pour le moment : pb si +sieurs instances ==> on simplifie
+    timeSinceLaunchStart="no launch time file available."
 fi
 
@@ -399 +436 @@
 echo "nb inode before : $NbInodeBefore"
 echo "nb inode after : $NbInodeAfter"
-echo "Total time for elementary operations : $totalTime  (sum of times on several proc)" 
-echo "waiting time : $waitingTime"
-echo "Time since execution start : $timeSinceExecutionStart" 
-
-
-
-
+echo "Total time for elementary operations : $totalTime" 
+# echo "waiting time : $waitingTime" # supprime pour le moment : pb si +sieurs instances ==> on simplifie
+# echo "Time since execution start : $timeSinceExecutionStart" # supprime pour le moment : pb si +sieurs instances ==> on simplifie
+echo "Time since launch start : $timeSinceLaunchStart"
+
+
+