From 4fbe77a051d6da845a1fafa69febb46f920dc03d Mon Sep 17 00:00:00 2001 From: penguin_wwy <940375606@qq.com> Date: Sun, 28 Apr 2024 02:18:33 +0800 Subject: [PATCH] [dynamo] Verify the default value is passed by kwargs (#2998) --- projects/pt1/e2e_testing/xfail_sets.py | 14 ++++---------- .../pt1/python/torch_mlir/_dynamo_fx_importer.py | 2 +- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/projects/pt1/e2e_testing/xfail_sets.py b/projects/pt1/e2e_testing/xfail_sets.py index 2b47c40c4..62c6cd777 100644 --- a/projects/pt1/e2e_testing/xfail_sets.py +++ b/projects/pt1/e2e_testing/xfail_sets.py @@ -252,18 +252,14 @@ TORCHDYNAMO_XFAIL_SET = { # ERROR: Exception: Unsupported: missing default value for argument 0 in schema for aten.div.Tensor_mode "ElementwiseAtenFloorDivideScalarNegativeModule_basic", "ElementwiseAtenFloorDivideScalarModule_basic", - "ElementwiseDivTensorRoundingModeFloorModule_basic", - "ElementwiseDivTensorRoundingModeTruncModule_basic", - "ElementwiseDivTensorRoundingModeFloorStaticModule_basic", - "ElementwiseDivTensorRoundingModeTruncStaticModule_basic", - "ElementwiseDivTensorRoundingModeFloorIntStaticModule_basic", - "ElementwiseDivTensorRoundingModeTruncIntStaticModule_basic", "ElementwiseDivScalarRoundingModeFloorModule_basic", "ElementwiseDivScalarRoundingModeTruncModule_basic", "ElementwiseDivScalarRoundingModeFloorStaticModule_basic", "ElementwiseDivScalarRoundingModeTruncStaticModule_basic", "ElementwiseDivScalarRoundingModeFloorIntStaticModule_basic", "ElementwiseDivScalarRoundingModeTruncIntStaticModule_basic", + + # ERROR: 'torch.aten.mul.Tensor' op operand #1 must be Any Torch tensor type, but got '!torch.int' "AdaptiveAvgPool1dStaticLargerOutput_basic", "AdaptiveAvgPool1dGeneralDynamic_basic", "AdaptiveAvgPool1dGeneralDynamicNoBatches_basic", @@ -276,10 +272,6 @@ TORCHDYNAMO_XFAIL_SET = { "TensorFloatModule_basic", "TensorIntModule_basic", - # ERROR: Exception: Unsupported: missing default value for argument 0 in schema for aten.randn.generator - "RandnGeneratorF64Module_basic", - "RandnGeneratorModule_basic", - # START tests failing due to: complex floating point ops # END tests failing due to: complex floating point ops @@ -343,8 +335,10 @@ TORCHDYNAMO_XFAIL_SET = { "IntImplicitModule_basic", # Others + "ExponentialModule_basic", "GridSamplerBasic1_basic", "GridSamplerBasic2_basic", + "GridSamplerBasic3_basic", "FakeQuantizePerTensorAffineModule_basic", "FakeQuantizePerTensorAffineDynamicShapeModule_basic", "FakeQuantizePerTensorAffineRoundToEvenModule_basic", diff --git a/projects/pt1/python/torch_mlir/_dynamo_fx_importer.py b/projects/pt1/python/torch_mlir/_dynamo_fx_importer.py index 895c87400..be87e775d 100644 --- a/projects/pt1/python/torch_mlir/_dynamo_fx_importer.py +++ b/projects/pt1/python/torch_mlir/_dynamo_fx_importer.py @@ -78,7 +78,7 @@ def _verify_fx_graph_conforms_to_subset(g: torch.fx.Graph): assert len(node.args) < len(node.target._schema.arguments) for i, argument in enumerate( node.target._schema.arguments[len(node.args):]): - if not argument.has_default_value(): + if not argument.has_default_value() and argument.name not in node.kwargs: raise Exception( f"Unsupported: missing default value for argument {i} in schema for {node.target}" )