diff --git a/env/merlin/sysconfigs/config.yaml b/env/merlin/sysconfigs/config.yaml index 87f463e..7be2ed7 100644 --- a/env/merlin/sysconfigs/config.yaml +++ b/env/merlin/sysconfigs/config.yaml @@ -4,28 +4,28 @@ config: - /scratch/spack-rhel7 install_tree: projections: - ^hdf5+mpi: HDF5/{name}/{version}/{compiler.name}/{compiler.version} - ^hdf5~mpi: HDF5_serial/{name}/{version}/{compiler.name}/{compiler.version} - ^mpi: MPI/{name}/{version}/{^mpi.name}/{^mpi.version}/{compiler.name}/{compiler.version} - all: misc/{name}/{version}/{^mpi.name}/{^mpi.version}/{compiler.name}/{compiler.version} - alsa-lib: &libraries_install_projection Librairies/{name}/{version}/{compiler.name}/{compiler.version} - aria2: &tools_install_projection Tools/{name}/{version}/{compiler.name}/{compiler.version} + ^hdf5+mpi: HDF5/{name}/{version}/{compiler.name}/{compiler.version}/{hashls + ^hdf5~mpi: HDF5_serial/{name}/{version}/{compiler.name}/{compiler.version}/{hash} + ^mpi: MPI/{name}/{version}/{^mpi.name}/{^mpi.version}/{compiler.name}/{compiler.version}/{hash} + all: misc/{name}/{version}/{compiler.name}/{compiler.version}/{hash} + alsa-lib: &libraries_install_projection Librairies/{name}/{version}/{compiler.name}/{compiler.version}/{hash} + aria2: &tools_install_projection Tools/{name}/{version}/{compiler.name}/{compiler.version}/{hash} asciidoc: *tools_install_projection - atlas: &compiler_install_projection Compiler/{name}/{version}/{compiler.name}/{compiler.version} - autoconf: &programming_install_projection Programming/{name}/{version}/{compiler.name}/{compiler.version} + atlas: &compiler_install_projection Compiler/{name}/{version}/{compiler.name}/{compiler.version}/{hash} + autoconf: &programming_install_projection Programming/{name}/{version}/{compiler.name}/{compiler.version}/{hash} automake: *programming_install_projection - bash: &system_install_projection System/{name}/{version}/{compiler.name}/{compiler.version} + bash: &system_install_projection System/{name}/{version}/{compiler.name}/{compiler.version}/{hash} binutils: *programming_install_projection bison: *programming_install_projection boost: *compiler_install_projection - cbflib: &MX_install_projection MX/{name}/{version}/{compiler.name}/{compiler.version} - cistem: &EM_install_projection EM/{name}/{version}/{compiler.name}/{compiler.version} + cbflib: &MX_install_projection MX/{name}/{version}/{compiler.name}/{compiler.version}/{hash} + cistem: &EM_install_projection EM/{name}/{version}/{compiler.name}/{compiler.version}/{hash} clapack: *compiler_install_projection clhep: *compiler_install_projection cmake: *programming_install_projection coreutils: *tools_install_projection ctffind: *EM_install_projection - cuda: cuda/{name}/{version}/{compiler.name}/{compiler.version} + cuda: cuda/{name}/{version}/{compiler.name}/{compiler.version}/{hash} eigen: *compiler_install_projection emacs: *tools_install_projection erlang: *programming_install_projection @@ -47,7 +47,7 @@ config: go: *programming_install_projection googletest: *compiler_install_projection gsl: *compiler_install_projection - hdf5~mpi: Compiler/{name}_serial/{version}/{compiler.name}/{compiler.version} + hdf5~mpi: Compiler/{name}_serial/{version}/{compiler.name}/{compiler.version}/{hash} hdfview: *tools_install_projection hwloc: *libraries_install_projection intel: *programming_install_projection @@ -80,9 +80,11 @@ config: ncview: *tools_install_projection nettle: *libraries_install_projection nmap: *system_install_projection - nvhpc: *programming_install_projection + nvhpc+mpi: *compiler_install_projection + nvhpc~mpi: *programming_install_projection openbabel: *MX_install_projection - openblas: *compiler_install_projection + openblas threads=none: *compiler_install_projection + openblas threads=openmp: Compiler/{name}_OMP/{version}/{compiler.name}/{compiler.version}/{hash} openjdk: *programming_install_projection openjpeg: *tools_install_projection openmpi: *compiler_install_projection