From 91434bcebfc07e819863c3091a8af9385df595c8 Mon Sep 17 00:00:00 2001 From: colramos-amd Date: Tue, 5 Mar 2024 15:10:08 -0600 Subject: [PATCH] Fix dangling merge conflict Signed-off-by: colramos-amd [ROCm/rocprofiler-compute commit: 6c5a3623b65df973f4dc43e04a602f0bb0cd7221] --- .../src/omniperf_profile/profiler_base.py | 2 +- projects/rocprofiler-compute/src/utils/utils.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/rocprofiler-compute/src/omniperf_profile/profiler_base.py b/projects/rocprofiler-compute/src/omniperf_profile/profiler_base.py index 527e6addc0..22f8735ffe 100644 --- a/projects/rocprofiler-compute/src/omniperf_profile/profiler_base.py +++ b/projects/rocprofiler-compute/src/omniperf_profile/profiler_base.py @@ -319,7 +319,7 @@ class OmniProfiler_Base: # log basic info console_log(str(prog) + " ver: " + str(version)) console_log("Path: " + str(os.path.abspath(self.__args.path))) - console_log("Target: " + str(self.__args.gpu_model)) + console_log("Target: " + str(self._soc._mspec.gpu_model)) console_log("Command: " + str(self.__args.remaining)) console_log("Kernel Selection: " + str(self.__args.kernel)) console_log("Dispatch Selection: " + str(self.__args.dispatch)) diff --git a/projects/rocprofiler-compute/src/utils/utils.py b/projects/rocprofiler-compute/src/utils/utils.py index f2eddb1d32..28ad15797a 100644 --- a/projects/rocprofiler-compute/src/utils/utils.py +++ b/projects/rocprofiler-compute/src/utils/utils.py @@ -50,7 +50,7 @@ def demarcate(function): def console_error(*argv): if len(argv) > 1: - logging.error(f"[{argv[0]}]: {argv[1]}") + logging.error(f"[{argv[0]}] {argv[1]}") else: logging.error(f"{argv[0]}") sys.exit(1) @@ -58,14 +58,14 @@ def console_error(*argv): def console_log(*argv): if len(argv) > 1: - logging.info(f"[{argv[0]}]: {argv[1]}") + logging.info(f"[{argv[0]}] {argv[1]}") else: logging.info(f"{argv[0]}") def console_debug(*argv): if len(argv) > 1: - logging.debug(f"[{argv[0]}]: {argv[1]}") + logging.debug(f"[{argv[0]}] {argv[1]}") else: logging.debug(f"{argv[0]}")