From 5a3d387e97bc845c8be7a62fe1a314b93f369ecc Mon Sep 17 00:00:00 2001 From: heister Date: Tue, 23 Jul 2013 20:56:54 +0000 Subject: [PATCH] update benchmark (cmake, interactive graphs, etc.) git-svn-id: https://svn.dealii.org/trunk@30143 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/benchmarks/benchrev.sh | 10 +- tests/benchmarks/index.html | 1251 ++++++++++++++++- tests/benchmarks/interactive.py | 28 +- tests/benchmarks/setup.sh | 21 +- tests/benchmarks/step-22/CMakeLists.txt | 39 + tests/benchmarks/step-22/Makefile | 144 -- tests/benchmarks/tablehandler/CMakeLists.txt | 39 + tests/benchmarks/tablehandler/Makefile | 144 -- tests/benchmarks/test_assembly/CMakeLists.txt | 39 + tests/benchmarks/test_assembly/Makefile | 144 -- tests/benchmarks/test_poisson/CMakeLists.txt | 39 + tests/benchmarks/test_poisson/Makefile | 144 -- 12 files changed, 1446 insertions(+), 596 deletions(-) create mode 100644 tests/benchmarks/step-22/CMakeLists.txt delete mode 100644 tests/benchmarks/step-22/Makefile create mode 100644 tests/benchmarks/tablehandler/CMakeLists.txt delete mode 100644 tests/benchmarks/tablehandler/Makefile create mode 100644 tests/benchmarks/test_assembly/CMakeLists.txt delete mode 100644 tests/benchmarks/test_assembly/Makefile create mode 100644 tests/benchmarks/test_poisson/CMakeLists.txt delete mode 100644 tests/benchmarks/test_poisson/Makefile diff --git a/tests/benchmarks/benchrev.sh b/tests/benchmarks/benchrev.sh index 38a9f67fe5..b3666444dd 100644 --- a/tests/benchmarks/benchrev.sh +++ b/tests/benchmarks/benchrev.sh @@ -3,16 +3,18 @@ source testlist.sh PREVREVISION="`svn info deal.II | grep Revision | sed s/Revision://`" -MAKECMD="nice make -j10" +MAKECMD="nice make -j10 install" +#MAKECMD="nice make -j10 optimized" export MAKECMD echo "testing $PREVREVISION" -cd deal.II echo "configure" - ./configure --disable-threads --with-petsc=no || exit 2 + cd build + cmake ../deal.II || exit 2 + #./configure --disable-threads --with-petsc=no || exit 2 echo "compiling" - $MAKECMD optimized || exit 3 + $MAKECMD || exit 3 cd .. diff --git a/tests/benchmarks/index.html b/tests/benchmarks/index.html index a91ecc4c62..1121999dd5 100644 --- a/tests/benchmarks/index.html +++ b/tests/benchmarks/index.html @@ -1,9 +1,1248 @@ - - - + + + + + deal.II regression timings + + + + + + + + + deal.II performance benchmarks, see -http://www.dealii.org/testsuite.html
+http://www.dealii.org/testsuite.html

+ +
@@ -16,4 +1255,6 @@ deal.II performance benchmarks, see - + + + diff --git a/tests/benchmarks/interactive.py b/tests/benchmarks/interactive.py index 0ff0e7d3e1..f687f4b079 100755 --- a/tests/benchmarks/interactive.py +++ b/tests/benchmarks/interactive.py @@ -7,14 +7,13 @@ begin = \ - Highcharts Example + deal.II regression timings -