Skip to content

Commit 6153b1b

Browse files
zhxchen17facebook-github-bot
authored andcommitted
Update ExportedProgram ctor callsites. (#4347)
Summary: Pull Request resolved: #4347 as title Reviewed By: angelayi Differential Revision: D60074221 fbshipit-source-id: 9987d65227f7ff4819827fd1d5772900bf609467
1 parent 09cfc92 commit 6153b1b

File tree

6 files changed

+26
-20
lines changed

6 files changed

+26
-20
lines changed

backends/xnnpack/xnnpack_preprocess.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,12 @@ def preprocess(
105105
range_constraints=edge_program.range_constraints,
106106
module_call_graph=edge_program.module_call_graph,
107107
example_inputs=edge_program.example_inputs,
108-
verifier=EXIREdgeDialectVerifier(
109-
edge_compile_config=xnnpack_edge_compile_config, class_only=True
110-
),
111108
constants=edge_program.constants,
109+
verifiers=[
110+
EXIREdgeDialectVerifier(
111+
edge_compile_config=xnnpack_edge_compile_config, class_only=True
112+
)
113+
],
112114
)
113115

114116
passes = []

exir/backend/backend_api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,6 @@ def to_backend(
399399
range_constraints=copy.deepcopy(edge_program.range_constraints),
400400
module_call_graph=copy.deepcopy(edge_program.module_call_graph),
401401
example_inputs=None,
402-
verifier=edge_program.verifier,
403402
constants=new_constants,
403+
verifiers=[edge_program.verifier],
404404
)

exir/capture/_capture.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ def convert_to_fake(x):
355355
)
356356
],
357357
example_inputs=None,
358-
verifier=EXIRATenDialectVerifierBase,
358+
verifiers=[EXIRATenDialectVerifierBase],
359359
)
360360
return ExirExportedProgram(ep, False)
361361

exir/lowered_backend_module.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ def __deepcopy__(self, memo: Optional[Dict[int, Any]]) -> "LoweredBackendModule"
9191
module_call_graph=copy.deepcopy(
9292
self._original_exported_program.module_call_graph
9393
),
94-
verifier=copy.deepcopy(self._original_exported_program.verifier),
9594
constants=self._original_exported_program.constants,
95+
verifiers=[copy.deepcopy(self._original_exported_program.verifier)],
9696
)
9797

9898
res = LoweredBackendModule(
@@ -322,7 +322,7 @@ def program(
322322
range_constraints=lowered_exported_program.range_constraints,
323323
module_call_graph=lowered_exported_program.module_call_graph,
324324
example_inputs=None,
325-
verifier=lowered_exported_program.verifier,
325+
verifiers=[lowered_exported_program.verifier],
326326
)
327327
if memory_planning is None:
328328
memory_planning = MemoryPlanningPass("greedy")
@@ -616,8 +616,8 @@ def create_exported_program_from_submodule(
616616
),
617617
)
618618
],
619-
verifier=owning_program.verifier,
620619
constants=subgraph_constants,
620+
verifiers=[owning_program.verifier],
621621
)
622622

623623

exir/program/_fake_program.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ def get_fake_program(real_exported_program: ExportedProgram) -> ExportedProgram:
4949
state_dict=new_state_dict,
5050
range_constraints=copy.deepcopy(real_exported_program.range_constraints),
5151
module_call_graph=copy.deepcopy(real_exported_program.module_call_graph),
52-
verifier=real_exported_program.verifier,
5352
constants=real_exported_program.constants,
53+
verifiers=[real_exported_program.verifier],
5454
)
5555
return fake_exported_program
5656

exir/program/_program.py

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,8 @@ def _transform(self, *passes: PassType) -> "ExportedProgram":
193193
range_constraints=_get_updated_range_constraints(transformed_gm),
194194
module_call_graph=copy.deepcopy(self._module_call_graph),
195195
example_inputs=self.example_inputs,
196-
verifier=self.verifier,
197196
constants=self.constants,
197+
verifiers=[self.verifier],
198198
)
199199
transformed_ep.graph_module.meta.update(self.graph_module.meta)
200200
transformed_ep.graph_module.meta.update(res.graph_module.meta)
@@ -590,8 +590,8 @@ def _to_edge(ep, config: EdgeCompileConfig) -> "ExirExportedProgram":
590590
range_constraints=ep.exported_program.range_constraints,
591591
module_call_graph=ep.exported_program.module_call_graph,
592592
example_inputs=ep.exported_program.example_inputs,
593-
verifier=get_aten_verifier(enable=config._check_ir_validity),
594593
constants=ep.exported_program.constants,
594+
verifiers=[get_aten_verifier(enable=config._check_ir_validity)],
595595
),
596596
False,
597597
)
@@ -626,11 +626,13 @@ def _to_edge(ep, config: EdgeCompileConfig) -> "ExirExportedProgram":
626626
range_constraints=new_ep.exported_program.range_constraints,
627627
module_call_graph=new_ep.exported_program.module_call_graph,
628628
example_inputs=new_ep.exported_program.example_inputs,
629-
verifier=EXIREdgeDialectVerifier(
630-
edge_compile_config=config,
631-
class_only=True,
632-
),
633629
constants=new_ep.exported_program.constants,
630+
verifiers=[
631+
EXIREdgeDialectVerifier(
632+
edge_compile_config=config,
633+
class_only=True,
634+
)
635+
],
634636
)
635637
new_ep.after_to_edge_passes = True
636638
return new_ep
@@ -708,12 +710,14 @@ def _generate_edge_program(
708710
range_constraints=program.range_constraints,
709711
module_call_graph=program.module_call_graph,
710712
example_inputs=program.example_inputs,
711-
verifier=EXIREdgeDialectVerifier(
712-
edge_compile_config=config,
713-
class_only=True,
714-
exception_list=ops_set_to_not_decompose,
715-
),
716713
constants=program.constants,
714+
verifiers=[
715+
EXIREdgeDialectVerifier(
716+
edge_compile_config=config,
717+
class_only=True,
718+
exception_list=ops_set_to_not_decompose,
719+
)
720+
],
717721
)
718722
# Lift the tensor constants created in ScalarToTensorPass
719723
edge_program = lift_constant_tensor_pass(edge_program)

0 commit comments

Comments
 (0)