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>
This commit is contained in:
arjun-raj-kuppala 2020-08-26 18:47:55 -07:00 committed by GitHub
parent b93e65065a
commit 24f2850cab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 10 deletions

View file

@ -21,14 +21,15 @@ class Hip(CMakePackage):
depends_on('cmake@3:', type='build') depends_on('cmake@3:', type='build')
depends_on('perl@5.10:', type=('build', 'run')) depends_on('perl@5.10:', type=('build', 'run'))
for ver in ['3.5.0']:
depends_on('rocclr@3.5.0', when='@3.5.0') depends_on('rocclr@' + ver, type='build', when='@' + ver)
depends_on('hsakmt-roct@3.5.0', type='build', when='@3.5.0') depends_on('hsakmt-roct@' + ver, type='build', when='@' + ver)
depends_on('hsa-rocr-dev@3.5.0', type='link', when='@3.5.0') depends_on('hsa-rocr-dev@' + ver, type='link', when='@' + ver)
depends_on('comgr@3.5.0', type='build', when='@3.5.0') depends_on('comgr@' + ver, type='build', when='@' + ver)
depends_on('llvm-amdgpu@3.5.0', type='build', when='@3.5.0') depends_on('llvm-amdgpu@' + ver, type='build', when='@' + ver)
depends_on('rocm-device-libs', type='build') depends_on('rocm-device-libs@' + ver, type='build', when='@' + ver)
depends_on('rocminfo@3.5.0', type='build', when='@3.5.0') 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 # Note: the ROCm ecosystem expects `lib/` and `bin/` folders with symlinks
# in the parent directory of the package, which is incompatible with spack. # in the parent directory of the package, which is incompatible with spack.

View file

@ -31,3 +31,8 @@ class HsaRocrDev(CMakePackage):
patch('0001-Do-not-set-an-explicit-rpath-by-default-since-packag.patch', when='@3.5.0') patch('0001-Do-not-set-an-explicit-rpath-by-default-since-packag.patch', when='@3.5.0')
root_cmakelists_dir = 'src' 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

View file

@ -21,8 +21,9 @@ class RocmDbgapi(CMakePackage):
version('3.5.0', sha256='eeba0592bc79b90e5b874bba18fd003eab347e8a3cc80343708f8d19e047e87b') version('3.5.0', sha256='eeba0592bc79b90e5b874bba18fd003eab347e8a3cc80343708f8d19e047e87b')
depends_on('cmake@3:', type='build') depends_on('cmake@3:', type='build')
depends_on('hsa-rocr-dev@3.5.0', type='build', when='@3.5.0') for ver in ['3.5.0']:
depends_on('comgr@3.5.0', type=('build', 'link'), when='@3.5.0') depends_on('hsa-rocr-dev@' + ver, type='build', when='@' + ver)
depends_on('comgr@' + ver, when='@' + ver)
def patch(self): def patch(self):
filter_file(r'(<INSTALL_INTERFACE:include>)', r'\1 {0}/include'. filter_file(r'(<INSTALL_INTERFACE:include>)', r'\1 {0}/include'.