From 65e12fc811fe9b423ba0954bbda6da594e989c95 Mon Sep 17 00:00:00 2001 From: germann_e Date: Thu, 7 Nov 2024 10:45:22 +0100 Subject: [PATCH] FIX: remove preference for cray-mpich and use pmix --- env/sles15/aarch64/sysconfigs/packages.yaml | 18 ++++++++++-------- env/sles15/x86_64/sysconfigs/packages.yaml | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/env/sles15/aarch64/sysconfigs/packages.yaml b/env/sles15/aarch64/sysconfigs/packages.yaml index 8cd6ab9..526f221 100644 --- a/env/sles15/aarch64/sysconfigs/packages.yaml +++ b/env/sles15/aarch64/sysconfigs/packages.yaml @@ -1,10 +1,12 @@ packages: all: - compiler: [gcc@12.3, cce, nvhpc] + compiler: [gcc, nvhpc, cce] + prefer: + - spec: '^openmpi' providers: - blas: [cray-libsci, openblas, nvhpc] - lapack: [cray-libsci, openblas, nvhpc] - mpi: [cray-mpich, openmpi] + blas: [openblas, nvhpc, cray-libsci] + lapack: [openblas, nvhpc, cray-libsci] + mpi: [openmpi, cray-mpich] pkgconfig: [pkg-config] scalapack: [cray-libsci] require: @@ -211,10 +213,10 @@ packages: spec: openldap@2.4.46 openmpi: require: - - spec: 'schedulers=slurm fabrics=ofi +pmi pmi-interface=cray +cxx +cxx_exceptions +cuda +legacylaunchers' - when: '%gcc' - - spec: 'schedulers=slurm fabrics=ofi +pmi pmi-interface=cray +cxx +cuda +legacylaunchers' - when: '%nvhpc' + - spec: "schedulers=slurm fabrics=ofi +cuda +legacylaunchers" + when: "@5.0.0:" + - spec: "schedulers=slurm fabrics=ofi +pmi +cxx +cxx_exception +cuda +legacylaunchers" + when: "@:5.0.0" openssh: require: '%gcc@7.5.0' openssl: diff --git a/env/sles15/x86_64/sysconfigs/packages.yaml b/env/sles15/x86_64/sysconfigs/packages.yaml index 5d1294f..416a0b6 100644 --- a/env/sles15/x86_64/sysconfigs/packages.yaml +++ b/env/sles15/x86_64/sysconfigs/packages.yaml @@ -1,10 +1,12 @@ packages: all: - compiler: [gcc@12.3, cce, nvhpc] + compiler: [gcc, nvhpc, cce] + prefer: + - spec: '^openmpi' providers: - blas: [cray-libsci, openblas, nvhpc] - lapack: [cray-libsci, openblas, nvhpc] - mpi: [cray-mpich, openmpi] + blas: [openblas, nvhpc, cray-libsci] + lapack: [openblas, nvhpc, cray-libsci] + mpi: [openmpi, cray-mpich] pkgconfig: [pkg-config] scalapack: [cray-libsci] require: @@ -13,7 +15,6 @@ packages: when: "%gcc" - spec: "target=zen3" when: "%nvhpc" - # Grace Hopper arch variants: - cuda_arch=80 autoconf: @@ -215,11 +216,10 @@ packages: spec: openldap@2.4.46 openmpi: require: - - spec: 'schedulers=slurm fabrics=ofi +pmi pmi-interface=cray +cxx +cxx_exceptions +cuda +legacylaunchers' - when: '%gcc' - - spec: 'schedulers=slurm fabrics=ofi +pmi pmi-interface=cray +cxx +cuda +legacylaunchers' - when: 'nvhpc' - - spec: 'schedulers=slurm fabrics=ofi +pmi pmi-interface=cray +cxx +legacylaunchers' + - spec: "schedulers=slurm fabrics=ofi +cuda +legacylaunchers" + when: "@5.0.0:" + - spec: "schedulers=slurm fabrics=ofi +pmi +cxx +cxx_exception +cuda +legacylaunchers" + when: "@:5.0.0" openssh: require: '%gcc@7.5.0' openssl: