From 4fb3617b106492fc86c97e53833ad0effe6f9c4a Mon Sep 17 00:00:00 2001 From: Germann Elsa Sylvia Date: Fri, 19 Aug 2022 10:23:04 +0200 Subject: [PATCH] FIX: modules.yaml wrong paths and structure --- env/merlin/sysconfigs/config.yaml | 2 +- env/merlin/sysconfigs/modules.yaml | 224 ++++++++++++++--------------- 2 files changed, 113 insertions(+), 113 deletions(-) diff --git a/env/merlin/sysconfigs/config.yaml b/env/merlin/sysconfigs/config.yaml index 1259b10..87f463e 100644 --- a/env/merlin/sysconfigs/config.yaml +++ b/env/merlin/sysconfigs/config.yaml @@ -14,7 +14,7 @@ config: atlas: &compiler_install_projection Compiler/{name}/{version}/{compiler.name}/{compiler.version} autoconf: &programming_install_projection Programming/{name}/{version}/{compiler.name}/{compiler.version} automake: *programming_install_projection - bash: &system_install_projection *system_install_projection + bash: &system_install_projection System/{name}/{version}/{compiler.name}/{compiler.version} binutils: *programming_install_projection bison: *programming_install_projection boost: *compiler_install_projection diff --git a/env/merlin/sysconfigs/modules.yaml b/env/merlin/sysconfigs/modules.yaml index 631697e..3e2aab1 100644 --- a/env/merlin/sysconfigs/modules.yaml +++ b/env/merlin/sysconfigs/modules.yaml @@ -20,118 +20,118 @@ modules: ${PACKAGE}_INCLUDE_DIR: '{prefix}/include' ${PACKAGE}_LIBRARY_DIR: '{prefix}/lib' ${PACKAGE}_VERSION: '{version}' - projections: - ^hdf5+mpi: HDF5/modulefiles/{compiler.name}/{compiler.version}/{name}/{version} - ^hdf5~mpi: HDF5_serial/modulefiles/{compiler.name}/{compiler.version}/{name}/{version} - ^mpi: MPI/modulefiles/{^mpi.name}/{^mpi.version}/{compiler.name}/{compiler.version}/{name}/{version} - all: misc/modulesfiles/{compiler.name}/{compiler.version}/{name}/{version} - alsa-lib: &libraries_modules_projection Librairies/modulefiles/{compiler.name}/{compiler.version}/{name}/{version} - aria2: &tools_modules_projection Tools/modulefiles/{compiler.name}/{compiler.version}/{name}/{version} - asciidoc: *tools_modules_projection - atlas: &compiler_modules_projection Compiler/modulefiles/{compiler.name}/{compiler.version}/{name}/{version} - autoconf: &programming_modules_projection Programming/modulefiles/{compiler.name}/{compiler.version}/{name}/{version} - automake: *programming_modules_projection - bash: &system_install_projection *system_install_projection - binutils: *programming_modules_projection - bison: *programming_modules_projection - boost: *compiler_modules_projection - cbflib: &MX_modules_projection MX/modulefiles/{compiler.name}/{compiler.version}/{name}/{version} - cistem: &EM_module_projection EM/modulefiles/{compiler.name}/{compiler.version}/{name}/{version} - clapack: *compiler_modules_projection - clhep: *compiler_modules_projection - cmake: *programming_modules_projection - coreutils: *tools_modules_projection - ctffind: *EM_module_projection - cuda: cuda/{name}/{version}/{compiler.name}/{compiler.version} - eigen: *compiler_modules_projection - emacs: *tools_modules_projection - erlang: *programming_modules_projection - ffmpeg: *tools_modules_projection - filebench: *system_install_projection - gams: *tools_modules_projection - gaussian: *tools_modules_projection - gcc: *programming_modules_projection - gdrcopy: *libraries_install_projection - geant4: *compiler_modules_projection - gettext: *tools_modules_projection - giflib: *libraries_install_projection - git: *tools_modules_projection - global: *tools_modules_projection - gmp: *libraries_modules_projection - gnupg: *tools_modules_projection - gnuplot: *tools_modules_projection - gnutls: *tools_modules_projection - go: *programming_modules_projection - googletest: *compiler_modules_projection - gsl: *compiler_modules_projection - hdf5~mpi: Compiler/{name}_serial/{version}/{compiler.name}/{compiler.version} - hdfview: *tools_modules_projection - hwloc: *libraries_modules_projection - intel: *programming_modules_projection - intel-oneapi-mpi: *programming_modules_projection - ior: *system_install_projection - isl: *libraries_modules_projection - julia: *programming_modules_projection - knem: *libraries_modules_projection - kokkos: *compiler_modules_projection - krb5: *tools_modules_projection - kubernetes: *tools_modules_projection - libint: *compiler_modules_projection - libtasn1: *libraries_modules_projection - libtool: *programming_modules_projection - libxc: *compiler_modules_projection - libxsmm: *compiler_modules_projection - lua: *programming_modules_projection - lz4: *MX_modules_projection - m4: *programming_modules_projection - mathematica: *programming_modules_projection - matlab: *programming_modules_projection - mdtest: *system_install_projection - motioncor2: *EM_module_projection - mpc: *libraries_modules_projection - mpfr: *libraries_modules_projection - mpich: *compiler_modules_projection - mxm: *system_install_projection - namd: *tools_modules_projection - nasm: *programming_modules_projection - ncview: *tools_modules_projection - nettle: *libraries_modules_projection - nmap: *system_install_projection - nvhpc: *programming_modules_projection - openbabel: *MX_modules_projection - openblas: *compiler_modules_projection - openjdk: *programming_modules_projection - openjpeg: *tools_modules_projection - openmpi: *compiler_modules_projection - openssl: *tools_modules_projection - orca: *tools_modules_projection - paraview: *tools_modules_projection - patchelf: *system_install_projection - perl: *programming_modules_projection - pmix: *libraries_modules_projection - py-tensorflow: *programming_modules_projection - python: *programming_modules_projection - qt: *programming_modules_projection - r: *programming_modules_projection - relion: *EM_module_projection - root: *compiler_modules_projection - superlu: *compiler_modules_projection - tcl: *programming_modules_projection - texlive: *tools_modules_projection - tk: *programming_modules_projection - tmux: *tools_modules_projection - ucx: *libraries_modules_projection - udunits: *libraries_modules_projection - unblur: *EM_module_projection - uncrustify: *tools_modules_projection - unison: *system_install_projection - vim: *tools_modules_projection - visit: *tools_modules_projection - wxwidgets: *libraries_modules_projection - x264: *libraries_modules_projection - xmlto: *tools_modules_projection - xz: *tools_modules_projection - zlib: *libraries_modules_projection + projections: + ^hdf5+mpi: HDF5/modulefiles/{compiler.name}/{compiler.version}/{name}/{version} + ^hdf5~mpi: HDF5_serial/modulefiles/{compiler.name}/{compiler.version}/{name}/{version} + ^mpi: MPI/modulefiles/{^mpi.name}/{^mpi.version}/{compiler.name}/{compiler.version}/{name}/{version} + all: misc/modulesfiles/{compiler.name}/{compiler.version}/{name}/{version} + alsa-lib: &libraries_modules_projection Librairies/modulefiles/{compiler.name}/{compiler.version}/{name}/{version} + aria2: &tools_modules_projection Tools/modulefiles/{compiler.name}/{compiler.version}/{name}/{version} + asciidoc: *tools_modules_projection + atlas: &compiler_modules_projection Compiler/modulefiles/{compiler.name}/{compiler.version}/{name}/{version} + autoconf: &programming_modules_projection Programming/modulefiles/{compiler.name}/{compiler.version}/{name}/{version} + automake: *programming_modules_projection + bash: &system_modules_projection System/modulefiles/{compiler.name}/{compiler.version}/{name}/{version} + binutils: *programming_modules_projection + bison: *programming_modules_projection + boost: *compiler_modules_projection + cbflib: &MX_modules_projection MX/modulefiles/{compiler.name}/{compiler.version}/{name}/{version} + cistem: &EM_modules_projection EM/modulefiles/{compiler.name}/{compiler.version}/{name}/{version} + clapack: *compiler_modules_projection + clhep: *compiler_modules_projection + cmake: *programming_modules_projection + coreutils: *tools_modules_projection + ctffind: *EM_modules_projection + cuda: cuda/{name}/{version}/{compiler.name}/{compiler.version} + eigen: *compiler_modules_projection + emacs: *tools_modules_projection + erlang: *programming_modules_projection + ffmpeg: *tools_modules_projection + filebench: *system_modules_projection + gams: *tools_modules_projection + gaussian: *tools_modules_projection + gcc: *programming_modules_projection + gdrcopy: *libraries_modules_projection + geant4: *compiler_modules_projection + gettext: *tools_modules_projection + giflib: *libraries_modules_projection + git: *tools_modules_projection + global: *tools_modules_projection + gmp: *libraries_modules_projection + gnupg: *tools_modules_projection + gnuplot: *tools_modules_projection + gnutls: *tools_modules_projection + go: *programming_modules_projection + googletest: *compiler_modules_projection + gsl: *compiler_modules_projection + hdf5~mpi: Compiler/{name}_serial/{version}/{compiler.name}/{compiler.version} + hdfview: *tools_modules_projection + hwloc: *libraries_modules_projection + intel: *programming_modules_projection + intel-oneapi-mpi: *programming_modules_projection + ior: *system_modules_projection + isl: *libraries_modules_projection + julia: *programming_modules_projection + knem: *libraries_modules_projection + kokkos: *compiler_modules_projection + krb5: *tools_modules_projection + kubernetes: *tools_modules_projection + libint: *compiler_modules_projection + libtasn1: *libraries_modules_projection + libtool: *programming_modules_projection + libxc: *compiler_modules_projection + libxsmm: *compiler_modules_projection + lua: *programming_modules_projection + lz4: *MX_modules_projection + m4: *programming_modules_projection + mathematica: *programming_modules_projection + matlab: *programming_modules_projection + mdtest: *system_modules_projection + motioncor2: *EM_modules_projection + mpc: *libraries_modules_projection + mpfr: *libraries_modules_projection + mpich: *compiler_modules_projection + mxm: *system_modules_projection + namd: *tools_modules_projection + nasm: *programming_modules_projection + ncview: *tools_modules_projection + nettle: *libraries_modules_projection + nmap: *system_modules_projection + nvhpc: *programming_modules_projection + openbabel: *MX_modules_projection + openblas: *compiler_modules_projection + openjdk: *programming_modules_projection + openjpeg: *tools_modules_projection + openmpi: *compiler_modules_projection + openssl: *tools_modules_projection + orca: *tools_modules_projection + paraview: *tools_modules_projection + patchelf: *system_modules_projection + perl: *programming_modules_projection + pmix: *libraries_modules_projection + py-tensorflow: *programming_modules_projection + python: *programming_modules_projection + qt: *programming_modules_projection + r: *programming_modules_projection + relion: *EM_modules_projection + root: *compiler_modules_projection + superlu: *compiler_modules_projection + tcl: *programming_modules_projection + texlive: *tools_modules_projection + tk: *programming_modules_projection + tmux: *tools_modules_projection + ucx: *libraries_modules_projection + udunits: *libraries_modules_projection + unblur: *EM_modules_projection + uncrustify: *tools_modules_projection + unison: *system_modules_projection + vim: *tools_modules_projection + visit: *tools_modules_projection + wxwidgets: *libraries_modules_projection + x264: *libraries_modules_projection + xmlto: *tools_modules_projection + xz: *tools_modules_projection + zlib: *libraries_modules_projection slurm: environment: set: