From 2a9d1d444b7a8705a32810458c69263f251f791d Mon Sep 17 00:00:00 2001 From: AMD Toolchain Support <73240730+amd-toolchain-support@users.noreply.github.com> Date: Thu, 21 Sep 2023 22:17:29 +0530 Subject: aocl-sparse: use `.libs` instead of hard-coded value for library computation (#39868) Co-authored-by: matooley --- var/spack/repos/builtin/packages/amdlibflame/package.py | 7 +++++++ var/spack/repos/builtin/packages/aocl-sparse/package.py | 6 ++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/var/spack/repos/builtin/packages/amdlibflame/package.py b/var/spack/repos/builtin/packages/amdlibflame/package.py index ca9d73813e..d8e06c6b43 100644 --- a/var/spack/repos/builtin/packages/amdlibflame/package.py +++ b/var/spack/repos/builtin/packages/amdlibflame/package.py @@ -77,6 +77,13 @@ class Amdlibflame(LibflameBase): "libflame", root=self.prefix, shared="+shared" in self.spec, recursive=True ) + @property + def libs(self): + """find libflame libs function""" + return find_libraries( + "libflame", root=self.prefix, shared="+shared" in self.spec, recursive=True + ) + def flag_handler(self, name, flags): if name == "cflags": if self.spec.satisfies("%clang@16:") or self.spec.satisfies("%aocc@4.1.0:"): diff --git a/var/spack/repos/builtin/packages/aocl-sparse/package.py b/var/spack/repos/builtin/packages/aocl-sparse/package.py index da993c57dd..7adf7edaef 100644 --- a/var/spack/repos/builtin/packages/aocl-sparse/package.py +++ b/var/spack/repos/builtin/packages/aocl-sparse/package.py @@ -98,13 +98,11 @@ class AoclSparse(CMakePackage): args.append(self.define_from_variant("BUILD_ILP64", "ilp64")) if self.spec.satisfies("@4.0:"): - args.append("-DAOCL_BLIS_LIB={0}/libblis.so".format(self.spec["amdblis"].prefix.lib)) + args.append("-DAOCL_BLIS_LIB=" + str(self.spec["amdblis"].libs)) args.append( "-DAOCL_BLIS_INCLUDE_DIR={0}/blis".format(self.spec["amdblis"].prefix.include) ) - args.append( - "-DAOCL_LIBFLAME={0}/libflame.so".format(self.spec["amdlibflame"].prefix.lib) - ) + args.append("-DAOCL_LIBFLAME=" + str(self.spec["amdlibflame"].libs)) args.append( "-DAOCL_LIBFLAME_INCLUDE_DIR={0}".format(self.spec["amdlibflame"].prefix.include) ) -- cgit v1.2.3-60-g2f50