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

palace: fix bugs introduced in #38910 (#38983)

Browse Source
This commit is contained in:
Sebastian Grimberg 2023-07-18 22:21:06 -07:00 committed by GitHub
parent d7a1a61702
commit cf87d9f199
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
var/spack/repos/builtin/packages/palace/package.py
View File

@ -118,23 +118,23 @@ def cmake_args(self):
] ]
# HYPRE is always built with external BLAS/LAPACK # HYPRE is always built with external BLAS/LAPACK
args += self.define("HYPRE_REQUIRED_PACKAGES", "LAPACK;BLAS") args += [
self.define("HYPRE_REQUIRED_PACKAGES", "LAPACK;BLAS"),
self.define("BLAS_LIBRARIES", "{0}".format(self.spec["blas"].libs.joined(";"))),
self.define("LAPACK_LIBRARIES", "{0}".format(self.spec["lapack"].libs.joined(";"))),
]
# MPI compiler wrappers are not required, but MFEM test builds need to know to link # MPI compiler wrappers are not required, but MFEM test builds need to know to link
# against MPI libraries # against MPI libraries
if "+superlu-dist" in self.spec: if "+superlu-dist" in self.spec:
args += self.define("SuperLUDist_REQUIRED_PACKAGES", "LAPACK;BLAS;MPI") args += [self.define("SuperLUDist_REQUIRED_PACKAGES", "LAPACK;BLAS;MPI")]
if "+strumpack" in self.spec: if "+strumpack" in self.spec:
args += self.define("STRUMPACK_REQUIRED_PACKAGES", "LAPACK;BLAS;MPI;MPI_Fortran") args += [self.define("STRUMPACK_REQUIRED_PACKAGES", "LAPACK;BLAS;MPI;MPI_Fortran")]
if "+mumps" in self.spec: if "+mumps" in self.spec:
args += self.define("MUMPS_REQUIRED_PACKAGES", "LAPACK;BLAS;MPI;MPI_Fortran") args += [self.define("MUMPS_REQUIRED_PACKAGES", "LAPACK;BLAS;MPI;MPI_Fortran")]
# BLAS/LAPACK linkage
args += self.define("BLAS_LIBRARIES", "{0}".format(self.spec["blas"].libs.joined(";")))
args += self.define("LAPACK_LIBRARIES", "{0}".format(self.spec["lapack"].libs.joined(";")))
return args return args
def install(self, pkg, spec, prefix): def install(self, spec, prefix):
# No install phase for Palace (always performed during build) # No install phase for Palace (always performed during build)
pass pass