add verbose level name, rename get_adjusted_level

Author: nbcsm

tests/common.py

@@ -95,7 +95,7 @@ def load():
             config.backend = args.backend
             config.opset = args.opset
             config.target = args.target.split(',')
-            config.log_level = logging.get_adjusted_level(args.verbose, config.log_level)
+            config.log_level = logging.get_verbosity_level(args.verbose, config.log_level)
             config.is_debug_mode = args.debug
             if args.temp_dir:
                 config.temp_dir = args.temp_dir

tests/run_pretrained_models.py

@@ -371,7 +371,7 @@ def tests_from_yaml(fname):
 
 def main():
     args = get_args()
-    logging.basicConfig(level=logging.get_adjusted_level(args.verbose))
+    logging.basicConfig(level=logging.get_verbosity_level(args.verbose))
 
     Test.cache_dir = args.cache
     Test.target = args.target

tf2onnx/convert.py

@@ -80,7 +80,7 @@ def default_custom_op_handler(ctx, node, name, args):
 
 def main():
     args = get_args()
-    logging.basicConfig(level=logging.get_adjusted_level(args.verbose))
+    logging.basicConfig(level=logging.get_verbosity_level(args.verbose))
 
     # override unknown dimensions from -1 to 1 (aka batchsize 1) since not every runtime does
     # support unknown dimensions.

tf2onnx/logging.py

@@ -17,6 +17,8 @@
 
 VERBOSE = 15
 
+_logging.addLevelName(VERBOSE, "VERBOSE")
+
 
 def _verbose(self, message, *args, **kwargs):
     if self.isEnabledFor(VERBOSE):
@@ -51,9 +53,9 @@ def basicConfig(**kwargs):  # pylint: disable=invalid-name, function-redefined
 }
 
 
-def get_adjusted_level(verbosity, raw_level=INFO):
-    """ If verbosity is specified, return corresponding level, otherwise, return raw_level. """
-    return _VERBOSITY_TO_LEVEL.get(verbosity, raw_level)
+def get_verbosity_level(verbosity, default_level=INFO):
+    """ If verbosity is specified, return corresponding level, otherwise, return default_level. """
+    return _VERBOSITY_TO_LEVEL.get(verbosity, default_level)
 
 
 def set_level(level):