diff options
| author | eugeneswalker <38933153+eugeneswalker@users.noreply.github.com> | 2022-10-14 08:12:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-14 08:12:07 -0700 |
| commit | c44934a44dc3b36f30b744357fa7e2d42feb9ebb (patch) | |
| tree | 09851eaa368e440a521f61efbbe42aadc71ddfe0 /var | |
| parent | 67bc90acb764971e7bb07383c8ae469918886f6c (diff) | |
| download | spack-c44934a44dc3b36f30b744357fa7e2d42feb9ebb.tar.gz spack-c44934a44dc3b36f30b744357fa7e2d42feb9ebb.tar.bz2 spack-c44934a44dc3b36f30b744357fa7e2d42feb9ebb.tar.xz spack-c44934a44dc3b36f30b744357fa7e2d42feb9ebb.zip | |
hip@5.2.0 onwards: set prefix properly (#33257)
* hip-set-prefix-rocm5.2.0-onwards
* Update var/spack/repos/builtin/packages/hip/package.py
Update description
Co-authored-by: Satish Balay <balay@mcs.anl.gov>
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/hip/package.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/hip/package.py b/var/spack/repos/builtin/packages/hip/package.py index 8b9b39f9a7..41c2d2d29f 100644 --- a/var/spack/repos/builtin/packages/hip/package.py +++ b/var/spack/repos/builtin/packages/hip/package.py @@ -288,10 +288,12 @@ class Hip(CMakePackage): if self.spec.external: # For external packages we only assume the `hip` prefix is known, # because spack does not set prefixes of dependencies of externals. - # We assume self.spec.prefix is /opt/rocm-x.y.z/hip and rocm has a - # default installation with everything installed under - # /opt/rocm-x.y.z - rocm_prefix = Prefix(os.path.dirname(self.spec.prefix)) + # 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 + if self.spec.satisfies("@5.2.0:"): + rocm_prefix = Prefix(self.spec.prefix) + else: + rocm_prefix = Prefix(os.path.dirname(self.spec.prefix)) if not os.path.isdir(rocm_prefix): msg = "Could not determine prefix for other rocm components\n" |