From d7297c05c67f1ca8f027bd088005dd7cdbb489fa Mon Sep 17 00:00:00 2001 From: Matthias Krack Date: Wed, 16 Jul 2025 13:23:33 +0200 Subject: [PATCH] Enable xpmem only for Cray systems --- ci/docker/build_deps_spack.Dockerfile | 1 + tools/spack/cp2k_deps_all_psmp.yaml | 2 +- tools/spack/cp2k_deps_minimal_psmp.yaml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ci/docker/build_deps_spack.Dockerfile b/ci/docker/build_deps_spack.Dockerfile index d76704556e..5a34a1aba1 100644 --- a/ci/docker/build_deps_spack.Dockerfile +++ b/ci/docker/build_deps_spack.Dockerfile @@ -91,6 +91,7 @@ ENV CP2K_VERSION=${CP2K_VERSION:-ssmp} ARG CP2K_BUILD_TYPE ENV CP2K_BUILD_TYPE=${CP2K_BUILD_TYPE:-minimal} COPY ./tools/spack/cp2k_deps_${CP2K_BUILD_TYPE}_${CP2K_VERSION}.yaml ./ +RUN sed -e "s/~xpmem/+xpmem/" cp2k_deps_${CP2K_BUILD_TYPE}_${CP2K_VERSION}.yaml COPY ./tools/spack/cp2k_dev_repo ${SPACK_PACKAGES_ROOT}/repos/spack_repo/cp2k_dev_repo/ RUN spack repo add --scope site ${SPACK_PACKAGES_ROOT}/repos/spack_repo/cp2k_dev_repo/ RUN spack env create myenv cp2k_deps_${CP2K_BUILD_TYPE}_${CP2K_VERSION}.yaml && \ diff --git a/tools/spack/cp2k_deps_all_psmp.yaml b/tools/spack/cp2k_deps_all_psmp.yaml index 6e1aaac001..4c9b86c6bb 100644 --- a/tools/spack/cp2k_deps_all_psmp.yaml +++ b/tools/spack/cp2k_deps_all_psmp.yaml @@ -20,7 +20,7 @@ spack: - mpich mpich: require: - - +xpmem + - ~xpmem xpmem: buildable: false externals: diff --git a/tools/spack/cp2k_deps_minimal_psmp.yaml b/tools/spack/cp2k_deps_minimal_psmp.yaml index 4f5a8a2790..28412ee8f9 100644 --- a/tools/spack/cp2k_deps_minimal_psmp.yaml +++ b/tools/spack/cp2k_deps_minimal_psmp.yaml @@ -20,7 +20,7 @@ spack: - mpich mpich: require: - - +xpmem + - ~xpmem xpmem: buildable: false externals: