summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorAdam J. Stewart <ajstewart426@gmail.com>2017-08-16 12:21:07 -0500
committerGitHub <noreply@github.com>2017-08-16 12:21:07 -0500
commitdb657d938d38775e4364a6917cc78cb9cdb0b133 (patch)
tree17b7d463fbe55b928126ae70bd770f345a4ada70 /etc
parentad8c60239f0f2b8e6d6b95c9e3a5010e77ed0b24 (diff)
downloadspack-db657d938d38775e4364a6917cc78cb9cdb0b133.tar.gz
spack-db657d938d38775e4364a6917cc78cb9cdb0b133.tar.bz2
spack-db657d938d38775e4364a6917cc78cb9cdb0b133.tar.xz
spack-db657d938d38775e4364a6917cc78cb9cdb0b133.zip
Refactor IntelInstaller into IntelPackage base class (#4300)
* Refactor IntelInstaller into IntelPackage base class * Move license attributes from __init__ to class-level * Flake8 fixes: remove unused imports * Fix logic that writes the silent.cfg file * More specific version numbers for Intel MPI * Rework logic that selects components to install * Final changes necessary to get intel package working * Various updates to intel-parallel-studio * Add latest version of every Intel package * Add environment variables for Intel packages * Update env vars for intel package * Finalize components for intel-parallel-studio package Adds a +tbb variant to intel-parallel-studio. The tbb package was renamed to intel-tbb. Now both intel-tbb and intel-parallel-studio+tbb provide tbb. * Overhaul environment variables set by intel-parallel-studio * Point dependent packages to the correct MPI wrappers * Never default to intel-parallel-studio * Gather env vars by sourcing setup scripts * Use mpiicc instead of mpicc when using Intel compiler * Undo change to ARCH * Add changes from intel-mpi to intel-parallel-studio * Add comment explaining mpicc vs mpiicc * Prepend env vars containing 'PATH' or separators * Flake8 fix * Fix bugs in from_sourcing_file * Indentation fix * Prepend, not set if contains separator * Fix license symlinking broken by changes to intel-parallel-studio * Use comments instead of docstrings to document attributes * Flake8 fixes * Use a set instead of a list to prevent duplicate components * Fix MKL and MPI library linking directories * Remove +all variant from intel-parallel-studio * It is not possible to build with MKL, GCC, and OpenMP at this time * Found a workaround for locating GCC libraries * Typos and variable names * Fix initialization of empty LibraryList
Diffstat (limited to 'etc')
-rw-r--r--etc/spack/defaults/packages.yaml7
1 files changed, 4 insertions, 3 deletions
diff --git a/etc/spack/defaults/packages.yaml b/etc/spack/defaults/packages.yaml
index df785c5aa5..fc25599749 100644
--- a/etc/spack/defaults/packages.yaml
+++ b/etc/spack/defaults/packages.yaml
@@ -19,13 +19,13 @@ packages:
providers:
awk: [gawk]
blas: [openblas]
- daal: [intel-parallel-studio+daal]
+ daal: [intel-daal]
elf: [elfutils]
golang: [gcc]
- ipp: [intel-parallel-studio+ipp]
+ ipp: [intel-ipp]
java: [jdk]
lapack: [openblas]
- mkl: [intel-parallel-studio+mkl]
+ mkl: [intel-mkl]
mpe: [mpe2]
mpi: [openmpi, mpich]
opencl: [pocl]
@@ -33,3 +33,4 @@ packages:
pil: [py-pillow]
scalapack: [netlib-scalapack]
szip: [libszip, libaec]
+ tbb: [intel-tbb]