From 98e54f137278e2cc3d636c68e15b12bc8b24ac91 Mon Sep 17 00:00:00 2001
From: Nicolas Richart <nicolas.richart@epfl.ch>
Date: Wed, 26 Jun 2024 20:32:35 +0200
Subject: [PATCH] Correcting over constraint py-fenics-{ufl,ffx,basix}
---
stacks/pinot-noir/packages_stack.yaml | 10 ++++++++--
stacks/pinot-noir/spack.yaml | 3 ---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/stacks/pinot-noir/packages_stack.yaml b/stacks/pinot-noir/packages_stack.yaml
index ebe4b5e..a2feb1e 100644
--- a/stacks/pinot-noir/packages_stack.yaml
+++ b/stacks/pinot-noir/packages_stack.yaml
@@ -8,6 +8,9 @@ packages:
- spec: "^libiconv"
when: "^iconv"
+ - spec: '+ipo'
+ when: '%gcc'
+
- spec: ^intel-oneapi-mpi
when: '%oneapi ^mpi'
@@ -38,8 +41,11 @@ packages:
- spec: ^nvhpc+lapack
when: '%nvhpc ^lapack'
- - spec: '+ipo'
- when: '%gcc'
+ - spec: ^openblas
+ when: '%gcc ^py-numpy'
+
+ - spec: ^intel-oneapi-mkl
+ when: '%oneapi ^py-numpy'
# ----------------------------------------------------------------------------
# Requirements
diff --git a/stacks/pinot-noir/spack.yaml b/stacks/pinot-noir/spack.yaml
index aae9bfb..41049f4 100644
--- a/stacks/pinot-noir/spack.yaml
+++ b/stacks/pinot-noir/spack.yaml
@@ -283,10 +283,7 @@ spack:
- opencv
- openfoam +metis
- paraview +shared +python +hdf5 ~osmesa +opengl2 +egl
- - py-fenics-basix
- py-fenics-dolfinx
- - py-fenics-ffcx
- - py-fenics-ufl
- py-h5py
- py-horovod
- py-keras
--
GitLab