lite: Add VERBOSE in LogSeverity and add SetMinimumLogSeverity/GetMin…

…imumLogSeverity in the minimal logger. Log only when the severity is larger or equal to the minimum log severity.

PiperOrigin-RevId: 455663649

tensorflow/lite/BUILD

@@ -119,7 +119,6 @@ FRAMEWORK_LIB_HDRS = STABLE_FRAMEWORK_LIB_HDRS + [
     "core/subgraph.h",
     "graph_info.h",
     "interpreter_options.h",
-    "logger.h",
     "optional_debug_tools.h",
     "signature_runner.h",
 ]
@@ -506,14 +505,12 @@ cc_library(
         "core/subgraph.h",
         "interpreter.cc",
         "interpreter_builder.cc",
-        "logger.cc",
         "signature_runner.h",
     ],
     hdrs = [
         "interpreter.h",
         "interpreter_builder.h",
         "interpreter_options.h",
-        "logger.h",
         "model.h",
         "model_builder.h",
     ],
@@ -578,7 +575,6 @@ cc_library(
         "interpreter.h",
         "interpreter_builder.h",
         "interpreter_options.h",
-        "logger.h",
         "model.h",
         "model_builder.h",
         "signature_runner.h",
@@ -1165,10 +1161,7 @@ cc_library(
             "minimal_logging_default.cc",
         ],
     }),
-    hdrs = [
-        "logger.h",
-        "minimal_logging.h",
-    ],
+    hdrs = ["minimal_logging.h"],
     compatible_with = get_compatible_with_portable(),
     copts = tflite_copts_warnings() + tflite_copts(),
     linkopts = select({

tensorflow/lite/core/subgraph.cc

@@ -411,15 +411,26 @@ TfLiteStatus Subgraph::ReplaceNodeSubsetsWithDelegateKernels(
   PartitionGraphIntoIndependentNodeSubsets(&info, nodes_to_replace,
                                            &node_subsets);
 
+#ifdef __ANDROID__
   // On Android the log message below is used for diagnosing delegation success
-  // also in production builds. Use VERBOSE here so that the logging is turned
-  // off in production builds on other platforms.
+  // also in production builds. Delegation happens sufficiently rarely that the
+  // message isn't spammy.
   TFLITE_LOG_PROD(
-      tflite::TFLITE_LOG_VERBOSE,
+      tflite::TFLITE_LOG_INFO,
       "Replacing %d node(s) with delegate (%s) node, yielding %zu partitions.",
       nodes_to_replace->size,
       registration.custom_name ? registration.custom_name : "unknown",
       node_subsets.size());
+#else   // !__ANDROID__
+  // Server-side, delegation may happen so often as to make logging spammy + we
+  // don't have a clear need for the diagnostic in production builds.
+  TFLITE_LOG(
+      tflite::TFLITE_LOG_INFO,
+      "Replacing %d node(s) with delegate (%s) node, yielding %zu partitions.",
+      nodes_to_replace->size,
+      registration.custom_name ? registration.custom_name : "unknown",
+      node_subsets.size());
+#endif  // __ANDROID__
 
   execution_plan_.clear();
 

tensorflow/lite/minimal_logging.cc

@@ -29,8 +29,6 @@ void MinimalLogger::Log(LogSeverity severity, const char* format, ...) {
 
 const char* MinimalLogger::GetSeverityName(LogSeverity severity) {
   switch (severity) {
-    case TFLITE_LOG_VERBOSE:
-      return "VERBOSE";
     case TFLITE_LOG_INFO:
       return "INFO";
     case TFLITE_LOG_WARNING:
@@ -41,15 +39,5 @@ const char* MinimalLogger::GetSeverityName(LogSeverity severity) {
   return "<Unknown severity>";
 }
 
-LogSeverity MinimalLogger::GetMinimumLogSeverity() {
-  return MinimalLogger::minimum_log_severity_;
-}
-
-LogSeverity MinimalLogger::SetMinimumLogSeverity(LogSeverity new_severity) {
-  LogSeverity old_severity = MinimalLogger::minimum_log_severity_;
-  MinimalLogger::minimum_log_severity_ = new_severity;
-  return old_severity;
-}
-
 }  // namespace logging_internal
 }  // namespace tflite

tensorflow/lite/minimal_logging.h

@@ -17,13 +17,15 @@ limitations under the License.
 
 #include <cstdarg>
 
-#include "tensorflow/lite/logger.h"
-
 namespace tflite {
 
-namespace logging_internal {
+enum LogSeverity {
+  TFLITE_LOG_INFO = 0,
+  TFLITE_LOG_WARNING = 1,
+  TFLITE_LOG_ERROR = 2,
+};
 
-using tflite::LogSeverity;
+namespace logging_internal {
 
 // Helper class for simple platform-specific console logging. Note that we
 // explicitly avoid the convenience of ostream-style logging to minimize binary
@@ -37,17 +39,8 @@ class MinimalLogger {
   static void LogFormatted(LogSeverity severity, const char* format,
                            va_list args);
 
-  // Get the minimum severity level for logging. Default is INFO in prod builds
-  // and VERBOSE in debug builds.
-  // Note: Default is always VERBOSE on Android.
-  static LogSeverity GetMinimumLogSeverity();
-
-  // Set the minimum severity level for logging, returning the old severity.
-  static LogSeverity SetMinimumLogSeverity(LogSeverity new_severity);
-
  private:
   static const char* GetSeverityName(LogSeverity severity);
-  static LogSeverity minimum_log_severity_;
 };
 
 }  // namespace logging_internal
@@ -58,12 +51,8 @@ class MinimalLogger {
 // stripped in release optimized builds. In general, prefer the error reporting
 // APIs for developer-facing errors, and only use this for diagnostic output
 // that should always be logged in user builds.
-#define TFLITE_LOG_PROD(severity, format, ...)                            \
-  if (severity >=                                                         \
-      tflite::logging_internal::MinimalLogger::GetMinimumLogSeverity()) { \
-    tflite::logging_internal::MinimalLogger::Log(severity, format,        \
-                                                 ##__VA_ARGS__);          \
-  }
+#define TFLITE_LOG_PROD(severity, format, ...) \
+  tflite::logging_internal::MinimalLogger::Log(severity, format, ##__VA_ARGS__);
 
 // Convenience macro for logging a statement *once* for a given process lifetime
 // in production builds.

tensorflow/lite/minimal_logging_android.cc

@@ -25,7 +25,6 @@ namespace {
 
 int GetPlatformSeverity(LogSeverity severity) {
   switch (severity) {
-    case TFLITE_LOG_VERBOSE:
     case TFLITE_LOG_INFO:
       return ANDROID_LOG_INFO;
     case TFLITE_LOG_WARNING:
@@ -39,8 +38,6 @@ int GetPlatformSeverity(LogSeverity severity) {
 
 }  // namespace
 
-LogSeverity MinimalLogger::minimum_log_severity_ = TFLITE_LOG_VERBOSE;
-
 void MinimalLogger::LogFormatted(LogSeverity severity, const char* format,
                                  va_list args) {
   // First log to Android's explicit log(cat) API.

tensorflow/lite/minimal_logging_default.cc

@@ -22,14 +22,6 @@ limitations under the License.
 namespace tflite {
 namespace logging_internal {
 
-#ifndef NDEBUG
-// In debug builds, default is VERBOSE.
-LogSeverity MinimalLogger::minimum_log_severity_ = TFLITE_LOG_VERBOSE;
-#else
-// In prod builds, default is INFO.
-LogSeverity MinimalLogger::minimum_log_severity_ = TFLITE_LOG_INFO;
-#endif
-
 void MinimalLogger::LogFormatted(LogSeverity severity, const char* format,
                                  va_list args) {
   fprintf(stderr, "%s: ", GetSeverityName(severity));

tensorflow/lite/minimal_logging_ios.cc

@@ -26,7 +26,6 @@ namespace {
 
 int GetPlatformSeverity(LogSeverity severity) {
   switch (severity) {
-    case TFLITE_LOG_VERBOSE:
     case TFLITE_LOG_INFO:
       return LOG_INFO;
     case TFLITE_LOG_WARNING:
@@ -40,14 +39,6 @@ int GetPlatformSeverity(LogSeverity severity) {
 
 }  // namespace
 
-#ifndef NDEBUG
-// In debug builds, default is VERBOSE.
-LogSeverity MinimalLogger::minimum_log_severity_ = TFLITE_LOG_VERBOSE;
-#else
-// In prod builds, default is INFO.
-LogSeverity MinimalLogger::minimum_log_severity_ = TFLITE_LOG_INFO;
-#endif
-
 void MinimalLogger::LogFormatted(LogSeverity severity, const char* format,
                                  va_list args) {
   // First log to iOS system logging API.

tensorflow/lite/minimal_logging_test.cc

@@ -16,7 +16,6 @@ limitations under the License.
 #include "tensorflow/lite/minimal_logging.h"
 
 #include <gtest/gtest.h>
-#include "tensorflow/lite/logger.h"
 
 namespace tflite {
 
@@ -46,35 +45,9 @@ TEST(MinimalLogging, Error) {
 
 TEST(MinimalLogging, UnknownSeverity) {
   testing::internal::CaptureStderr();
-  LogSeverity default_log_severity = TFLITE_LOG_INFO;
-#if defined(__ANDROID__) || !defined(NDEBUG)
-  default_log_severity = TFLITE_LOG_VERBOSE;
-#endif
-  EXPECT_EQ(tflite::logging_internal::MinimalLogger::SetMinimumLogSeverity(
-                static_cast<LogSeverity>(-1)),
-            default_log_severity);
   TFLITE_LOG_PROD(static_cast<LogSeverity>(-1), "Three");
   EXPECT_EQ("<Unknown severity>: Three\n",
             testing::internal::GetCapturedStderr());
-  tflite::logging_internal::MinimalLogger::SetMinimumLogSeverity(
-      default_log_severity);
-}
-
-TEST(MinimalLogging, MinimumSeverity) {
-  testing::internal::CaptureStderr();
-  LogSeverity default_log_severity = TFLITE_LOG_INFO;
-#if defined(__ANDROID__) || !defined(NDEBUG)
-  default_log_severity = TFLITE_LOG_VERBOSE;
-#endif
-
-  EXPECT_EQ(tflite::logging_internal::MinimalLogger::SetMinimumLogSeverity(
-                TFLITE_LOG_WARNING),
-            default_log_severity);
-  TFLITE_LOG_PROD(TFLITE_LOG_WARNING, "Foo");
-  TFLITE_LOG_PROD(default_log_severity, "Bar");
-  EXPECT_EQ("WARNING: Foo\n", testing::internal::GetCapturedStderr());
-  tflite::logging_internal::MinimalLogger::SetMinimumLogSeverity(
-      default_log_severity);
 }
 
 TEST(MinimalLogging, Once) {

tensorflow/lite/nnapi/sl/BUILD

@@ -19,6 +19,7 @@ cc_library(
     compatible_with = get_compatible_with_portable(),
     visibility = _DEFAULT_VISIBILITY + nnapi_sl_visibility_allowlist(),
     deps = [
+        "//tensorflow/lite:minimal_logging",
         "//tensorflow/lite/kernels/internal:compatibility",
         "//tensorflow/lite/nnapi:nnapi_lib",
     ],