unify logger name

Author: nbcsm

tests/backend_test_base.py

@@ -31,7 +31,7 @@ def setUp(self):
         utils.INTERNAL_NAME = 1
         np.random.seed(1)  # Make it reproducible.
 
-        self.log = logging.getLogger("tf2onnx.unitest." + str(type(self)))
+        self.logger = logging.getLogger(self.__class__.__name__)
         if not self.config.is_debug_mode:
             # suppress log info of tensorflow so that result of test can be seen much easier
             os.environ['TF_CPP_MIN_LOG_LEVEL'] = '3'
@@ -121,15 +121,15 @@ def run_test_case(self, feed_dict, input_names_with_port, output_names_with_port
                 os.makedirs(self.test_data_directory)
             model_path = os.path.join(self.test_data_directory, self._testMethodName + "_original.pb")
             utils.save_protobuf(model_path, sess.graph_def)
-            self.log.debug("created file %s", model_path)
+            self.logger.debug("created file %s", model_path)
 
         graph_def = tf_optimize(input_names_with_port, output_names_with_port,
                                 sess.graph_def, constant_fold)
 
         if self.config.is_debug_mode:
             model_path = os.path.join(self.test_data_directory, self._testMethodName + "_after_tf_optimize.pb")
             utils.save_protobuf(model_path, graph_def)
-            self.log.debug("created file  %s", model_path)
+            self.logger.debug("created file  %s", model_path)
 
         tf.reset_default_graph()
         tf.import_graph_def(graph_def, name='')
@@ -158,5 +158,5 @@ def save_onnx_model(self, model_proto, feed_dict, postfix=""):
                                             model_proto, include_test_data=self.config.is_debug_mode,
                                             as_text=self.config.is_debug_mode)
 
-        self.log.debug("create model file: %s", target_path)
+        self.logger.debug("create model file: %s", target_path)
         return target_path

tests/run_pretrained_models.py

@@ -34,7 +34,7 @@
 # pylint: disable=broad-except,logging-not-lazy,unused-argument,unnecessary-lambda
 
 logging.basicConfig(level=logging.INFO, format=constants.LOG_FORMAT)
-log = logging.getLogger("tf2onnx")
+logger = logging.getLogger("run_pretrained")
 
 TEMP_DIR = os.path.join(utils.get_temp_directory(), "run_pretrained")
 PERFITER = 1000
@@ -255,7 +255,7 @@ def run_test(self, name, backend="caffe2", debug=False, onnx_file=None, opset=No
                 dtype = tf.as_dtype(t.dtype).name
                 v = inputs[k]
                 if dtype != v.dtype:
-                    log.warning("input dtype doesn't match tensorflow's")
+                    logger.warning("input dtype doesn't match tensorflow's")
                     inputs[k] = np.array(v, dtype=dtype)
             if self.force_input_shape:
                 for k, v in inputs.items():

tests/test_backend.py

@@ -188,7 +188,7 @@ def test_maxpool(self):
                 mp = tf.nn.max_pool(x, ksize, strides, padding=padding)
                 _ = tf.identity(mp, name=_TFOUTPUT)
 
-                self.log.debug(str(p))
+                self.logger.debug(str(p))
                 self._run_test_case([_OUTPUT], {_INPUT: x_val})
 
     @unittest.skipIf(get_test_config().is_onnxruntime_backend and get_test_config().backend_version == "0.2.1",
@@ -207,7 +207,7 @@ def test_avgpool(self):
                 mp = tf.nn.avg_pool(x, ksize, strides, padding=padding)
                 _ = tf.identity(mp, name=_TFOUTPUT)
 
-                self.log.debug(str(p))
+                self.logger.debug(str(p))
                 self._run_test_case([_OUTPUT], {_INPUT: x_val}, rtol=1e-06)
 
     def _conv_test(self, x_val, w, strides=None, padding="VALID", dilations=None, rtol=1e-07):
@@ -1125,7 +1125,7 @@ def test_pad_const_default_val(self):
             paddings = tf.constant(pad)
             op = tf.pad(x, paddings, mode)
             _ = tf.identity(op, name=_TFOUTPUT)
-            self.log.debug(str(p))
+            self.logger.debug(str(p))
             self._run_test_case([_OUTPUT], {_INPUT: x_val})
 
     @skip_caffe2_backend()

tf2onnx/graph.py

@@ -24,7 +24,7 @@
 from tf2onnx.schemas import get_schema
 
 
-log = logging.getLogger("graph")
+logger = logging.getLogger(__name__)
 
 
 # todo(pengwa): remove protected-access later
@@ -90,8 +90,8 @@ def attr_onnx(self):
         """Return onnx valid attributes"""
         schema = get_schema(self.type, self.graph.opset, self.domain)
         if schema is None and not (self.is_const() or self.is_graph_input()):
-            log.debug("Node %s uses non-stardard onnx op <%s, %s>, skip attribute check",
-                      self.name, self.domain, self.type)
+            logger.debug("Node %s uses non-stardard onnx op <%s, %s>, skip attribute check",
+                         self.name, self.domain, self.type)
         onnx_attrs = {}
         for a in self._attr.values():
             if schema is None or schema.has_attribute(a.name):

tf2onnx/loader.py

@@ -16,7 +16,7 @@
 from tf2onnx import utils
 
 
-log = logging.getLogger("loader")
+logger = logging.getLogger(__name__)
 
 # pylint: disable=unused-argument
 
@@ -48,7 +48,7 @@ def remove_redundant_inputs(frozen_graph, input_names):
                 frozen_inputs.append(inp)
     deleted_inputs = list(set(input_names) - set(frozen_inputs))
     if deleted_inputs:
-        log.warning("inputs [%s] is not in frozen graph, delete them", ",".join(deleted_inputs))
+        logger.warning("inputs [%s] is not in frozen graph, delete them", ",".join(deleted_inputs))
     return frozen_inputs
 
 

tf2onnx/onnx_opset/common.py

@@ -2,7 +2,7 @@
 # Licensed under the MIT license.
 
 """
-tf2onnx.tf2onnx.onnx_opset.math
+common
 """
 
 from __future__ import division
@@ -14,7 +14,7 @@
 from tf2onnx import constants
 
 
-log = logging.getLogger("onnx_opset.common")
+logger = logging.getLogger(__name__)
 
 # pylint: disable=unused-argument,missing-docstring
 

tf2onnx/onnx_opset/controlflow.py

@@ -2,7 +2,7 @@
 # Licensed under the MIT license.
 
 """
-tf2onnx.tf2onnx.onnx_opset.controlflow
+controlflow
 """
 
 from __future__ import division
@@ -21,7 +21,7 @@
 from tf2onnx.utils import make_sure
 
 
-log = logging.getLogger("onnx_opset.controlflow")
+logger = logging.getLogger(__name__)
 
 # pylint: disable=unused-argument,missing-docstring
 

tf2onnx/onnx_opset/generator.py

@@ -2,7 +2,7 @@
 # Licensed under the MIT license.
 
 """
-tf2onnx.tf2onnx.onnx_opset.generator
+generator
 """
 
 from __future__ import division
@@ -17,7 +17,7 @@
 from tf2onnx.handler import tf_op
 
 
-log = logging.getLogger("onnx_opset.generator")
+logger = logging.getLogger(__name__)
 
 # pylint: disable=unused-argument,missing-docstring
 

tf2onnx/onnx_opset/logical.py

@@ -2,7 +2,7 @@
 # Licensed under the MIT license.
 
 """
-tf2onnx.tf2onnx.onnx_opset.logical
+logical
 """
 
 from __future__ import division
@@ -17,7 +17,7 @@
 from tf2onnx.onnx_opset import common
 
 
-log = logging.getLogger("onnx_opset.logical")
+logger = logging.getLogger(__name__)
 
 # pylint: disable=unused-argument,missing-docstring
 

tf2onnx/onnx_opset/math.py

@@ -2,7 +2,7 @@
 # Licensed under the MIT license.
 
 """
-tf2onnx.tf2onnx.onnx_opset.math
+math
 """
 
 from __future__ import division
@@ -18,7 +18,7 @@
 from tf2onnx.onnx_opset import common
 
 
-log = logging.getLogger("onnx_opset.math")
+logger = logging.getLogger(__name__)
 
 # pylint: disable=unused-argument,missing-docstring