[Bugfix][Model] Validate DefaultModelLoader / LoadConfig and fail with clear errors (#45196)

Signed-off-by: Ting Sun <suntcrick@gmail.com>
This commit is contained in:
Ting SUN
2026-06-17 21:46:33 +00:00
committed by GitHub
parent 58b2e89642
commit 9d4b87f4f0
5 changed files with 108 additions and 7 deletions
@@ -76,6 +76,11 @@ class DefaultModelLoader(BaseModelLoader):
self.local_expert_ids: set[int] | None = None
extra_config = load_config.model_loader_extra_config
if not isinstance(extra_config, dict):
raise ValueError(
f"model_loader_extra_config must be a dict for load format "
f"{load_config.load_format}, got {type(extra_config).__name__}"
)
allowed_keys = {
"enable_multithread_load",
"num_threads",
@@ -90,10 +95,36 @@ class DefaultModelLoader(BaseModelLoader):
f"{unexpected_keys}"
)
enable_multithread_load = extra_config.get("enable_multithread_load", False)
if not isinstance(enable_multithread_load, bool):
raise ValueError(
f"enable_multithread_load must be a bool, got "
f"{type(enable_multithread_load).__name__}"
)
num_threads = extra_config.get("num_threads")
if num_threads is not None and not (
isinstance(num_threads, int) and num_threads > 0
):
raise ValueError(
f"num_threads must be a positive integer, got {num_threads!r}"
)
self.enable_weights_track: bool | None = extra_config.get(
"enable_weights_track", None
)
# The multi-thread loader ignores safetensors_load_strategy, so reject
# the combination instead of silently dropping the requested strategy.
if extra_config.get("enable_multithread_load") and (
load_config.safetensors_load_strategy not in (None, "lazy")
):
raise ValueError(
"enable_multithread_load does not support "
"safetensors_load_strategy="
f"{load_config.safetensors_load_strategy!r}; the multi-thread "
"loader only implements the default lazy strategy."
)
def _prepare_weights(
self,
model_name_or_path: str,
@@ -152,7 +183,9 @@ class DefaultModelLoader(BaseModelLoader):
else:
raise ValueError(f"Unknown load_format: {load_format}")
if fall_back_to_pt:
# Don't fall back to .pt for explicit safetensors formats; otherwise a
# .pt file is matched and later opened as safetensors.
if fall_back_to_pt and not use_safetensors:
allow_patterns += ["*.pt"]
if allow_patterns_overrides is not None: