From c3ad5361c00745f7cf1dd70d44106bfce450f4c8 Mon Sep 17 00:00:00 2001
From: Nicolas Richart <nicolas.richart@epfl.ch>
Date: Tue, 6 Aug 2024 13:30:44 +0200
Subject: [PATCH] Aligning kokkos and petsc
---
stacks/pinot-noir-gcc13/packages_kuma-h100.yaml | 2 +-
stacks/pinot-noir-gcc13/packages_kuma-l40s.yaml | 2 +-
stacks/pinot-noir-gcc13/packages_stack.yaml | 13 +++++++++----
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/stacks/pinot-noir-gcc13/packages_kuma-h100.yaml b/stacks/pinot-noir-gcc13/packages_kuma-h100.yaml
index 944276b..5be710f 100644
--- a/stacks/pinot-noir-gcc13/packages_kuma-h100.yaml
+++ b/stacks/pinot-noir-gcc13/packages_kuma-h100.yaml
@@ -28,7 +28,7 @@ packages:
kokkos:
require:
- - spec: '+cuda +cuda_lambda cuda_arch=90 +cuda_uvm +wrapper ~openmptarget'
+ - spec: '+cuda +cuda_lambda cuda_arch=90 +wrapper ~openmptarget'
when: '%gcc'
kokkos-kernels:
diff --git a/stacks/pinot-noir-gcc13/packages_kuma-l40s.yaml b/stacks/pinot-noir-gcc13/packages_kuma-l40s.yaml
index 7816954..5dabe12 100644
--- a/stacks/pinot-noir-gcc13/packages_kuma-l40s.yaml
+++ b/stacks/pinot-noir-gcc13/packages_kuma-l40s.yaml
@@ -28,7 +28,7 @@ packages:
kokkos:
require:
- - spec: '+cuda +cuda_lambda cuda_arch=89 +cuda_uvm +wrapper ~openmptarget'
+ - spec: '+cuda +cuda_lambda cuda_arch=89 +wrapper ~openmptarget'
when: '%gcc'
kokkos-kernels:
diff --git a/stacks/pinot-noir-gcc13/packages_stack.yaml b/stacks/pinot-noir-gcc13/packages_stack.yaml
index db7e046..cd9787a 100644
--- a/stacks/pinot-noir-gcc13/packages_stack.yaml
+++ b/stacks/pinot-noir-gcc13/packages_stack.yaml
@@ -84,11 +84,13 @@ packages:
require: ['@1.10.4']
kokkos:
- require: ['+openmp', '+numactl', '+memkind', '~threads',
- '+aggressive_vectorization', '@4.3.01']
+ require: ['+numactl', '+memkind', '+serial',
+ '+openmp', '~openmptarget',
+ '+threads', '~sycl',
+ '+aggressive_vectorization', '@4.3.01']
kokkos-kernels:
- require: ['@4.3.01', '+openmp', '~threads', '~ipo']
+ require: ['@4.3.01', '+openmp', '+threads', '~ipo']
kokkos-nvcc-wrapper:
prefer: ['@4.3.01']
@@ -161,6 +163,9 @@ packages:
mpfr:
require: ['@4.0.2']
+ mumps:
+ require: ['+openmp', '+metis', '+parmetis']
+
netcdf-c:
prefer: ['+mpi']
@@ -186,7 +191,7 @@ packages:
petsc:
require:
- - spec: '+hypre +mumps +saws +scalapack +mpi +suite-sparse +kokkos'
+ - spec: '+hypre +mumps +saws +scalapack +mpi +suite-sparse +kokkos +openmp'
python:
require:
--
GitLab