From e15be0ade511d2cac17f54d98021b188e548ba89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Sch=C3=BCtt?= Date: Thu, 11 Jun 2020 10:27:25 +0200 Subject: [PATCH] Docker: Remove popt from scaling test --- tools/docker/scripts/install_scaling.sh | 2 +- tools/docker/scripts/test_scaling.sh | 2 +- tools/regtesting/test_scaling.py | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/docker/scripts/install_scaling.sh b/tools/docker/scripts/install_scaling.sh index 2474475d27..71712a2902 100755 --- a/tools/docker/scripts/install_scaling.sh +++ b/tools/docker/scripts/install_scaling.sh @@ -16,7 +16,7 @@ source /opt/cp2k-toolchain/install/setup # pre-build cp2k cd /workspace/cp2k -for VERSION in 'popt' 'psmp' 'ssmp'; do +for VERSION in 'psmp' 'ssmp'; do echo -n "Warming cache by trying to compile cp2k.${VERSION}... " if make -j VERSION="${VERSION}" &> /dev/null ; then echo 'done.' diff --git a/tools/docker/scripts/test_scaling.sh b/tools/docker/scripts/test_scaling.sh index 38f39afd43..8e36fd51ce 100755 --- a/tools/docker/scripts/test_scaling.sh +++ b/tools/docker/scripts/test_scaling.sh @@ -7,7 +7,7 @@ source /opt/cp2k-toolchain/install/setup echo -e '\n========== Compiling CP2K ==========' cd /workspace/cp2k -for VERSION in 'popt' 'psmp' 'ssmp' ; do +for VERSION in 'psmp' 'ssmp' ; do echo -n "Compiling cp2k.${VERSION}... " if make -j VERSION="${VERSION}" &> /dev/null ; then echo 'done.' diff --git a/tools/regtesting/test_scaling.py b/tools/regtesting/test_scaling.py index 6faae04e5e..1a46de1d3a 100755 --- a/tools/regtesting/test_scaling.py +++ b/tools/regtesting/test_scaling.py @@ -36,7 +36,6 @@ def main(): ref_energies.append(float(rest_args.pop(0))) configs = [ - (8, 1, "popt"), (8, 1, "psmp"), (4, 2, "psmp"), (2, 4, "psmp"),