Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Cleanup][A-14] clean some VarType for test #61567

Merged
merged 2 commits into from
Feb 6, 2024
Merged

[Cleanup][A-14] clean some VarType for test #61567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4d6d21
Fix VarType
co63oc Feb 5, 2024
3f44b16
Fix
co63oc Feb 5, 2024
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
8 changes: 8 additions & 0 deletions python/paddle/tensor/creation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ def _complex_to_real_dtype(dtype):
return core.VarDesc.VarType.FP32
elif dtype == core.VarDesc.VarType.COMPLEX128:
return core.VarDesc.VarType.FP64
elif dtype == paddle.pir.core.DataType.COMPLEX64:
return paddle.pir.core.DataType.FP32
elif dtype == paddle.pir.core.DataType.COMPLEX128:
return paddle.pir.core.DataType.FP64
else:
return dtype

Expand All @@ -62,6 +66,10 @@ def _real_to_complex_dtype(dtype):
return core.VarDesc.VarType.COMPLEX64
elif dtype == core.VarDesc.VarType.FP64:
return core.VarDesc.VarType.COMPLEX128
elif dtype == paddle.pir.core.DataType.FP32:
return paddle.pir.core.DataType.COMPLEX64
elif dtype == paddle.pir.core.DataType.FP64:
return paddle.pir.core.DataType.COMPLEX128
else:
return dtype

Expand Down
11 changes: 6 additions & 5 deletions python/paddle/tensor/to_string.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

import numpy as np

import paddle
from paddle.base.data_feeder import check_type, convert_dtype

from ..framework import core
Expand Down Expand Up @@ -238,7 +239,7 @@ def to_string(var, prefix='Tensor'):
indent = len(prefix) + 1

dtype = convert_dtype(var.dtype)
if var.dtype == core.VarDesc.VarType.BF16:
if var.dtype == paddle.bfloat16:
dtype = 'bfloat16'

_template = "{prefix}(shape={shape}, dtype={dtype}, place={place}, stop_gradient={stop_gradient},\n{indent}{data})"
Expand All @@ -247,7 +248,7 @@ def to_string(var, prefix='Tensor'):
if not tensor._is_initialized():
return "Tensor(Not initialized)"

if var.dtype == core.VarDesc.VarType.BF16:
if var.dtype == paddle.bfloat16:
var = var.astype('float32')
np_var = var.numpy(False)

Expand Down Expand Up @@ -280,7 +281,7 @@ def to_string(var, prefix='Tensor'):


def _format_dense_tensor(tensor, indent):
if tensor.dtype == core.VarDesc.VarType.BF16:
if tensor.dtype == paddle.bfloat16:
tensor = tensor.astype('float32')

# TODO(zhouwei): will remove 0-D Tensor.numpy() hack
Expand Down Expand Up @@ -360,7 +361,7 @@ def dist_tensor_to_string(tensor, prefix='Tensor'):
# is ready.
indent = len(prefix) + 1
dtype = convert_dtype(tensor.dtype)
if tensor.dtype == core.VarDesc.VarType.BF16:
if tensor.dtype == paddle.bfloat16:
dtype = 'bfloat16'

if not tensor._is_dense_tensor_hold_allocation():
Expand Down Expand Up @@ -395,7 +396,7 @@ def tensor_to_string(tensor, prefix='Tensor'):
indent = len(prefix) + 1

dtype = convert_dtype(tensor.dtype)
if tensor.dtype == core.VarDesc.VarType.BF16:
if tensor.dtype == paddle.bfloat16:
dtype = 'bfloat16'

_template = "{prefix}(shape={shape}, dtype={dtype}, place={place}, stop_gradient={stop_gradient},\n{indent}{data})"
Expand Down