diff options
| author | arjun-raj-kuppala <60718144+arjun-raj-kuppala@users.noreply.github.com> | 2020-08-26 18:47:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-26 20:47:55 -0500 |
| commit | 24f2850cab759cb735ea2282da043cacfd53dfe3 (patch) | |
| tree | 05f4a12f03cc9af74b36366d1f24518cdedd80e7 /var | |
| parent | b93e65065ad74e42bdffe41f182316e1f66b4d32 (diff) | |
| download | spack-24f2850cab759cb735ea2282da043cacfd53dfe3.tar.gz spack-24f2850cab759cb735ea2282da043cacfd53dfe3.tar.bz2 spack-24f2850cab759cb735ea2282da043cacfd53dfe3.tar.xz spack-24f2850cab759cb735ea2282da043cacfd53dfe3.zip | |
update to rocm hip,hsa-rocr-dev,rocm-dbgapi (#18280)
* update to rocm hip,hsa-rocr-dev,rocm-dbgapi
* Update var/spack/repos/builtin/packages/rocm-dbgapi/package.py
Co-authored-by: Harmen Stoppels <harmenstoppels@gmail.com>
Co-authored-by: Harmen Stoppels <harmenstoppels@gmail.com>
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/hip/package.py | 17 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/hsa-rocr-dev/package.py | 5 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/rocm-dbgapi/package.py | 5 |
3 files changed, 17 insertions, 10 deletions
diff --git a/var/spack/repos/builtin/packages/hip/package.py b/var/spack/repos/builtin/packages/hip/package.py index 80eb95c5f5..fde1b58de5 100644 --- a/var/spack/repos/builtin/packages/hip/package.py +++ b/var/spack/repos/builtin/packages/hip/package.py @@ -21,14 +21,15 @@ class Hip(CMakePackage): depends_on('cmake@3:', type='build') depends_on('perl@5.10:', type=('build', 'run')) - - depends_on('rocclr@3.5.0', when='@3.5.0') - depends_on('hsakmt-roct@3.5.0', type='build', when='@3.5.0') - depends_on('hsa-rocr-dev@3.5.0', type='link', when='@3.5.0') - depends_on('comgr@3.5.0', type='build', when='@3.5.0') - depends_on('llvm-amdgpu@3.5.0', type='build', when='@3.5.0') - depends_on('rocm-device-libs', type='build') - depends_on('rocminfo@3.5.0', type='build', when='@3.5.0') + for ver in ['3.5.0']: + depends_on('rocclr@' + ver, type='build', when='@' + ver) + depends_on('hsakmt-roct@' + ver, type='build', when='@' + ver) + depends_on('hsa-rocr-dev@' + ver, type='link', when='@' + ver) + depends_on('comgr@' + ver, type='build', when='@' + ver) + depends_on('llvm-amdgpu@' + ver, type='build', when='@' + ver) + depends_on('rocm-device-libs@' + ver, type='build', when='@' + ver) + depends_on('rocminfo@' + ver, type='build', when='@' + ver) + depends_on('mesa~llvm@18.3:', type=('build', 'link'), when='@' + ver) # Note: the ROCm ecosystem expects `lib/` and `bin/` folders with symlinks # in the parent directory of the package, which is incompatible with spack. diff --git a/var/spack/repos/builtin/packages/hsa-rocr-dev/package.py b/var/spack/repos/builtin/packages/hsa-rocr-dev/package.py index af355f241d..c1bc00b66a 100644 --- a/var/spack/repos/builtin/packages/hsa-rocr-dev/package.py +++ b/var/spack/repos/builtin/packages/hsa-rocr-dev/package.py @@ -31,3 +31,8 @@ class HsaRocrDev(CMakePackage): patch('0001-Do-not-set-an-explicit-rpath-by-default-since-packag.patch', when='@3.5.0') root_cmakelists_dir = 'src' + + def cmake_args(self): + libelf_include = self.spec['libelf'].prefix.include.libelf + args = ['-DLIBELF_INCLUDE_DIRS=%s' % libelf_include] + return args diff --git a/var/spack/repos/builtin/packages/rocm-dbgapi/package.py b/var/spack/repos/builtin/packages/rocm-dbgapi/package.py index 33f6c0e66f..9b98a1d7ea 100644 --- a/var/spack/repos/builtin/packages/rocm-dbgapi/package.py +++ b/var/spack/repos/builtin/packages/rocm-dbgapi/package.py @@ -21,8 +21,9 @@ class RocmDbgapi(CMakePackage): version('3.5.0', sha256='eeba0592bc79b90e5b874bba18fd003eab347e8a3cc80343708f8d19e047e87b') depends_on('cmake@3:', type='build') - depends_on('hsa-rocr-dev@3.5.0', type='build', when='@3.5.0') - depends_on('comgr@3.5.0', type=('build', 'link'), when='@3.5.0') + for ver in ['3.5.0']: + depends_on('hsa-rocr-dev@' + ver, type='build', when='@' + ver) + depends_on('comgr@' + ver, when='@' + ver) def patch(self): filter_file(r'(<INSTALL_INTERFACE:include>)', r'\1 {0}/include'. |