zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use newer spack version to install intel compiler

Browse Source 
This removes the need for patches and makes sure the `prefer` directives in
`package.yaml` are understood.
This commit is contained in:
Stephen Sachs 2024-04-10 10:49:19 +02:00
parent c7eea3d032
commit ecb25a192c
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
share/spack/gitlab/cloud_pipelines/scripts/pcluster/setup-pcluster.sh
View File

@ -10,7 +10,7 @@ set -e
# The best solution would be to have the compilers hash (or packages contents) be part of the
# individual packages hashes. I don't see this at the moment.
# Set to the latest tag including a recent oneapi compiler.
spack_intel_compiler_commit="develop-2023-08-06"
spack_intel_compiler_commit="develop-2024-03-10"
set_pcluster_defaults() {
# Set versions of pre-installed software in packages.yaml
@ -108,8 +108,6 @@ install_compilers() {
# this leads to libstdc++.so errors during linking (e.g. slepc).
git clone --depth=1 -b ${spack_intel_compiler_commit} https://github.com/spack/spack.git \
&& cd spack \
&& curl -sL https://github.com/spack/spack/pull/40557.patch | patch -p1 \
&& curl -sL https://github.com/spack/spack/pull/40561.patch | patch -p1 \
&& cp "${CURRENT_SPACK_ROOT}/etc/spack/config.yaml" etc/spack/ \
&& cp "${CURRENT_SPACK_ROOT}/etc/spack/compilers.yaml" etc/spack/ \
&& cp "${CURRENT_SPACK_ROOT}/etc/spack/packages.yaml" etc/spack/ \