Changeset 11552

Timestamp:

02/27/12 13:33:21 (13 years ago)

Author:

Eric.Larour

Message:

New nightly run script compatible with Windows

Location:

issm/trunk-jpl/cron

Files:

• nightlyrun.sh (modified) (12 diffs)
• nightlyrun.sh.new (deleted)

issm/trunk-jpl/cron/nightlyrun.sh

@@ -29 +29 @@
 {
         #return host name depending on the OS
-        if [ "$1" = "wineric" ] 
+        if [ "$1" = "win7" ] 
         then
-                HOST_NAME=`hostname`;
+                HOST_NAME=`hostname | sed 's/-//g'`;
         else
-                HOST_NAME=`hostname -s`;
+                HOST_NAME=`hostname -s | sed 's/-//g'`;
         fi
         echo $HOST_NAME;
 } #}}}
-
+function pause() #{{{1
+{
+pid=`ps aux -W | grep $1 | awk '{printf("%s\n",$1);}'`
+
+while [ -n "$pid" ]
+do
+        pid=`ps aux -W | grep $1 | awk '{printf("%s\n",$1);}'`
+done
+}
+#}}}
 #Get configuration
 #Source config file{{{1
@@ -74 +83 @@
         #Erase previous code and Fetch the new one
         rm -rf $ISSM_RELEASE
-        svn checkout $REPOSITORY
+        svn checkout "$REPOSITORY"
 
 elif [ "$ISSM_INSTALLATION" == "update" ]
@@ -100 +109 @@
 #create simpler  cluster.rc file, with only the cluster we are interested in.
 cd $ISSM_TIER/test/NightlyRun/
+if [ "$MACHINE" = "win7" ]; then
+cat << END > $HOST_NAME"_settings.m"
+cluster.login='$USER';
+cluster.codepath='`cygpath -m $ISSM_TIER/bin`';
+cluster.executionpath='`cygpath -m $EXECUTION_PATH`';
+END
+else
 cat << END > $HOST_NAME"_settings.m"
 cluster.login='$USER';
@@ -105 +121 @@
 cluster.executionpath='$EXECUTION_PATH';
 END
+fi
 #}}}
 #Source environment variables with new matlab path {{{1
@@ -113 +130 @@
 if [ "$ISSM_EXTERNALPACKAGES" == "install" ]
 then
+        
         cd $ISSM_TIER/externalpackages
-        for ep in $EXTERNALPACKAGES
-        do 
-                cd $ep
-                case $ep in
-                        "mpich2" )   ./install-1.0.2-linux64.sh ;;
-                        "petsc" )    ./install-3.2-linux64.sh   ;;
-                        "metis" )    ./install-4.0-linux64.sh ;;
-                        "triangle" ) ./install-linux64.sh ;;
-                        "dakota" )   ./install-linux64-astrid.sh ;;
-                        *)           ./install.sh $NUMCPUS_INSTALL
-                esac
+        #number of packages: 
+        numpackages=`echo $EXTERNALPACKAGES | wc -w`
+
+        for (( i=1; i<=$numpackages; i++ ))
+        do
+                package=`echo $EXTERNALPACKAGES | cut -d " " -f $i-$i`
+                package_config=`echo $EXTERNALPACKAGES_CONFIGS | cut -d " " -f $i-$i`
+                package_numcpus=`echo $EXTERNALPACKAGES_NUMCPUS | cut -d " " -f $i-$i`
+
+                cd $package
+                $package_config $package_numcpus
                 cd ..
         done
+
 
 elif [ "$ISSM_EXTERNALPACKAGES" == "copy" ]
@@ -158 +177 @@
         make distclean
         ./scripts/automakererun.sh
-        ./configs/config-linux64-astrid.sh
-
-        #4: compile and install ISSM
-        if [ "$MACHINE" = "wineric" ] 
-        then
-                cd $ISSM_TIER/src/c
-                ./intel-compile.sh
-                cd $ISSM_TIER/src/mex
-                make install
-                cd $ISSM_TIER
-        else
-                make -j $NUMCPUS_INSTALL
-                make -j $NUMCPUS_INSTALL install
-        fi
+        source ./configs/$COMPILE_CONFIG_FILE
+
+        make -j $NUMCPUS_INSTALL
+        make -j $NUMCPUS_INSTALL install
 
 elif [ "$ISSM_COMPILATION" == "no" ]
@@ -185 +194 @@
 #create softlink to startup {{{1
 cd $ISSM_TIER/test/NightlyRun/
-ln -s $ISSM_TIER/startup.m .
+if [ "$MACHINE" = "win7" ]; then
+        cp $ISSM_TIER/startup.m .
+else
+        ln -s $ISSM_TIER/startup.m .
+fi
 #}}}
 #Create nightlylog directory and info.log {{{1
@@ -212 +225 @@
 
 #Run tests
+#on Matlab and windows machines, we'll need a windows style path:  {{{
+if [ "$MACHINE" = "win7" ]; then
+        MATLAB_TIER=`cygpath -m $ISSM_TIER`
+else 
+        MATLAB_TIER=$ISSM_TIER
+fi
+
+#}}}
 #Launch all tests on different cpus {{{1
 for (( i=1;i<=$NUMCPUS_RUN;i++ ))
@@ -219 +240 @@
         warning off %necessary to avoid a info.log of several Go for parallel runs
         try,
-        cd $ISSM_TIER/test/NightlyRun
+        cd $MATLAB_TIER/test/NightlyRun
         startup;
         $(if [ "$NROPTIONS" = ""  ]
@@ -225 +246 @@
                 echo "runme('output','nightly','rank',$i,'numprocs',$NUMCPUS_RUN);"
         else
+                #echo "runme('id',[101 102]);" 
                 echo "runme($NROPTIONS,'output','nightly','rank',$i,'numprocs',$NUMCPUS_RUN);"
         fi
@@ -245 +267 @@
 
         #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 &
+        $MATLABBIN  -nojvm -nosplash  -r matlab_run$i -logfile matlab_log$i.log &
+
 done
 
 #wait until matlab closes
-wait
+if [ "$MACHINE" = "win7" ]; then
+        pause MATLAB
+else
+        wait
+fi
+
 #}}}
 #concatenate all reports {{{1
@@ -290 +317 @@
         for i in `echo $MAILINGLIST`; do
 
-                if [ "$MACHINE" = "wineric" ]
+                if [ "$MACHINE" = "win7" ]
                 then
-                        email -html -f "ISSM Nightly run $EMAIL_ADRESS" -s "Nightly runs of $ISSM_RELEASE , configuration: $MACHINE, host: $HOST_NAME, user: $USER. " $i < $ISSM_TIER/test/Verification/NightlyRun/report.html
+                        echo $i
+                        email -html -s "Nightly runs of $ISSM_RELEASE , configuration: $MACHINE, host: $HOST_NAME, user: $USER. " $i < $ISSM_TIER/nightlylog/report.html
                 else 
                         if [ "$MACHINE" = "astrid" ]