diff options
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/spack/defaults/config.yaml | 7 | ||||
| -rw-r--r-- | etc/spack/defaults/linux/modules.yaml | 11 | ||||
| -rw-r--r-- | etc/spack/defaults/modules.yaml | 23 |
3 files changed, 24 insertions, 17 deletions
diff --git a/etc/spack/defaults/config.yaml b/etc/spack/defaults/config.yaml index 61c23f42df..2400686e60 100644 --- a/etc/spack/defaults/config.yaml +++ b/etc/spack/defaults/config.yaml @@ -33,13 +33,6 @@ config: template_dirs: - $spack/share/spack/templates - - # Locations where different types of modules should be installed. - module_roots: - tcl: $spack/share/spack/modules - lmod: $spack/share/spack/lmod - - # Temporary locations Spack can try to use for builds. # # Recommended options are given below. diff --git a/etc/spack/defaults/linux/modules.yaml b/etc/spack/defaults/linux/modules.yaml index a86a4794f1..353a6ea9ab 100644 --- a/etc/spack/defaults/linux/modules.yaml +++ b/etc/spack/defaults/linux/modules.yaml @@ -14,8 +14,9 @@ # ~/.spack/modules.yaml # ------------------------------------------------------------------------- modules: - prefix_inspections: - lib: - - LD_LIBRARY_PATH - lib64: - - LD_LIBRARY_PATH + default: + prefix_inspections: + lib: + - LD_LIBRARY_PATH + lib64: + - LD_LIBRARY_PATH diff --git a/etc/spack/defaults/modules.yaml b/etc/spack/defaults/modules.yaml index d6d245930c..27b7c45f66 100644 --- a/etc/spack/defaults/modules.yaml +++ b/etc/spack/defaults/modules.yaml @@ -14,8 +14,7 @@ # ~/.spack/modules.yaml # ------------------------------------------------------------------------- modules: - enable: - - tcl + # Paths to check when creating modules for all module sets prefix_inspections: bin: - PATH @@ -34,6 +33,20 @@ modules: '': - CMAKE_PREFIX_PATH - lmod: - hierarchy: - - mpi + # These are configurations for the module set named "default" + default: + # These values are defaulted in the code. They are not defaulted here so + # that we can enable backwards compatibility with the old syntax more + # easily (old value is in the config yaml, config:module_roots) + # Where to install modules + # roots: + # tcl: $spack/share/spack/modules + # lmod: $spack/share/spack/lmod + # What type of modules to use + enable: + - tcl + + # Default configurations if lmod is enabled + lmod: + hierarchy: + - mpi |