Docker: Make scaling test less noisy and reduce threshold to 15%

cp2k · Aug 22, 2019 · 5ffd82a · 5ffd82a
1 parent ff7806a
commit 5ffd82a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 15 deletions.
diff --git a/tools/docker/scripts/install_scaling.sh b/tools/docker/scripts/install_scaling.sh
@@ -16,15 +16,14 @@ source /opt/cp2k-toolchain/install/setup
 
 # pre-build cp2k
 cd /workspace/cp2k
-echo -n "Warming cache by trying to compile... "
-if make -j VERSION="popt" cp2k &> /dev/null && \
-   make -j VERSION="psmp" cp2k &> /dev/null && \
-   make -j VERSION="ssmp" cp2k &> /dev/null ; then
-   echo "done."
-else
-   echo "failed."
-fi
-
+for VERSION in 'popt' 'psmp' 'ssmp'; do
+   echo -n "Warming cache by trying to compile cp2k.${VERSION}... "
+   if make -j VERSION="${VERSION}" &> /dev/null ; then
+      echo 'done.'
+   else
+      echo 'failed.'
+   fi
+done
 
 rm -rf lib exe
 

diff --git a/tools/docker/scripts/test_scaling.sh b/tools/docker/scripts/test_scaling.sh
@@ -5,14 +5,22 @@
 # shellcheck disable=SC1091
 source /opt/cp2k-toolchain/install/setup
 
-echo -e "\n========== Compiling CP2K =========="
+echo -e '\n========== Compiling CP2K =========='
 cd /workspace/cp2k
-make -j VERSION="popt" cp2k
-make -j VERSION="psmp" cp2k
-make -j VERSION="ssmp" cp2k
+for VERSION in 'popt' 'psmp' 'ssmp' ; do
+   echo -n "Compiling cp2k.${VERSION}... "
+   if make -j VERSION="${VERSION}" &> /dev/null ; then
+      echo 'done.'
+   else
+      echo -e 'failed.\n\n'
+      echo 'Summary: Compilation failed.'
+      echo 'Status: FAILED'
+      exit
+   fi
+done
 
-echo -e "\n========== Running Scaling Test =========="
+echo -e '\n========== Running Scaling Test =========='
 cd ./tests/QS/benchmark
-../../../tools/regtesting/test_scaling.py 30.0 ../../../exe/local/ H2O-32.inp -550.50556087853511
+../../../tools/regtesting/test_scaling.py 15.0 ../../../exe/local/ H2O-32.inp -550.50556087853511
 
 #EOF