From b113021c754cb88896e63bfda908f5f4c1bfefc7 Mon Sep 17 00:00:00 2001
From: Nicolas Richart <networms@gmail.ch>
Date: Fri, 21 Jun 2024 00:59:27 +0200
Subject: [PATCH] A bit of cleaning and moving things around
---
stacks/pinot-noir/config.json | 1 +
stacks/pinot-noir/packages_jed.yaml | 8 +++-----
stacks/pinot-noir/packages_stack.yaml | 6 ------
stacks/pinot-noir/spack.yaml | 4 ++--
4 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/stacks/pinot-noir/config.json b/stacks/pinot-noir/config.json
index 28eb966..1b75910 100644
--- a/stacks/pinot-noir/config.json
+++ b/stacks/pinot-noir/config.json
@@ -63,6 +63,7 @@
"ca-certificates-mozilla",
"check",
"cmake",
+ "cuda",
"diffutils",
"expat",
"findutils",
diff --git a/stacks/pinot-noir/packages_jed.yaml b/stacks/pinot-noir/packages_jed.yaml
index 2785d62..674aa61 100644
--- a/stacks/pinot-noir/packages_jed.yaml
+++ b/stacks/pinot-noir/packages_jed.yaml
@@ -2,19 +2,17 @@ packages:
all:
target: ["icelake"]
require:
- - spec: ^openmpi +cuda target=icelake
+ - spec: ^openmpi target=icelake
when: '%gcc ^mpi'
- spec: cuda_arch=90 target=icelake
when: '+cuda'
- - spec: "^cuda target=icelake"
- when: '^cuda'
-
- spec: '~cuda'
when: '%oneapi'
- - '+cuda'
+ - spec: '+cuda'
+ when: '%gcc'
ucx:
require:
diff --git a/stacks/pinot-noir/packages_stack.yaml b/stacks/pinot-noir/packages_stack.yaml
index 45968fa..62441fe 100644
--- a/stacks/pinot-noir/packages_stack.yaml
+++ b/stacks/pinot-noir/packages_stack.yaml
@@ -34,12 +34,6 @@ packages:
- spec: ^nvhpc+lapack
when: '%nvhpc ^lapack'
- - spec: ^cuda %gcc@12.3.0
- when: '%gcc@12.3.0 ^cuda'
-
- - spec: ^cuda +allow-unsupported-compilers %oneapi
- when: '%oneapi ^cuda'
-
- spec: "+ipo"
when: '%gcc'
diff --git a/stacks/pinot-noir/spack.yaml b/stacks/pinot-noir/spack.yaml
index 390d649..e6decb0 100644
--- a/stacks/pinot-noir/spack.yaml
+++ b/stacks/pinot-noir/spack.yaml
@@ -10,12 +10,12 @@ spack:
- mpi_gcc:
- openmpi
- mpi_oneapi:
- - intel_oneapi_mpi
+ - intel-oneapi-mpi
- blas_gcc:
- openblas
- blas_oneapi:
- - intel_oneapi_mkl
+ - intel-oneapi-mkl
# -------------------------------------------------------------------------
# Core packages
--
GitLab