[Dy2St] Fix pass nested list with tensor to to_tensor (#66379)

SigureMo · web-flow · commit 8b5e1cb14f85 · 2024-07-24T09:03:36.000+08:00
diff --git a/python/paddle/tensor/creation.py b/python/paddle/tensor/creation.py
@@ -720,12 +720,14 @@ def _to_tensor_static(
 
                     Thus, process nested structure in except block
                     '''
-                    data = np.array(data)
+                    array_data = np.array(data)
 
                     # for numpy version <= 1.23.5
-                    if data.dtype == 'object':
+                    if array_data.dtype == 'object':
                         raise RuntimeError("Numpy get dtype `object`.")
 
+                    data = array_data
+
                 except:
                     to_stack_list = [None] * len(data)
                     for idx, d in enumerate(data):
@@ -2547,6 +2549,7 @@ def assign(x: TensorLike, output: paddle.Tensor | None = None) -> paddle.Tensor:
                     'uint16',
                     'float32',
                     'float64',
+                    'int16',
                     'int32',
                     'int64',
                     'uint8',
diff --git a/test/dygraph_to_static/test_to_tensor.py b/test/dygraph_to_static/test_to_tensor.py
@@ -15,6 +15,7 @@
 import unittest
 
 import numpy
+import numpy as np
 from dygraph_to_static_utils import (
     Dy2StTestBase,
     IrMode,
@@ -215,21 +216,26 @@ def test_static(self):
 class TestInt16(Dy2StTestBase):
     @test_legacy_and_pt_and_pir
     def test_static(self):
-        import numpy as np
-
         paddle.enable_static()
         data = np.array([1, 2], dtype="int16")
         x = paddle.to_tensor(data)
-        if paddle.base.framework.use_pir_api():
-            self.assertTrue(x.dtype == paddle.base.libpaddle.DataType.INT16)
-        else:
-            self.assertTrue(x.dtype == paddle.int16)
+        self.assertEqual(x.dtype, paddle.int16)
 
         y = paddle.to_tensor([1, 2], dtype="int16")
-        if paddle.base.framework.use_pir_api():
-            self.assertTrue(y.dtype == paddle.base.libpaddle.DataType.INT16)
+        self.assertEqual(y.dtype, paddle.int16)
+
+
+class TestNestedListWithTensor(Dy2StTestBase):
+    @test_legacy_and_pt_and_pir
+    def test_nested_list_with_tensor(self):
+        paddle.enable_static()
+        x = paddle.to_tensor(1)
+        y = paddle.to_tensor([[x]])
+        if paddle.framework.use_pir_api():
+            self.assertEqual(y.shape, [1, 1])
         else:
-            self.assertTrue(y.dtype == paddle.int16)
+            self.assertEqual(y.shape, (1, 1))
+        self.assertEqual(y.dtype, paddle.int64)
 
 
 if __name__ == '__main__':
