Fix dangling merge conflict

Signed-off-by: colramos-amd <colramos@amd.com>


[ROCm/rocprofiler-compute commit: 6c5a3623b6]

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))

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]}")