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

Fix cray-libsci package to find correct libraries (#23501)

Browse Source
This commit is contained in:
lukebroskop 2021-05-11 18:35:28 -05:00 committed by GitHub
parent 297f0e489a
commit 8d4c2d1c76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
var/spack/repos/builtin/packages/cray-libsci/package.py
View File

@ -14,6 +14,7 @@ class CrayLibsci(Package):
has_code = False # Skip attempts to fetch source that is not available has_code = False # Skip attempts to fetch source that is not available
version("20.06.1") version("20.06.1")
version("20.03.1")
version("19.06.1") version("19.06.1")
version("18.12.1") version("18.12.1")
version("18.11.1.2") version("18.11.1.2")
@ -55,16 +56,19 @@ def blas_libs(self):
shared = True if "+shared" in self.spec else False shared = True if "+shared" in self.spec else False
compiler = self.spec.compiler.name compiler = self.spec.compiler.name
lib = []
if "+openmp" in self.spec and "+mpi" in self.spec: if "+openmp" in self.spec and "+mpi" in self.spec:
lib = "libsci_{0}_mpi_mp" lib = ["libsci_{0}_mpi_mp", "libsci_{0}_mp"]
elif "+openmp" in self.spec: elif "+openmp" in self.spec:
lib = "libsci_{0}_mp" lib = ["libsci_{0}_mp"]
elif "+mpi" in self.spec: elif "+mpi" in self.spec:
lib = "libsci_{0}_mpi" lib = ["libsci_{0}_mpi", "libsci_{0}"]
else: else:
lib = "libsci_{0}" lib = ["libsci_{0}"]
libname = lib.format(self.canonical_names[compiler].lower()) libname = []
for lib_fmt in lib:
libname.append(lib_fmt.format(self.canonical_names[compiler].lower()))
return find_libraries( return find_libraries(
libname, libname,