From 28f027c7bf9bc0d6ec5739e8c576eca9788ad1eb Mon Sep 17 00:00:00 2001 From: Karl W Schulz Date: Mon, 11 Mar 2024 12:02:31 -0500 Subject: [PATCH] move set_locale_encoding() to occur after logging is setup - allows function to use console_error() directly (https://github.com/AMDResearch/omniperf/pull/308#discussion_r1519914083) Signed-off-by: Karl W Schulz [ROCm/rocprofiler-compute commit: e85037fdfb8b4d1de2596e4293909302771c3847] --- projects/rocprofiler-compute/src/omniperf_base.py | 3 +-- projects/rocprofiler-compute/src/utils/utils.py | 9 +++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/projects/rocprofiler-compute/src/omniperf_base.py b/projects/rocprofiler-compute/src/omniperf_base.py index 3fa5106fc3..39b8494657 100644 --- a/projects/rocprofiler-compute/src/omniperf_base.py +++ b/projects/rocprofiler-compute/src/omniperf_base.py @@ -58,7 +58,6 @@ SUPPORTED_ARCHS = { class Omniperf: def __init__(self): - set_locale_encoding() self.__args = None self.__profiler_mode = None self.__analyze_mode = None @@ -80,8 +79,8 @@ class Omniperf: self.__loglevel = setup_logging_priority( self.__args.verbose, self.__args.quiet, self.__mode ) - setattr(self.__args, "loglevel", self.__loglevel) + set_locale_encoding() if self.__mode == "profile": self.detect_profiler() diff --git a/projects/rocprofiler-compute/src/utils/utils.py b/projects/rocprofiler-compute/src/utils/utils.py index 4d783c5aec..f8853e9ad9 100644 --- a/projects/rocprofiler-compute/src/utils/utils.py +++ b/projects/rocprofiler-compute/src/utils/utils.py @@ -603,7 +603,8 @@ def set_locale_encoding(): try: locale.setlocale(locale.LC_ALL, "en_US.UTF-8") except locale.Error as error: - print("Please ensure that the 'en_US.UTF-8' locale is available on your system.") - print("") - print("ERROR: ", error) - sys.exit(1) + console_error( + "Please ensure that the 'en_US.UTF-8' locale is available on your system.", + exit=False, + ) + console_error(error)