From a824f0edd80d47ce8dd119f16b18512e151fc347 Mon Sep 17 00:00:00 2001 From: Matthias Krack Date: Tue, 7 Jan 2025 16:53:51 +0100 Subject: [PATCH] Test libsmeagol only with Intel and GCC 14 --- arch/Linux-gnu-x86_64.psmp | 2 +- tools/docker/Dockerfile.test_intel-psmp | 1 + tools/docker/generate_dockerfiles.py | 1 + tools/toolchain/install_cp2k_toolchain.sh | 3 ++- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/Linux-gnu-x86_64.psmp b/arch/Linux-gnu-x86_64.psmp index 2ac490bfca..7aed094ed6 100644 --- a/arch/Linux-gnu-x86_64.psmp +++ b/arch/Linux-gnu-x86_64.psmp @@ -35,7 +35,7 @@ ./install_cp2k_toolchain.sh --install-all -j${maxtasks} --no-arch-files --target-cpu=${target_cpu} --with-gcc=system --with-${mpi_implementation}; \ fi; \ else \ - ./install_cp2k_toolchain.sh --install-all -j${maxtasks} --no-arch-files --target-cpu=${target_cpu} --with-gcc --with-${mpi_implementation}; \ + ./install_cp2k_toolchain.sh --install-all -j${maxtasks} --no-arch-files --target-cpu=${target_cpu} --with-gcc --with-${mpi_implementation} --with-libsmeagol; \ fi; \ source ./install/setup; \ cd ../..; \ diff --git a/tools/docker/Dockerfile.test_intel-psmp b/tools/docker/Dockerfile.test_intel-psmp index 0ad34f3c39..e540c8b722 100644 --- a/tools/docker/Dockerfile.test_intel-psmp +++ b/tools/docker/Dockerfile.test_intel-psmp @@ -24,6 +24,7 @@ RUN ./install_cp2k_toolchain.sh \ --install-all \ --with-intelmpi \ --with-mkl \ + --with-libsmeagol \ --with-libtorch=no \ --dry-run diff --git a/tools/docker/generate_dockerfiles.py b/tools/docker/generate_dockerfiles.py index fa4656fafc..b8b3ca0158 100755 --- a/tools/docker/generate_dockerfiles.py +++ b/tools/docker/generate_dockerfiles.py @@ -522,6 +522,7 @@ FROM intel/hpckit:2024.2.1-0-devel-ubuntu22.04 install_all="", with_intelmpi="", with_mkl="", + with_libsmeagol="", with_libtorch="no", ) diff --git a/tools/toolchain/install_cp2k_toolchain.sh b/tools/toolchain/install_cp2k_toolchain.sh index 4974ba16ca..9163bb6c51 100755 --- a/tools/toolchain/install_cp2k_toolchain.sh +++ b/tools/toolchain/install_cp2k_toolchain.sh @@ -436,7 +436,8 @@ while [ $# -ge 1 ]; do for ii in ${package_list}; do if [ "${ii}" != "intel" ] && [ "${ii}" != "intelmpi" ] && - [ "${ii}" != "amd" ]; then + [ "${ii}" != "amd" ] && + [ "${ii}" != "libsmeagol" ]; then eval with_${ii}="__INSTALL__" fi done