From 9f0cd71ab66685f33cf426198e7d9cc1c81b6c03 Mon Sep 17 00:00:00 2001 From: Matthias Krack Date: Thu, 11 Jul 2024 17:59:07 +0200 Subject: [PATCH] Update Intel hpckit version --- arch/Linux-gnu-x86_64.psmp | 4 ++-- tools/docker/Dockerfile.test_intel-psmp | 2 +- tools/docker/generate_dockerfiles.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/Linux-gnu-x86_64.psmp b/arch/Linux-gnu-x86_64.psmp index 802d7903f1..9fdcf801be 100644 --- a/arch/Linux-gnu-x86_64.psmp +++ b/arch/Linux-gnu-x86_64.psmp @@ -2,7 +2,7 @@ # # CP2K (GNU x86_64) arch file for Linux clusters # -# Tested with: GNU 14.1.0, MPICH 4.0.3 and OpenMPI 4.1.6, +# Tested with: GNU 14.1.0, MPICH 4.0.3 and OpenMPI 5.0.3, # ScaLAPACK 2.2.1, OpenBLAS 0.3.27, # FFTW 3.3.10, ELPA 2024.03.001, HDF5 1.14.2, # LIBINT 2.6.0, LIBXC 6.2.2, PLUMED 2.9.0, @@ -17,7 +17,7 @@ # Optionally, GNU compiler and MPI implementation can be specified as arguments. # Replace or adapt the "module add" commands below if needed. # -# Last update: 02.07.2024 +# Last update: 11.07.2024 # # \ if [[ "${0}" == "${BASH_SOURCE}" ]]; then \ diff --git a/tools/docker/Dockerfile.test_intel-psmp b/tools/docker/Dockerfile.test_intel-psmp index d7c2ade99a..fa8d358934 100644 --- a/tools/docker/Dockerfile.test_intel-psmp +++ b/tools/docker/Dockerfile.test_intel-psmp @@ -3,7 +3,7 @@ # Usage: docker build -f ./Dockerfile.test_intel-psmp ../../ # -FROM intel/hpckit:2024.2.0-devel-ubuntu22.04 +FROM intel/hpckit:2024.2.0-1-devel-ubuntu22.04 # Install requirements for the toolchain. WORKDIR /opt/cp2k-toolchain diff --git a/tools/docker/generate_dockerfiles.py b/tools/docker/generate_dockerfiles.py index b43226d319..69768c0e53 100755 --- a/tools/docker/generate_dockerfiles.py +++ b/tools/docker/generate_dockerfiles.py @@ -508,7 +508,7 @@ def toolchain_ubuntu2004_nompi(gcc_version: int = 8) -> str: # ====================================================================================== def toolchain_intel() -> str: return rf""" -FROM intel/hpckit:2024.2.0-devel-ubuntu22.04 +FROM intel/hpckit:2024.2.0-1-devel-ubuntu22.04 """ + install_toolchain( base_image="ubuntu",