Changing constraints

stacks/pinot-noir/packages.yaml

@@ -3,6 +3,12 @@ packages:
     providers:
       mpi: [openmpi, intel-oneapi-mpi]
       jpeg: [libjpeg]
+    require:
+      - spec: ^intel-oneapi-mpi
+        when: '%oneapi ^mpi'
+
+      - spec: ^openmpi
+        when: '%gcc ^mpi'
 
   # System dependencies  # ----------------------------------------------------------------------------
   rdma-core:
@@ -38,18 +44,9 @@ packages:
   hdf5:
     variants: +hl +threadsafe +szip +cxx +fortran
 
-  libfabric:
-    require:
-    - spec: fabrics=mlx,tcp,udp,verbs,sockets,shm
-
-  intel-oneapi-mpi:
-    require:
-    - any_of: ['%oneapi', '%intel']
-
   openmpi:
     require:
-    - any_of: ['%gcc']
-    - spec: fabrics=ofi,ucx,verbs schedulers=slurm ~rsh +gpfs
+    - spec: fabrics=ofi,ucx,verbs schedulers=slurm ~rsh +romio romio-filesystem=gpfs
     - spec: ^ucx +cuda
       when: +cuda
 
@@ -58,3 +55,7 @@ packages:
     - spec: +rdmacm +rc +dc +ud +cma +verbs
     - spec: +gdrcopy
       when: +cuda
+
+  libfabric:
+    require:
+    - spec: fabris=mlx,mrail,psm2,psm3,verbs,udp,tcp,sockets,shm