comp-chem/cp2k
1
0
Fork 0
mirror of https://github.com/cp2k/cp2k.git synced 2026-07-27 13:45:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix file name pattern

Browse source
This commit is contained in:
Matthias Krack 2025-04-10 17:01:57 +02:00
parent 44e17d3851
commit edaa72e6aa
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tools/docker/Dockerfile.test_spack
View file

@ -60,15 +60,15 @@ RUN spack mirror add ${SPACK_BUILD_CACHE} https://binaries.spack.io/${SPACK_BUIL
# Copy Spack configuration and build recipes
ARG CP2K_BUILD_TYPE
ENV CP2K_BUILD_TYPE=${CP2K_BUILD_TYPE:-all}
COPY ./tools/spack/cp2k_deps_${CP2K_BUILD_TYPE}.yaml .
COPY ./tools/spack/cp2k_deps_${CP2K_BUILD_TYPE}_psmp.yaml .
COPY ./tools/spack/cp2k ./cp2k
# Sarus containers must be dynamically linked to an MPI implementation that is ABI-compatible
# with the MPI on the compute nodes at CSCS like MPICH@3
ARG MPICH_VERSION
ENV MPICH_VERSION=${MPICH_VERSION:-3.4.3}
RUN sed -i -e "s/mpich@[0-9.]*/mpich@${MPICH_VERSION}/" cp2k_deps_${CP2K_BUILD_TYPE}.yaml && \
spack env create myenv cp2k_deps_${CP2K_BUILD_TYPE}.yaml && \
RUN sed -i -e "s/mpich@[0-9.]*/mpich@${MPICH_VERSION}/" cp2k_deps_${CP2K_BUILD_TYPE}_psmp.yaml && \
spack env create myenv cp2k_deps_${CP2K_BUILD_TYPE}_psmp.yaml && \
spack -e myenv repo list
# Install CP2K dependencies via Spack

10
tools/docker/generate_dockerfiles.py
View file

@ -50,7 +50,7 @@ def main() -> None:
f.write(regtest_cmake("minimal", "ssmp"))
with OutputFile(f"Dockerfile.test_spack", args.check) as f:
f.write(install_deps_spack())
f.write(install_deps_spack("psmp"))
f.write(regtest_cmake("spack_all", "psmp"))
for version in "ssmp", "psmp":
@ -827,7 +827,7 @@ RUN ./scripts/generate_arch_files.sh && rm -rf ./build
# ======================================================================================
def install_deps_spack() -> str:
def install_deps_spack(version: str) -> str:
return rf"""
FROM ubuntu:24.04
@ -886,15 +886,15 @@ RUN spack mirror add ${{SPACK_BUILD_CACHE}} https://binaries.spack.io/${{SPACK_B
# Copy Spack configuration and build recipes
ARG CP2K_BUILD_TYPE
ENV CP2K_BUILD_TYPE=${{CP2K_BUILD_TYPE:-all}}
COPY ./tools/spack/cp2k_deps_${{CP2K_BUILD_TYPE}}.yaml .
COPY ./tools/spack/cp2k_deps_${{CP2K_BUILD_TYPE}}_{version}.yaml .
COPY ./tools/spack/cp2k ./cp2k
# Sarus containers must be dynamically linked to an MPI implementation that is ABI-compatible
# with the MPI on the compute nodes at CSCS like MPICH@3
ARG MPICH_VERSION
ENV MPICH_VERSION=${{MPICH_VERSION:-3.4.3}}
RUN sed -i -e "s/mpich@[0-9.]*/mpich@${{MPICH_VERSION}}/" cp2k_deps_${{CP2K_BUILD_TYPE}}.yaml && \
spack env create myenv cp2k_deps_${{CP2K_BUILD_TYPE}}.yaml && \
RUN sed -i -e "s/mpich@[0-9.]*/mpich@${{MPICH_VERSION}}/" cp2k_deps_${{CP2K_BUILD_TYPE}}_{version}.yaml && \
spack env create myenv cp2k_deps_${{CP2K_BUILD_TYPE}}_{version}.yaml && \
spack -e myenv repo list
# Install CP2K dependencies via Spack