[loading] Fix device detection (#42323)

Cyrilvallez · web-flow · commit 4799952dca33 · 2025-11-21T13:20:49.000+01:00
fix
diff --git a/src/transformers/core_model_loading.py b/src/transformers/core_model_loading.py
@@ -610,7 +610,7 @@ def convert_and_load_state_dict_in_model(
     tp_plan = tp_plan or {}
     device_map = device_map or {"": "cpu"}
     device_map_regex = re.compile(
-        "|".join(rf"({k})" for k in sorted(device_map.keys(), key=lambda x: x.count("."), reverse=True))
+        "|".join(rf"({k})" for k in sorted(device_map.keys(), key=lambda x: (x.count("."), len(x)), reverse=True))
     )
     dtype_plan = dtype_plan or {}
     weight_mapping = weight_mapping or []

Original file line number	Diff line number	Diff line change
`@@ -610,7 +610,7 @@ def convert_and_load_state_dict_in_model(`
`610`	`610`	`tp_plan = tp_plan or {}`
`611`	`611`	`device_map = device_map or {"": "cpu"}`
`612`	`612`	`device_map_regex = re.compile(`
`613`		`- "\|".join(rf"({k})" for k in sorted(device_map.keys(), key=lambda x: x.count("."), reverse=True))`
	`613`	`+ "\|".join(rf"({k})" for k in sorted(device_map.keys(), key=lambda x: (x.count("."), len(x)), reverse=True))`
`614`	`614`	`)`
`615`	`615`	`dtype_plan = dtype_plan or {}`
`616`	`616`	`weight_mapping = weight_mapping or []`