diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2017-04-02 14:48:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-02 14:48:27 -0500 |
| commit | c0cfaacbc8a8327552d3017f5d8498b22565062e (patch) | |
| tree | 92ae3553f103f48f4c716287f83bdf72993cc102 | |
| parent | ffef681377a2140040b4d65a991b9f75e56f9252 (diff) | |
| download | spack-c0cfaacbc8a8327552d3017f5d8498b22565062e.tar.gz spack-c0cfaacbc8a8327552d3017f5d8498b22565062e.tar.bz2 spack-c0cfaacbc8a8327552d3017f5d8498b22565062e.tar.xz spack-c0cfaacbc8a8327552d3017f5d8498b22565062e.zip | |
Set default providers for all virtual dependencies (#3634)
* Set default providers for everything
* Add default OpenFOAM provider
| -rw-r--r-- | etc/spack/defaults/packages.yaml | 13 | ||||
| -rwxr-xr-x | share/spack/spack-completion.bash | 4 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/intel-daal/package.py (renamed from var/spack/repos/builtin/packages/daal/package.py) | 4 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/intel-ipp/package.py (renamed from var/spack/repos/builtin/packages/ipp/package.py) | 4 |
4 files changed, 19 insertions, 6 deletions
diff --git a/etc/spack/defaults/packages.yaml b/etc/spack/defaults/packages.yaml index 37737da7c6..0cafab28e9 100644 --- a/etc/spack/defaults/packages.yaml +++ b/etc/spack/defaults/packages.yaml @@ -17,8 +17,17 @@ packages: all: compiler: [gcc, intel, pgi, clang, xl, nag] providers: - mpi: [openmpi, mpich] + awk: [gawk] blas: [openblas] + daal: [intel-parallel-studio+daal] + elf: [elfutils] + golang: [gcc] + ipp: [intel-parallel-studio+ipp] lapack: [openblas] - awk: [gawk] + mkl: [intel-parallel-studio+mkl] + mpe: [mpe2] + mpi: [openmpi, mpich] + opencl: [pocl] + openfoam: [foam-extend] pil: [py-pillow] + scalapack: [netlib-scalapack] diff --git a/share/spack/spack-completion.bash b/share/spack/spack-completion.bash index eb2da5b7d7..726e1c81cb 100755 --- a/share/spack/spack-completion.bash +++ b/share/spack/spack-completion.bash @@ -589,8 +589,8 @@ function _spack_providers { then compgen -W "-h --help" -- "$cur" else - compgen -W "blas daal elf golang ipp lapack mkl - mpe mpi openfoam pil scalapack" -- "$cur" + compgen -W "awk blas daal elf golang ipp lapack mkl + mpe mpi opencl openfoam pil scalapack" -- "$cur" fi } diff --git a/var/spack/repos/builtin/packages/daal/package.py b/var/spack/repos/builtin/packages/intel-daal/package.py index 18ecfed7c2..011dec158e 100644 --- a/var/spack/repos/builtin/packages/daal/package.py +++ b/var/spack/repos/builtin/packages/intel-daal/package.py @@ -28,7 +28,7 @@ import os from spack.pkg.builtin.intel import IntelInstaller -class Daal(IntelInstaller): +class IntelDaal(IntelInstaller): """Intel Data Analytics Acceleration Library. Note: You will have to add the download file to a @@ -44,6 +44,8 @@ class Daal(IntelInstaller): version('2016.3.210', 'ad747c0dd97dace4cad03cf2266cad28', url="file://%s/l_daal_2016.3.210.tgz" % os.getcwd()) + provides('daal') + def install(self, spec, prefix): self.intel_prefix = os.path.join(prefix, "pkg") diff --git a/var/spack/repos/builtin/packages/ipp/package.py b/var/spack/repos/builtin/packages/intel-ipp/package.py index a9765e1a0a..3c37b2342f 100644 --- a/var/spack/repos/builtin/packages/ipp/package.py +++ b/var/spack/repos/builtin/packages/intel-ipp/package.py @@ -28,7 +28,7 @@ import os from spack.pkg.builtin.intel import IntelInstaller -class Ipp(IntelInstaller): +class IntelIpp(IntelInstaller): """Intel Integrated Performance Primitives. Note: You will have to add the download file to a @@ -42,6 +42,8 @@ class Ipp(IntelInstaller): version('9.0.3.210', '0e1520dd3de7f811a6ef6ebc7aa429a3', url="file://%s/l_ipp_9.0.3.210.tgz" % os.getcwd()) + provides('ipp') + def install(self, spec, prefix): self.intel_prefix = os.path.join(prefix, "pkg") |