From c48c427517e1e35a33f0e0a776cd2bc5a8588ac3 Mon Sep 17 00:00:00 2001
From: Nicolas Richart <networms@gmail.ch>
Date: Fri, 21 Jun 2024 01:20:31 +0200
Subject: [PATCH] More constraint

---
 stacks/pinot-noir/config.json         |  1 +
 stacks/pinot-noir/packages_jed.yaml   | 19 +++++++++++--------
 stacks/pinot-noir/packages_stack.yaml |  7 +++++++
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/stacks/pinot-noir/config.json b/stacks/pinot-noir/config.json
index 1b75910..560deec 100644
--- a/stacks/pinot-noir/config.json
+++ b/stacks/pinot-noir/config.json
@@ -78,6 +78,7 @@
             "gnuplot",
             "libaec",
             "libevent",
+            "libfuse",
             "libpciaccess",
             "libsigsegv",
             "libtool",
diff --git a/stacks/pinot-noir/packages_jed.yaml b/stacks/pinot-noir/packages_jed.yaml
index 674aa61..52d74c3 100644
--- a/stacks/pinot-noir/packages_jed.yaml
+++ b/stacks/pinot-noir/packages_jed.yaml
@@ -14,20 +14,19 @@ packages:
       - spec: '+cuda'
         when: '%gcc'
 
-  ucx:
-    require:
-      - spec: +xpmem +cma +rdmacm +rc +ud +dc +verbs +ib_hw_tm +vfs +gdrcopy +cuda
-
-  openmpi:
-    require:
-      - spec: fabrics=hcoll
-
   hcoll:
     buildable: False
     externals:
     - spec: 'hcoll@4.8.3227'
       prefix: /usr
 
+  hypre:
+    prefer: ['+unified-memory', '+magma']
+
+  openmpi:
+    require:
+      - spec: 'fabrics=hcoll'
+
   pmix:
     buildable: false
     externals:
@@ -46,6 +45,10 @@ packages:
     - spec: 'slurm@24-05-0-1'
       prefix: /usr
 
+  ucx:
+    require:
+      - spec: '+xpmem +cma +rdmacm +rc +ud +dc +verbs +ib_hw_tm +vfs +gdrcopy +cuda'
+
   xpmem:
     buildable: false
     externals:
diff --git a/stacks/pinot-noir/packages_stack.yaml b/stacks/pinot-noir/packages_stack.yaml
index 1309a47..ec3e36f 100644
--- a/stacks/pinot-noir/packages_stack.yaml
+++ b/stacks/pinot-noir/packages_stack.yaml
@@ -69,6 +69,9 @@ packages:
   mesa:
     require: ['~llvm', '+opengl', '+opengles', '+osmesa']
 
+  metis:
+    require: ['+real64']
+
   openblas:
     prefer: ['threads=pthreads']
 
@@ -78,6 +81,10 @@ packages:
     - spec: ^ucx +cuda
       when: +cuda
 
+  petsc:
+    require:
+    - spec: '+hypre +mumps +saws +scalapack'
+
   python:
     require:
     - spec: +optimizations
-- 
GitLab