From 41e7293884ee250ffd00c5b9fbe3a4e17ad05faf Mon Sep 17 00:00:00 2001 From: Robert Cohn Date: Wed, 6 Jan 2021 13:37:24 -0500 Subject: fix mpi lib paths, add virtual provides (#20693) --- var/spack/repos/builtin/packages/intel-oneapi-ipp/package.py | 2 ++ var/spack/repos/builtin/packages/intel-oneapi-mkl/package.py | 6 ++++++ var/spack/repos/builtin/packages/intel-oneapi-mpi/package.py | 11 +++++++++++ var/spack/repos/builtin/packages/intel-oneapi-tbb/package.py | 2 ++ 4 files changed, 21 insertions(+) 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 b583ccef2c..96a63addb6 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-ipp/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-ipp/package.py @@ -19,6 +19,8 @@ class IntelOneapiIpp(IntelOneApiLibraryPackage): version('2021.1.1', sha256='2656a3a7f1f9f1438cbdf98fd472a213c452754ef9476dd65190a7d46618ba86', expand=False) + provides('ipp') + def __init__(self, spec): self.component_info(dir_name='ipp', components='intel.oneapi.lin.ipp.devel', 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 69ef8a4050..1a1594f525 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-mkl/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-mkl/package.py @@ -19,6 +19,12 @@ class IntelOneapiMkl(IntelOneApiLibraryPackage): version('2021.1.1', sha256='818b6bd9a6c116f4578cda3151da0612ec9c3ce8b2c8a64730d625ce5b13cc0c', expand=False) + provides('fftw-api@3') + provides('scalapack') + provides('mkl') + provides('lapack') + provides('blas') + def __init__(self, spec): self.component_info(dir_name='mkl', components='intel.oneapi.lin.mkl.devel', diff --git a/var/spack/repos/builtin/packages/intel-oneapi-mpi/package.py b/var/spack/repos/builtin/packages/intel-oneapi-mpi/package.py index 729a87d4bb..f6354fe64a 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-mpi/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-mpi/package.py @@ -19,9 +19,20 @@ class IntelOneapiMpi(IntelOneApiLibraryPackage): version('2021.1.1', sha256='8b7693a156c6fc6269637bef586a8fd3ea6610cac2aae4e7f48c1fbb601625fe', expand=False) + provides('mpi@:3') + def __init__(self, spec): self.component_info(dir_name='mpi', components='intel.oneapi.lin.mpi.devel', releases=releases, url_name='mpi_oneapi') super(IntelOneapiMpi, self).__init__(spec) + + @property + def libs(self): + libs = [] + for dir in ['lib/release_mt', 'lib', 'libfabric/lib']: + lib_path = '{0}/{1}/latest/{2}'.format(self.prefix, self._dir_name, dir) + ldir = find_libraries('*', root=lib_path, shared=True, recursive=False) + libs += ldir + return libs diff --git a/var/spack/repos/builtin/packages/intel-oneapi-tbb/package.py b/var/spack/repos/builtin/packages/intel-oneapi-tbb/package.py index ba17522e73..3eb94d1e64 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-tbb/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-tbb/package.py @@ -19,6 +19,8 @@ class IntelOneapiTbb(IntelOneApiLibraryPackage): version('2021.1.1', sha256='535290e3910a9d906a730b24af212afa231523cf13a668d480bade5f2a01b53b', expand=False) + provides('tbb') + def __init__(self, spec): self.component_info(dir_name='tbb', components='intel.oneapi.lin.tbb.devel', -- cgit v1.2.3-60-g2f50