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

[tests] make test_model_parallelism device-agnostic #30844

Merged
merged 4 commits into from
May 24, 2024
Merged

[tests] make test_model_parallelism device-agnostic #30844

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f99e2ae
enable on xpu
faaany May 16, 2024
ff0b240
fix style
faaany May 16, 2024
f975ab8
add comment and mps
faaany May 24, 2024
7531f06
Merge branch 'huggingface:main' into parallelism
faaany May 24, 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
9 changes: 6 additions & 3 deletions tests/test_modeling_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
require_safetensors,
require_torch,
require_torch_gpu,
require_torch_multi_accelerator,
require_torch_multi_gpu,
require_torch_sdpa,
slow,
Expand Down Expand Up @@ -3009,8 +3010,11 @@ def check_device_map_is_respected(self, model, device_map):
param_device = device_map[param_name]
if param_device in ["cpu", "disk"]:
self.assertEqual(param.device, torch.device("meta"))
elif param_device in ["mps"]:
self.assertEqual(param.device, torch.device("mps"))
else:
self.assertEqual(param.device, torch.device(param_device))
# when loaded with device_map, `param_device` are integer values for cuda/xpu/npu/mlu
self.assertEqual(param.device, torch.device(f"{torch_device}:{param_device}"))

@require_accelerate
@mark.accelerate_tests
Expand Down Expand Up @@ -3129,7 +3133,7 @@ def test_cpu_offload(self):

@require_accelerate
@mark.accelerate_tests
@require_torch_multi_gpu
@require_torch_multi_accelerator
def test_model_parallelism(self):
config, inputs_dict = self.model_tester.prepare_config_and_inputs_for_common()

Expand All @@ -3155,7 +3159,6 @@ def test_model_parallelism(self):
new_model = model_class.from_pretrained(tmp_dir, device_map="auto", max_memory=max_memory)
# Making sure part of the model will actually end up offloaded
self.assertSetEqual(set(new_model.hf_device_map.values()), {0, 1})

self.check_device_map_is_respected(new_model, new_model.hf_device_map)

torch.manual_seed(0)
Expand Down