diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2018-01-17 14:14:45 -0800 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2018-01-17 14:14:45 -0800 |
| commit | c2a10a2aa23f3905ee22bb4b7c79ab963d966a9d (patch) | |
| tree | 18d502edbbc09b8f9cf255697bd135e9718fb584 /etc | |
| parent | 52a9e5d2a31b4a66ce51d0ff03ab709417dee6dc (diff) | |
| parent | ba6c39310b537bbeafd4eb00836623ac2bb19d99 (diff) | |
| download | spack-c2a10a2aa23f3905ee22bb4b7c79ab963d966a9d.tar.gz spack-c2a10a2aa23f3905ee22bb4b7c79ab963d966a9d.tar.bz2 spack-c2a10a2aa23f3905ee22bb4b7c79ab963d966a9d.tar.xz spack-c2a10a2aa23f3905ee22bb4b7c79ab963d966a9d.zip | |
Merge branch 'releases/v0.11.0'v0.11.0
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/spack/defaults/config.yaml | 9 | ||||
| -rw-r--r-- | etc/spack/defaults/modules.yaml | 4 | ||||
| -rw-r--r-- | etc/spack/defaults/packages.yaml | 16 |
3 files changed, 28 insertions, 1 deletions
diff --git a/etc/spack/defaults/config.yaml b/etc/spack/defaults/config.yaml index 4e02d0973d..b6a09a7738 100644 --- a/etc/spack/defaults/config.yaml +++ b/etc/spack/defaults/config.yaml @@ -18,6 +18,9 @@ config: # You can use $spack here to refer to the root of the spack instance. install_tree: $spack/opt/spack + # Locations where templates should be found + template_dirs: + - $spack/templates # Locations where different types of modules should be installed. module_roots: @@ -66,3 +69,9 @@ config: # If set to true, `spack install` and friends will NOT clean # potentially harmful variables from the build environment. Use wisely. dirty: false + + + # The default number of jobs to use when running `make` in parallel. + # If set to 4, for example, `spack install` will run `make -j4`. + # If not set, all available cores are used by default. + # build_jobs: 4 diff --git a/etc/spack/defaults/modules.yaml b/etc/spack/defaults/modules.yaml index 25fe2088e7..8b6f1b40af 100644 --- a/etc/spack/defaults/modules.yaml +++ b/etc/spack/defaults/modules.yaml @@ -40,3 +40,7 @@ modules: - PKG_CONFIG_PATH '': - CMAKE_PREFIX_PATH + + lmod: + hierarchy: + - mpi diff --git a/etc/spack/defaults/packages.yaml b/etc/spack/defaults/packages.yaml index eae7752eee..2cfdd399df 100644 --- a/etc/spack/defaults/packages.yaml +++ b/etc/spack/defaults/packages.yaml @@ -17,7 +17,21 @@ packages: all: compiler: [gcc, intel, pgi, clang, xl, nag] providers: - mpi: [openmpi, mpich] + awk: [gawk] blas: [openblas] + daal: [intel-daal] + elf: [elfutils] + golang: [gcc] + ipp: [intel-ipp] + java: [jdk] lapack: [openblas] + mkl: [intel-mkl] + mpe: [mpe2] + mpi: [openmpi, mpich] + opencl: [pocl] + openfoam: [openfoam-com, openfoam-org, foam-extend] pil: [py-pillow] + scalapack: [netlib-scalapack] + szip: [libszip, libaec] + tbb: [intel-tbb] + jpeg: [libjpeg-turbo, libjpeg] |