From 3437926cdebd3c5789620793802668290ce8555b Mon Sep 17 00:00:00 2001 From: Brian Van Essen Date: Thu, 10 Nov 2022 23:32:55 -0800 Subject: Fixed a bug where the external HIP library is found in a nested directory, even on newer releases of ROCm. (#33772) --- var/spack/repos/builtin/packages/hip/package.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/hip/package.py b/var/spack/repos/builtin/packages/hip/package.py index 9dce218904..e179ccb887 100644 --- a/var/spack/repos/builtin/packages/hip/package.py +++ b/var/spack/repos/builtin/packages/hip/package.py @@ -291,8 +291,13 @@ class Hip(CMakePackage): hip_libs_at_top = os.path.basename(self.spec.prefix) != "hip" # We assume self.spec.prefix is /opt/rocm-x.y.z for rocm-5.2.0 and newer # and /opt/rocm-x.y.z/hip for older versions + # However, depending on how an external is found it can be at either level + # of the installation path if self.spec.satisfies("@5.2.0:"): - rocm_prefix = Prefix(self.spec.prefix) + if hip_libs_at_top: + rocm_prefix = Prefix(self.spec.prefix) + else: + rocm_prefix = Prefix(os.path.dirname(self.spec.prefix)) else: # We assume self.spec.prefix is /opt/rocm-x.y.z/hip and rocm has a # default installation with everything installed under -- cgit v1.2.3-60-g2f50