From e46dae9eb642a903dd9d4429140c03839ddb3ae2 Mon Sep 17 00:00:00 2001 From: jordialcaraz Date: Tue, 20 May 2025 16:31:34 +0200 Subject: [PATCH] [Tau package] patch for rocm 6.2, do not configure for rocprofiler by default, only if enabled with +rocprofiler (#50555) * Updateing TAU recipe to add patch file for ROCM>6.2 * Create tau-rocm-disable-rocprofiler-default.patch * Changing from version check to +rocm * [@spackbot] updating style on behalf of jordialcaraz --------- Co-authored-by: jordialcaraz --- .../builtin/packages/tau/package.py | 2 ++ ...tau-rocm-disable-rocprofiler-default.patch | 21 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 var/spack/repos/spack_repo/builtin/packages/tau/tau-rocm-disable-rocprofiler-default.patch diff --git a/var/spack/repos/spack_repo/builtin/packages/tau/package.py b/var/spack/repos/spack_repo/builtin/packages/tau/package.py index a974c59a892..4eba55f1ebb 100644 --- a/var/spack/repos/spack_repo/builtin/packages/tau/package.py +++ b/var/spack/repos/spack_repo/builtin/packages/tau/package.py @@ -209,6 +209,8 @@ class Tau(Package): # https://github.com/UO-OACISS/tau2/commit/1d2cb6b patch("tau-rocm-disable-llvm-plugin.patch", when="@2.33.2 +rocm") + # https://github.com/UO-OACISS/tau2/commit/523df968dd17ffad74f0d944ecbb958ba0e8c6e8 + patch("tau-rocm-disable-rocprofiler-default.patch", when="@2.34 +rocm") filter_compiler_wrappers("Makefile", relative_root="include") filter_compiler_wrappers("Makefile.tau*", relative_root="lib") diff --git a/var/spack/repos/spack_repo/builtin/packages/tau/tau-rocm-disable-rocprofiler-default.patch b/var/spack/repos/spack_repo/builtin/packages/tau/tau-rocm-disable-rocprofiler-default.patch new file mode 100644 index 00000000000..46c5bbddc01 --- /dev/null +++ b/var/spack/repos/spack_repo/builtin/packages/tau/tau-rocm-disable-rocprofiler-default.patch @@ -0,0 +1,21 @@ +spack-src/configure spack-src-patched/configurediff -ruN +--- spack-src/configure 2024-11-05 17:07:38.000000000 -0800 ++++ spack-src-patched/configure 2025-05-19 08:56:22.311253328 -0700 +@@ -3191,7 +3191,7 @@ + #fixmakeargs="$fixmakeargs rocmdir=$rocmdir ROCM ROCPROFILER" + fixmakeargs="$fixmakeargs rocmdir=$rocmdir ROCM" + rocm=yes +- rocprofiler=yes ++ #rocprofiler=yes + tauoptions="${tauoptions}-rocm" + pthread=yes + shift +@@ -3207,7 +3207,7 @@ + rocm=yes + fi + #fixmakeargs="$fixmakeargs ROCPROFILER" +- rocprofiler=yes ++ #rocprofiler=yes + tauoptions="${tauoptions}-rocm" + pthread=yes + shift