zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update providers of virtual packages related to Intel OneAPI (#37412)

Browse Source 
* 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>
This commit is contained in:
Nisarg Patel 2023-05-11 11:58:24 +02:00 committed by GitHub
parent 0c69e5a442
commit f090b05346
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etc/spack/defaults/packages.yaml
View File

@ -20,7 +20,7 @@ packages:
awk: [gawk] awk: [gawk]
blas: [openblas, amdblis] blas: [openblas, amdblis]
D: [ldc] D: [ldc]
daal: [intel-daal] daal: [intel-oneapi-daal]
elf: [elfutils] elf: [elfutils]
fftw-api: [fftw, amdfftw] fftw-api: [fftw, amdfftw]
flame: [libflame, amdlibflame] flame: [libflame, amdlibflame]
@ -30,7 +30,7 @@ packages:
golang: [go, gcc] golang: [go, gcc]
go-or-gccgo-bootstrap: [go-bootstrap, gcc] go-or-gccgo-bootstrap: [go-bootstrap, gcc]
iconv: [libiconv] iconv: [libiconv]
ipp: [intel-ipp] ipp: [intel-oneapi-ipp]
java: [openjdk, jdk, ibm-java] java: [openjdk, jdk, ibm-java]
jpeg: [libjpeg-turbo, libjpeg] jpeg: [libjpeg-turbo, libjpeg]
lapack: [openblas, amdlibflame] lapack: [openblas, amdlibflame]
@ -40,7 +40,7 @@ packages:
lua-lang: [lua, lua-luajit-openresty, lua-luajit] lua-lang: [lua, lua-luajit-openresty, lua-luajit]
luajit: [lua-luajit-openresty, lua-luajit] luajit: [lua-luajit-openresty, lua-luajit]
mariadb-client: [mariadb-c-client, mariadb] mariadb-client: [mariadb-c-client, mariadb]
mkl: [intel-mkl] mkl: [intel-oneapi-mkl]
mpe: [mpe2] mpe: [mpe2]
mpi: [openmpi, mpich] mpi: [openmpi, mpich]
mysql-client: [mysql, mariadb-c-client] mysql-client: [mysql, mariadb-c-client]

2
var/spack/repos/builtin/packages/intel-oneapi-dal/package.py
View File

@ -93,7 +93,7 @@ class IntelOneapiDal(IntelOneApiLibraryPackage):
expand=False, expand=False,
) )
depends_on("intel-oneapi-tbb") depends_on("tbb")
provides("daal") provides("daal")
provides("onedal") provides("onedal")

2
var/spack/repos/builtin/packages/intel-oneapi-dnn/package.py
View File

@ -93,7 +93,7 @@ class IntelOneapiDnn(IntelOneApiLibraryPackage):
expand=False, expand=False,
) )
depends_on("intel-oneapi-tbb") depends_on("tbb")
@property @property
def component_dir(self): def component_dir(self):

2
var/spack/repos/builtin/packages/intel-oneapi-ipp/package.py
View File

@ -94,7 +94,7 @@ class IntelOneapiIpp(IntelOneApiLibraryPackage):
expand=False, expand=False,
) )
depends_on("intel-oneapi-tbb") depends_on("tbb")
provides("ipp") provides("ipp")

2
var/spack/repos/builtin/packages/intel-oneapi-mkl/package.py
View File

@ -105,7 +105,7 @@ class IntelOneapiMkl(IntelOneApiLibraryPackage):
multi=False, multi=False,
) )
depends_on("intel-oneapi-tbb") depends_on("tbb")
# cluster libraries need mpi # cluster libraries need mpi
depends_on("mpi", when="+cluster") depends_on("mpi", when="+cluster")