[Misc] Change the default loglevel to 2

This patch changes the default loglevel to 2.
It will show warning messages as well as error messages.

Signed-off-by: Dongju Chae <dongju.chae@samsung.com>

diff --git a/docs/markdown/Debugging.md b/docs/markdown/Debugging.md
index 277ccd9420a23574d66272981b14d4939f15b172..b68cfcc119276d4d1220032abad7730eef0c2dda 100644 (file)
--- a/docs/markdown/Debugging.md
+++ b/docs/markdown/Debugging.md
@@ -19,21 +19,19 @@ There are three different log levels depending on the severity of log messages.
 - INFO (3): Informational messages
 
 All log messages are stored to a log file and the default log file path, `/tmp/npu-engine.log`.
-Optionally, we can see partial log messages in the screen by setting `log_level` (default is 1)
-which is the maximum level to print messages to `stderr`.
-If you want to mute all messages, please set `log_level` to 0.
+Optionally, we can see partial log messages in the screen by setting `log_level` which is the maximum level to print messages to `stderr`. By default, the default loglevel is 2 to show error and warning messages. If you want to mute all messages, please set `log_level` to 0.
 
 After modifying .ini file
 ```console
 $ sudo sed -i "s|log_dir=.*|log_dir=/home/test/log_dir|" /opt/trinity/etc/npu-engine.ini
-$ sudo sed -i "s|log_level=.*|log_level=2|" /opt/trinity/etc/npu-engine.ini
+$ sudo sed -i "s|log_level=.*|log_level=0|" /opt/trinity/etc/npu-engine.ini
 $ ... [run your apps] ...
 ```
 
 After setting the env variable
 ```console
 $ export NE_LOG_DIR=/home/test/log_dir
-$ export NE_LOG_LEVLE=2
+$ export NE_LOG_LEVEL=0
 $ ... [run your apps] ...
 ```
 

diff --git a/meson_options.txt b/meson_options.txt
index 26daf4edd5e0279c79fc491144541188bcfb49b0..1ac4f9c6a95b37b98b5f8f2286a7f9b8ffe52195 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -4,7 +4,7 @@ option('num_threads', type : 'string', value : '8')
 option('prefix_share', type : 'string', value : '/share')
 option('prefix_profile', type : 'string', value : '/tmp')
 option('log_dir', type : 'string', value : '/tmp/')
-option('log_level', type : 'string', value : '1')
+option('log_level', type : 'string', value : '2')
 option('mute_stdout', type : 'boolean', value : false)
 option('target_platform', type : 'combo', choices : ['debian', 'tizen', 'fpga'], value : 'debian')
 option('enable_npu_emul', type : 'boolean', value : false)

diff --git a/src/core/utils/ne-conf.cc b/src/core/utils/ne-conf.cc
index 1c1cc98ff421426594df37abcf44e0ecc0a44a84..d80bf77c3fcae4a1dcc28b6fcf8b5b5f1f08164a 100644 (file)
--- a/src/core/utils/ne-conf.cc
+++ b/src/core/utils/ne-conf.cc
@@ -31,7 +31,7 @@ std::once_flag Conf::once_flag_;
 static const uint32_t default_num_threads = 8;
 static const size_t default_resv_mem_size = 0; /* deprecated */
 static const char default_log_dir[] = "/tmp/";
-static const uint32_t default_log_level = 1; /* error only */
+static const uint32_t default_log_level = 2; /* error/warning */
 static const char default_prefix_share[] = NE_PREFIX "/share";
 static const char default_prefix_profile[] = "/tmp";
 static bool default_mute_stdout = false;
@@ -54,6 +54,55 @@ Conf::getInstance (const char *inipath) {
   return *(instance_.get ());
 }
 
+uint32_t
+Conf::getNumThreads (bool is_default) const {
+  if (is_default)
+    return default_num_threads;
+  return num_threads_;
+}
+
+size_t
+Conf::getResvMemSize (bool is_default) const {
+  if (is_default)
+    return default_resv_mem_size;
+  return reserved_mem_size_;
+}
+
+const char *
+Conf::getLogDir (bool is_default) const {
+  if (is_default)
+    return default_log_dir;
+  return log_dir_;
+}
+
+uint32_t
+Conf::getLogLevel (bool is_default) const {
+  if (is_default)
+    return default_log_level;
+  return log_level_;
+}
+
+const char *
+Conf::getPrefixShare (bool is_default) const {
+  if (is_default)
+    return default_prefix_share;
+  return prefix_share_;
+}
+
+const char *
+Conf::getPrefixProfile (bool is_default) const {
+  if (is_default)
+    return default_prefix_profile;
+  return prefix_profile_;
+}
+
+bool
+Conf::getMuteStdout (bool is_default) const {
+  if (is_default)
+    return default_mute_stdout;
+  return mute_stdout_;
+}
+
 /**
  * @breif error callback of iniparser, used to ignore its error message
  */

diff --git a/src/core/utils/ne-conf.h b/src/core/utils/ne-conf.h
index f4a15703735071a923990f266bdd748952e9b095..718dea79558a2d54744688092f4a15a257809784 100644 (file)
--- a/src/core/utils/ne-conf.h
+++ b/src/core/utils/ne-conf.h
@@ -40,13 +40,13 @@ class Conf {
  public:
   static Conf &getInstance (const char *inipath = nullptr);
 
-  uint32_t getNumThreads () { return num_threads_; }
-  size_t getResvMemSize () { return reserved_mem_size_; }
-  const char *getLogDir () { return log_dir_; }
-  uint32_t getLogLevel () { return log_level_; }
-  const char *getPrefixShare () { return prefix_share_; }
-  const char *getPrefixProfile () { return prefix_profile_; }
-  bool getMuteStdout () { return mute_stdout_; }
+  uint32_t getNumThreads (bool is_default = false) const;
+  size_t getResvMemSize (bool is_default = false) const;
+  const char *getLogDir (bool is_default = false) const;
+  uint32_t getLogLevel (bool is_default = false) const;
+  const char *getPrefixShare (bool is_default = false) const;
+  const char *getPrefixProfile (bool is_default = false) const;
+  bool getMuteStdout (bool is_default = false) const;
 
   void reset ();
 

diff --git a/tests/unittests/ne_core_utils_test.cc b/tests/unittests/ne_core_utils_test.cc
index 0e21513a0fbdf3421b53ac69549ba626a4ad1ed7..7667c58db546db13d870dfb1800cd0d7ee6f7008 100644 (file)
--- a/tests/unittests/ne_core_utils_test.cc
+++ b/tests/unittests/ne_core_utils_test.cc
@@ -29,7 +29,7 @@ typedef std::vector<std::pair<const char *, char *>> ENV_PAIR;
 static const uint32_t default_num_threads = 8;
 static const size_t default_resv_mem_size = 0; /* deprecated */
 static const char default_log_dir[] = "/tmp/";
-static const uint32_t default_log_level = 1; /* error only */
+static const uint32_t default_log_level = 2; /* error/warning */
 static const char default_prefix_share[] = NE_PREFIX "/share";
 static const char default_prefix_profile[] = "/tmp";
 
@@ -87,12 +87,12 @@ TEST (ne_core_utils_test, load_conf_default) {
   Conf &conf = Conf::getInstance ();
 
   /** default configurations */
-  EXPECT_EQ (conf.getResvMemSize (), default_resv_mem_size);
-  EXPECT_EQ (conf.getNumThreads (), default_num_threads);
-  EXPECT_STREQ (conf.getLogDir (), default_log_dir);
-  EXPECT_EQ (conf.getLogLevel (), default_log_level);
-  EXPECT_STREQ (conf.getPrefixShare (), default_prefix_share);
-  EXPECT_STREQ (conf.getPrefixProfile (), default_prefix_profile);
+  EXPECT_EQ (conf.getResvMemSize (true), default_resv_mem_size);
+  EXPECT_EQ (conf.getNumThreads (true), default_num_threads);
+  EXPECT_STREQ (conf.getLogDir (true), default_log_dir);
+  EXPECT_EQ (conf.getLogLevel (true), default_log_level);
+  EXPECT_STREQ (conf.getPrefixShare (true), default_prefix_share);
+  EXPECT_STREQ (conf.getPrefixProfile (true), default_prefix_profile);
 
   restore_envvars (envvars);
 }