Add --glog flag when building and fix output_message func

Author: vlad-perevezentsev

libsyclinterface/helper/source/dpctl_error_handlers.cpp

@@ -65,7 +65,7 @@ int requested_verbosity_level(void)
     return requested_level;
 }
 
-void output_message(std::string ss_str, error_level error_type)
+void output_message(std::string ss_str, error_level error_type, bool to_output)
 {
 #ifdef ENABLE_GLOG
     switch (error_type) {
@@ -79,7 +79,7 @@ void output_message(std::string ss_str, error_level error_type)
         LOG(FATAL) << ss_str;
     }
 #else
-    if (requested_level >= error_level) {
+    if (to_output) {
         std::cerr << ss_str;
     }
 #endif
@@ -96,12 +96,14 @@ void error_handler(const std::exception &e,
     int requested_level = requested_verbosity_level();
     int error_level = static_cast<int>(error_type);
 
-    if (requested_level >= error_level) {
+    bool to_output = requested_level >= error_level;
+
+    if (to_output) {
         std::stringstream ss;
         ss << e.what() << " in " << func_name << " at " << file_name << ":"
            << line_num << std::endl;
 
-        output_message(ss.str(), error_type);
+        output_message(ss.str(), error_type, to_output);
     }
 }
 
@@ -114,11 +116,13 @@ void error_handler(const std::string &what,
     int requested_level = requested_verbosity_level();
     int error_level = static_cast<int>(error_type);
 
-    if (requested_level >= error_level) {
+    bool to_output = requested_level >= error_level;
+
+    if (to_output) {
         std::stringstream ss;
         ss << what << " in " << func_name << " at " << file_name << ":"
            << line_num << std::endl;
 
-        output_message(ss.str(), error_type);
+        output_message(ss.str(), error_type, to_output);
     }
 }

scripts/build_backend.py

@@ -19,7 +19,7 @@
 
 
 def build_backend(
-    l0_support=False, code_coverage=False, sycl_compiler_prefix=None
+    l0_support=False, code_coverage=False, glog=False, sycl_compiler_prefix=None
 ):
     import glob
     import os
@@ -99,6 +99,8 @@ def build_backend(
                 "-DCMAKE_CXX_COMPILER:PATH="
                 + os.path.join(DPCPP_ROOT, "bin", "clang++"),
             ]
+        if glog:
+            cmake_compiler_args.append("-DDPCTL_ENABLE_GLOG=ON")
         if code_coverage:
             cmake_args = (
                 [
@@ -135,7 +137,6 @@ def build_backend(
                 + [
                     "-DDPCTL_ENABLE_LO_PROGRAM_CREATION="
                     + ENABLE_LO_PROGRAM_CREATION,
-                    "-DDPCTL_ENABLE_GLOG=ON",
                     backends,
                 ]
             )
@@ -178,6 +179,8 @@ def build_backend(
                 "-DCMAKE_CXX_COMPILER:PATH="
                 + os.path.join(DPCPP_ROOT, "bin", "clang++.exe"),
             ]
+        if glog:
+            cmake_compiler_args.append("-DDPCTL_ENABLE_GLOG=ON")
         cmake_args = (
             [
                 "cmake",

setup.py

@@ -102,7 +102,7 @@ def get_suppressed_warning_flags():
         return []
 
 
-def build_backend(l0_support, coverage, sycl_compiler_prefix):
+def build_backend(l0_support, coverage, glog, sycl_compiler_prefix):
     import os.path
     from importlib.util import module_from_spec, spec_from_file_location
 
@@ -114,6 +114,7 @@ def build_backend(l0_support, coverage, sycl_compiler_prefix):
     builder_module.build_backend(
         l0_support=l0_support,
         code_coverage=coverage,
+        glog=glog,
         sycl_compiler_prefix=sycl_compiler_prefix,
     )
 
@@ -358,7 +359,9 @@ def finalize_options(self):
         super().finalize_options()
 
     def run(self):
-        build_backend(self.level_zero_support, False, self.sycl_compiler_prefix)
+        build_backend(
+            self.level_zero_support, False, False, self.sycl_compiler_prefix
+        )
         if _coverage:
             pre_d = getattr(self, "define", None)
             if pre_d is None:
@@ -405,12 +408,18 @@ class develop(orig_develop.develop):
             "Whether to generate coverage report "
             "when building the backend library",
         ),
+        (
+            "glog=",
+            None,
+            "Whether to use Google Logging for errors" "in the backend library",
+        ),
     ]
 
     def initialize_options(self):
         super().initialize_options()
         self.level_zero_support = "True"
         self.coverage = "False"
+        self.glog = "False"
         self.sycl_compiler_prefix = None
 
     def finalize_options(self):
@@ -430,6 +439,12 @@ def finalize_options(self):
             _coverage = self.coverage
         else:
             raise ValueError("--coverage value is invalid, use True/False")
+        if isinstance(self.glog, str):
+            self.glog = self.glog.capitalize()
+        if self.glog in ["True", "False", "0", "1"]:
+            self.glog = bool(eval(self.glog))
+        else:
+            raise ValueError("--glog value is invalid, use True/False")
         if isinstance(self.sycl_compiler_prefix, str):
             if not os.path.exists(os.path.join(self.sycl_compiler_prefix)):
                 raise ValueError(
@@ -449,7 +464,10 @@ def finalize_options(self):
 
     def run(self):
         build_backend(
-            self.level_zero_support, self.coverage, self.sycl_compiler_prefix
+            self.level_zero_support,
+            self.coverage,
+            self.glog,
+            self.sycl_compiler_prefix,
         )
         if _coverage:
             pre_d = getattr(self, "define", None)