From 7df462761b744b6cbde5e20fa097d74e405b7a0a Mon Sep 17 00:00:00 2001
From: "svcusr-spack (Resp. Germann Elsa Sylvia)"
 <svcusr-spack@gpu001.merlin7.psi.ch>
Date: Mon, 27 Jan 2025 14:36:21 +0100
Subject: [PATCH] FIX: nvhpc module for aarch64 sles15

---
 env/sles15/aarch64/sysconfigs/packages.yaml | 29 ++++-----------------
 1 file changed, 5 insertions(+), 24 deletions(-)

diff --git a/env/sles15/aarch64/sysconfigs/packages.yaml b/env/sles15/aarch64/sysconfigs/packages.yaml
index 0c3a61e..1981a6f 100644
--- a/env/sles15/aarch64/sysconfigs/packages.yaml
+++ b/env/sles15/aarch64/sysconfigs/packages.yaml
@@ -3,6 +3,7 @@ packages:
     compiler: [gcc, nvhpc, cce]
     prefer:
     - spec: '^openmpi'
+      when: '^mpi'
     providers:
       blas: [openblas, nvhpc, cray-libsci]
       lapack: [openblas, nvhpc, cray-libsci]
@@ -141,26 +142,6 @@ packages:
     require: '%gcc@7.5.0'
   groff:
     require: '%gcc@7.5.0'
-  hdf5:
-    prefer:
-      - spec: '~mpi'
-    externals:
-      - modules:
-        - cray-hdf5/1.12.2.9
-        prefix: /opt/cray/pe/hdf5/1.12.2.9/crayclang/17.0
-        spec: hdf5@1.12.2+cxx+fortran+hl~mpi+shared~szip~threadsafe%cce@17.0.0
-      - modules:
-        - cray-parallel-hdf5/1.12.2.9
-        prefix: /opt/cray/pe/hdf5-parallel/1.12.2.9/crayclang/17.0
-        spec: hdf5@1.12.2+cxx+fortran+hl+mpi+shared~szip~threadsafe%cce@17.0.0
-      - modules:
-        - cray-hdf5/1.12.2.9
-        prefix: /opt/cray/pe/hdf5/1.12.2.9/gnu/12.3
-        spec: hdf5@1.12.2+cxx+fortran+hl~mpi+shared~szip~threadsafe%gcc@12.3
-      - modules:
-        - cray-parallel-hdf5/1.12.2.9
-        prefix: /opt/cray/pe/hdf5-parallel/1.12.2.9/gnu/12.3
-        spec: hdf5@1.12.2+cxx+fortran+hl+mpi+shared~szip~threadsafe%gcc@12.3
   libbsd:
     require: '%gcc@7.5.0'
   libevent:
@@ -237,9 +218,7 @@ packages:
     require: '%gcc@7.5.0'
   nvhpc:
     externals:
-      - modules:
-        - libfabric/1.15.2.0
-        - nvhpc-nompi/24.3
+      - prefix: /opt/nvidia/hpc_sdk
         spec: nvhpc@24.3
         extra_attributes:
           compilers:
@@ -247,7 +226,9 @@ packages:
             cxx: /opt/nvidia/hpc_sdk/Linux_aarch64/24.3/compilers/bin/nvc++
             fortran: /opt/nvidia/hpc_sdk/Linux_aarch64/24.3/compilers/bin/nvfortran
           operating_system: sles15
-          target: aarch64
+          modules:
+          - libfabric/1.15.2.0
+          - nvhpc-nompi/24.3
           environment:
             prepend_path:
               LD_LIBRARY_PATH: /opt/nvidia/hpc_sdk/Linux_aarch64/24.3/math_libs/lib64/stubs