diff --git a/test/dynamo_expected_failures/TestArrayConstruction.test_array_empty b/test/dynamo_expected_failures/TestArrayConstruction.test_array_empty deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestAttributes.test_set_stridesattr b/test/dynamo_expected_failures/TestAttributes.test_set_stridesattr deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestAttributes.test_stridesattr b/test/dynamo_expected_failures/TestAttributes.test_stridesattr deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestBincount.test_with_incorrect_minlength b/test/dynamo_expected_failures/TestBincount.test_with_incorrect_minlength deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestClip.test_simple_int32_inout_casting_unsafe b/test/dynamo_expected_failures/TestClip.test_simple_int32_inout_casting_unsafe deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestConstant.test_check_constant_float3 b/test/dynamo_expected_failures/TestConstant.test_check_constant_float3 deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestConstant.test_check_constant_pad_2d b/test/dynamo_expected_failures/TestConstant.test_check_constant_pad_2d deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestConvolutionNN.test_Conv2d_missing_argument b/test/dynamo_expected_failures/TestConvolutionNN.test_Conv2d_missing_argument deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestHistogram.test_precision b/test/dynamo_expected_failures/TestHistogram.test_precision deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestHistogram2d.test_all_outliers b/test/dynamo_expected_failures/TestHistogram2d.test_all_outliers deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestHistogram2d.test_asym b/test/dynamo_expected_failures/TestHistogram2d.test_asym deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestHistogramdd.test_finite_range b/test/dynamo_expected_failures/TestHistogramdd.test_finite_range deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestHistogramdd.test_simple b/test/dynamo_expected_failures/TestHistogramdd.test_simple deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestMeshgrid.test_invalid_arguments b/test/dynamo_expected_failures/TestMeshgrid.test_invalid_arguments deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestNativeFunctions.test_optional_floatlist_invalid b/test/dynamo_expected_failures/TestNativeFunctions.test_optional_floatlist_invalid deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestNativeFunctions.test_optional_intlist_invalid b/test/dynamo_expected_failures/TestNativeFunctions.test_optional_intlist_invalid deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestNativeFunctions.test_symintlist_error b/test/dynamo_expected_failures/TestNativeFunctions.test_symintlist_error deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestNativeFunctions.test_symintlist_error_with_overload b/test/dynamo_expected_failures/TestNativeFunctions.test_symintlist_error_with_overload deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestNativeFunctions.test_vararg_symintlist_error b/test/dynamo_expected_failures/TestNativeFunctions.test_vararg_symintlist_error deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestPower.test_modular_power b/test/dynamo_expected_failures/TestPower.test_modular_power deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestQuantizedEmbeddingOps.test_embedding_bag_2bit b/test/dynamo_expected_failures/TestQuantizedEmbeddingOps.test_embedding_bag_2bit deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestQuantizedEmbeddingOps.test_embedding_bag_4bit b/test/dynamo_expected_failures/TestQuantizedEmbeddingOps.test_embedding_bag_4bit deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestQuantizedOps.test_avg_pool2d_nhwc b/test/dynamo_expected_failures/TestQuantizedOps.test_avg_pool2d_nhwc deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestQuantizedOps.test_avg_pool3d_nhwc b/test/dynamo_expected_failures/TestQuantizedOps.test_avg_pool3d_nhwc deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestQuantizedOps.test_cat_nhwc b/test/dynamo_expected_failures/TestQuantizedOps.test_cat_nhwc deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestQuantizedOps.test_interpolate b/test/dynamo_expected_failures/TestQuantizedOps.test_interpolate deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestQuantizedOps.test_interpolate3d b/test/dynamo_expected_failures/TestQuantizedOps.test_interpolate3d deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestQuantizedOps.test_max_pool2d_nhwc b/test/dynamo_expected_failures/TestQuantizedOps.test_max_pool2d_nhwc deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestQuantizedTensor.test_per_channel_qtensor_to_memory_format b/test/dynamo_expected_failures/TestQuantizedTensor.test_per_channel_qtensor_to_memory_format deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestQuantizedTensor.test_per_tensor_qtensor_to_memory_format b/test/dynamo_expected_failures/TestQuantizedTensor.test_per_tensor_qtensor_to_memory_format deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestSortAndSelectCPU.test_topk_arguments_cpu b/test/dynamo_expected_failures/TestSortAndSelectCPU.test_topk_arguments_cpu deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestStaticQuantizedModule.test_embedding_api b/test/dynamo_expected_failures/TestStaticQuantizedModule.test_embedding_api deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestStaticQuantizedModule.test_embedding_bag_api b/test/dynamo_expected_failures/TestStaticQuantizedModule.test_embedding_bag_api deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestTEFuserDynamic.test_gelu b/test/dynamo_expected_failures/TestTEFuserDynamic.test_gelu deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestTEFuserStatic.test_gelu b/test/dynamo_expected_failures/TestTEFuserStatic.test_gelu deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestTensorBoardSummary.test_uint8_image b/test/dynamo_expected_failures/TestTensorBoardSummary.test_uint8_image deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestTensorBoardUtils.test_to_HWC b/test/dynamo_expected_failures/TestTensorBoardUtils.test_to_HWC deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestTorch.test_contains b/test/dynamo_expected_failures/TestTorch.test_contains deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestTorch.test_parsing_double b/test/dynamo_expected_failures/TestTorch.test_parsing_double deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestTorch.test_parsing_int64 b/test/dynamo_expected_failures/TestTorch.test_parsing_int64 deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/dynamo_expected_failures/TestCustomOp.test_impl_device_function b/test/dynamo_skips/TestCustomOp.test_impl_device_function similarity index 100% rename from test/dynamo_expected_failures/TestCustomOp.test_impl_device_function rename to test/dynamo_skips/TestCustomOp.test_impl_device_function diff --git a/test/dynamo_expected_failures/TestDLPack.test_non_contiguous b/test/dynamo_skips/TestDLPack.test_non_contiguous similarity index 100% rename from test/dynamo_expected_failures/TestDLPack.test_non_contiguous rename to test/dynamo_skips/TestDLPack.test_non_contiguous diff --git a/test/dynamo_expected_failures/TestFX.test_custom_traceback_raised_when_exception_source_is_graphmodule b/test/dynamo_skips/TestFX.test_custom_traceback_raised_when_exception_source_is_graphmodule similarity index 100% rename from test/dynamo_expected_failures/TestFX.test_custom_traceback_raised_when_exception_source_is_graphmodule rename to test/dynamo_skips/TestFX.test_custom_traceback_raised_when_exception_source_is_graphmodule diff --git a/test/dynamo_expected_failures/TestIndexingCPU.test_invalid_index_cpu b/test/dynamo_skips/TestIndexingCPU.test_invalid_index_cpu similarity index 100% rename from test/dynamo_expected_failures/TestIndexingCPU.test_invalid_index_cpu rename to test/dynamo_skips/TestIndexingCPU.test_invalid_index_cpu diff --git a/test/dynamo_expected_failures/TestQuantizedEmbeddingOps.test_embedding_bag_byte b/test/dynamo_skips/TestQuantizedEmbeddingOps.test_embedding_bag_byte similarity index 100% rename from test/dynamo_expected_failures/TestQuantizedEmbeddingOps.test_embedding_bag_byte rename to test/dynamo_skips/TestQuantizedEmbeddingOps.test_embedding_bag_byte diff --git a/test/dynamo_expected_failures/TestSetOps.test_in1d_table_timedelta_fails b/test/dynamo_skips/TestSetOps.test_in1d_table_timedelta_fails similarity index 100% rename from test/dynamo_expected_failures/TestSetOps.test_in1d_table_timedelta_fails rename to test/dynamo_skips/TestSetOps.test_in1d_table_timedelta_fails diff --git a/test/dynamo_expected_failures/TestSetOps.test_in1d_timedelta_kind0 b/test/dynamo_skips/TestSetOps.test_in1d_timedelta_kind0 similarity index 100% rename from test/dynamo_expected_failures/TestSetOps.test_in1d_timedelta_kind0 rename to test/dynamo_skips/TestSetOps.test_in1d_timedelta_kind0 diff --git a/test/dynamo_expected_failures/TestSetOps.test_in1d_timedelta_kind_sort b/test/dynamo_skips/TestSetOps.test_in1d_timedelta_kind_sort similarity index 100% rename from test/dynamo_expected_failures/TestSetOps.test_in1d_timedelta_kind_sort rename to test/dynamo_skips/TestSetOps.test_in1d_timedelta_kind_sort diff --git a/test/dynamo_expected_failures/TestSetOps.test_setdiff1d b/test/dynamo_skips/TestSetOps.test_setdiff1d similarity index 100% rename from test/dynamo_expected_failures/TestSetOps.test_setdiff1d rename to test/dynamo_skips/TestSetOps.test_setdiff1d diff --git a/test/onnx/test_fx_to_onnx_with_onnxruntime.py b/test/onnx/test_fx_to_onnx_with_onnxruntime.py index 68ca1eba0b80..c9bdcbe5fbdb 100644 --- a/test/onnx/test_fx_to_onnx_with_onnxruntime.py +++ b/test/onnx/test_fx_to_onnx_with_onnxruntime.py @@ -1255,8 +1255,8 @@ class TestFxToOnnxFakeTensorWithOnnxRuntime(onnx_test_common._TestONNXRuntime): model_type=pytorch_test_common.TorchModelType.TORCH_EXPORT_EXPORTEDPROGRAM, ) @pytorch_test_common.xfail_dynamic_fx_test( - error_message=" Failed running call_function ", - reason="dynamo does not support it.", + error_message="NOT_IMPLEMENTED : Could not find an implementation for Trilu(14) node", + reason="Need to check Trilu node in the ONNX graph", model_type=pytorch_test_common.TorchModelType.TORCH_NN_MODULE, ) @pytorch_test_common.xfail_if_model_type_is_not_exportedprogram( diff --git a/torch/_dynamo/utils.py b/torch/_dynamo/utils.py index 1974eb0b36b5..92cb80bb449e 100644 --- a/torch/_dynamo/utils.py +++ b/torch/_dynamo/utils.py @@ -1729,6 +1729,9 @@ def get_fake_value(node, tx, allow_non_graph_fake=False): ) elif isinstance(cause, ValueRangeError): raise UserError(UserErrorType.CONSTRAINT_VIOLATION, e.args[0]) from e + elif isinstance(cause, TypeError) and "argument" in str(cause): + unimplemented(f"TypeError {node.target}: {cause}") + raise TorchRuntimeError(str(e)).with_traceback(e.__traceback__) from None if not allow_non_graph_fake: