From 671de6f0f75db7a62f411d694752be8c731b5df2 Mon Sep 17 00:00:00 2001
From: Nicolas Richart <networms@gmail.ch>
Date: Sat, 22 Jun 2024 00:24:08 +0200
Subject: [PATCH] Adding versions
---
ci/setup_spack.sh | 2 +-
stacks/pinot-noir/packages_stack.yaml | 2 +-
stacks/pinot-noir/spack.yaml | 24 +++++++++++++++++++-----
3 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/ci/setup_spack.sh b/ci/setup_spack.sh
index 0237cf3..9895757 100755
--- a/ci/setup_spack.sh
+++ b/ci/setup_spack.sh
@@ -50,7 +50,7 @@ done
cp -r "${STACK_CONFIG_PATH}/templates" ${SPACK_SYSTEM_CONFIG_PATH}
-cat <<EOF >> ${SPACK_SYSTEM_CONFIG_PATH}/config_stack.yaml
+cat <<EOF > ${SPACK_SYSTEM_CONFIG_PATH}/config_stack.yaml
config:
template_dirs:
- ${SPACK_SYSTEM_CONFIG_PATH}/templates
diff --git a/stacks/pinot-noir/packages_stack.yaml b/stacks/pinot-noir/packages_stack.yaml
index dcd12c6..57d8021 100644
--- a/stacks/pinot-noir/packages_stack.yaml
+++ b/stacks/pinot-noir/packages_stack.yaml
@@ -85,7 +85,7 @@ packages:
openmpi:
require:
- - spec: '@5.0.3 fabrics=ofi,ucx,verbs schedulers=slurm ~rsh +romio romio-filesystem=gpfs +internal-pmix'
+ - spec: 'fabrics=ofi,ucx,verbs schedulers=slurm ~rsh +romio romio-filesystem=gpfs +internal-pmix'
- spec: ^ucx +cuda
when: +cuda
diff --git a/stacks/pinot-noir/spack.yaml b/stacks/pinot-noir/spack.yaml
index eb707d3..2ac9123 100644
--- a/stacks/pinot-noir/spack.yaml
+++ b/stacks/pinot-noir/spack.yaml
@@ -16,16 +16,16 @@ spack:
# PE definition
# -------------------------------------------------------------------------
- mpi_gcc:
- - openmpi
+ - openmpi@5.0.3
- mpi_oneapi:
- - intel-oneapi-mpi
+ - intel-oneapi-mpi@2021.12.1
- blas_gcc:
- - openblas
+ - openblas@0.3.26
- blas_oneapi:
- - intel-oneapi-mkl
+ - intel-oneapi-mkl@2024.1.0
# -------------------------------------------------------------------------
# Core packages
@@ -106,8 +106,10 @@ spack:
- mpi_codes:
- osu-micro-benchmarks +graphing
- hdf5 +mpi
- - hypre
- parmetis
+
+ - blas_mpi_codes:
+ - hypre
- mumps
- superlu-dist
@@ -164,6 +166,18 @@ spack:
- [$^mpi_gcc]
- [$%compiler_gcc]
+ - matrix:
+ - [$blas_mpi_codes]
+ - [$^blas_oneapi]
+ - [$^mpi_oneapi]
+ - [$%compiler_oneapi]
+
+ - matrix:
+ - [$blas_mpi_codes]
+ - [$^blas_gcc]
+ - [$^mpi_gcc]
+ - [$%compiler_gcc]
+
- matrix:
- [$blas_mpi_python_codes]
- [$^blas_oneapi]
--
GitLab