From 3e09f038e50d7f1371e7a5885c73a771f546a7f7 Mon Sep 17 00:00:00 2001 From: ywang103-amd Date: Wed, 16 Apr 2025 12:38:20 -0400 Subject: [PATCH] change default rocprof version to v3 when not setting env variable (#673) --- CHANGELOG.md | 1 + src/utils/utils.py | 13 ++++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 84b52a5cbc..33042478fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -47,6 +47,7 @@ Full documentation for ROCm Compute Profiler is available at [https://rocm.docs. ### Changed +* Change the default rocprof version to v3 when environment variable "ROCPROF" is not set * Change the rocprof version for unit tests to rocprofv3 on all SoCs except MI100 * Change normal_unit default to per_kernel * Change dependency from rocm-smi to amd-smi diff --git a/src/utils/utils.py b/src/utils/utils.py index fc158ebd72..24370386c4 100644 --- a/src/utils/utils.py +++ b/src/utils/utils.py @@ -70,14 +70,13 @@ def get_base_spi_pipe_counter(counter): def using_v1(): - - return "ROCPROF" not in os.environ.keys() or ( - "ROCPROF" in os.environ.keys() and os.environ["ROCPROF"].endswith("rocprof") - ) + return "ROCPROF" in os.environ.keys() and os.environ["ROCPROF"].endswith("rocprof") def using_v3(): - return "ROCPROF" in os.environ.keys() and os.environ["ROCPROF"].endswith("rocprofv3") + return "ROCPROF" not in os.environ.keys() or ( + "ROCPROF" in os.environ.keys() and os.environ["ROCPROF"].endswith("rocprofv3") + ) def get_version(rocprof_compute_home) -> dict: @@ -141,7 +140,7 @@ def detect_rocprof(): global rocprof_cmd # detect rocprof if not "ROCPROF" in os.environ.keys(): - rocprof_cmd = "rocprof" + rocprof_cmd = "rocprofv3" else: rocprof_cmd = os.environ["ROCPROF"] @@ -149,7 +148,7 @@ def detect_rocprof(): rocprof_path = shutil.which(rocprof_cmd) if not rocprof_path: - rocprof_cmd = "rocprof" + rocprof_cmd = "rocprofv3" console_warning( "Unable to resolve path to %s binary. Reverting to default." % rocprof_cmd )