Adapting for magma and pmix

stacks/pinot-noir/packages_jed.yaml

@@ -11,16 +11,35 @@ packages:
       - spec: '+cuda'
         when: '%gcc'
 
+  # ---------------------------------------------------------------------------
+  hypre:
+    require:
+    - spec: '+cuda'
+      when: '%gcc'
+
+  openmpi:
+    require:
+      - spec: 'fabrics=hcoll +cuda cuda_arch=90 target=icelake'
+
+  petsc:
+    require:
+    - spec: '+cuda'
+      when: '%gcc'
+
+  ucx:
+    require:
+      - spec: '+xpmem +cma +rdmacm +rc +ud +dc +verbs +ib_hw_tm +vfs +gdrcopy +cuda cuda_arch=90 target=icelake'
+
+  # ---------------------------------------------------------------------------
+  # Externals
+  # ---------------------------------------------------------------------------
+
   hcoll:
     buildable: False
     externals:
     - spec: 'hcoll@4.8.3227'
       prefix: /usr
 
-  openmpi:
-    require:
-      - spec: 'fabrics=hcoll +cuda cuda_arch=90 target=icelake'
-
   pmix:
     buildable: false
     externals:
@@ -39,10 +58,6 @@ packages:
     - spec: 'slurm@24-05-0-2'
       prefix: /usr
 
-  ucx:
-    require:
-      - spec: '+xpmem +cma +rdmacm +rc +ud +dc +verbs +ib_hw_tm +vfs +gdrcopy +cuda cuda_arch=90 target=icelake'
-
   xpmem:
     buildable: false
     externals:

stacks/pinot-noir/packages_stack.yaml

@@ -37,12 +37,6 @@ packages:
       - spec: '+ipo'
         when: '%gcc'
 
-      - spec: '^python %gcc@12.3.0'
-        when: '%gcc@12.3.0 ^python'
-
-      - spec: '^openblas %gcc@12.3.0'
-        when: '%gcc@12.3.0 ^openblas'
-
   # ----------------------------------------------------------------------------
   # Requirements
   # ----------------------------------------------------------------------------
@@ -61,7 +55,7 @@ packages:
 
   hypre:
     require:
-      - spec: '+unified-memory +magma'
+      - spec: '+unified-memory ~magma'
         when: '+cuda'
 
   intel-oneapi-mkl:
@@ -85,7 +79,7 @@ packages:
 
   openmpi:
     require:
-    - spec: '@5.0.3 fabrics=ofi,ucx,verbs schedulers=slurm ~rsh +romio romio-filesystem=gpfs'
+    - spec: '@5.0.3 fabrics=ofi,ucx,verbs schedulers=slurm ~rsh +romio romio-filesystem=gpfs +internal-pmix'
     - spec: ^ucx +cuda
       when: +cuda
 
@@ -116,7 +110,7 @@ packages:
   slurm:
     buildable: false
     externals:
-    - spec: 'slurm@24-05-0-1'
+    - spec: 'slurm@23-11-7-1'
       prefix: /usr
 
   pmix: