Remove exir's patch for capture_scalar_outputs

Summary: After D47841078, capture_scalar_outputs is always True in dynamo.export. Remove this config as it's not being used.

Reviewed By: tugsbayasgalan

Differential Revision: D47883466

fbshipit-source-id: 738c915365306c456f6c4b171434a44ac980baca

Author: ydwu4

backends/qnnpack/partition/support_patterns.py

@@ -50,7 +50,6 @@ def get_dynamic_quantized_graph(f, example_inputs, dynamic_shape=False):
     converted_mod = _convert_to_reference_decomposed_fx(prepared_mod)
     if dynamic_shape:
         dynamo_config = ExirDynamoConfig(
-            capture_scalar_outputs=True,
             guard_nn_modules=True,
             dynamic_shapes=True,
             specialize_int=True,

exir/tests/test_quant_fusion_pass.py

@@ -301,7 +301,6 @@ def forward(self, indices):
             m(*example_inputs)
             m = _convert_to_reference_decomposed_fx(m)
             dynamo_config = ExirDynamoConfig(
-                capture_scalar_outputs=True,
                 guard_nn_modules=True,
                 dynamic_shapes=False,
                 specialize_int=True,
@@ -364,7 +363,6 @@ def forward(self, indices):
             m(*example_inputs)
             m = _convert_to_reference_decomposed_fx(m)
             dynamo_config = ExirDynamoConfig(
-                capture_scalar_outputs=True,
                 guard_nn_modules=True,
                 dynamic_shapes=False,
                 specialize_int=True,

exir/tests/test_quantization.py

@@ -49,7 +49,6 @@ def test_resnet(self) -> None:
             m_copy = copy.deepcopy(m)
             # program capture
             dynamo_config = ExirDynamoConfig(
-                capture_scalar_outputs=True,
                 guard_nn_modules=True,
                 dynamic_shapes=False,
                 specialize_int=True,

exir/tests/test_tracer.py

@@ -194,27 +194,16 @@ def f(x: torch.Tensor) -> Tuple[torch.Tensor, torch.Tensor]:
         self.assertTrue(torch.allclose(orig_res[0], new_res[0]))
         self.assertTrue(torch.allclose(orig_res[1], new_res[1]))
 
-    def test_toggle_dynamo_capture_scalar_outputs(self) -> None:
+    def test_dynamo_capture_scalar_outputs(self) -> None:
         def f(x: torch.Tensor) -> float:
             return x.item()
 
-        with self.assertRaisesRegex(
-            ExportError,
-            "The user code is using a feature we don't support.",
-        ):
-            dynamo_trace(
-                f,
-                (torch.ones(1),),
-                False,
-                "real",
-                ExirDynamoConfig(capture_scalar_outputs=False),
-            )
-        dynamo_trace(
+        gm, guards = dynamo_trace(
             f,
             (torch.ones(1),),
             False,
             "real",
-            ExirDynamoConfig(capture_scalar_outputs=True),
+            ExirDynamoConfig(),
         )
 
     # pyre-ignore

exir/tracer.py

@@ -605,7 +605,6 @@ class ExirDynamoConfig:
     Manage Exir-specific configurations of Dynamo.
     """
 
-    capture_scalar_outputs: bool = True
     capture_dynamic_output_shape_ops: bool = True
     guard_nn_modules: bool = True
     dynamic_shapes: bool = True