Remove oss libfabric/1.22.0 in favor of Cray. Update OpenMPI modules with new libfbric

Compiler/openmpi/files/config.yaml

@@ -57,26 +57,32 @@ openmpi:
     openmpi-5.0.5.tar.bz2: 6588d57c0a4bd299a24103f4e196051b29e8b55fbda49e11d5b3d32030a32776
 
   versions:
-    # 5.0.6:
-    #   config:
-    #     configure_args+:
-    #       - --enable-mpi1-compatibility
-    #       - --enable-static=no
-    #   variants:
-    #     - systems: [.*.merlin7.psi.ch]
-    #       relstage: unstable
-    #       overlay: Alps
-    #       use_overlays: [PSI, Alps]
-    #       group_deps:
-    #         compiler: {gcc: [14.2.0,12.3.0,8.5.0], intelcc: [22.2]}
-    #       build_requires: [hwloc/2.11.1, patchelf/0.14.5]
-    #       runtime_deps: [cuda/12.2.0, libfabric/1.15.2.0, pmix/5.0.4]
-    #       configure_args+:
-    #         - --with-cxi
-    #         - --with-lustre
-    #         - --with-slingshot
-    #       use_flags: [merlin7, slurm]
-
+    5.0.8:
+      config:
+        configure_args+:
+          - --enable-mpi1-compatibility
+          - --enable-static=no
+      variants:
+        - systems: [.*.merlin7.psi.ch]
+          relstage: stable
+          overlay: Alps
+          use_overlays: [PSI, Alps]
+          group_deps:
+            compiler: {gcc: [14.2.0,12.3.0]}
+          build_requires: 
+            - hwloc/2.12.0
+            - patchelf/0.14.5
+            - shs-cassini-headers/12.0.1-oss
+            - shs-cxi-driver/12.0.1-oss
+            - shs-libcxi/12.0.1-oss
+          runtime_deps:
+            - cuda/12.9.1
+            - pmix/5.0.8
+            - libfabric/2.2.0-oss
+          configure_args+:
+            - --with-lustre
+            - --with-xpmem
+          use_flags: [merlin7, slurm]
     5.0.5:
       config:
         configure_args+:
@@ -91,7 +97,7 @@ openmpi:
             compiler: {gcc: [14.2.0, 12.3.0, 8.5.0],
                        intelcc: [22.2]}
           build_requires: [hwloc/2.11.1, patchelf/0.14.5]
-          runtime_deps: [cuda/12.2.0, libfabric/1.15.2.0, pmix/5.0.3]
+          runtime_deps: [cuda/12.2.0, libfabric/1.22.0, pmix/5.0.3]
           configure_args+:
             - --with-cxi
             - --with-lustre
@@ -141,7 +147,7 @@ openmpi:
           group_deps:
             compiler: {gcc: [12.3.0, 13.3.0, 14.2.0], intelcc: [22.2]}
           build_requires: [hwloc/2.11.1, patchelf/0.14.5]
-          runtime_deps: [cuda/12.2.0, libfabric/1.15.2.0, pmix/4.2.9]
+          runtime_deps: [cuda/12.2.0, libfabric/1.22.0, pmix/4.2.9]
           configure_args+:
             - --enable-mpi1-compatibility
             - --enable-static=no