mirror of
https://github.com/cp2k/cp2k.git
synced 2026-07-28 14:15:19 -04:00
Toolchain: Include libsmeagol in --install-all
This commit is contained in:
parent
63abb3d0f5
commit
aac52debd2
3 changed files with 2 additions and 8 deletions
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue