[SOT][DynamicShape] Filter out no need guard variables in list (#65882)

SigureMo · web-flow · commit bfde1fecaef4 · 2024-07-10T12:05:44.000+08:00
diff --git a/python/paddle/jit/sot/opcode_translator/executor/variables/container.py b/python/paddle/jit/sot/opcode_translator/executor/variables/container.py
@@ -97,7 +97,11 @@ def make_stringified_guard(self) -> list[StringifiedExpression]:
         return reduce(
             operator.add,
             [[type_guard, len_guard]]
-            + [item.make_stringified_guard() for item in guard_variables],
+            + [
+                item.make_stringified_guard()
+                for item in guard_variables
+                if item.tracker.need_guard()
+            ],
         )
 
 
diff --git a/test/sot/test_sot_dynamic_shape.py b/test/sot/test_sot_dynamic_shape.py
@@ -51,6 +51,10 @@ def dynamic_shape_access_inner_var_shape(x):
     return y.shape[0]
 
 
+def dynamic_shape_in_list(x, shape):
+    return x.reshape(shape)
+
+
 class TestOpcodeExecutorDynamicShapeCache(TestCaseBase):
     def test_dynamic_int_input_cache_hit_case1(self):
         with with_allow_dynamic_shape_guard(
@@ -119,6 +123,24 @@ def test_dynamic_shape_input_cache_hit_case2(self):
                 )
                 self.assertEqual(ctx.translate_count, 2)
 
+    # def test_dynamic_shape_in_list(self):
+    #     with with_allow_dynamic_shape_guard(
+    #         True
+    #     ), test_instruction_translator_cache_context() as ctx:
+    #         self.assert_results(
+    #             dynamic_shape_in_list,
+    #             paddle.randn([1, 4, 5]),
+    #             [4, 5],
+    #         )
+    #         self.assertEqual(ctx.translate_count, 1)
+    #         for i in range(2, 6):
+    #             self.assert_results(
+    #                 dynamic_shape_in_list,
+    #                 paddle.randn([i, 4, 5]),
+    #                 [i * 4, 5],
+    #             )
+    #             self.assertEqual(ctx.translate_count, 2)
+
 
 if __name__ == '__main__':
     unittest.main()
