From 09d0623be924ad72eb63342b733c14431208c323 Mon Sep 17 00:00:00 2001 From: arjun-raj-kuppala <60718144+arjun-raj-kuppala@users.noreply.github.com> Date: Wed, 7 Oct 2020 06:55:29 -0700 Subject: AMD ROCm 3.8.0 - roctracer-dev (#19086) * AMD ROCm 3.8.0 - roctracer-dev * Update var/spack/repos/builtin/packages/roctracer-dev/package.py Co-authored-by: Adam J. Stewart * added py-ply dependency * remove py-ply * Update var/spack/repos/builtin/packages/roctracer-dev/package.py Co-authored-by: Adam J. Stewart Co-authored-by: Adam J. Stewart --- .../builtin/packages/py-cppheaderparser/package.py | 19 +++++++++++++++++++ .../repos/builtin/packages/roctracer-dev/package.py | 15 ++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 var/spack/repos/builtin/packages/py-cppheaderparser/package.py diff --git a/var/spack/repos/builtin/packages/py-cppheaderparser/package.py b/var/spack/repos/builtin/packages/py-cppheaderparser/package.py new file mode 100644 index 0000000000..23e4c1a700 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-cppheaderparser/package.py @@ -0,0 +1,19 @@ +# Copyright 2013-2020 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack import * + + +class PyCppheaderparser(PythonPackage): + """Parse C++ header files and generate a data structure + representing the class""" + + homepage = "https://pypi.org/project/CppHeaderParser" + url = "https://pypi.io/packages/source/C/CppHeaderParser/CppHeaderParser-2.7.4.tar.gz" + + version('2.7.4', sha256='382b30416d95b0a5e8502b214810dcac2a56432917e2651447d3abe253e3cc42') + + depends_on('py-setuptools', type='build') + depends_on('py-ply', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/roctracer-dev/package.py b/var/spack/repos/builtin/packages/roctracer-dev/package.py index f79f3e1042..36f22a1f30 100644 --- a/var/spack/repos/builtin/packages/roctracer-dev/package.py +++ b/var/spack/repos/builtin/packages/roctracer-dev/package.py @@ -17,12 +17,16 @@ class RoctracerDev(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('3.8.0', sha256='5154a84ce7568cd5dba756e9508c34ae9fc62f4b0b5731f93c2ad68b21537ed1') version('3.7.0', sha256='6fa5b771e990f09c242237ab334b9f01039ec7d54ccde993e719c5d6577d1518') version('3.5.0', sha256='7af5326c9ca695642b4265232ec12864a61fd6b6056aa7c4ecd9e19c817f209e') depends_on('cmake@3:', type='build') + depends_on('py-setuptools@:44', type='build') + depends_on('python@:2', type='build') + depends_on('py-cppheaderparser', 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='build', when='@' + ver) depends_on('rocminfo@' + ver, type='build', when='@' + ver) @@ -36,6 +40,15 @@ class RoctracerDev(CMakePackage): filter_file('${CMAKE_PREFIX_PATH}/hsa', '${HSA_RUNTIME_INC_PATH}', 'src/CMakeLists.txt', string=True) + kwargs = {'ignore_absent': False, 'backup': False, 'string': False} + with working_dir('script'): + match = '^#!/usr/bin/python' + python = self.spec['python'].command.path + substitute = "#!{python}".format(python=python) + files = [ + 'check_trace.py', 'gen_ostream_ops.py', 'hsaap.py', 'kfdap.py' + ] + filter_file(match, substitute, *files, **kwargs) def cmake_args(self): args = ['-DHIP_VDI=1', -- cgit v1.2.3-70-g09d2