From 857026969beb56f865d8a93ed65a5c2edc5d1ed5 Mon Sep 17 00:00:00 2001 From: Ganesan Ramalingam Date: Wed, 2 Jul 2025 16:58:45 -0700 Subject: [PATCH 1/2] Reorder optimization passes Signed-off-by: Ganesan Ramalingam --- onnxscript/optimizer/_optimizer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/onnxscript/optimizer/_optimizer.py b/onnxscript/optimizer/_optimizer.py index ba03a44d9c..384cc12fd4 100644 --- a/onnxscript/optimizer/_optimizer.py +++ b/onnxscript/optimizer/_optimizer.py @@ -53,10 +53,10 @@ def optimize_ir( early_stop=stop_if_no_change, ), common_passes.RemoveUnusedNodesPass(), - common_passes.CommonSubexpressionEliminationPass(), - common_passes.LiftConstantsToInitializersPass(), + common_passes.LiftConstantsToInitializersPass(lift_all_constants=True, size_limit=0), common_passes.LiftSubgraphInitializersToMainGraphPass(), common_passes.DeduplicateInitializersPass(), + common_passes.CommonSubexpressionEliminationPass(), ] if inline: # Inline all functions first before optimizing From d7f0fa8ecf83c71b35ceb39d28444c877b7cf4d6 Mon Sep 17 00:00:00 2001 From: Ganesan Ramalingam Date: Thu, 3 Jul 2025 07:29:00 -0700 Subject: [PATCH 2/2] Update assertion Signed-off-by: Ganesan Ramalingam --- onnxscript/optimizer/_function_folding_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onnxscript/optimizer/_function_folding_test.py b/onnxscript/optimizer/_function_folding_test.py index 5e7de8b0de..6f2b052b9e 100644 --- a/onnxscript/optimizer/_function_folding_test.py +++ b/onnxscript/optimizer/_function_folding_test.py @@ -151,7 +151,7 @@ def test_fold_nested_if_function_succeeds(self): optimized = optimizer.optimize(model, onnx_shape_inference=False, inline=True) self.assertEqual(len(optimized.functions), 0) - self.assertEqual(len(optimized.graph), 2) + self.assertEqual(len(optimized.graph), 1) self.assertNotIn("If", {n.op_type for n in optimized.graph})