From 14ec6aa6c9647e21a2c8bd2e44785210676fa3cc Mon Sep 17 00:00:00 2001 From: Thiago Crepaldi Date: Mon, 31 Oct 2022 18:19:44 -0400 Subject: [PATCH] Fix regression for onnx export with caffe2 builds Signed-off-by: Thiago Crepaldi --- test/onnx/test_pytorch_onnx_no_runtime.py | 3 +++ torch/onnx/utils.py | 24 ++++++++++------------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/test/onnx/test_pytorch_onnx_no_runtime.py b/test/onnx/test_pytorch_onnx_no_runtime.py index 8ed183156f0cacc..1095406e311dbe3 100644 --- a/test/onnx/test_pytorch_onnx_no_runtime.py +++ b/test/onnx/test_pytorch_onnx_no_runtime.py @@ -35,6 +35,7 @@ def export_to_onnx( mocks: Optional[Iterable] = None, operator_export_type: torch.onnx.OperatorExportTypes = torch.onnx.OperatorExportTypes.ONNX, opset_version: int = GLOBALS.export_onnx_opset_version, + **torch_onnx_export_kwargs, ) -> onnx.ModelProto: """Exports `model(input)` to ONNX and returns it. @@ -47,6 +48,7 @@ def export_to_onnx( mocks: list of mocks to use during export operator_export_type: export type as described by `torch.onnx.export(...operator_export_type,...)` opset_version: ONNX opset version as described by `torch.onnx.export(...opset_version,...)` + torch_onnx_export_kwargs: extra torch.onnx.export kwargs arguments Returns: A valid ONNX model (`onnx.ModelProto`) """ @@ -63,6 +65,7 @@ def export_to_onnx( f, operator_export_type=operator_export_type, opset_version=opset_version, + **torch_onnx_export_kwargs, ) # Validate ONNX graph before returning it diff --git a/torch/onnx/utils.py b/torch/onnx/utils.py index 201028173cd0d03..ff0ef755968d3a5 100644 --- a/torch/onnx/utils.py +++ b/torch/onnx/utils.py @@ -1739,17 +1739,22 @@ def _add_output_to_block(block: _C.Block, value: _C.Value) -> int: @_beartype.beartype def _should_aten_fallback( - name: str, - opset_version: int, - operator_export_type: _C_onnx.OperatorExportTypes, + name: str, opset_version: int, operator_export_type: _C_onnx.OperatorExportTypes ): + # For BUILD_CAFFE2=0 builds, if domain=="aten" and operator_export_type==ONNX_ATEN, + # an aten::ATen operator is created regardless of symbolics existence + # For BUILD_CAFFE2=1, the same applies only if there is no symbolic available + is_exportable_aten_op = registration.registry.is_registered_op(name, opset_version) is_onnx_aten_export = operator_export_type == _C_onnx.OperatorExportTypes.ONNX_ATEN is_aten_fallback_export = ( operator_export_type == _C_onnx.OperatorExportTypes.ONNX_ATEN_FALLBACK ) + is_caffe2_build = _C_onnx._CAFFE2_ATEN_FALLBACK + return name.startswith("aten::") and ( - is_onnx_aten_export or (not is_exportable_aten_op and is_aten_fallback_export) + ((is_onnx_aten_export or is_aten_fallback_export) and not is_caffe2_build) + or (not is_exportable_aten_op and is_aten_fallback_export) ) @@ -1845,16 +1850,7 @@ def _run_symbolic_function( ) # Direct ATen export requested - # For BUILD_CAFFE2=0 builds, if domain=="aten" and operator_export_type==ONNX_ATEN, - # an aten::ATen operator is created regardless of symbolics existence - # For BUILD_CAFFE2=1, the same applies only if there is no symbolic available - if ( - _C_onnx._CAFFE2_ATEN_FALLBACK - and not registration.registry.is_registered_op(ns_op_name, opset_version) - ) or ( - not _C_onnx._CAFFE2_ATEN_FALLBACK - and _should_aten_fallback(ns_op_name, opset_version, operator_export_type) - ): + if _should_aten_fallback(ns_op_name, opset_version, operator_export_type): attrs = { k + "_" + node.kindOf(k)[0]: symbolic_helper._node_get(node, k) for k in node.attributeNames()