Changeset 5082

Timestamp:

08/09/10 12:25:40 (15 years ago)

Author:

Mathieu Morlighem

Message:

better dailyrun

Location:

issm/trunk/scripts

Files:

• dailyrun.sh (modified) (4 diffs)
• report.sh (added)

issm/trunk/scripts/dailyrun.sh

@@ -2 +2 @@
 #This bash script calls the dailyrun.m matlab file to run our daily test decks. 
 #It then processes the results and sends an email to the Ice developpers.
+
+#Hard coded options
+NUMCPUS_RUN=7
+NROPTIONS=""
 
 #some functions
@@ -58 +62 @@
 fi
 #}}}
-#Create dailylog directory and daily.log {{{1
-#put installation elapsed time in daily.log
+#create softlink to startup {{{1
+cd $ISSM_DIR/test/NightlyRun/
+ln -s $ISSM_DIR/startup.m .
+#}}}
+#Create dailylog directory and info.log {{{1
+#put installation elapsed time in info.log
 INSTALL_TIME=$(timer)
 ELAPSED_INSTALL=$(timer $START_TIME)
 rm -rf $ISSM_DIR/dailylog
 mkdir  $ISSM_DIR/dailylog
-cat << END > $ISSM_DIR/dailylog/daily.log
+cat << END > $ISSM_DIR/dailylog/info.log
 today:     $(echo $TODAY)
 user:      $(echo $USER)
@@ -74 +82 @@
 END
 #}}}
+#check NUMCPUS_RUN options {{{1
+if [ "$NUMCPUS_RUN" = "" ]
+then
+        echo "NUMCPUS_RUN option not found, defaulting to NUMCPUS_RUN = 1"
+        NUMCPUS_RUN=1
+fi
+#}}}
 
 #Run tests
-#Call run.sh script{{{1
-cd $ISSM_DIR/scripts
-./run.sh
+#Launch all tests on different cpus {{{1
+for (( i=1;i<=$NUMCPUS_RUN;i++ ))
+do
+        #Launch matlab and the daily run script
+        cat > $ISSM_DIR/dailylog/matlab_run$i.m << EOF
+        warning off %necessary to avoid a info.log of several Go for parallel runs
+        try,
+        cd $ISSM_DIR/test/NightlyRun
+        startup;
+        $(if [ "$NROPTIONS" = ""  ]
+        then
+                echo "runme('output','daily','rank',$i,'numprocs',$NUMCPUS_RUN);"
+        else
+                echo "runme($NROPTIONS,'output','daily','rank',$i,'numprocs',$NUMCPUS_RUN);"
+        fi
+        )
+        catch me,
+                %An error occured, get report and exit
+                directory=strsplit(pwd,'/');
+                message=getReport(me)
+                fid=fopen([ISSM_DIR '/dailylog/matlaberror.log'], 'at');
+                fprintf(fid,'\nMatlab error occured in: %s\n\n',directory{end});
+                fprintf(fid,'%s',message);
+                fclose(fid);
+        end
+        exit
+EOF
+
+        #Start run from dailylog directory
+        cd $ISSM_DIR/dailylog/
+
+        #Start test
+        MATLAB_VERSION="7.6" #7.2,7.4,7.6 and 7.8
+        /usr/local/pkgs/matlab-$MATLAB_VERSION/bin/matlab  -nojvm -nosplash  -r matlab_run$i -logfile matlab_log$i.log &
+done
+
+#wait until matlab closes
+wait
 #}}}
-#Complete daily.log {{{1
+#concatenate all reports {{{1
+cd $ISSM_DIR/dailylog/
+mv matlab_log1.log  matlab_log.log
+for (( i=2;i<=$NUMCPUS_RUN;i++ ))
+do
+        cat matlab_log.log matlab_log$i.log > matlab_log.log.bak
+        mv matlab_log.log.bak matlab_log.log
+        rm matlab_log$i.log
+
+done
+#}}}
+#Complete info.log {{{1
 ELAPSED_RUN=$(timer $INSTALL_TIME)
 ELAPSED_TOTAL=$(timer $START_TIME)
-cat << END >>  $ISSM_DIR/dailylog/daily.log
+cat << END >>  $ISSM_DIR/dailylog/info.log
 elapsed_run:   $(echo $ELAPSED_RUN)
 elapsed_total: $(echo $ELAPSED_TOTAL)
@@ -92 +153 @@
 #Build html report {{{1
 cd $ISSM_DIR/dailylog/
-sh ../cron/report.sh
+sh ../scripts/report.sh
 ln -s $ISSM_DIR/dailylog/report.html $INIT_PATH
-echo "html report located in $ISSM_DIR/dailylog/report.html and $INIT_PATH"
+echo "html report located in $ISSM_DIR/dailylog/report.html and $INIT_PATH/report.html"
 #}}}