From dd3718b590275a769157cc7b63455f6bff0264ad Mon Sep 17 00:00:00 2001 From: "svcusr-spack (Resp. Germann Elsa Sylvia)" Date: Tue, 9 Jul 2024 16:53:10 +0200 Subject: [PATCH] FIX: Sles cray-modules now using modules AND prefix --- env/sles15/x86_64/sysconfigs/packages.yaml | 48 ++++++++++++++++------ 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/env/sles15/x86_64/sysconfigs/packages.yaml b/env/sles15/x86_64/sysconfigs/packages.yaml index a63e944..225c99c 100644 --- a/env/sles15/x86_64/sysconfigs/packages.yaml +++ b/env/sles15/x86_64/sysconfigs/packages.yaml @@ -29,20 +29,24 @@ packages: cray-libsci: buildable: false externals: - - prefix: /opt/cray/pe/libsci/23.12.5/GNU/12.3/x86_64/ + - modules: + - cray-libsci + prefix: /opt/cray/pe/libsci/23.12.5/cray/17.0/x86_64 spec: cray-libsci@23.12.5%cce@17.0.0 +mpi +openmp - - prefix: /opt/cray/pe/libsci/23.12.5/GNU/12.3/x86_64/ + - modules: + - cray-libsci + prefix: /opt/cray/pe/libsci/23.12.5/GNU/12.3/x86_64/ spec: cray-libsci@23.12.5%gcc@12.3 +mpi +openmp cray-mpich: buildable: false externals: - modules: - - PrgEnv-cce/17.0.0 - cray-mpich + prefix: /opt/cray/pe/mpich/8.1.28/ofi/cray/17.0 spec: cray-mpich@8.1.28%cce@17.0.0 - modules: - - PrgEnv-gnu/8.5.0 - cray-mpich + prefix: /opt/cray/pe/mpich/8.1.28/ofi/gnu/12.3 spec: cray-mpich@8.1.28%gcc@12.3 cray-pmi: buildable: false @@ -62,7 +66,9 @@ packages: require: '%gcc@7.5.0' fftw: externals: - - prefix: /opt/cray/pe/fftw/3.3.10.6/x86_64 + - modules: + - cray-fftw/3.3.10.6 + prefix: /opt/cray/pe/fftw/3.3.10.6/x86_64 spec: fftw@3.3.10.6+mpi+openmp~pfft_patches precision=double,float%gcc@12.3 findutils: require: '%gcc@7.5.0' @@ -143,19 +149,31 @@ packages: require: '%gcc@7.5.0' netcdf-c: externals: - - prefix: /opt/cray/pe/netcdf/4.9.0.9/crayclang/17.0 + - modules: + - cray-netcdf/4.9.0.9 + prefix: /opt/cray/pe/netcdf/4.9.0.9/crayclang/17.0 spec: netcdf-c@4.9.0.9~dap~hdf4~jna~mpi~parallel-netcdf+shared%cce@17.0.0 - - prefix: /opt/cray/pe/netcdf-hdf5parallel/4.9.0.9/crayclang/17.0 + - modules: + - cray-netcdf-hdf5parallel/4.9.0.9 + prefix: /opt/cray/pe/netcdf-hdf5parallel/4.9.0.9/crayclang/17.0 spec: netcdf-c@4.9.0.9~dap~hdf4~jna+mpi~parallel-netcdf+shared%cce@17.0.0 - - prefix: /opt/cray/pe/netcdf/4.9.0.9/gnu/12.3 + - modules: + - cray-netcdf/4.9.0.9 + prefix: /opt/cray/pe/netcdf/4.9.0.9/gnu/12.3 spec: netcdf-c@4.9.0.9~dap~hdf4~jna~mpi~parallel-netcdf+shared%gcc@12.3 - - prefix: /opt/cray/pe/netcdf-hdf5parallel/4.9.0.9/gnu/12.3 + - modules: + - cray-netcdf-hdf5parallel/4.9.0.9 + prefix: /opt/cray/pe/netcdf-hdf5parallel/4.9.0.9/gnu/12.3 spec: netcdf-c@4.9.0.9~dap~hdf4~jna+mpi~parallel-netcdf+shared%gcc@12.3 netcdf-fortran: externals: - - prefix: /opt/cray/pe/netcdf/4.9.0.9/crayclang/17.0 + - modules: + - cray-netcdf/4.9.0.9 + prefix: /opt/cray/pe/netcdf/4.9.0.9/crayclang/17.0 spec: netcdf-fortran@4.9.0.9~doc+shared%cce@17.0.0 - - prefix: /opt/cray/pe/netcdf/4.9.0.9/gnu/12.3 + - modules: + - cray-netcdf/4.9.0.9 + prefix: /opt/cray/pe/netcdf/4.9.0.9/gnu/12.3 spec: netcdf-fortran@4.9.0.9~doc+shared%gcc@12.3 ninja: require: '%gcc@7.5.0' @@ -185,9 +203,13 @@ packages: require: '%gcc@7.5.0' parallel-netcdf: externals: - - prefix: /opt/cray/pe/parallel-netcdf/1.12.3.9/crayclang/17.0 + - modules: + - cray-parallel-netcdf/1.12.3.9 + prefix: /opt/cray/pe/parallel-netcdf/1.12.3.9/crayclang/17.0 spec: parallel-netcdf@1.12.3.9+cxx+fortran%cce@17.0.0 - - prefix: /opt/cray/pe/parallel-netcdf/1.12.3.9/gnu/12.3 + - modules: + - cray-parallel-netcdf/1.12.3.9 + prefix: /opt/cray/pe/parallel-netcdf/1.12.3.9/gnu/12.3 spec: parallel-netcdf@1.12.3.9+cxx+fortran%gcc@12.3 perl: buildable: false