Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion python/paddle/tensor/creation.py
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,24 @@ def _handle_tensor_dtype(
if np.isscalar(data) and not isinstance(data, str):
data = np.array(data)
elif isinstance(data, (list, tuple)):
data = np.array(data)
has_tensor = False
for d in data:
if isinstance(d, paddle.Tensor):
has_tensor = True
break
if has_tensor:
if (
len(data) == 1
and isinstance(data[0], paddle.Tensor)
and data[0].dtype == paddle.bfloat16
):
data = np.array([data[0].numpy()])
else:
data = np.array(data)
if not dtype:
dtype = data.dtype
else:
data = np.array(data)
if data.dtype == np.object_:
raise ValueError(
"\n\tFailed to convert input data to a regular ndarray :\n\t - Usually "
Expand Down
34 changes: 34 additions & 0 deletions test/legacy_test/test_eager_tensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -2179,5 +2179,39 @@ def test_set_dynamic_attribute_to_eager_tensor_instance_create_via_to_pyobject(
self.assertEqual(tensor_instance.__dict__["_custom_flag"], True)


class TestListToTensor(unittest.TestCase):
def test_list_to_tensor_bfloat16(self):
a = [paddle.to_tensor(2, dtype=paddle.bfloat16)]
b = paddle.to_tensor(a)
self.assertEqual(b.dtype, paddle.bfloat16)
self.assertEqual(b[0], 2.0)

def test_list_to_tensor_float16(self):
a = [paddle.to_tensor(2, dtype=paddle.float16)]
b = paddle.to_tensor(a)
self.assertEqual(b.dtype, paddle.float16)
self.assertEqual(b[0], 2.0)

def test_list_to_tensor_bfloat16_float32(self):
a = [
paddle.to_tensor(2, dtype=paddle.bfloat16),
paddle.to_tensor(2, dtype=paddle.float32),
]
b = paddle.to_tensor(a)
self.assertEqual(b.dtype, paddle.float32)
self.assertEqual(b[0], 2.0)
self.assertEqual(b[1], 2.0)

def test_list_to_tensor_float16_float32(self):
a = [
paddle.to_tensor(2, dtype=paddle.float16),
paddle.to_tensor(2, dtype=paddle.float32),
]
b = paddle.to_tensor(a)
self.assertEqual(b.dtype, paddle.float32)
self.assertEqual(b[0], 2.0)
self.assertEqual(b[1], 2.0)


if __name__ == "__main__":
unittest.main()