Fix OpBuilder to properly extract _domain, _version, _outputs from kwargs

OpBuilder._call_op was inserting _domain, _version into the kwargs dict,
but GraphBuilder.call_op expects domain, version, outputs as separate
keyword arguments. This caused them to be treated as node attributes,
breaking custom domain handling, schema lookup, type inference, shape
inference, and output naming.

Changes:
- OpBuilder._call_op: pop _domain, _version, _outputs from kwargs and
  pass as separate keyword args to call_op
- Remove _prefix from GraphBuilder.call and OpBuilder.call (only
  call_inline needs it)
- Update test to use push_module/pop_module instead of _prefix on call

Author: Justin Chu

onnxscript/_internal/builder.py

@@ -721,11 +721,12 @@ def version(self) -> int | None:
         return self._version
 
     def _call_op(self, op_type: str, inputs: Sequence[Any], kwargs: dict[str, Any]):
-        if "_domain" not in kwargs:
-            kwargs["_domain"] = self._domain
-        if self._version is not None and "_version" not in kwargs:
-            kwargs["_version"] = self._version
-        return self._builder.call_op(op_type, inputs, kwargs)
+        domain = kwargs.pop("_domain", self._domain)
+        version = kwargs.pop("_version", self._version)
+        outputs = kwargs.pop("_outputs", 1)
+        return self._builder.call_op(
+            op_type, inputs, kwargs, domain=domain, version=version, outputs=outputs
+        )
 
     def __getattr__(self, op_type: str) -> Callable:
         return lambda *args, **kwargs: self._call_op(op_type, args, kwargs)

onnxscript/_internal/builder_test.py

@@ -925,8 +925,8 @@ def add_mul(X, Y):
         self.assertEqual(len(nodes), 1)
         self.assertEqual(nodes[0].op_type, "add_mul")
 
-    def test_call_with_prefix_option(self):
-        """Test that GraphBuilder.call respects the _prefix option for hierarchical naming."""
+    def test_call_with_push_module_prefix(self):
+        """Test that GraphBuilder.call respects push_module for hierarchical naming."""
         op, x, y = _create_builder_with_inputs()
 
         @script(default_opset=op)
@@ -935,7 +935,9 @@ def mul_add_relu(X, Y):
             tmp = tmp + X
             return op.Relu(tmp)
 
-        result = op.call(mul_add_relu, x, y, _prefix="layer1")
+        op.builder.push_module("layer1")
+        result = op.call(mul_add_relu, x, y)
+        op.builder.pop_module()
 
         nodes = list(op.builder.graph)
         self.assertEqual(len(nodes), 1)