summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAMD Toolchain Support <73240730+amd-toolchain-support@users.noreply.github.com>2023-09-21 22:17:29 +0530
committerGitHub <noreply@github.com>2023-09-21 18:47:29 +0200
commit2a9d1d444b7a8705a32810458c69263f251f791d (patch)
tree8681ff2fe1377f07ed5c80aab111149b149f5727
parentabad16c1983685772f5c4ac36f1a9fecfe276793 (diff)
downloadspack-2a9d1d444b7a8705a32810458c69263f251f791d.tar.gz
spack-2a9d1d444b7a8705a32810458c69263f251f791d.tar.bz2
spack-2a9d1d444b7a8705a32810458c69263f251f791d.tar.xz
spack-2a9d1d444b7a8705a32810458c69263f251f791d.zip
aocl-sparse: use `.libs` instead of hard-coded value for library computation (#39868)
Co-authored-by: matooley <phil.tooley@amd.com>
-rw-r--r--var/spack/repos/builtin/packages/amdlibflame/package.py7
-rw-r--r--var/spack/repos/builtin/packages/aocl-sparse/package.py6
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)
)