atmi,rocgdb,rocm-dbgapi changes for rocm3.7 (#18404)

This commit is contained in:
srekolam 2020-08-31 02:36:38 -07:00 committed by GitHub
parent 06ad858be2
commit d73db33005
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 10 deletions

View file

@ -14,23 +14,24 @@ class Atmi(CMakePackage):
(integrated and discrete).""" (integrated and discrete)."""
homepage = "https://github.com/RadeonOpenCompute/atmi" homepage = "https://github.com/RadeonOpenCompute/atmi"
url = "https://github.com/RadeonOpenCompute/atmi/archive/rocm-3.5.0.tar.gz" url = "https://github.com/RadeonOpenCompute/atmi/archive/rocm-3.7.0.tar.gz"
maintainers = ['srekolam', 'arjun-raj-kuppala'] maintainers = ['srekolam', 'arjun-raj-kuppala']
version('3.7.0', sha256='8df08489a10ee04cea911811393e0e7d91bd437fc1fd81a23a4e7ab924a974f3')
version('3.5.0', sha256='3fb57d2e583fab82bd0582d0c2bccff059ca91122c18ac49a7770a8bb041a37b') version('3.5.0', sha256='3fb57d2e583fab82bd0582d0c2bccff059ca91122c18ac49a7770a8bb041a37b')
variant('build_type', default='Release', values=("Release", "Debug"), description='CMake build type') variant('build_type', default='Release', values=("Release", "Debug"), description='CMake build type')
depends_on('cmake@3:', type='build') depends_on('cmake@3:', type='build')
depends_on('libelf@0.8:', type='link', when='@3.5:')
for ver in ['3.5.0']: for ver in ['3.5.0', '3.7.0']:
depends_on('comgr@' + ver, type='link', when='@' + ver) depends_on('comgr@' + ver, type='link', when='@' + ver)
depends_on('hsa-rocr-dev@' + ver, type='link', when='@' + ver) depends_on('hsa-rocr-dev@' + ver, type='link', when='@' + ver)
depends_on('libelf@0.8:', type='link', when='@' + ver)
root_cmakelists_dir = 'src' root_cmakelists_dir = 'src'
patch('0001-Remove-relative-link-paths-to-external-libraries.patch') patch('0001-Remove-relative-link-paths-to-external-libraries.patch', when='@3.5.0')
def cmake_args(self): def cmake_args(self):
return [ return [

View file

@ -12,10 +12,11 @@ class Rocgdb(AutotoolsPackage):
based on GDB, the GNU source-level debugger.""" based on GDB, the GNU source-level debugger."""
homepage = "https://github.com/ROCm-Developer-Tools/ROCgdb/" homepage = "https://github.com/ROCm-Developer-Tools/ROCgdb/"
url = "https://github.com/ROCm-Developer-Tools/ROCgdb/archive/rocm-3.5.0.tar.gz" url = "https://github.com/ROCm-Developer-Tools/ROCgdb/archive/rocm-3.7.0.tar.gz"
maintainers = ['srekolam', 'arjun-raj-kuppala'] maintainers = ['srekolam', 'arjun-raj-kuppala']
version('3.7.0', sha256='7a29ef584fd7b6c66bb03aaf8ec2f5a8c758370672a28a4d0d95066e5f6fbdc1')
version('3.5.0', sha256='cf36d956e84c7a5711b71f281a44b0a9708e13e941d8fca0247d01567e7ee7d1') version('3.5.0', sha256='cf36d956e84c7a5711b71f281a44b0a9708e13e941d8fca0247d01567e7ee7d1')
depends_on('cmake@3:', type='build') depends_on('cmake@3:', type='build')
depends_on('texinfo', type='build') depends_on('texinfo', type='build')
@ -25,7 +26,7 @@ class Rocgdb(AutotoolsPackage):
depends_on('expat', type='build') depends_on('expat', type='build')
depends_on('python', type='build') depends_on('python', type='build')
depends_on('zlib', type='link') depends_on('zlib', type='link')
for ver in ['3.5.0']: for ver in ['3.5.0', '3.7.0']:
depends_on('rocm-dbgapi@' + ver, type='link', when='@' + ver) depends_on('rocm-dbgapi@' + ver, type='link', when='@' + ver)
depends_on('comgr@' + ver, type='link', when='@' + ver) depends_on('comgr@' + ver, type='link', when='@' + ver)
@ -52,6 +53,7 @@ def configure_args(self):
'--without-guile', '--without-guile',
'--with-babeltrace', '--with-babeltrace',
'--with-lzma', '--with-lzma',
'--with-python' '--with-python',
'--with-rocm-dbgapi={0}'.format(self.spec['rocm-dbgapi'].prefix)
] ]
return options return options

View file

@ -14,16 +14,18 @@ class RocmDbgapi(CMakePackage):
AMD's commercially available GPU architectures.""" AMD's commercially available GPU architectures."""
homepage = "https://github.com/ROCm-Developer-Tools/ROCdbgapi" homepage = "https://github.com/ROCm-Developer-Tools/ROCdbgapi"
url = "https://github.com/ROCm-Developer-Tools/ROCdbgapi/archive/rocm-3.5.0.tar.gz" url = "https://github.com/ROCm-Developer-Tools/ROCdbgapi/archive/rocm-3.7.0.tar.gz"
maintainers = ['srekolam', 'arjun-raj-kuppala'] maintainers = ['srekolam', 'arjun-raj-kuppala']
version('3.7.0', sha256='bdeaf81ea8a0ac861a697e435c72cbe767c291638be43f0d09116ad605dfee4f')
version('3.5.0', sha256='eeba0592bc79b90e5b874bba18fd003eab347e8a3cc80343708f8d19e047e87b') version('3.5.0', sha256='eeba0592bc79b90e5b874bba18fd003eab347e8a3cc80343708f8d19e047e87b')
depends_on('cmake@3:', type='build') depends_on('cmake@3:', type='build')
for ver in ['3.5.0']:
for ver in ['3.5.0', '3.7.0']:
depends_on('hsa-rocr-dev@' + ver, type='build', when='@' + ver) depends_on('hsa-rocr-dev@' + ver, type='build', when='@' + ver)
depends_on('comgr@' + ver, when='@' + ver) depends_on('comgr@' + ver, type=('build', 'link'), 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'.