From 2cb3c6d84fdf246cae83b47faab08aa2e659ad63 Mon Sep 17 00:00:00 2001 From: "Nagaraj, Sriraksha" Date: Fri, 6 Dec 2024 17:07:45 -0600 Subject: [PATCH] fix avail test (#50) * fix avail test * changing the regular expression * Adding fatal error to avail script * Revert "changing the regular expression" This reverts commit e522143b5d9dccb870fd7f5667619ed32687d1e6. [ROCm/rocprofiler-sdk commit: 5556774c3a10099283952174110b5573f5809a8a] --- projects/rocprofiler-sdk/source/bin/rocprofv3_avail.py | 7 +++++++ .../counter-collection/list_metrics/CMakeLists.txt | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/projects/rocprofiler-sdk/source/bin/rocprofv3_avail.py b/projects/rocprofiler-sdk/source/bin/rocprofv3_avail.py index e3329498e7..49ee37077a 100644 --- a/projects/rocprofiler-sdk/source/bin/rocprofv3_avail.py +++ b/projects/rocprofiler-sdk/source/bin/rocprofv3_avail.py @@ -6,6 +6,13 @@ import os import io import csv import socket +import sys + + +def fatal_error(msg, exit_code=1): + sys.stderr.write(f"Fatal error: {msg}\n") + sys.stderr.flush() + sys.exit(exit_code) class derived_counter: diff --git a/projects/rocprofiler-sdk/tests/rocprofv3/counter-collection/list_metrics/CMakeLists.txt b/projects/rocprofiler-sdk/tests/rocprofv3/counter-collection/list_metrics/CMakeLists.txt index afe6276fa4..7775c8a156 100644 --- a/projects/rocprofiler-sdk/tests/rocprofv3/counter-collection/list_metrics/CMakeLists.txt +++ b/projects/rocprofiler-sdk/tests/rocprofv3/counter-collection/list_metrics/CMakeLists.txt @@ -52,7 +52,7 @@ set_tests_properties( ENVIRONMENT "${cc-env-list-metrics}" PASS_REGULAR_EXPRESSION - "gpu-agent:[0-9]*\\n*; Name:\t[a-zA-Z_]*\\n;Description:\t(.*)\\n*;Expression:\t(.)*\\n*;Block:\t[a-zA-Z]*\\n*;Dimensions:\t([A-Z_]*\\[[0-9]*:[0-9]*\\];Method:\t(.*);Unit:\t(.*);Minimum_Interval:\t[0-9]*;Maximum_Interval:\t[0-9]*)*\\n*;" + "gpu-agent:[0-9]*\\n*; Name:\\t[a-zA-Z_]*\\n;Description:\\t(.*)\\n*;Expression:\\t(.)*\\n*;Block:\\t[a-zA-Z]*\\n*;Dimensions:\\t([A-Z_]*\\[[0-9]*:[0-9]*\\])*\\n*;Method:\\t(.*);Unit:\\t(.*);Minimum_Interval:\\t[0-9]*;Maximum_Interval:\\t[0-9]*\\n*;" ) set_tests_properties(