From 97aa0d46de93b0467c87abda095227beafed9317 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 6 Dec 2024 11:51:50 -0700 Subject: [PATCH] Build ip with gcc when using aocc as preferred compiler, bump ip to 5.1.0 (#1394) Because ip doesn't build with the AMD aocc compilers, we switch to building it with gcc for that setup. While at it, bump ip to 5.1.0 and revert the workaround in the neptune-env template. --- configs/common/packages.yaml | 2 +- configs/common/packages_aocc.yaml | 4 ++++ configs/sites/tier2/blackpearl/packages_aocc.yaml | 4 ++-- spack-ext/repos/spack-stack/packages/neptune-env/package.py | 6 +----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 5a84256db..77ef53a69 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -123,7 +123,7 @@ packages: hdf-eos2: require: '@2.20v1.00' ip: - require: '@5.0.0 precision=4,d,8' + require: '@5.1.0 precision=4,d,8' ip2: require: '@1.1.2' jasper: diff --git a/configs/common/packages_aocc.yaml b/configs/common/packages_aocc.yaml index 70012d1a0..f7240475a 100644 --- a/configs/common/packages_aocc.yaml +++ b/configs/common/packages_aocc.yaml @@ -13,3 +13,7 @@ packages: py-numpy: require: - '^openblas' + # ip@5 doesn't build with aocc@4 compilers + ip: + require: + - '%gcc' diff --git a/configs/sites/tier2/blackpearl/packages_aocc.yaml b/configs/sites/tier2/blackpearl/packages_aocc.yaml index 43a858a5a..3e690c586 100644 --- a/configs/sites/tier2/blackpearl/packages_aocc.yaml +++ b/configs/sites/tier2/blackpearl/packages_aocc.yaml @@ -1,5 +1,5 @@ packages: all: - compiler:: [aocc@4.2.0] + compiler:: [aocc@4.2.0,gcc@11.4.1] providers: - mpi:: [openmpi@5.0.3] + mpi:: [openmpi@5.0.5] diff --git a/spack-ext/repos/spack-stack/packages/neptune-env/package.py b/spack-ext/repos/spack-stack/packages/neptune-env/package.py index ff7aef9d4..08c2c9ca8 100644 --- a/spack-ext/repos/spack-stack/packages/neptune-env/package.py +++ b/spack-ext/repos/spack-stack/packages/neptune-env/package.py @@ -31,11 +31,7 @@ class NeptuneEnv(BundlePackage): depends_on("libyaml", type="run") depends_on("p4est", type="run") depends_on("w3emc", type="run") - depends_on("sp", type="run", when="%aocc") - depends_on("ip@5:", type="run", when="%apple-clang") - depends_on("ip@5:", type="run", when="%gcc") - depends_on("ip@5:", type="run", when="%intel") - depends_on("ip@5:", type="run", when="%oneapi") + depends_on("ip", type="run") depends_on("esmf", type="run") depends_on("nco", type="run") depends_on("mct", type="run")