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

Format tensor on cpu #8548

Merged
merged 7 commits into from
Jul 4, 2022
Merged

Format tensor on cpu #8548

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7e04d4d
Format tensor on cpu
liujuncheng Jul 1, 2022
e9989e3
use tensor.detach
liujuncheng Jul 1, 2022
180cf73
Merge branch 'master' into dev_format_tensor_on_cpu
liujuncheng Jul 4, 2022
f5be8d1
Merge branch 'master' into dev_format_tensor_on_cpu
mergify[bot] Jul 4, 2022
9e98465
fix global
liujuncheng Jul 4, 2022
13aeb68
Merge branch 'master' into dev_format_tensor_on_cpu
liujuncheng Jul 4, 2022
112bfcd
Merge branch 'master' into dev_format_tensor_on_cpu
liujuncheng Jul 4, 2022
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
17 changes: 13 additions & 4 deletions python/oneflow/framework/tensor_str.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,14 @@ def get_summarized_data(self):
)


def _format_tensor_on_cpu(tensor):
if tensor.is_global:
device = tensor.placement.type
else:
device = tensor.device.type
return device != "cpu" and device != "cuda"


def _gen_tensor_str_template(tensor, is_meta):
is_meta = is_meta or tensor.is_lazy
prefix = "tensor("
Expand All @@ -349,10 +357,8 @@ def _gen_tensor_str_template(tensor, is_meta):
if tensor.is_global:
suffixes.append(f"placement={str(tensor.placement)}")
suffixes.append(f"sbp={str(tensor.sbp)}")
elif tensor.device.type == "cuda":
suffixes.append("device='" + str(tensor.device) + "'")
elif tensor.device.type != "cpu":
raise RunTimeError("unknow device type")
suffixes.append("device='" + str(tensor.device) + "'")
if tensor.is_lazy:
suffixes.append("is_lazy='True'")

Expand All @@ -366,7 +372,10 @@ def _gen_tensor_str_template(tensor, is_meta):
tensor_str = "..."
suffixes.append("size=" + str(tuple(tensor.shape)))
else:
tensor_str = _tensor_str(tensor, indent)
if _format_tensor_on_cpu(tensor):
tensor_str = _tensor_str(tensor.detach().to("cpu"), indent)
else:
tensor_str = _tensor_str(tensor, indent)

suffixes.append("dtype=" + str(tensor.dtype))
if tensor.grad_fn is not None:
Expand Down