From 22b69304e83204f85939a3c9ab3eaf0a8342bbc7 Mon Sep 17 00:00:00 2001
From: Ilya Churaev <ilya.churaev@intel.com>
Date: Wed, 9 Nov 2022 12:16:58 +0400
Subject: [PATCH] Disable stderr output in Release builds (#13666)

* Disable stderr output in Release builds

* Reverted TF FE changes

* Try to avoid ONNX issue

* Revert "Try to avoid ONNX issue"

This reverts commit 9c5bd7e7faa589cbdf38fce21c78a55e49bed2b3.

* Try to fix ONNX tests

* Revert "Try to fix ONNX tests"

This reverts commit b74f21baf6f9f8a770577b9fe124f82938516d33.

* Try to fix build

* Try to fix ONNX debug build
---
 src/common/util/include/openvino/util/log.hpp | 36 ++++---------------
 src/common/util/src/log.cpp                   |  2 ++
 src/core/include/ngraph/log.hpp               | 36 ++++---------------
 src/core/src/log.cpp                          |  2 ++
 src/frontends/onnx/frontend/src/frontend.cpp  |  6 ++++
 src/frontends/paddle/src/frontend.cpp         |  7 ++++
 6 files changed, 29 insertions(+), 60 deletions(-)

diff --git a/src/common/util/include/openvino/util/log.hpp b/src/common/util/include/openvino/util/log.hpp
index b62e6c5c8a4..24ad4e0700a 100644
--- a/src/common/util/include/openvino/util/log.hpp
+++ b/src/common/util/include/openvino/util/log.hpp
@@ -110,35 +110,11 @@ void default_logger_handler_func(const std::string& s);
                           ::ov::util::default_logger_handler_func)                \
         .stream()
 
-#ifdef ENABLE_OPENVINO_DEBUG
-#    define OPENVINO_DEBUG                                                            \
-        ::ov::util::LogHelper(::ov::util::LOG_TYPE::_LOG_TYPE_DEBUG,                  \
-                              ::ov::util::trim_file_name(PROJECT_ROOT_DIR, __FILE__), \
-                              __LINE__,                                               \
-                              ::ov::util::default_logger_handler_func)                \
-            .stream()
-#else
-
-struct NullLogger {};
-
-template <typename T>
-NullLogger&& operator<<(NullLogger&& logger, T&&) {
-    return std::move(logger);
-}
-
-template <typename T>
-NullLogger&& operator<<(NullLogger&& logger, const T&) {
-    return std::move(logger);
-}
-
-inline NullLogger&& operator<<(
-    NullLogger&& logger,
-    std::basic_ostream<char, std::char_traits<char>>& (&)(std::basic_ostream<char, std::char_traits<char>>&)) {
-    return std::move(logger);
-}
-
-#    define OPENVINO_DEBUG \
-        ::ov::util::NullLogger {}
-#endif
+#define OPENVINO_DEBUG                                                            \
+    ::ov::util::LogHelper(::ov::util::LOG_TYPE::_LOG_TYPE_DEBUG,                  \
+                          ::ov::util::trim_file_name(PROJECT_ROOT_DIR, __FILE__), \
+                          __LINE__,                                               \
+                          ::ov::util::default_logger_handler_func)                \
+        .stream()
 }  // namespace util
 }  // namespace ov
diff --git a/src/common/util/src/log.cpp b/src/common/util/src/log.cpp
index adfbe45308f..fcf30fbbc26 100644
--- a/src/common/util/src/log.cpp
+++ b/src/common/util/src/log.cpp
@@ -47,8 +47,10 @@ ov::util::LogHelper::LogHelper(LOG_TYPE type,
 }
 
 ov::util::LogHelper::~LogHelper() {
+#ifdef ENABLE_OPENVINO_DEBUG
     if (m_handler_func) {
         m_handler_func(m_stream.str());
     }
     // Logger::log_item(m_stream.str());
+#endif
 }
diff --git a/src/core/include/ngraph/log.hpp b/src/core/include/ngraph/log.hpp
index 641ff1a3942..977fc4b65e2 100644
--- a/src/core/include/ngraph/log.hpp
+++ b/src/core/include/ngraph/log.hpp
@@ -120,34 +120,10 @@ void default_logger_handler_func(const std::string& s);
                       ngraph::default_logger_handler_func)                \
         .stream()
 
-#ifdef ENABLE_OPENVINO_DEBUG
-#    define NGRAPH_DEBUG                                                      \
-        ngraph::LogHelper(ngraph::LOG_TYPE::_LOG_TYPE_DEBUG,                  \
-                          ngraph::trim_file_name(PROJECT_ROOT_DIR, __FILE__), \
-                          __LINE__,                                           \
-                          ngraph::default_logger_handler_func)                \
-            .stream()
-#else
-
-struct NullLogger {};
-
-template <typename T>
-NullLogger&& operator<<(NullLogger&& logger, T&&) {
-    return std::move(logger);
-}
-
-template <typename T>
-NullLogger&& operator<<(NullLogger&& logger, const T&) {
-    return std::move(logger);
-}
-
-inline NullLogger&& operator<<(
-    NullLogger&& logger,
-    std::basic_ostream<char, std::char_traits<char>>& (&)(std::basic_ostream<char, std::char_traits<char>>&)) {
-    return std::move(logger);
-}
-
-#    define NGRAPH_DEBUG \
-        ::ngraph::NullLogger {}
-#endif
+#define NGRAPH_DEBUG                                                      \
+    ngraph::LogHelper(ngraph::LOG_TYPE::_LOG_TYPE_DEBUG,                  \
+                      ngraph::trim_file_name(PROJECT_ROOT_DIR, __FILE__), \
+                      __LINE__,                                           \
+                      ngraph::default_logger_handler_func)                \
+        .stream()
 }  // namespace ngraph
diff --git a/src/core/src/log.cpp b/src/core/src/log.cpp
index 9abcf3b5c79..cf4dbe601d7 100644
--- a/src/core/src/log.cpp
+++ b/src/core/src/log.cpp
@@ -53,8 +53,10 @@ LogHelper::LogHelper(LOG_TYPE type, const char* file, int line, function<void(co
 }
 
 LogHelper::~LogHelper() {
+#ifdef ENABLE_OPENVINO_DEBUG
     if (m_handler_func) {
         m_handler_func(m_stream.str());
     }
     // Logger::log_item(m_stream.str());
+#endif
 }
diff --git a/src/frontends/onnx/frontend/src/frontend.cpp b/src/frontends/onnx/frontend/src/frontend.cpp
index c3b99375824..3319c5fcf6a 100644
--- a/src/frontends/onnx/frontend/src/frontend.cpp
+++ b/src/frontends/onnx/frontend/src/frontend.cpp
@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+#include <google/protobuf/stubs/logging.h>
+
 #include <fstream>
 #include <input_model.hpp>
 #include <onnx_import/onnx.hpp>
@@ -33,6 +35,10 @@ ONNX_FRONTEND_C_API void* GetFrontEndData() {
     res->m_creator = []() {
         return std::make_shared<FrontEnd>();
     };
+#ifndef OPENVINO_DEBUG_ENABLE
+    // disable protobuf logging
+    google::protobuf::SetLogHandler(nullptr);
+#endif
     return res;
 }
 
diff --git a/src/frontends/paddle/src/frontend.cpp b/src/frontends/paddle/src/frontend.cpp
index f53324bc803..adafbff2579 100644
--- a/src/frontends/paddle/src/frontend.cpp
+++ b/src/frontends/paddle/src/frontend.cpp
@@ -4,6 +4,8 @@
 
 #include "openvino/frontend/paddle/frontend.hpp"
 
+#include <google/protobuf/stubs/logging.h>
+
 #include <fstream>
 #include <map>
 #include <string>
@@ -523,5 +525,10 @@ PADDLE_C_API void* GetFrontEndData() {
     res->m_creator = []() {
         return std::make_shared<ov::frontend::paddle::FrontEnd>();
     };
+
+#ifndef OPENVINO_DEBUG_ENABLE
+    // disable protobuf logging
+    google::protobuf::SetLogHandler(nullptr);
+#endif
     return res;
 }