Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions invokeai/backend/model_management/model_merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ def merge_diffusion_models_and_save(
# pick up the first model's vae
if mod == model_names[0]:
vae = info.get("vae")
model_paths.extend([config.root_path / info["path"]])
model_paths.extend([(config.root_path / info["path"]).as_posix()])

merge_method = None if interp == "weighted_sum" else MergeInterpolationMethod(interp)
logger.debug(f"interp = {interp}, merge_method={merge_method}")
Expand All @@ -120,11 +120,11 @@ def merge_diffusion_models_and_save(
else config.models_path / base_model.value / ModelType.Main.value
)
dump_path.mkdir(parents=True, exist_ok=True)
dump_path = dump_path / merged_model_name
dump_path = (dump_path / merged_model_name).as_posix()

merged_pipe.save_pretrained(dump_path, safe_serialization=True)
attributes = dict(
path=str(dump_path),
path=dump_path,
description=f"Merge of models {', '.join(model_names)}",
model_format="diffusers",
variant=ModelVariantType.Normal.value,
Expand Down
169 changes: 0 additions & 169 deletions invokeai/frontend/web/dist/assets/App-0a099278.js

This file was deleted.

169 changes: 169 additions & 0 deletions invokeai/frontend/web/dist/assets/App-7d912410.js

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

151 changes: 151 additions & 0 deletions invokeai/frontend/web/dist/assets/index-2c171c8f.js

Large diffs are not rendered by default.

151 changes: 0 additions & 151 deletions invokeai/frontend/web/dist/assets/index-deaa1f26.js

This file was deleted.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion invokeai/frontend/web/dist/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
margin: 0;
}
</style>
<script type="module" crossorigin src="./assets/index-deaa1f26.js"></script>
<script type="module" crossorigin src="./assets/index-2c171c8f.js"></script>
</head>

<body dir="ltr">
Expand Down
3 changes: 3 additions & 0 deletions invokeai/frontend/web/dist/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,9 @@
"hiresStrength": "High Res Strength",
"imageFit": "Fit Initial Image To Output Size",
"codeformerFidelity": "Fidelity",
"maskAdjustmentsHeader": "Mask Adjustments",
"maskBlur": "Mask Blur",
"maskBlurMethod": "Mask Blur Method",
"seamSize": "Seam Size",
"seamBlur": "Seam Blur",
"seamStrength": "Seam Strength",
Expand Down