Skip to content

[hotfix] Dist Mgr gather torch version #1284

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

Merged
FrankLeeeee merged 11 commits into from
Jul 12, 2022
Merged

[hotfix] Dist Mgr gather torch version #1284

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
86be744
make it faster
feifeibear Jul 6, 2022
4b2333e
Merge branch 'main' of github.com:hpcaitech/ColossalAI into main
feifeibear Jul 7, 2022
5078a72
Merge branch 'main' of github.com:hpcaitech/ColossalAI into main
feifeibear Jul 7, 2022
73069e2
Merge branch 'main' of github.com:hpcaitech/ColossalAI into main
feifeibear Jul 11, 2022
371aa27
Merge branch 'main' of github.com:hpcaitech/ColossalAI into main
feifeibear Jul 12, 2022
9c504af
[hotfix] torchvison fx tests
feifeibear Jul 12, 2022
0488f3a
[hotfix] rename duplicated named test_gpt.py
feifeibear Jul 12, 2022
f919ae7
Merge branch 'main' of github.com:hpcaitech/ColossalAI into hotfix/fx
feifeibear Jul 12, 2022
2709969
Merge branch 'main' of github.com:hpcaitech/ColossalAI into hotfix/fx
feifeibear Jul 12, 2022
5cabe7e
Merge branch 'main' of github.com:hpcaitech/ColossalAI into hotfix/fx
feifeibear Jul 12, 2022
6960701
[hotfix] dist mgr torch version
feifeibear Jul 12, 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
6 changes: 4 additions & 2 deletions colossalai/tensor/dist_spec_mgr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,13 @@ def _gather(tensor: torch.Tensor, old_dist_spec: _DistSpec, pg: ProcessGroup) ->
torch.Tensor: a replicated tensor.
"""
assert old_dist_spec.placement.value == 's', f"The old_dist_spec of DistSpecManager._gather must be SHARD!"
if version.parse(torch.__version__) < version.parse("1.11.0"):
is_cpu_tensor = False
if tensor.device.type == 'cpu':
# pytorch lower than 1.11 dose not support gather a cpu tensor.
# Therefore, we transfer tensor to GPU before gather.
saved_dev = tensor.device
tensor.data = tensor.data.cuda()
is_cpu_tensor = True

buffer = [torch.empty_like(tensor) for _ in range(pg.tp_world_size())]
assert tensor.device.type == 'cuda'
Expand All @@ -106,7 +108,7 @@ def _gather(tensor: torch.Tensor, old_dist_spec: _DistSpec, pg: ProcessGroup) ->
buffer = new_buffer
assert len(buffer) == 1

if version.parse(torch.__version__) < version.parse("1.11.0"):
if is_cpu_tensor:
buffer[0].data = buffer[0].data.to(saved_dev)
return buffer[0]

Expand Down