zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hpctoolkit: replace filter_file with upstream patch (#34604)

Browse Source 
Replace the filter_file for older configure with rocm 5.3 with an
upstream patch.  Further, the patch is no longer needed for develop or
later releases.
This commit is contained in:
Mark W. Krentel 2022-12-21 13:18:58 -06:00 committed by GitHub
parent 5483b5ff99
commit a6c2569b18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
var/spack/repos/builtin/packages/hpctoolkit/package.py
View File

@ -159,6 +159,13 @@ class Hpctoolkit(AutotoolsPackage):
when="@2019.08.01:2021.03 %gcc@11.0:", when="@2019.08.01:2021.03 %gcc@11.0:",
) )
# Update configure for rocm 5.3.0
patch(
"https://gitlab.com/hpctoolkit/hpctoolkit/-/commit/411d62544717873432c49ef45c7cb99cc5de2fb8.patch",
sha256="484045891a665cdba3b0f141540c89f0d691ed32c5912ef62a93670d44c2786c",
when="@2022.04:2022.10 +rocm ^hip@5.3.0:",
)
# Change python to python3 for some old revs that use a script # Change python to python3 for some old revs that use a script
# with /usr/bin/env python. # with /usr/bin/env python.
depends_on("python@3.4:", type="build", when="@2020.03:2020.08") depends_on("python@3.4:", type="build", when="@2020.03:2020.08")
@ -166,21 +173,6 @@ class Hpctoolkit(AutotoolsPackage):
flag_handler = AutotoolsPackage.build_system_flags flag_handler = AutotoolsPackage.build_system_flags
def patch(self):
if self.spec.satisfies("^hip@5.3.0:"):
filter_file(
'ROCM_HSA_IFLAGS="-I$ROCM_HSA/include/hsa"',
'ROCM_HSA_IFLAGS="-I$ROCM_HSA/include"',
"configure",
string=True,
)
filter_file(
"#include <hsa.h>",
"#include <hsa/hsa.h>",
"src/tool/hpcrun/gpu/amd/roctracer-api.c",
string=True,
)
def configure_args(self): def configure_args(self):
spec = self.spec spec = self.spec