Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into feat/use-custom-vaes

Browse Source
This commit is contained in:
Lincoln Stein
2023-03-23 10:32:56 -04:00
parent 3ca654d256 485f6e5954
commit a958ae5e29
55 changed files with 854 additions and 724 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
invokeai/backend/model_management/convert_ckpt_to_diffusers.py
View File

@ -1086,9 +1086,10 @@ def load_pipeline_from_original_stable_diffusion_ckpt(
dlogging.set_verbosity_error()
checkpoint = (
load_file(checkpoint_path)
if Path(checkpoint_path).suffix == ".safetensors"
else torch.load(checkpoint_path)
torch.load(checkpoint_path)
if Path(checkpoint_path).suffix == ".ckpt"
else load_file(checkpoint_path)
)
cache_dir = global_cache_dir("hub")
pipeline_class = (

6
invokeai/backend/model_management/model_manager.py
View File

@ -730,9 +730,9 @@ v Apply picklescanner to the indicated checkpoint and issue a warning
# another round of heuristics to guess the correct config file.
checkpoint = (
safetensors.torch.load_file(model_path)
if model_path.suffix == ".safetensors"
else torch.load(model_path)
torch.load(model_path)
if model_path.suffix == ".ckpt"
else safetensors.torch.load_file(model_path)
)
# additional probing needed if no config file provided