From a9c9501a47d8ddaa27cf205d313ab21931201cd4 Mon Sep 17 00:00:00 2001 From: Ganesh Kumar <46193450+gkathirv@users.noreply.github.com> Date: Fri, 25 Sep 2020 11:56:04 +0530 Subject: ROCm3.8 atmi, hipify-clang, rocm-clang-ocl, rocm-dbgapi, rocprofiler (#18871) Co-authored-by: root --- var/spack/repos/builtin/packages/atmi/package.py | 7 ++++--- var/spack/repos/builtin/packages/hipify-clang/package.py | 7 ++++--- var/spack/repos/builtin/packages/rocm-clang-ocl/package.py | 8 ++++---- var/spack/repos/builtin/packages/rocm-dbgapi/package.py | 5 +++-- .../repos/builtin/packages/rocprofiler-dev/package.py | 14 ++++++++++++-- 5 files changed, 27 insertions(+), 14 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/atmi/package.py b/var/spack/repos/builtin/packages/atmi/package.py index 08f3c31d52..c70a037435 100644 --- a/var/spack/repos/builtin/packages/atmi/package.py +++ b/var/spack/repos/builtin/packages/atmi/package.py @@ -14,17 +14,18 @@ class Atmi(CMakePackage): (integrated and discrete).""" homepage = "https://github.com/RadeonOpenCompute/atmi" - url = "https://github.com/RadeonOpenCompute/atmi/archive/rocm-3.7.0.tar.gz" + url = "https://github.com/RadeonOpenCompute/atmi/archive/rocm-3.8.0.tar.gz" maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('3.8.0', sha256='039f0c2b369d0dbc01000754893d9210828f4cb9b36c3e70da8c3819b131c933') version('3.7.0', sha256='8df08489a10ee04cea911811393e0e7d91bd437fc1fd81a23a4e7ab924a974f3') version('3.5.0', sha256='3fb57d2e583fab82bd0582d0c2bccff059ca91122c18ac49a7770a8bb041a37b') variant('build_type', default='Release', values=("Release", "Debug"), description='CMake build type') - depends_on('cmake@3:', type='build') - for ver in ['3.5.0', '3.7.0']: + depends_on('cmake@3:', type='build') + for ver in ['3.5.0', '3.7.0', '3.8.0']: depends_on('comgr@' + ver, type='link', when='@' + ver) depends_on('hsa-rocr-dev@' + ver, type='link', when='@' + ver) depends_on('libelf@0.8:', type='link', when='@' + ver) diff --git a/var/spack/repos/builtin/packages/hipify-clang/package.py b/var/spack/repos/builtin/packages/hipify-clang/package.py index 5f85fade4e..ff9d478934 100644 --- a/var/spack/repos/builtin/packages/hipify-clang/package.py +++ b/var/spack/repos/builtin/packages/hipify-clang/package.py @@ -11,15 +11,16 @@ class HipifyClang(CMakePackage): sources into HIP sources""" homepage = "https://github.com/ROCm-Developer-Tools/HIPIFY" - url = "https://github.com/ROCm-Developer-Tools/HIPIFY/archive/rocm-3.5.0.tar.gz" + url = "https://github.com/ROCm-Developer-Tools/HIPIFY/archive/rocm-3.8.0.tar.gz" maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('3.8.0', sha256='095b876a750a0dc1ae669102ba53d668f65062b823f8be745411db86a2db7916') version('3.7.0', sha256='dd58c8b88d4b7877f2521b02954de79d570fa36fc751a17d33e56436ee02571e') version('3.5.0', sha256='31e7c11d3e221e15a2721456c4f8bceea9c28fd37345464c86ea74cf05ddf2c9') variant('build_type', default='Release', values=("Release", "Debug"), description='CMake build type') - depends_on('cmake@3.5.1:', type='build') - for ver in ['3.5.0', '3.7.0']: + depends_on('cmake@3.5:', type='build') + for ver in ['3.5.0', '3.7.0', '3.8.0']: depends_on('llvm-amdgpu@' + ver, when='@' + ver) diff --git a/var/spack/repos/builtin/packages/rocm-clang-ocl/package.py b/var/spack/repos/builtin/packages/rocm-clang-ocl/package.py index f030f0881f..1e4ca302a5 100644 --- a/var/spack/repos/builtin/packages/rocm-clang-ocl/package.py +++ b/var/spack/repos/builtin/packages/rocm-clang-ocl/package.py @@ -10,10 +10,11 @@ class RocmClangOcl(CMakePackage): """ OpenCL compilation with clang compiler """ homepage = "https://github.com/RadeonOpenCompute/clang-ocl" - url = "https://github.com/RadeonOpenCompute/clang-ocl/archive/rocm-3.5.0.tar.gz" + url = "https://github.com/RadeonOpenCompute/clang-ocl/archive/rocm-3.8.0.tar.gz" maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('3.8.0', sha256='a829aa2efb6e3bc00d8a08a96404f937f3c8adf3b4922b5ac35050d6e08b912d') version('3.7.0', sha256='9c00c7e7dd3ac8326ae6772a43866b44ae049d5960ea6993d14a2370db74d326') version('3.5.0', sha256='38c95fbd0ac3d11d9bd224ad333b68b9620dde502b8a8a9f3d96ba642901e8bb') @@ -21,8 +22,7 @@ class RocmClangOcl(CMakePackage): depends_on('cmake@3:', type='build') - for ver in ['3.5.0', '3.7.0']: + for ver in ['3.5.0', '3.7.0', '3.8.0']: depends_on('rocm-cmake@' + ver, type='build', when='@' + ver) depends_on('llvm-amdgpu@' + ver, type='build', when='@' + ver) - - depends_on('rocm-device-libs@3.7.0', type='build', when='@3.7.0') + depends_on('rocm-device-libs@' + ver, type='build', when='@' + ver) diff --git a/var/spack/repos/builtin/packages/rocm-dbgapi/package.py b/var/spack/repos/builtin/packages/rocm-dbgapi/package.py index 75ff61749e..73c0ec6931 100644 --- a/var/spack/repos/builtin/packages/rocm-dbgapi/package.py +++ b/var/spack/repos/builtin/packages/rocm-dbgapi/package.py @@ -14,16 +14,17 @@ class RocmDbgapi(CMakePackage): AMD's commercially available GPU architectures.""" homepage = "https://github.com/ROCm-Developer-Tools/ROCdbgapi" - url = "https://github.com/ROCm-Developer-Tools/ROCdbgapi/archive/rocm-3.7.0.tar.gz" + url = "https://github.com/ROCm-Developer-Tools/ROCdbgapi/archive/rocm-3.8.0.tar.gz" maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('3.8.0', sha256='760ff77c6578f3548f367a8bd3dda8680b7519f6b20216755105b87785d1e3f8') version('3.7.0', sha256='bdeaf81ea8a0ac861a697e435c72cbe767c291638be43f0d09116ad605dfee4f') version('3.5.0', sha256='eeba0592bc79b90e5b874bba18fd003eab347e8a3cc80343708f8d19e047e87b') depends_on('cmake@3:', type='build') - for ver in ['3.5.0', '3.7.0']: + for ver in ['3.5.0', '3.7.0', '3.8.0']: depends_on('hsa-rocr-dev@' + ver, type='build', when='@' + ver) depends_on('comgr@' + ver, type=('build', 'link'), when='@' + ver) diff --git a/var/spack/repos/builtin/packages/rocprofiler-dev/package.py b/var/spack/repos/builtin/packages/rocprofiler-dev/package.py index 454a5ae960..71be27d06c 100644 --- a/var/spack/repos/builtin/packages/rocprofiler-dev/package.py +++ b/var/spack/repos/builtin/packages/rocprofiler-dev/package.py @@ -11,15 +11,16 @@ class RocprofilerDev(CMakePackage): """ROCPROFILER library for AMD HSA runtime API extension support""" homepage = "https://github.com/ROCm-Developer-Tools/rocprofiler" - url = "https://github.com/ROCm-Developer-Tools/rocprofiler/archive/rocm-3.7.0.tar.gz" + url = "https://github.com/ROCm-Developer-Tools/rocprofiler/archive/rocm-3.8.0.tar.gz" maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('3.8.0', sha256='38ad3ac20f60f3290ce750c34f0aad442354b1d0a56b81167a018e44ecdf7fff') version('3.7.0', sha256='d3f03bf850cbd86ca9dfe6e6cc6f559d8083b0f3ea4711d8260b232cb6fdd1cc') version('3.5.0', sha256='c42548dd467b7138be94ad68c715254eb56a9d3b670ccf993c43cd4d43659937') depends_on('cmake@3:', type='build') - for ver in ['3.5.0', '3.7.0']: + for ver in ['3.5.0', '3.7.0', '3.8.0']: depends_on('hsakmt-roct@' + ver, type='build', when='@' + ver) depends_on('hsa-rocr-dev@' + ver, type='link', when='@' + ver) depends_on('rocminfo@' + ver, type='build', when='@' + ver) @@ -31,6 +32,7 @@ class RocprofilerDev(CMakePackage): destination='', placement='roctracer', when='@3.5.0') + resource(name='roctracer-dev', url='https://github.com/ROCm-Developer-Tools/roctracer/archive/rocm-3.7.0.tar.gz', sha256='6fa5b771e990f09c242237ab334b9f01039ec7d54ccde993e719c5d6577d1518', @@ -39,6 +41,14 @@ class RocprofilerDev(CMakePackage): placement='roctracer', when='@3.7.0') + resource(name='roctracer-dev', + url='https://github.com/ROCm-Developer-Tools/roctracer/archive/rocm-3.8.0.tar.gz', + sha256='5154a84ce7568cd5dba756e9508c34ae9fc62f4b0b5731f93c2ad68b21537ed1', + expand=True, + destination='', + placement='roctracer', + when='@3.8.0') + def patch(self): filter_file('${HSA_RUNTIME_LIB_PATH}/../include', '${HSA_RUNTIME_LIB_PATH}/../include ${HSA_KMT_LIB_PATH}/..\ -- cgit v1.2.3-60-g2f50