2024-06-15 nightly release (4b6331d)

pytorch · Jun 15, 2024 · e08e0a1 · e08e0a1
1 parent 1d2fb27
commit e08e0a1
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 27 deletions.
diff --git a/backends/arm/test/models/test_mobilenet_v2_arm.py b/backends/arm/test/models/test_mobilenet_v2_arm.py
@@ -60,7 +60,7 @@ def test_mv2_tosa_MI(self):
             .check(list(self.all_operators))
             .partition()
             .to_executorch()
-            .run_method_and_compare_outputs()
+            .run_method_and_compare_outputs(inputs=self.model_inputs)
         )
 
     def test_mv2_tosa_BI(self):

diff --git a/backends/arm/test/ops/test_add.py b/backends/arm/test/ops/test_add.py
@@ -71,7 +71,7 @@ def _test_add_tosa_MI_pipeline(
             .partition()
             .check_count({"torch.ops.higher_order.executorch_call_delegate": 1})
             .to_executorch()
-            .run_method_and_compare_outputs()
+            .run_method_and_compare_outputs(inputs=test_data)
         )
 
     def _test_add_tosa_BI_pipeline(
@@ -91,7 +91,7 @@ def _test_add_tosa_BI_pipeline(
             .partition()
             .check_count({"torch.ops.higher_order.executorch_call_delegate": 1})
             .to_executorch()
-            .run_method_and_compare_outputs(qtol=1)
+            .run_method_and_compare_outputs(inputs=test_data, qtol=1)
         )
 
     def _test_add_u55_BI_pipeline(

diff --git a/backends/arm/test/ops/test_avg_pool.py b/backends/arm/test/ops/test_avg_pool.py
@@ -60,7 +60,7 @@ def _test_avgpool2d_tosa_MI_pipeline(
             .check_not(["executorch_exir_dialects_edge__ops_aten_avg_pool2d_default"])
             .check_count({"torch.ops.higher_order.executorch_call_delegate": 1})
             .to_executorch()
-            .run_method_and_compare_outputs()
+            .run_method_and_compare_outputs(inputs=test_data)
         )
 
     def _test_avgpool2d_tosa_BI_pipeline(
@@ -81,7 +81,7 @@ def _test_avgpool2d_tosa_BI_pipeline(
             .check_not(["executorch_exir_dialects_edge__ops_aten_avg_pool2d_default"])
             .check_count({"torch.ops.higher_order.executorch_call_delegate": 1})
             .to_executorch()
-            .run_method_and_compare_outputs(qtol=1)
+            .run_method_and_compare_outputs(inputs=test_data, qtol=1)
         )
 
     def _test_avgpool2d_tosa_u55_BI_pipeline(

diff --git a/backends/arm/test/ops/test_batch_norm.py b/backends/arm/test/ops/test_batch_norm.py
@@ -552,7 +552,7 @@ def _test_batchnorm2d_tosa_MI_pipeline(
                 ]
             )
             .to_executorch()
-            .run_method_and_compare_outputs(test_data)
+            .run_method_and_compare_outputs(inputs=test_data)
         )
 
     def _test_batchnorm2d_no_stats_tosa_MI_pipeline(
@@ -581,7 +581,7 @@ def _test_batchnorm2d_no_stats_tosa_MI_pipeline(
                 ]
             )
             .to_executorch()
-            .run_method_and_compare_outputs(test_data)
+            .run_method_and_compare_outputs(inputs=test_data)
         )
 
     def _test_batchnorm2d_tosa_BI_pipeline(
@@ -613,7 +613,7 @@ def _test_batchnorm2d_tosa_BI_pipeline(
                 ]
             )
             .to_executorch()
-            .run_method_and_compare_outputs(test_data)
+            .run_method_and_compare_outputs(inputs=test_data)
         )
 
     def _test_batchnorm2d_u55_BI_pipeline(

diff --git a/backends/arm/test/ops/test_clone.py b/backends/arm/test/ops/test_clone.py
@@ -47,7 +47,7 @@ def _test_clone_tosa_MI_pipeline(
             .partition()
             .check_count({"torch.ops.higher_order.executorch_call_delegate": 1})
             .to_executorch()
-            .run_method_and_compare_outputs(qtol=1)
+            .run_method_and_compare_outputs(inputs=test_data)
         )
 
     def _test_clone_tosa_BI_pipeline(
@@ -66,7 +66,7 @@ def _test_clone_tosa_BI_pipeline(
             .partition()
             .check_count({"torch.ops.higher_order.executorch_call_delegate": 1})
             .to_executorch()
-            .run_method_and_compare_outputs(qtol=1)
+            .run_method_and_compare_outputs(inputs=test_data, qtol=1)
         )
 
     def _test_clone_tosa_u55_pipeline(

diff --git a/backends/arm/test/ops/test_conv.py b/backends/arm/test/ops/test_conv.py
@@ -256,7 +256,7 @@ def _test_conv2d_tosa_MI_pipeline(
             .check_count({"torch.ops.higher_order.executorch_call_delegate": 1})
             .check_not(["executorch_exir_dialects_edge__ops_aten_convolution_default"])
             .to_executorch()
-            .run_method_and_compare_outputs()
+            .run_method_and_compare_outputs(inputs=test_data)
         )
 
     def _test_conv2d_tosa_BI_pipeline(
@@ -277,7 +277,7 @@ def _test_conv2d_tosa_BI_pipeline(
             .check_count({"torch.ops.higher_order.executorch_call_delegate": 1})
             .check_not(["executorch_exir_dialects_edge__ops_aten_convolution_default"])
             .to_executorch()
-            .run_method_and_compare_outputs(qtol=1)
+            .run_method_and_compare_outputs(inputs=test_data, qtol=1)
         )
 
     def _test_conv2d_u55_BI_pipeline(

diff --git a/backends/arm/test/ops/test_conv_combos.py b/backends/arm/test/ops/test_conv_combos.py
@@ -169,7 +169,7 @@ def _test_conv_combo_tosa_MI_pipeline(
             .check_count({"torch.ops.higher_order.executorch_call_delegate": 1})
             .check_not(list(module.edge_op_list))
             .to_executorch()
-            .run_method_and_compare_outputs()
+            .run_method_and_compare_outputs(inputs=test_data)
         )
 
     def _test_conv_combo_tosa_BI_pipeline(
@@ -192,7 +192,9 @@ def _test_conv_combo_tosa_BI_pipeline(
             .check_count({"torch.ops.higher_order.executorch_call_delegate": 1})
             .check_not(list(module.edge_op_list))
             .to_executorch()
-            .run_method_and_compare_outputs(atol=atol, rtol=rtol, qtol=1)
+            .run_method_and_compare_outputs(
+                inputs=test_data, atol=atol, rtol=rtol, qtol=1
+            )
         )
 
     def _test_conv_combo_u55_BI_pipeline(

diff --git a/backends/arm/test/ops/test_depthwise_conv.py b/backends/arm/test/ops/test_depthwise_conv.py
@@ -142,7 +142,7 @@ def _test_dw_conv2d_tosa_MI_pipeline(
             .check_not(["executorch_exir_dialects_edge__ops_aten_convolution_default"])
             .check_count({"torch.ops.higher_order.executorch_call_delegate": 1})
             .to_executorch()
-            .run_method_and_compare_outputs()
+            .run_method_and_compare_outputs(inputs=test_data)
         )
 
     def _test_dw_conv2d_tosa_BI_pipeline(
@@ -161,7 +161,7 @@ def _test_dw_conv2d_tosa_BI_pipeline(
             .check_not(["executorch_exir_dialects_edge__ops_aten_convolution_default"])
             .check_count({"torch.ops.higher_order.executorch_call_delegate": 1})
             .to_executorch()
-            .run_method_and_compare_outputs(qtol=1)
+            .run_method_and_compare_outputs(inputs=test_data, qtol=1)
         )
 
     def _test_dw_conv2d_u55_BI_pipeline(

diff --git a/backends/arm/test/ops/test_div.py b/backends/arm/test/ops/test_div.py
@@ -117,7 +117,7 @@ def _test_div_tosa_MI_pipeline(
             .partition()
             .check_count({"torch.ops.higher_order.executorch_call_delegate": 1})
             .to_executorch()
-            .run_method_and_compare_outputs(test_data)
+            .run_method_and_compare_outputs(inputs=test_data)
         )
 
     def _test_div_tosa_BI_pipeline(
@@ -137,7 +137,7 @@ def _test_div_tosa_BI_pipeline(
             .partition()
             .check_count({"torch.ops.higher_order.executorch_call_delegate": 1})
             .to_executorch()
-            .run_method_and_compare_outputs(test_data)
+            .run_method_and_compare_outputs(inputs=test_data)
         )
 
     def _test_div_u55_BI_pipeline(

diff --git a/backends/arm/test/ops/test_linear.py b/backends/arm/test/ops/test_linear.py
@@ -129,7 +129,7 @@ def _test_linear_tosa_MI_pipeline(
             .partition()
             .check_count({"torch.ops.higher_order.executorch_call_delegate": 1})
             .to_executorch()
-            .run_method_and_compare_outputs()
+            .run_method_and_compare_outputs(inputs=test_data)
         )
 
     def _test_linear_tosa_BI_pipeline(
@@ -149,7 +149,7 @@ def _test_linear_tosa_BI_pipeline(
             .partition()
             .check_count({"torch.ops.higher_order.executorch_call_delegate": 1})
             .to_executorch()
-            .run_method_and_compare_outputs(qtol=True)
+            .run_method_and_compare_outputs(inputs=test_data, qtol=True)
         )
 
     def _test_linear_tosa_u55_BI_pipeline(

diff --git a/backends/arm/test/ops/test_mean_dim.py b/backends/arm/test/ops/test_mean_dim.py
@@ -65,7 +65,7 @@ def _test_meandim_tosa_MI_pipeline(
             .check_not(["executorch_exir_dialects_edge__ops_aten_mean_dim"])
             .check_count({"torch.ops.higher_order.executorch_call_delegate": 1})
             .to_executorch()
-            .run_method_and_compare_outputs()
+            .run_method_and_compare_outputs(inputs=test_data)
         )
 
     def _test_meandim_tosa_BI_pipeline(
@@ -86,7 +86,7 @@ def _test_meandim_tosa_BI_pipeline(
             .check_not(["executorch_exir_dialects_edge__ops_aten_mean_dim"])
             .check_count({"torch.ops.higher_order.executorch_call_delegate": 1})
             .to_executorch()
-            .run_method_and_compare_outputs(qtol=1)
+            .run_method_and_compare_outputs(inputs=test_data, qtol=1)
         )
 
     def _test_meandim_tosa_u55_BI_pipeline(

diff --git a/backends/arm/test/ops/test_softmax.py b/backends/arm/test/ops/test_softmax.py
@@ -53,7 +53,7 @@ def _test_softmax_tosa_MI_pipeline(
             .check_not(["executorch_exir_dialects_edge__ops_aten__softmax_default"])
             .check_count({"torch.ops.higher_order.executorch_call_delegate": 1})
             .to_executorch()
-            .run_method_and_compare_outputs()
+            .run_method_and_compare_outputs(inputs=test_data)
         )
 
     def _test_softmax_tosa_BI_pipeline(
@@ -74,7 +74,7 @@ def _test_softmax_tosa_BI_pipeline(
             .check_not(["executorch_exir_dialects_edge__ops_aten__softmax_default"])
             .check_count({"torch.ops.higher_order.executorch_call_delegate": 1})
             .to_executorch()
-            .run_method_and_compare_outputs(qtol=1)
+            .run_method_and_compare_outputs(inputs=test_data, qtol=1)
         )
 
     def _test_softmax_tosa_u55_BI_pipeline(

diff --git a/backends/arm/test/ops/test_view.py b/backends/arm/test/ops/test_view.py
@@ -44,7 +44,7 @@ def _test_view_tosa_MI_pipeline(
             .partition()
             .check_count({"torch.ops.higher_order.executorch_call_delegate": 1})
             .to_executorch()
-            .run_method_and_compare_outputs(qtol=1)
+            .run_method_and_compare_outputs(inputs=test_data)
         )
 
     def _test_view_tosa_BI_pipeline(
@@ -63,7 +63,7 @@ def _test_view_tosa_BI_pipeline(
             .partition()
             .check_count({"torch.ops.higher_order.executorch_call_delegate": 1})
             .to_executorch()
-            .run_method_and_compare_outputs(qtol=1)
+            .run_method_and_compare_outputs(inputs=test_data, qtol=1)
         )
 
     def _test_view_u55_BI_pipeline(

diff --git a/exir/lowered_backend_module.py b/exir/lowered_backend_module.py
@@ -24,6 +24,7 @@
 from executorch.exir.schema import Program
 
 from executorch.exir.tracer import Value
+from torch._library.fake_class_registry import FakeScriptObject
 
 from torch._subclasses import FakeTensor
 from torch.export.exported_program import (
@@ -430,7 +431,7 @@ def _get_new_signature(  # noqa: C901
 ) -> Tuple[
     ExportGraphSignature,
     Dict[str, Union[torch.Tensor, torch.nn.Parameter]],
-    Dict[str, Union[torch.Tensor, torch.ScriptObject]],
+    Dict[str, Union[torch.Tensor, FakeScriptObject, torch.ScriptObject]],
 ]:
     """
     Args: