From db2b24267a74301bf55395ca24e4a6596afd18d4 Mon Sep 17 00:00:00 2001
From: Nicolas Richart <networms@gmail.ch>
Date: Fri, 21 Jun 2024 10:47:36 +0200
Subject: [PATCH] Trying to limit the compilers mixups
---
stacks/pinot-noir/config.json | 10 +++++-----
stacks/pinot-noir/spack.yaml | 3 +++
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/stacks/pinot-noir/config.json b/stacks/pinot-noir/config.json
index 1b75910..f454b7b 100644
--- a/stacks/pinot-noir/config.json
+++ b/stacks/pinot-noir/config.json
@@ -30,11 +30,6 @@
"kuma_h100": "zen4"
},
"compilers": {
- "gcc": {
- "compiler": "gcc",
- "spec": "gcc@12.3.0 %gcc@11.4.1",
- "version": "12.3.0"
- },
"oneapi": {
"compiler": "oneapi",
"spec": "intel-oneapi-compilers@2024.0.2 %gcc@11.4.1",
@@ -51,6 +46,11 @@
"spec": "aocc@4.2.0 +license-agreed %gcc@11.4.1",
"version": "4.2.0",
"constraint": "env['environment'] in ['jed']"
+ },
+ "gcc": {
+ "compiler": "gcc",
+ "spec": "gcc@12.3.0 %gcc@11.4.1",
+ "version": "12.3.0"
}
},
"system_packages": [
diff --git a/stacks/pinot-noir/spack.yaml b/stacks/pinot-noir/spack.yaml
index 9c1e986..f3db612 100644
--- a/stacks/pinot-noir/spack.yaml
+++ b/stacks/pinot-noir/spack.yaml
@@ -9,11 +9,13 @@ spack:
# -------------------------------------------------------------------------
- mpi_gcc:
- openmpi
+
- mpi_oneapi:
- intel-oneapi-mpi
- blas_gcc:
- openblas
+
- blas_oneapi:
- intel-oneapi-mkl
@@ -23,6 +25,7 @@ spack:
- core_codes:
- gnuplot
- imagemagick +ghostscript
+ - lmod
# -------------------------------------------------------------------------
# Serial codes
--
GitLab