From 57f0dc00cda3b97408875d288d599e08ccd4d6c2 Mon Sep 17 00:00:00 2001
From: Nicolas Richart <nicolas.richart@epfl.ch>
Date: Thu, 27 Jun 2024 17:32:20 +0200
Subject: [PATCH] To many constraint

---
 stacks/pinot-noir/packages_jed.yaml   |  9 +++--
 stacks/pinot-noir/packages_stack.yaml | 54 +++++++++++++--------------
 2 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/stacks/pinot-noir/packages_jed.yaml b/stacks/pinot-noir/packages_jed.yaml
index 89f3fe6..dcc04e3 100644
--- a/stacks/pinot-noir/packages_jed.yaml
+++ b/stacks/pinot-noir/packages_jed.yaml
@@ -6,9 +6,8 @@ packages:
 
       - spec: cuda_arch=90 target=icelake
         when: '+cuda'
-
-      - spec: '~cuda'
-        when: '%oneapi'
+      # - spec: '~cuda'
+      #   when: '%oneapi'
 
       - spec: '+cuda'
         when: '%gcc'
@@ -41,6 +40,10 @@ packages:
     require:
     - spec: '~cuda'
 
+  suite-sparse:
+    require:
+    - spec: '+cuda'
+
   ucx:
     require:
       - spec: '+xpmem +cma +rdmacm +rc +ud +dc +verbs +ib_hw_tm +vfs +gdrcopy +cuda cuda_arch=90 target=icelake ~rocm'
diff --git a/stacks/pinot-noir/packages_stack.yaml b/stacks/pinot-noir/packages_stack.yaml
index a2feb1e..bdebbbd 100644
--- a/stacks/pinot-noir/packages_stack.yaml
+++ b/stacks/pinot-noir/packages_stack.yaml
@@ -8,44 +8,44 @@ packages:
       - spec: "^libiconv"
         when: "^iconv"
 
-      - spec: '+ipo'
-        when: '%gcc'
+      # - spec: ^intel-oneapi-mpi
+      #   when: '%oneapi ^mpi'
 
-      - spec: ^intel-oneapi-mpi
-        when: '%oneapi ^mpi'
+      # - spec: ^openmpi
+      #   when: '%gcc ^mpi'
 
-      - spec: ^openmpi
-        when: '%gcc ^mpi'
+      # - spec: ^openmpi
+      #   when: '%aocc ^mpi'
 
-      - spec: ^openmpi
-        when: '%aocc ^mpi'
+      # - spec: ^nvhpc+mpi
+      #   when: '%nvhpc ^mpi'
 
-      - spec: ^nvhpc+mpi
-        when: '%nvhpc ^mpi'
+      # - spec: ^openblas
+      #   when: '%gcc ^blas'
 
-      - spec: ^openblas
-        when: '%gcc ^blas'
+      # - spec: ^openblas
+      #   when: '%gcc ^lapack'
 
-      - spec: ^openblas
-        when: '%gcc ^lapack'
+      # - spec: ^intel-oneapi-mkl
+      #   when: '%oneapi ^blas'
 
-      - spec: ^intel-oneapi-mkl
-        when: '%oneapi ^blas'
+      # - spec: ^intel-oneapi-mkl
+      #   when: '%oneapi ^lapack'
 
-      - spec: ^intel-oneapi-mkl
-        when: '%oneapi ^lapack'
+      # - spec: ^nvhpc+blas
+      #   when: '%nvhpc ^blas'
 
-      - spec: ^nvhpc+blas
-        when: '%nvhpc ^blas'
+      # - spec: ^nvhpc+lapack
+      #   when: '%nvhpc ^lapack'
 
-      - spec: ^nvhpc+lapack
-        when: '%nvhpc ^lapack'
+      # - spec: ^openblas
+      #   when: '%gcc ^py-numpy'
 
-      - spec: ^openblas
-        when: '%gcc ^py-numpy'
+      # - spec: ^intel-oneapi-mkl
+      #   when: '%oneapi ^py-numpy'
 
-      - spec: ^intel-oneapi-mkl
-        when: '%oneapi ^py-numpy'
+      - spec: '+ipo'
+        when: '%gcc'
 
   # ----------------------------------------------------------------------------
   # Requirements
@@ -157,7 +157,7 @@ packages:
 
   suite-sparse:
     require:
-    - spec: '@7.3.1'
+    - spec: '+graphblas'
 
   tk:
     require: ['+xft', '+xss']
-- 
GitLab