diff options
| author | Nisarg Patel <33021055+hpcnpatel@users.noreply.github.com> | 2023-05-11 11:58:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-11 05:58:24 -0400 |
| commit | f090b05346e09bfff45929e2ce9805b8f6ec7f74 (patch) | |
| tree | 57578efd2391ab41c4857c23eaf390853b006215 | |
| parent | 0c69e5a4422a053276d33d5629714dcc71d4c71c (diff) | |
| download | spack-f090b05346e09bfff45929e2ce9805b8f6ec7f74.tar.gz spack-f090b05346e09bfff45929e2ce9805b8f6ec7f74.tar.bz2 spack-f090b05346e09bfff45929e2ce9805b8f6ec7f74.tar.xz spack-f090b05346e09bfff45929e2ce9805b8f6ec7f74.zip | |
Update providers of virtual packages related to Intel OneAPI (#37412)
* add a virtual dependency name instead of complete package name
* add OneAPI components as providers of virtual packages
* Revert the default of tbb
---------
Co-authored-by: Nisarg Patel <nisarg.patel@lrz.de>
5 files changed, 7 insertions, 7 deletions
diff --git a/etc/spack/defaults/packages.yaml b/etc/spack/defaults/packages.yaml index 792e8f14a6..22b766264c 100644 --- a/etc/spack/defaults/packages.yaml +++ b/etc/spack/defaults/packages.yaml @@ -20,7 +20,7 @@ packages: awk: [gawk] blas: [openblas, amdblis] D: [ldc] - daal: [intel-daal] + daal: [intel-oneapi-daal] elf: [elfutils] fftw-api: [fftw, amdfftw] flame: [libflame, amdlibflame] @@ -30,7 +30,7 @@ packages: golang: [go, gcc] go-or-gccgo-bootstrap: [go-bootstrap, gcc] iconv: [libiconv] - ipp: [intel-ipp] + ipp: [intel-oneapi-ipp] java: [openjdk, jdk, ibm-java] jpeg: [libjpeg-turbo, libjpeg] lapack: [openblas, amdlibflame] @@ -40,7 +40,7 @@ packages: lua-lang: [lua, lua-luajit-openresty, lua-luajit] luajit: [lua-luajit-openresty, lua-luajit] mariadb-client: [mariadb-c-client, mariadb] - mkl: [intel-mkl] + mkl: [intel-oneapi-mkl] mpe: [mpe2] mpi: [openmpi, mpich] mysql-client: [mysql, mariadb-c-client] diff --git a/var/spack/repos/builtin/packages/intel-oneapi-dal/package.py b/var/spack/repos/builtin/packages/intel-oneapi-dal/package.py index cf86a2d72d..bff7da5109 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-dal/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-dal/package.py @@ -93,7 +93,7 @@ class IntelOneapiDal(IntelOneApiLibraryPackage): expand=False, ) - depends_on("intel-oneapi-tbb") + depends_on("tbb") provides("daal") provides("onedal") diff --git a/var/spack/repos/builtin/packages/intel-oneapi-dnn/package.py b/var/spack/repos/builtin/packages/intel-oneapi-dnn/package.py index 545b791e52..16738b93b8 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-dnn/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-dnn/package.py @@ -93,7 +93,7 @@ class IntelOneapiDnn(IntelOneApiLibraryPackage): expand=False, ) - depends_on("intel-oneapi-tbb") + depends_on("tbb") @property def component_dir(self): diff --git a/var/spack/repos/builtin/packages/intel-oneapi-ipp/package.py b/var/spack/repos/builtin/packages/intel-oneapi-ipp/package.py index 5fca4757ce..05ae9499ce 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-ipp/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-ipp/package.py @@ -94,7 +94,7 @@ class IntelOneapiIpp(IntelOneApiLibraryPackage): expand=False, ) - depends_on("intel-oneapi-tbb") + depends_on("tbb") provides("ipp") diff --git a/var/spack/repos/builtin/packages/intel-oneapi-mkl/package.py b/var/spack/repos/builtin/packages/intel-oneapi-mkl/package.py index c8cd33ab8a..7ab0750161 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-mkl/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-mkl/package.py @@ -105,7 +105,7 @@ class IntelOneapiMkl(IntelOneApiLibraryPackage): multi=False, ) - depends_on("intel-oneapi-tbb") + depends_on("tbb") # cluster libraries need mpi depends_on("mpi", when="+cluster") |