]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
update benchmark scripts
authorheister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 6 Feb 2013 21:31:54 +0000 (21:31 +0000)
committerheister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 6 Feb 2013 21:31:54 +0000 (21:31 +0000)
git-svn-id: https://svn.dealii.org/trunk@28256 0785d39b-7218-0410-832d-ea1e28bc413d

tests/benchmarks/bench.sh
tests/benchmarks/plot.sh
tests/benchmarks/sync.sh [new file with mode: 0755]
tests/benchmarks/testplotscript [deleted file]

index 2fe4f85dbac79977e4c4c11c3379024f30d78c1a..748aa0d45d827288c98c0f9a8c81b7a1e0b6dfaf 100644 (file)
@@ -1,10 +1,10 @@
 #!/bin/bash
 
-TESTS="step-22 tablehandler"
+source testlist.sh
 
 PREVREVISION="`svn info deal.II | grep Revision | sed s/Revision://`"
-HEADREVISION="`svn info http://www.dealii.org/svn/dealii | grep Revision | sed s/Revision://`"
-MAKECMD="make -j2"
+HEADREVISION="`svn info https://svn.dealii.org/trunk/deal.II | grep Revision | sed s/Revision://`"
+MAKECMD="nice make -j20"
 export MAKECMD
 
 echo "previous $PREVREVISION"
@@ -12,21 +12,23 @@ echo "HEAD: $HEADREVISION"
 
 while [ $PREVREVISION -lt $HEADREVISION ] ; do
 
-  NEXTREVISION=`expr $PREVREVISION "+" 100`
+  NEXTREVISION=`expr $PREVREVISION "+" 10`
   echo "Updating from $PREVREVISION to $NEXTREVISION"
   cd deal.II
-  svn up -r$NEXTREVISION >/dev/null
+  svn up -r$NEXTREVISION || exit 1
   if test -z "`svn diff -r$PREVREVISION:$NEXTREVISION .`" ; then
       echo "Skipping revision $NEXTREVISION" ;
+      PREVREVISION=$NEXTREVISION
+      cd ..
       continue ;
   fi
 
   PREVREVISION=$NEXTREVISION
 
   echo "configure"
-  ./configure --disable-threads --with-petsc=no >/dev/null
+  ./configure --disable-threads --with-petsc=no || exit 2
   echo "compiling" 
-  $MAKECMD optimized>/dev/null
+  $MAKECMD optimized || exit 3
   
   cd ..
 
@@ -35,13 +37,16 @@ while [ $PREVREVISION -lt $HEADREVISION ] ; do
       echo "** working on $test"
       make clean >/dev/null
       echo -n "" > temp.txt
-      for a in {1..3}; do
+      for a in {1..5}; do
          echo "*" >> temp.txt
           make run | grep "|" >> temp.txt
       done
       ./../gettimes/gettimes > names.test
       if [[ -s names.test ]] ; then
-      cp names.test ../names.$test
+      words=`wc -w names.test | cut -f1 -d' '`
+      if [ "$words" -gt "0" ] ; then
+         cp names.test ../names.$test
+      fi ;
       fi ;
       ./../gettimes/gettimes $NEXTREVISION >>../datatable.$test
       cd ..      
index 47149d508030da3493dbf989b3279fec322260e2..90ada2a3f9fe9a0b936ad343b886f9480764757d 100644 (file)
@@ -1,17 +1,28 @@
+#!/bin/bash
 
+#launch with the name of test to generate the .eps for
 
+cat <<EOF
+set terminal postscript eps color enh
+set key left bottom
+set output "$1.eps"
+set log y
+set xlabel 'revision'
+set title 'benchmark $1 - rev $2'
+EOF
+#echo "set terminal x11 persist"
 
-echo "set terminal x11 persist"
-echo "set log y"
 echo "plot \\"
 n=1
 for i in `cat names.$1`
 do
   n=`expr $n "+" 1`
-  echo "'datatable.$1' using 1:$n title '$i' w lp,\\";
+  echo "'datatable.$1' using 1:(int(\$$n*10.0+0.5)/10.0) title '$i' w lp,\\";
+#  echo "'datatable.$1' using 1:$n title '$i' w lp,\\";
 done
 
-echo "0"
+# this forces 0.01 to be in the yrange and ends the plot list (trailing comma above)
+echo "0.01 title ''"
 
-echo "pause -1"
+#echo "pause -1"
 
diff --git a/tests/benchmarks/sync.sh b/tests/benchmarks/sync.sh
new file mode 100755 (executable)
index 0000000..c649d27
--- /dev/null
@@ -0,0 +1,5 @@
+#!/bin/bash
+cp *png ~/public_html/bench/
+chmod a+r ~/public_html/bench/*png
+#rsync -a *png root@dealii.org:/home/archiver/public_html/
+#ssh root@dealii.org chmod a+r /home/archiver/public_html/*png
diff --git a/tests/benchmarks/testplotscript b/tests/benchmarks/testplotscript
deleted file mode 100644 (file)
index 3b92fb5..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-set terminal x11 persist
-set log y
-plot \
-'datatable.step-22' using 1:2 title 'assembly' w lp,\
-'datatable.step-22' using 1:3 title 'refine' w lp,\
-'datatable.step-22' using 1:4 title 'results' w lp,\
-'datatable.step-22' using 1:5 title 'setup' w lp,\
-'datatable.step-22' using 1:6 title 'solver' w lp,\
-0
-pause -1

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.