Merge remote-tracking branch 'upstream/model-loading-refactor' into model-loading-refactor

SunMarc · SunMarc · commit 21f94a185602 · 2025-01-21T11:00:24.000+01:00
diff --git a/src/diffusers/models/modeling_utils.py b/src/diffusers/models/modeling_utils.py
@@ -946,7 +946,7 @@ def from_pretrained(cls, pretrained_model_name_or_path: Optional[Union[str, os.P
                             "Defaulting to unsafe serialization. Pass `allow_pickle=False` to raise an error instead."
                         )
 
-                if resolved_archive_file is None:
+                if resolved_archive_file is None and not is_sharded:
                     resolved_archive_file = _get_model_file(
                         pretrained_model_name_or_path,
                         weights_name=_add_variant(WEIGHTS_NAME, variant),

Original file line number	Diff line number	Diff line change
`@@ -946,7 +946,7 @@ def from_pretrained(cls, pretrained_model_name_or_path: Optional[Union[str, os.P`
`946`	`946`	"Defaulting to unsafe serialization. Pass `allow_pickle=False` to raise an error instead."
`947`	`947`	`)`
`948`	`948`
`949`		`- if resolved_archive_file is None:`
	`949`	`+ if resolved_archive_file is None and not is_sharded:`
`950`	`950`	`resolved_archive_file = _get_model_file(`
`951`	`951`	`pretrained_model_name_or_path,`
`952`	`952`	`weights_name=_add_variant(WEIGHTS_NAME, variant),`