From 022fbf2b710e2741a1dbd8182ddf96b03c7d5f76 Mon Sep 17 00:00:00 2001
From: Nicolas Richart <nicolas.richart@epfl.ch>
Date: Mon, 5 Aug 2024 14:14:40 +0200
Subject: [PATCH] Forcing proper compiler

---
 stacks/pinot-noir-gcc13/packages_kuma-h100.yaml | 8 ++++----
 stacks/pinot-noir-gcc13/packages_kuma-l40s.yaml | 6 +++---
 stacks/pinot-noir-gcc13/packages_stack.yaml     | 2 +-
 stacks/pinot-noir/spack.yaml                    | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/stacks/pinot-noir-gcc13/packages_kuma-h100.yaml b/stacks/pinot-noir-gcc13/packages_kuma-h100.yaml
index a1da6ae..2eb5060 100644
--- a/stacks/pinot-noir-gcc13/packages_kuma-h100.yaml
+++ b/stacks/pinot-noir-gcc13/packages_kuma-h100.yaml
@@ -14,9 +14,9 @@ packages:
   # ---------------------------------------------------------------------------
   cuda:
     prefer:
-    - spec: "^gcc-runtime@12.3.0"
+    - spec: "^gcc-runtime@13.2.0"
       when: "%gcc"
-    - spec: "%gcc@12.3.0 target=zen4"
+    - spec: "%gcc@13.2.0 target=zen4"
       when: "%gcc"
     require:
     - '@12.4.0'
@@ -64,11 +64,11 @@ packages:
   python:
     require:
     - spec: 'target=zen4'
-      when: '%gcc@12.3.0'
+      when: '%gcc@13.2.0'
 
   quantum-espresso:
     require:
-    - spec: '~cuda'
+    - spec: '+nvptx'
 
   suite-sparse:
     require:
diff --git a/stacks/pinot-noir-gcc13/packages_kuma-l40s.yaml b/stacks/pinot-noir-gcc13/packages_kuma-l40s.yaml
index a3d8533..f65be6c 100644
--- a/stacks/pinot-noir-gcc13/packages_kuma-l40s.yaml
+++ b/stacks/pinot-noir-gcc13/packages_kuma-l40s.yaml
@@ -14,9 +14,9 @@ packages:
   # ---------------------------------------------------------------------------
   cuda:
     prefer:
-    - spec: "^gcc-runtime@12.3.0"
+    - spec: "^gcc-runtime@13.2.0"
       when: "%gcc"
-    - spec: "%gcc@12.3.0 target=zen4"
+    - spec: "%gcc@13.2.0 target=zen4"
       when: "%gcc"
     require:
     - '@12.4.0'
@@ -64,7 +64,7 @@ packages:
   python:
     require:
     - spec: 'target=zen4'
-      when: '%gcc@12.3.0'
+      when: '%gcc@13.2.0'
 
   quantum-espresso:
     require:
diff --git a/stacks/pinot-noir-gcc13/packages_stack.yaml b/stacks/pinot-noir-gcc13/packages_stack.yaml
index 7ae1a64..db7e046 100644
--- a/stacks/pinot-noir-gcc13/packages_stack.yaml
+++ b/stacks/pinot-noir-gcc13/packages_stack.yaml
@@ -194,7 +194,7 @@ packages:
     - spec: '+optimizations'
       when: '%gcc'
     prefer:
-    - spec: '%gcc@12.3.0'
+    - spec: '%gcc@13.2.0'
       when: '%gcc'
 
   py-cython:
diff --git a/stacks/pinot-noir/spack.yaml b/stacks/pinot-noir/spack.yaml
index a942fee..01584c3 100644
--- a/stacks/pinot-noir/spack.yaml
+++ b/stacks/pinot-noir/spack.yaml
@@ -261,7 +261,7 @@ spack:
         - mumps@5.6.2
         - superlu-dist@8.2.1
         #- quantum-espresso ++mpi +scalapack +gipaw
-        #- quantum-espresso ++mpi +scalapack +gipaw hdf5=parallel
+        - quantum-espresso
 
     - gcc_mpi_blas_codes:
         - armadillo +hdf5 ^arpack-ng ++mpi ^hdf5 ++mpi
-- 
GitLab