diff --git a/tools/docker/Dockerfile.test_psmp b/tools/docker/Dockerfile.test_psmp index 7d5aca7855..0bd0d55729 100644 --- a/tools/docker/Dockerfile.test_psmp +++ b/tools/docker/Dockerfile.test_psmp @@ -23,7 +23,6 @@ COPY ./tools/toolchain/install_cp2k_toolchain.sh . RUN ./install_cp2k_toolchain.sh \ --install-all \ --with-gcc=system \ - --with-libsmeagol \ --dry-run # Dry-run leaves behind config files for the followup install scripts. diff --git a/tools/docker/generate_dockerfiles.py b/tools/docker/generate_dockerfiles.py index 65cc711cb5..71c82a0a84 100755 --- a/tools/docker/generate_dockerfiles.py +++ b/tools/docker/generate_dockerfiles.py @@ -17,11 +17,8 @@ def main() -> None: for version in "sdbg", "ssmp", "pdbg", "psmp": with OutputFile(f"Dockerfile.test_{version}", args.check) as f: if version in ("ssmp", "psmp"): - kwargs = {} - if version == "psmp": - kwargs = {"with_libsmeagol": ""} # Use ssmp/psmp as guinea pigs - f.write(install_deps_toolchain(with_dbcsr=True, **kwargs)) + f.write(install_deps_toolchain()) f.write(install_dbcsr("toolchain", version)) f.write(regtest_cmake("toolchain", version)) else: @@ -425,7 +422,6 @@ RUN ./install_dbcsr.sh {profile} {version} def install_deps_toolchain( base_image: str = "ubuntu:24.04", with_gcc: str = "system", - with_dbcsr: bool = False, **kwargs: str, ) -> str: output = f"\nFROM {base_image}\n\n" diff --git a/tools/toolchain/install_cp2k_toolchain.sh b/tools/toolchain/install_cp2k_toolchain.sh index a45c2b3774..110ca83e00 100755 --- a/tools/toolchain/install_cp2k_toolchain.sh +++ b/tools/toolchain/install_cp2k_toolchain.sh @@ -428,8 +428,7 @@ while [ $# -ge 1 ]; do for ii in ${package_list}; do if [ "${ii}" != "intel" ] && [ "${ii}" != "intelmpi" ] && - [ "${ii}" != "amd" ] && - [ "${ii}" != "libsmeagol" ]; then + [ "${ii}" != "amd" ]; then eval with_${ii}="__INSTALL__" fi done