rename DEFAULT_CUSTOM_OP_OPSET

Author: nbcsm

tests/test_graph.py

@@ -340,7 +340,7 @@ def print_handler(ctx, node, name, args):  # pylint: disable=unused-argument
             # becomes:
             #   T output = Identity(T Input)
             self.assertEqual(node.type, "Identity")
-            node.domain = constants.DEFAULT_CUSTOM_OP_OPSET.domain
+            node.domain = constants.TENSORFLOW_OPSET.domain
             self.assertEqual(args[0], "mode")
             del node.input[1:]
             return node
@@ -352,13 +352,13 @@ def print_handler(ctx, node, name, args):  # pylint: disable=unused-argument
             g = process_tf_graph(sess.graph,
                                  custom_op_handlers={"Print": (print_handler, ["Identity", "mode"])},
                                  opset=self.config.opset,
-                                 extra_opset=[constants.DEFAULT_CUSTOM_OP_OPSET])
+                                 extra_opset=[constants.TENSORFLOW_OPSET])
             self.assertEqual(
                 'digraph { input1 [op_type=Placeholder shape="[2, 3]"] Print [domain="ai.onnx.converters.tensorflow" '
                 'op_type=Identity] output [op_type=Identity] input1:0 -> Print Print:0 -> output }',
                 onnx_to_graphviz(g))
             self.assertEqual(g.opset, self.config.opset)
-            self.assertEqual(g.extra_opset, [constants.DEFAULT_CUSTOM_OP_OPSET])
+            self.assertEqual(g.extra_opset, [constants.TENSORFLOW_OPSET])
 
     def test_extra_opset(self):
         extra_opset = [

tf2onnx/constants.py

@@ -16,7 +16,7 @@
 PREFERRED_OPSET = 7
 
 # Default opset for custom ops
-DEFAULT_CUSTOM_OP_OPSET = utils.make_opsetid("ai.onnx.converters.tensorflow", 1)
+TENSORFLOW_OPSET = utils.make_opsetid("ai.onnx.converters.tensorflow", 1)
 
 # Target for the generated onnx graph. It possible targets:
 # onnx-1.1 = onnx at v1.1 (winml in rs4 is based on this)

tf2onnx/convert.py

@@ -73,7 +73,7 @@ def get_args():
 
 
 def default_custom_op_handler(ctx, node, name, args):
-    node.domain = constants.DEFAULT_CUSTOM_OP_OPSET.domain
+    node.domain = constants.TENSORFLOW_OPSET.domain
     return node
 
 
@@ -89,7 +89,7 @@ def main():
     if args.custom_ops:
         # default custom ops for tensorflow-onnx are in the "tf" namespace
         custom_ops = {op: (default_custom_op_handler, []) for op in args.custom_ops.split(",")}
-        extra_opset.append(constants.DEFAULT_CUSTOM_OP_OPSET)
+        extra_opset.append(constants.TENSORFLOW_OPSET)
 
     # get the frozen tensorflow model from graphdef, checkpoint or saved_model.
     if args.graphdef: