From 8b657a6026eaf7f4e7eec531715d5178a7eff7f9 Mon Sep 17 00:00:00 2001
From: "svcusr-spack (Resp. Germann Elsa Sylvia)"
 <svcusr-spack@gpu001.merlin7.psi.ch>
Date: Mon, 17 Mar 2025 14:03:28 +0100
Subject: [PATCH] ADD: default correct openmpi variants x86_64 SLES

---
 env/sles15/x86_64/sysconfigs/packages.yaml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/env/sles15/x86_64/sysconfigs/packages.yaml b/env/sles15/x86_64/sysconfigs/packages.yaml
index aa2163f..8fc8062 100644
--- a/env/sles15/x86_64/sysconfigs/packages.yaml
+++ b/env/sles15/x86_64/sysconfigs/packages.yaml
@@ -44,6 +44,8 @@ packages:
           target: x86_64
   cairo:
     require: '%gcc@7.5.0'
+  cassini-headers:
+    require: '@main'
   cmake:
     require: '%gcc@7.5.0'
   coreutils:
@@ -79,7 +81,7 @@ packages:
         spec: cray-pmi@6.1.13%gcc
   cuda:
     prefer:
-    - spec: '@12.2.0'
+    - spec: '@12.8.0'
     require: '@12.2.0:'
     externals:
       - modules:
@@ -88,6 +90,8 @@ packages:
         spec: cuda@12.2.0%nvhpc@23.9
   curl:
     require: '%gcc@7.5.0'
+  cxi-driver:
+    require: '@main'
   expat:
     require: '%gcc@7.5.0'
   fftw:
@@ -148,11 +152,14 @@ packages:
     require: 'default_library=shared,static'
   libbsd:
     require: '%gcc@7.5.0'
+  libcxi:
+    require: '@main'
   libevent:
     require: '%gcc@7.5.0'
   # Crayism
   libfabric:
     buildable: true
+    require: '@main+cuda+uring fabrics=cxi,sockets,tcp,udp,xpmem'
     externals:
       - modules:
           - libfabric/1.22.0
@@ -225,9 +232,7 @@ packages:
             cxx: /opt/nvidia/hpc_sdk/Linux_x86_64/23.9/compilers/bin/nvc++
             fortran: /opt/nvidia/hpc_sdk/Linux_x86_64/23.9/compilers/bin/nvfortran
           operating_system: sles15
-          modules:
-            - libfabrics
-            - nvhpc-nompi/23.9
+          modules: nvhpc-nompi/23.9
           environment:
             prepend_path:
               LD_LIBRARY_PATH: '/opt/nvidia/hpc_sdk/Linux_x86_64/23.9/compilers/lib:/opt/nvidia/hpc_sdk/Linux_x86_64/23.9/math_libs/lib64/stubs'
@@ -246,9 +251,9 @@ packages:
         spec: openldap@2.4.46
   openmpi:
     require:
-      - spec: "schedulers=slurm fabrics=ofi +cuda +legacylaunchers"
+      - spec: "schedulers=slurm fabrics=ofi,xpmem +cuda +internal-pmix"
         when: "@5.0.0:"
-      - spec:  "schedulers=slurm fabrics=ofi +pmi +cxx +cxx_exceptions +cuda +legacylaunchers"
+      - spec:  "schedulers=slurm fabrics=ofi,xpmem +pmi +cxx +cxx_exceptions +cuda +legacylaunchers"
         when: "@:5.0.0"
   openssh:
     require: '%gcc@7.5.0'
@@ -308,6 +313,7 @@ packages:
     externals:
       - modules:
           - xpmem/2.8.2-1.0_3.9__g84a27a5.shasta
+        prefix: /usr
         spec: xpmem@2.8.2-1
   xxhash:
     require: '%gcc@7.5.0'