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

intel-oneapi-mkl: linking with the +cluster variant is broken for external mkl (#39343)

Browse Source 
* Update package.py

Adding `mpi` variant to deal with external oneapi-mkl usage per #38238.

* style conformance

* accept both mpi specification mechanisms

* style conformance

* Update package.py

* Update var/spack/repos/builtin/packages/intel-oneapi-mkl/package.py

Co-authored-by: Robert Cohn <rscohn2@gmail.com>

* rename mpi variant mpi_family

* style conformance

* update help message for mpi_family

---------

Co-authored-by: Robert Cohn <rscohn2@gmail.com>
This commit is contained in:
William R Tobin 2023-08-10 07:33:29 -07:00 committed by GitHub
parent 7968cb7fa2
commit b8bfaf65bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,6 +103,14 @@ class IntelOneapiMkl(IntelOneApiLibraryPackage):
variant(
"cluster", default=False, description="Build with cluster support: scalapack, blacs, etc"
)
variant(
"mpi_family",
default="none",
values=("none", "mpich", "openmpi"),
description="MPI family",
multi=False,
)
variant(
"threads",
default="none",
@ -184,16 +192,23 @@ def _find_mkl_libs(self, shared):
if self.spec.satisfies("+cluster"):
if any(
self.spec.satisfies(m)
for m in ["^intel-oneapi-mpi", "^intel-mpi", "^mpich", "^cray-mpich"]
for m in [
"^intel-oneapi-mpi",
"^intel-mpi",
"^mpich",
"^cray-mpich",
"mpi_family=mpich",
]
):
libs.append(self._xlp64_lib("libmkl_blacs_intelmpi"))
elif self.spec.satisfies("^openmpi"):
elif any(self.spec.satisfies(m) for m in ["^openmpi", "mpi_family=openmpi"]):
libs.append(self._xlp64_lib("libmkl_blacs_openmpi"))
else:
raise RuntimeError(
(
"intel-oneapi-mpi +cluster requires one of "
"^intel-oneapi-mpi, ^intel-mpi, ^mpich, or ^openmpi"
"intel-oneapi-mpi +cluster requires one of ^intel-oneapi-mpi, "
"^intel-mpi, ^mpich, ^cray-mpich, mpi_family=mpich, ^openmpi, "
"or mpi_family=openmpi"
)
)