diff options
| author | Harmen Stoppels <harmenstoppels@gmail.com> | 2021-05-17 15:42:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-17 06:42:48 -0700 |
| commit | 8446bebdd98460805f0f5f0c83b3608b9fb577f5 (patch) | |
| tree | f6a4219e52e7a5c323a38e980f606a9cd44f0aa9 /etc | |
| parent | 213ef656c52cdfd6e36eab55a6c208917cc2091d (diff) | |
| download | spack-8446bebdd98460805f0f5f0c83b3608b9fb577f5.tar.gz spack-8446bebdd98460805f0f5f0c83b3608b9fb577f5.tar.bz2 spack-8446bebdd98460805f0f5f0c83b3608b9fb577f5.tar.xz spack-8446bebdd98460805f0f5f0c83b3608b9fb577f5.zip | |
Revert "Separable module configurations (#22588)" (#23674)
This reverts commit cefbe48c89209dc3df654795644973b1885cdea4.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/spack/defaults/config.yaml | 7 | ||||
| -rw-r--r-- | etc/spack/defaults/darwin/modules.yaml | 11 | ||||
| -rw-r--r-- | etc/spack/defaults/linux/modules.yaml | 11 | ||||
| -rw-r--r-- | etc/spack/defaults/modules.yaml | 20 |
4 files changed, 22 insertions, 27 deletions
diff --git a/etc/spack/defaults/config.yaml b/etc/spack/defaults/config.yaml index 2400686e60..61c23f42df 100644 --- a/etc/spack/defaults/config.yaml +++ b/etc/spack/defaults/config.yaml @@ -33,6 +33,13 @@ 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/darwin/modules.yaml b/etc/spack/defaults/darwin/modules.yaml index 3bfca8c613..a90cc24c60 100644 --- a/etc/spack/defaults/darwin/modules.yaml +++ b/etc/spack/defaults/darwin/modules.yaml @@ -14,9 +14,8 @@ # ~/.spack/modules.yaml # ------------------------------------------------------------------------- modules: - default: - prefix_inspections: - lib: - - DYLD_FALLBACK_LIBRARY_PATH - lib64: - - DYLD_FALLBACK_LIBRARY_PATH + prefix_inspections: + lib: + - DYLD_FALLBACK_LIBRARY_PATH + lib64: + - DYLD_FALLBACK_LIBRARY_PATH diff --git a/etc/spack/defaults/linux/modules.yaml b/etc/spack/defaults/linux/modules.yaml index 353a6ea9ab..a86a4794f1 100644 --- a/etc/spack/defaults/linux/modules.yaml +++ b/etc/spack/defaults/linux/modules.yaml @@ -14,9 +14,8 @@ # ~/.spack/modules.yaml # ------------------------------------------------------------------------- modules: - default: - prefix_inspections: - lib: - - LD_LIBRARY_PATH - lib64: - - LD_LIBRARY_PATH + 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 4539dbc9c2..d6d245930c 100644 --- a/etc/spack/defaults/modules.yaml +++ b/etc/spack/defaults/modules.yaml @@ -14,7 +14,8 @@ # ~/.spack/modules.yaml # ------------------------------------------------------------------------- modules: - # Paths to check when creating modules for all module sets + enable: + - tcl prefix_inspections: bin: - PATH @@ -33,17 +34,6 @@ modules: '': - CMAKE_PREFIX_PATH - # These are configurations for the module set named "default" - default: - # 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 + lmod: + hierarchy: + - mpi |