From badb3bcee7e07683bee952d775cf0e7c756fb2cd Mon Sep 17 00:00:00 2001 From: Mikael Simberg Date: Thu, 26 Sep 2024 09:33:27 +0200 Subject: dla-future: Adapt lapack/scalapack CMake variables for master branch and next version (#46570) * dla-future: Add DLAF_ prefix to LAPACK_LIBRARY CMake variable in newer versions * dla-future: Use spec.satisfies to check version constraint for LAPACK_LIBRARY variable prefix Co-authored-by: Alberto Invernizzi <9337627+albestro@users.noreply.github.com> --------- Co-authored-by: Alberto Invernizzi <9337627+albestro@users.noreply.github.com> --- var/spack/repos/builtin/packages/dla-future/package.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dla-future/package.py b/var/spack/repos/builtin/packages/dla-future/package.py index 078779411e..c831dd1f67 100644 --- a/var/spack/repos/builtin/packages/dla-future/package.py +++ b/var/spack/repos/builtin/packages/dla-future/package.py @@ -223,14 +223,19 @@ class DlaFuture(CMakePackage, CudaPackage, ROCmPackage): ) else: args.append(self.define("DLAF_WITH_MKL", spec["lapack"].name in INTEL_MATH_LIBRARIES)) + add_dlaf_prefix = lambda x: x if spec.satisfies("@:0.6") else "DLAF_" + x args.append( self.define( - "LAPACK_LIBRARY", + add_dlaf_prefix("LAPACK_LIBRARY"), " ".join([spec[dep].libs.ld_flags for dep in ["blas", "lapack"]]), ) ) if spec.satisfies("+scalapack"): - args.append(self.define("SCALAPACK_LIBRARY", spec["scalapack"].libs.ld_flags)) + args.append( + self.define( + add_dlaf_prefix("SCALAPACK_LIBRARY"), spec["scalapack"].libs.ld_flags + ) + ) args.append(self.define_from_variant("DLAF_WITH_SCALAPACK", "scalapack")) -- cgit v1.2.3-70-g09d2