From f090b05346e09bfff45929e2ce9805b8f6ec7f74 Mon Sep 17 00:00:00 2001 From: Nisarg Patel <33021055+hpcnpatel@users.noreply.github.com> Date: Thu, 11 May 2023 11:58:24 +0200 Subject: 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 --- var/spack/repos/builtin/packages/intel-oneapi-dal/package.py | 2 +- var/spack/repos/builtin/packages/intel-oneapi-dnn/package.py | 2 +- var/spack/repos/builtin/packages/intel-oneapi-ipp/package.py | 2 +- var/spack/repos/builtin/packages/intel-oneapi-mkl/package.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'var') 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") -- cgit v1.2.3-70-g09d2