Use Spack fork for the time being

The spack develop branch has been quite volatile recently and required
changes for the CP2K CI build are still in the pipeline.
The dust will hopefully settle once Spack v1.0 is released.
This commit is contained in:
Matthias Krack 2025-04-02 11:40:59 +02:00
parent 8da3cacd52
commit 47e5eb7857
5 changed files with 10 additions and 9 deletions

View file

@ -47,9 +47,9 @@ ENV NUM_PROCS=${NUM_PROCS:-32}
# Install a recent Spack version
WORKDIR /root/spack
ARG SPACK_VERSION
ENV SPACK_VERSION=${SPACK_VERSION:-a3abc1c492f2431f477a63bbccb48aa3a2d34199}
ENV SPACK_VERSION=${SPACK_VERSION:-test_cp2k}
RUN git init --quiet && \
git remote add origin https://github.com/spack/spack.git && \
git remote add origin https://github.com/mkrack/spack.git && \
git fetch --quiet --depth 1 origin ${SPACK_VERSION} --no-tags && \
git checkout --quiet FETCH_HEAD
ENV PATH="/root/spack/bin:${PATH}"

View file

@ -37,9 +37,9 @@ RUN apt-get update -qq && apt-get install -qq --no-install-recommends \
# Install a recent Spack version
WORKDIR /root/spack
ARG SPACK_VERSION
ENV SPACK_VERSION=${SPACK_VERSION:-a3abc1c492f2431f477a63bbccb48aa3a2d34199}
ENV SPACK_VERSION=${SPACK_VERSION:-test_cp2k}
RUN git init --quiet && \
git remote add origin https://github.com/spack/spack.git && \
git remote add origin https://github.com/mkrack/spack.git && \
git fetch --quiet --depth 1 origin ${SPACK_VERSION} --no-tags && \
git checkout --quiet FETCH_HEAD
ENV PATH="/root/spack/bin:${PATH}"

View file

@ -863,9 +863,9 @@ RUN apt-get update -qq && apt-get install -qq --no-install-recommends \
# Install a recent Spack version
WORKDIR /root/spack
ARG SPACK_VERSION
ENV SPACK_VERSION=${{SPACK_VERSION:-a3abc1c492f2431f477a63bbccb48aa3a2d34199}}
ENV SPACK_VERSION=${{SPACK_VERSION:-test_cp2k}}
RUN git init --quiet && \
git remote add origin https://github.com/spack/spack.git && \
git remote add origin https://github.com/mkrack/spack.git && \
git fetch --quiet --depth 1 origin ${{SPACK_VERSION}} --no-tags && \
git checkout --quiet FETCH_HEAD
ENV PATH="/root/spack/bin:${{PATH}}"

View file

@ -87,7 +87,8 @@ spack:
- "mpich@4.2.3"
- "openblas@0.3.29"
- "netlib-scalapack@2.2.2"
- "cosma@2.6.6"
# - "cosma@2.6.6" Use master until a new release will be available
- "cosma@master"
- "dbcsr@2.8.0"
- "dftd4@3.6.0"
- "dla-future@0.8.0"
@ -99,7 +100,7 @@ spack:
- "libsmeagol@1.2"
- "libvori@220621"
- "libxc@7.0.0"
- "libxsmm@1.17"
- "libxsmm@main-2024-09"
- "plumed@2.9.2"
- "py-torch@2.6"
- "sirius@7.6.1"

View file

@ -49,7 +49,7 @@ spack:
- "dbcsr@2.8.0"
- "fftw@3.3.10"
- "libxc@7.0.0"
- "libxsmm@1.17"
- "libxsmm@main-2024-09"
view:
default:
root: ./spack-env/view