[SOT] Fallback dynamic shape for non list arguments (#70877)

SigureMo · web-flow · commit 331891e954f0 · 2025-01-17T18:07:25.000+08:00
diff --git a/python/paddle/utils/layers_utils.py b/python/paddle/utils/layers_utils.py
@@ -72,6 +72,11 @@ def convert_to_list(value, n, name, dtype=int):
     if isinstance(value, dtype):
         return [value] * n
     else:
+        if isinstance(value, (Variable, paddle.pir.Value)):
+            raise NotSupportedTensorArgumentError(
+                f"`{name}` required numerical type with `{dtype}`, but received Tensor.",
+                name,
+            )
         try:
             value_list = list(value)
         except TypeError:
diff --git a/test/sot/test_sot_dynamic_shape.py b/test/sot/test_sot_dynamic_shape.py
@@ -83,6 +83,10 @@ def forward(self, x):
         )
 
 
+def pool2d_fallback(x, kernel_size):
+    return paddle.nn.functional.max_pool2d(x, kernel_size=kernel_size)
+
+
 class TestOpcodeExecutorDynamicShapeCache(TestCaseBase):
     def test_dynamic_int_input_cache_hit_case1(self):
         with allow_dynamic_shape_guard(
@@ -180,7 +184,7 @@ def test_dynamic_shape_in_list(self):
                 )
                 self.assertEqual(ctx.translate_count, 2)
 
-    def test_conv_dynamic_shape_fallback(self):
+    def test_conv_dynamic_shape_stride_fallback(self):
         with allow_dynamic_shape_guard(
             True
         ), test_instruction_translator_cache_context() as ctx:
@@ -189,6 +193,15 @@ def test_conv_dynamic_shape_fallback(self):
                 conv(paddle.randn([1, 3, 224, 224]))
                 self.assertEqual(ctx.translate_count, i)
 
+    def test_conv_dynamic_shape_kernel_size_fallback(self):
+        with allow_dynamic_shape_guard(
+            True
+        ), test_instruction_translator_cache_context() as ctx:
+            for i in range(1, 5):
+                x = paddle.randn([1, 3, 224, 224])
+                self.assert_results(pool2d_fallback, x, i)
+                self.assertEqual(ctx.translate_count, i)
+
     def test_pad_dynamic_shape_fallback(self):
         with allow_dynamic_shape_guard(
             True
