Remove usages of extract_constant_segment=False

lucylq · web-flow · commit ae05ed80403f · 2024-09-04T13:38:34.000-07:00
Differential Revision: D61945429 Pull Request resolved: #5074
diff --git a/backends/apple/mps/test/test_mps_utils.py b/backends/apple/mps/test/test_mps_utils.py
@@ -239,9 +239,7 @@ def lower_module_and_test_output(
             )
 
             executorch_program = delegated_program.to_executorch(
-                config=ExecutorchBackendConfig(
-                    extract_delegate_segments=False, extract_constant_segment=False
-                )
+                config=ExecutorchBackendConfig(extract_delegate_segments=False)
             )
         else:
             delegated_program = to_backend(
@@ -258,9 +256,7 @@ def lower_module_and_test_output(
                     _skip_dim_order=True,  # TODO(T182928844): Delegate dim order op to backend.
                 ),
             ).to_executorch(
-                config=ExecutorchBackendConfig(
-                    extract_delegate_segments=False, extract_constant_segment=False
-                )
+                config=ExecutorchBackendConfig(extract_delegate_segments=False)
             )
 
         if bundled_program:
diff --git a/examples/apple/coreml/scripts/export.py b/examples/apple/coreml/scripts/export.py
@@ -104,11 +104,7 @@ def export_lowered_module_to_executorch_program(lowered_module, example_inputs):
     lowered_module(*example_inputs)
     exec_prog = to_edge(
         export(lowered_module, example_inputs), compile_config=_EDGE_COMPILE_CONFIG
-    ).to_executorch(
-        config=exir.ExecutorchBackendConfig(
-            extract_constant_segment=False, extract_delegate_segments=True
-        )
-    )
+    ).to_executorch(config=exir.ExecutorchBackendConfig(extract_delegate_segments=True))
 
     return exec_prog
 
@@ -178,9 +174,7 @@ def generate_compile_specs_from_args(args):
         )
         delegated_program_manager = edge_program_manager.to_backend(partitioner)
         exec_program = delegated_program_manager.to_executorch(
-            config=exir.ExecutorchBackendConfig(
-                extract_constant_segment=False, extract_delegate_segments=True
-            )
+            config=exir.ExecutorchBackendConfig(extract_delegate_segments=True)
         )
     else:
         lowered_module, edge_copy = lower_module_to_coreml(
diff --git a/examples/apple/coreml/scripts/inspector_utils.py b/examples/apple/coreml/scripts/inspector_utils.py
@@ -79,7 +79,6 @@ def build_sdk_runner_including_coreml(
 )
 
 _EDGE_BACKEND_CONFIG = exir.ExecutorchBackendConfig(
-    extract_constant_segment=False,
     extract_delegate_segments=True,
 )
 
diff --git a/examples/apple/mps/scripts/mps_example.py b/examples/apple/mps/scripts/mps_example.py
@@ -183,9 +183,7 @@ def get_model_config(args):
         logging.info(f"Lowered graph:\n{edge.exported_program().graph}")
 
         executorch_program = edge.to_executorch(
-            config=ExecutorchBackendConfig(
-                extract_delegate_segments=False, extract_constant_segment=False
-            )
+            config=ExecutorchBackendConfig(extract_delegate_segments=False)
         )
     else:
         lowered_module = to_backend(
@@ -195,11 +193,7 @@ def get_model_config(args):
             lowered_module,
             example_inputs,
             edge_compile_config=exir.EdgeCompileConfig(_check_ir_validity=False),
-        ).to_executorch(
-            config=ExecutorchBackendConfig(
-                extract_delegate_segments=False, extract_constant_segment=False
-            )
-        )
+        ).to_executorch(config=ExecutorchBackendConfig(extract_delegate_segments=False))
 
     model_name = f"{args.model_name}_mps"
 
diff --git a/examples/arm/aot_arm_compiler.py b/examples/arm/aot_arm_compiler.py
@@ -226,9 +226,7 @@ def forward(self, x):
 
     try:
         exec_prog = edge.to_executorch(
-            config=ExecutorchBackendConfig(
-                extract_delegate_segments=False, extract_constant_segment=False
-            )
+            config=ExecutorchBackendConfig(extract_delegate_segments=False)
         )
     except RuntimeError as e:
         if "Missing out variants" in str(e.args[0]):
diff --git a/examples/models/llava/export_llava.py b/examples/models/llava/export_llava.py
@@ -222,7 +222,6 @@ def export_all(llava_model: LlavaModel):
 
     executorch_program = lowered_and_edge.to_executorch(
         ExecutorchBackendConfig(
-            extract_constant_segment=True,
             extract_delegate_segments=True,
             passes=[
                 QuantFusionPass(),
diff --git a/examples/portable/scripts/export_and_delegate.py b/examples/portable/scripts/export_and_delegate.py
@@ -15,8 +15,6 @@
     BackendWithCompilerDemo,
 )
 from executorch.exir.backend.test.op_partitioner_demo import AddMulPartitionerDemo
-from executorch.exir.capture._config import ExecutorchBackendConfig
-
 from executorch.extension.export_util import export_to_edge
 
 from ...models import MODEL_NAME_TO_MODEL
@@ -94,9 +92,7 @@ def forward(self, *args):
 
     logging.info(f"Lowered graph:\n{composited_edge.exported_program().graph}")
 
-    exec_prog = composited_edge.to_executorch(
-        config=ExecutorchBackendConfig(extract_constant_segment=False)
-    )
+    exec_prog = composited_edge.to_executorch()
     buffer = exec_prog.buffer
 
     model_name = "composite_model"
@@ -147,9 +143,7 @@ def get_example_inputs(self):
     edge = edge.to_backend(AddMulPartitionerDemo())
     logging.info(f"Lowered graph:\n{edge.exported_program().graph}")
 
-    exec_prog = edge.to_executorch(
-        config=ExecutorchBackendConfig(extract_constant_segment=False)
-    )
+    exec_prog = edge.to_executorch()
     buffer = exec_prog.buffer
 
     model_name = "partition_lowered_model"
diff --git a/examples/qualcomm/oss_scripts/llama2/llama.py b/examples/qualcomm/oss_scripts/llama2/llama.py
@@ -315,7 +315,6 @@ def lowering_modules(
             passes=[
                 BuildQuantIo(),
             ],
-            extract_constant_segment=False,
             # For shared buffer, user must pass the memory address
             # which is allocated by RPC memory to executor runner.
             # Therefore, won't want to pre-allocate
diff --git a/examples/qualcomm/scripts/export_example.py b/examples/qualcomm/scripts/export_example.py
@@ -96,9 +96,7 @@
         )
 
     executorch_program = delegated_program.to_executorch(
-        config=ExecutorchBackendConfig(
-            extract_delegate_segments=False, extract_constant_segment=False
-        )
+        config=ExecutorchBackendConfig(extract_delegate_segments=False)
     )
 
     if args.generate_etrecord:
diff --git a/examples/qualcomm/utils.py b/examples/qualcomm/utils.py
@@ -254,7 +254,6 @@ def build_executorch_binary(
     )
 
     executorch_config = ExecutorchBackendConfig(
-        extract_constant_segment=False,
         # For shared buffer, user must pass the memory address
         # which is allocated by RPC memory to executor runner.
         # Therefore, won't want to pre-allocate
diff --git a/examples/sdk/scripts/gen_sample_etrecord.py b/examples/sdk/scripts/gen_sample_etrecord.py
@@ -4,6 +4,8 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
+# pyre-unsafe
+
 # Generate fixture files
 import argparse
 import copy
@@ -18,7 +20,6 @@
     ExportedProgram,
     to_edge,
 )
-from executorch.exir.capture._config import ExecutorchBackendConfig
 from torch.export import export
 
 from ...models import MODEL_NAME_TO_MODEL
@@ -38,9 +39,7 @@ def gen_etrecord(model: torch.nn.Module, inputs: Any, output_path=None):
         aten_dialect, compile_config=EdgeCompileConfig(_check_ir_validity=True)
     )
     edge_program_copy = copy.deepcopy(edge_program)
-    et_program: ExecutorchProgramManager = edge_program_copy.to_executorch(
-        config=ExecutorchBackendConfig(extract_constant_segment=False)
-    )
+    et_program: ExecutorchProgramManager = edge_program_copy.to_executorch()
     generate_etrecord(
         (DEFAULT_OUTPUT_PATH if not output_path else output_path),
         edge_dialect_program=edge_program,
diff --git a/examples/xnnpack/aot_compiler.py b/examples/xnnpack/aot_compiler.py
@@ -4,6 +4,8 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
+# pyre-unsafe
+
 # Example script for exporting simple models to flatbuffer
 
 import argparse
@@ -103,9 +105,7 @@
     logging.info(f"Lowered graph:\n{edge.exported_program().graph}")
 
     exec_prog = edge.to_executorch(
-        config=ExecutorchBackendConfig(
-            extract_delegate_segments=False, extract_constant_segment=False
-        )
+        config=ExecutorchBackendConfig(extract_delegate_segments=False)
     )
 
     if args.etrecord is not None:
diff --git a/examples/xnnpack/quantization/example.py b/examples/xnnpack/quantization/example.py
@@ -4,6 +4,8 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
+# pyre-unsafe
+
 import argparse
 import copy
 import logging
@@ -191,9 +193,7 @@ def main() -> None:
 
     start = time.perf_counter()
     prog = edge_m.to_executorch(
-        config=ExecutorchBackendConfig(
-            extract_delegate_segments=False, extract_constant_segment=False
-        )
+        config=ExecutorchBackendConfig(extract_delegate_segments=False)
     )
     save_pte_program(prog, f"{args.model_name}_quantized")
     end = time.perf_counter()

Original file line number	Diff line number	Diff line change
`@@ -239,9 +239,7 @@ def lower_module_and_test_output(`
`239`	`239`	`)`
`240`	`240`
`241`	`241`	`executorch_program = delegated_program.to_executorch(`
`242`		`- config=ExecutorchBackendConfig(`
`243`		`- extract_delegate_segments=False, extract_constant_segment=False`
`244`		`- )`
	`242`	`+ config=ExecutorchBackendConfig(extract_delegate_segments=False)`
`245`	`243`	`)`
`246`	`244`	`else:`
`247`	`245`	`delegated_program = to_backend(`
`@@ -258,9 +256,7 @@ def lower_module_and_test_output(`
`258`	`256`	`_skip_dim_order=True, # TODO(T182928844): Delegate dim order op to backend.`
`259`	`257`	`),`
`260`	`258`	`).to_executorch(`
`261`		`- config=ExecutorchBackendConfig(`
`262`		`- extract_delegate_segments=False, extract_constant_segment=False`
`263`		`- )`
	`259`	`+ config=ExecutorchBackendConfig(extract_delegate_segments=False)`
`264`	`260`	`)`
`265`	`261`
`266`	`262`	`if bundled_program:`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,6 @@ def build_sdk_runner_including_coreml(`
`79`	`79`	`)`
`80`	`80`
`81`	`81`	`_EDGE_BACKEND_CONFIG = exir.ExecutorchBackendConfig(`
`82`		`- extract_constant_segment=False,`
`83`	`82`	`extract_delegate_segments=True,`
`84`	`83`	`)`
`85`	`84`
Original file line number	Diff line number	Diff line change
`@@ -96,9 +96,7 @@`
`96`	`96`	`)`
`97`	`97`
`98`	`98`	`executorch_program = delegated_program.to_executorch(`
`99`		`- config=ExecutorchBackendConfig(`
`100`		`- extract_delegate_segments=False, extract_constant_segment=False`
`101`		`- )`
	`99`	`+ config=ExecutorchBackendConfig(extract_delegate_segments=False)`
`102`	`100`	`)`
`103`	`101`
`104`	`102`	`if args.generate_etrecord:`
Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,6 @@ def build_executorch_binary(`
`254`	`254`	`)`
`255`	`255`
`256`	`256`	`executorch_config = ExecutorchBackendConfig(`
`257`		`- extract_constant_segment=False,`
`258`	`257`	`# For shared buffer, user must pass the memory address`
`259`	`258`	`# which is allocated by RPC memory to executor runner.`
`260`	`259`	`# Therefore, won't want to pre-allocate`