Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
68f22fa87b | ||
|
|
5ea63abfbe | ||
|
|
232dc76db2 | ||
|
|
31989beefd | ||
|
|
0d035ef072 | ||
|
|
78b3198c14 | ||
|
|
79593701aa | ||
|
|
cbe3502e83 | ||
|
|
4f08fe69b2 |
+48
-8
@@ -1,17 +1,57 @@
|
|||||||
from .nodes import *
|
from .nodes import *
|
||||||
|
|
||||||
NODE_CLASS_MAPPINGS = {
|
NODE_CLASS_MAPPINGS = {
|
||||||
"UNetMetaKeys": UNetMetaKeys,
|
"ModelMetaKeys": ModelMetaKeys,
|
||||||
"CLIPMetaKeys": CLIPMetaKeys,
|
"TextEncoderMetaKeys": TextEncoderMetaKeys,
|
||||||
"LoRAMetaKeys": LoRAMetaKeys,
|
"LoRAMetaKeys": LoRAMetaKeys,
|
||||||
"CheckpointMetaKeys": CheckpointMetaKeys,
|
"CheckpointMetaKeys": CheckpointMetaKeys,
|
||||||
"OffloadModels": OffloadModelsNode,
|
"EmbeddingMetaKeys": EmbeddingMetaKeys,
|
||||||
|
"ModelRenameKeys": ModelRenameKeys,
|
||||||
|
"TextEncoderRenameKeys": TextEncoderRenameKeys,
|
||||||
|
"LoRARenameKeys": LoRARenameKeys,
|
||||||
|
"CheckpointRenameKeys": CheckpointRenameKeys,
|
||||||
|
"EmbeddingRenameKeys": EmbeddingRenameKeys,
|
||||||
|
"ModelPruneKeys": ModelPruneKeys,
|
||||||
|
"TextEncoderPruneKeys": TextEncoderPruneKeys,
|
||||||
|
"LoRAPruneKeys": LoRAPruneKeys,
|
||||||
|
"CheckpointPruneKeys": CheckpointPruneKeys,
|
||||||
|
"EmbeddingPruneKeys": EmbeddingPruneKeys,
|
||||||
|
"ModelTwoMerger": ModelTwoMerger,
|
||||||
|
"TextEncoderTwoMerger": TextEncoderTwoMerger,
|
||||||
|
"LoRATwoMerger": LoRATwoMerger,
|
||||||
|
"CheckpointTwoMerger": CheckpointTwoMerger,
|
||||||
|
"EmbeddingTwoMerger": EmbeddingTwoMerger,
|
||||||
|
"ModelThreeMerger": ModelThreeMerger,
|
||||||
|
"TextEncoderThreeMerger": TextEncoderThreeMerger,
|
||||||
|
"LoRAThreeMerger": LoRAThreeMerger,
|
||||||
|
"CheckpointThreeMerger": CheckpointThreeMerger,
|
||||||
|
"EmbeddingThreeMerger": EmbeddingThreeMerger,
|
||||||
}
|
}
|
||||||
|
|
||||||
NODE_DISPLAY_NAME_MAPPINGS = {
|
NODE_DISPLAY_NAME_MAPPINGS = {
|
||||||
"UNetMetaKeys": "Get UNet Metadata and Keys",
|
"ModelMetaKeys": "Get Diffusion Model Metadata & Keys",
|
||||||
"CLIPMetaKeys": "Get CLIP Metadata and Keys",
|
"TextEncoderMetaKeys": "Get Text Encoder Metadata & Keys",
|
||||||
"LoRAMetaKeys": "Get LoRA Metadata and Keys",
|
"LoRAMetaKeys": "Get LoRA Metadata & Keys",
|
||||||
"CheckpointMetaKeys": "Get Checkpoint Metadata and Keys",
|
"CheckpointMetaKeys": "Get Checkpoint Metadata & Keys",
|
||||||
"OffloadModelsNode": "Offload Models with Passthrough",
|
"EmbeddingMetaKeys": "Get Embedding Metadata & Keys",
|
||||||
|
"ModelRenameKeys": "ModelRenameKeys",
|
||||||
|
"TextEncoderRenameKeys": "TextEncoderRenameKeys",
|
||||||
|
"LoRARenameKeys": "LoRARenameKeys",
|
||||||
|
"CheckpointRenameKeys": "CheckpointRenameKeys",
|
||||||
|
"EmbeddingRenameKeys": "EmbeddingRenameKeys",
|
||||||
|
"ModelPruneKeys": "ModelPruneKeys",
|
||||||
|
"TextEncoderPruneKeys": "TextEncoderPruneKeys",
|
||||||
|
"LoRAPruneKeys": "LoRAPruneKeys",
|
||||||
|
"CheckpointPruneKeys": "Prune Checkpoint Keys",
|
||||||
|
"EmbeddingPruneKeys": "Prune Embedding Keys",
|
||||||
|
"ModelTwoMerger": "Merge Models (2 Models)",
|
||||||
|
"TextEncoderTwoMerger": "Merge Text Encoders (2 Models)",
|
||||||
|
"LoRATwoMerger": "Merge LoRAs (2 Models)",
|
||||||
|
"CheckpointTwoMerger": "Merge Checkpoints (2 Models)",
|
||||||
|
"EmbeddingTwoMerger": "Merge Embeddings (2 Models)",
|
||||||
|
"ModelThreeMerger": "Merge Models (3 Models)",
|
||||||
|
"TextEncoderThreeMerger": "Merge Text Encoders (3 Models)",
|
||||||
|
"LoRAThreeMerger": "Merge LoRAs (3 Models)",
|
||||||
|
"CheckpointThreeMerger": "Merge Checkpoints (3 Models)",
|
||||||
|
"EmbeddingThreeMerger": "Merge Embeddings (3 Models)",
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
# 2-Model Merger Documentation
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Weight-Sum
|
||||||
|
> `A * (1 - α) + B * α`. A simple linear interpolation between two models.
|
||||||
|
|
||||||
|
**Models Used:** A, B
|
||||||
|
**Parameters:**
|
||||||
|
- **Alpha:** Interpolation weight. `0.0` is 100% Model A, `1.0` is 100% Model B.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Comparative-Interpolation
|
||||||
|
> Interpolates between A and B based on the relative differences in their tensor values. Creates a unique blend by deciding how much of each model to use for each individual weight.
|
||||||
|
|
||||||
|
**Models Used:** A, B
|
||||||
|
**Parameters:**
|
||||||
|
- **Alpha:** Controls the interpolation curve's strength and shape.
|
||||||
|
- **Beta:** Switches the interpolation style. `0.0` focuses on similarity, `1.0` focuses on difference.
|
||||||
|
- **Gamma:** Mixes between a randomized (binomial) interpolation at `0.0` and a smooth (linear) one at `1.0`.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Power-Up (DARE)
|
||||||
|
> Adds the unique capabilities of Model B to Model A using the Drop and Rescale (DARE) technique, which often preserves the knowledge of the base model better than simple additions.
|
||||||
|
|
||||||
|
**Models Used:** A, B
|
||||||
|
**Parameters:**
|
||||||
|
- **Alpha:** The dropout rate. This is the proportion of unique weights from Model B that are *dropped* before merging. A higher value means less of B is merged.
|
||||||
|
- **Beta:** A final multiplier for the rescaled difference before it's added to Model A.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## SVD LoRA Extraction
|
||||||
|
> Extracts the difference between Model B and Model A and saves it as a new LoRA file. **This mode outputs a LoRA, not a full model.** The output file will be saved to your `loras` directory.
|
||||||
|
|
||||||
|
**Models Used:** A (Tuned Model), B (Base Model)
|
||||||
|
**Parameters:**
|
||||||
|
- **Alpha:** The Rank (dimension) for the LoRA's standard layers.
|
||||||
|
- **Beta:** The Rank (dimension) specifically for 3x3 convolution layers.
|
||||||
|
- **Gamma:** The clamp quantile for weight values. `0.99` is a typical value to prevent outlier weights from dominating.
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
# 3-Model Merger Documentation
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Add-Difference
|
||||||
|
> `A + (B - C) * α`. This classic technique applies the "difference" between models B and C to model A. For example, it can be used to add a style (B) to a base model (A) while subtracting the style's original base (C).
|
||||||
|
|
||||||
|
**Models Used:** A, B, C
|
||||||
|
**Parameters:**
|
||||||
|
- **Alpha:** A multiplier for the `(B - C)` difference vector before it's added to A.
|
||||||
|
- **Beta:** A smoothing toggle. `0` for Off, `1` for On. When On, applies a median and gaussian filter to the difference, which can result in a smoother merge.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Train-Difference
|
||||||
|
> A variation of Add-Difference from the SuperMerger extension that uses a more complex scaling factor based on the relative distances between the tensors of A, B, and C.
|
||||||
|
|
||||||
|
**Models Used:** A, B, C
|
||||||
|
**Parameters:**
|
||||||
|
- **Alpha:** A multiplier for the final calculated "training" difference.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Extract-Features
|
||||||
|
> A powerful mode that identifies features present in both `(B - A)` and `(C - A)` and adds them to A. Allows for fine-grained control over combining aspects based on their similarity.
|
||||||
|
|
||||||
|
**Models Used:** A, B, C
|
||||||
|
**Parameters:**
|
||||||
|
- **Alpha:** Weights the merge between Model B (`0.0`) and Model C (`1.0`).
|
||||||
|
- **Beta:** Controls the focus on similarity (`0.0`) versus dissimilarity (`1.0`).
|
||||||
|
- **Gamma:** A bias exponent for similarity. Higher values increase the bias.
|
||||||
|
- **Delta:** A final multiplier for the extracted features before they are added to Model A.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Add-Dissimilarities
|
||||||
|
> Identifies features that are dissimilar between Model B and Model C and adds them to Model A. Useful for combining unique aspects of two different models.
|
||||||
|
|
||||||
|
**Models Used:** A, B, C
|
||||||
|
**Parameters:**
|
||||||
|
- **Alpha:** Weights the comparison between Model B (`0.0`) and Model C (`1.0`).
|
||||||
|
- **Beta:** A multiplier for the final extracted dissimilar features.
|
||||||
|
- **Gamma:** A bias exponent for the similarity calculation.
|
||||||
+10
-8
@@ -1,10 +1,12 @@
|
|||||||
from .metakeys import *
|
from .metakeys import *
|
||||||
from .modelunloader import *
|
from .renamekeys import *
|
||||||
|
from .prunekeys import *
|
||||||
|
from .merger import *
|
||||||
|
|
||||||
__all__ = (
|
__all__ = [
|
||||||
"UNetMetaKeys",
|
"ModelMetaKeys", "TextEncoderMetaKeys", "LoRAMetaKeys", "CheckpointMetaKeys", "EmbeddingMetaKeys",
|
||||||
"CLIPMetaKeys",
|
"ModelRenameKeys", "TextEncoderRenameKeys", "LoRARenameKeys", "CheckpointRenameKeys", "EmbeddingRenameKeys",
|
||||||
"LoRAMetaKeys",
|
"ModelPruneKeys", "TextEncoderPruneKeys", "LoRAPruneKeys", "CheckpointPruneKeys", "EmbeddingPruneKeys",
|
||||||
"CheckpointMetaKeys",
|
"CheckpointTwoMerger", "ModelTwoMerger", "TextEncoderTwoMerger", "LoRATwoMerger", "EmbeddingTwoMerger",
|
||||||
"OffloadModels",
|
"CheckpointThreeMerger", "ModelThreeMerger", "TextEncoderThreeMerger", "LoRAThreeMerger", "EmbeddingThreeMerger",
|
||||||
)
|
]
|
||||||
+173
@@ -0,0 +1,173 @@
|
|||||||
|
import os
|
||||||
|
import torch
|
||||||
|
import folder_paths
|
||||||
|
import comfy.utils
|
||||||
|
from safetensors.torch import save_file
|
||||||
|
from .merger_ops import TWO_MODEL_MODES, THREE_MODEL_MODES
|
||||||
|
from .merger_utils import MemoryEfficientSafeOpen
|
||||||
|
|
||||||
|
def load_documentation_from_file(filename):
|
||||||
|
"""Loads documentation from a markdown file in the ../docs/ directory."""
|
||||||
|
current_dir = os.path.dirname(os.path.realpath(__file__))
|
||||||
|
docs_path = os.path.join(current_dir, '..', 'docs', filename)
|
||||||
|
try:
|
||||||
|
with open(docs_path, 'r', encoding='utf-8') as f:
|
||||||
|
return f.read()
|
||||||
|
except FileNotFoundError:
|
||||||
|
return f"# Documentation File Not Found\n\nPlease ensure `{filename}` exists in the `docs` directory of the custom node."
|
||||||
|
|
||||||
|
# --- UI Dictionary Helper Functions ---
|
||||||
|
def _create_two_model_inputs(model_folder_name):
|
||||||
|
return {"required": {
|
||||||
|
"execution_mode": (["MERGE", "DOCUMENTATION ONLY"],),
|
||||||
|
"model_a": (["None"] + folder_paths.get_filename_list(model_folder_name),),
|
||||||
|
"model_b": (["None"] + folder_paths.get_filename_list(model_folder_name),),
|
||||||
|
"calc_mode": ([m.name for m in TWO_MODEL_MODES],),
|
||||||
|
"alpha": ("FLOAT", {"default": 0.5, "min": -2.0, "max": 3.0, "step": 0.01}),
|
||||||
|
"beta": ("FLOAT", {"default": 0.5, "min": -2.0, "max": 3.0, "step": 0.01}),
|
||||||
|
"gamma": ("FLOAT", {"default": 0.99, "min": 0.0, "max": 1.0, "step": 0.001}),
|
||||||
|
"seed": ("INT", {"default": 0, "min": 0, "max": 0xffffffffffffffff}),
|
||||||
|
"output_filename": ("STRING", {"default": "merged_2_model"}),
|
||||||
|
"save_dtype": (["fp32", "fp16", "bf16"],),
|
||||||
|
"process_device": (["cuda", "cpu"],),
|
||||||
|
}}
|
||||||
|
|
||||||
|
def _create_three_model_inputs(model_folder_name):
|
||||||
|
return {"required": {
|
||||||
|
"execution_mode": (["MERGE", "DOCUMENTATION ONLY"],),
|
||||||
|
"model_a": (["None"] + folder_paths.get_filename_list(model_folder_name),),
|
||||||
|
"model_b": (["None"] + folder_paths.get_filename_list(model_folder_name),),
|
||||||
|
"model_c": (["None"] + folder_paths.get_filename_list(model_folder_name),),
|
||||||
|
"calc_mode": ([m.name for m in THREE_MODEL_MODES],),
|
||||||
|
"alpha": ("FLOAT", {"default": 0.5, "min": -2.0, "max": 3.0, "step": 0.01}),
|
||||||
|
"beta": ("FLOAT", {"default": 0.5, "min": -2.0, "max": 3.0, "step": 0.01}),
|
||||||
|
"gamma": ("FLOAT", {"default": 0.5, "min": -2.0, "max": 3.0, "step": 0.01}),
|
||||||
|
"delta": ("FLOAT", {"default": 0.5, "min": -2.0, "max": 3.0, "step": 0.01}),
|
||||||
|
"seed": ("INT", {"default": 0, "min": 0, "max": 0xffffffffffffffff}),
|
||||||
|
"output_filename": ("STRING", {"default": "merged_3_model"}),
|
||||||
|
"save_dtype": (["fp32", "fp16", "bf16"],),
|
||||||
|
"process_device": (["cuda", "cpu"],),
|
||||||
|
}}
|
||||||
|
|
||||||
|
# --- Base Classes for Backend Logic ONLY ---
|
||||||
|
class MergerLogic:
|
||||||
|
def _execute_merge(self, model_names, calc_mode, all_modes, recipe_params, model_type):
|
||||||
|
calc_mode_class = next((m for m in all_modes if m.name == calc_mode), None)
|
||||||
|
if not calc_mode_class: raise ValueError(f"Calc mode '{calc_mode}' not found.")
|
||||||
|
primary_model_name = model_names.get('model_a')
|
||||||
|
if not primary_model_name or primary_model_name == "None": raise ValueError("Model A is required to run the merge.")
|
||||||
|
handlers = {}
|
||||||
|
for name in model_names.values():
|
||||||
|
if name and name != "None":
|
||||||
|
path = folder_paths.get_full_path(model_type, name)
|
||||||
|
if not path: raise FileNotFoundError(f"Model '{name}' not found.")
|
||||||
|
handlers[name] = MemoryEfficientSafeOpen(path)
|
||||||
|
all_keys = handlers[primary_model_name].keys()
|
||||||
|
metadata = handlers[primary_model_name].header.get("__metadata__", {})
|
||||||
|
merged_state_dict = {}
|
||||||
|
pbar = comfy.utils.ProgressBar(len(all_keys))
|
||||||
|
save_dtype = recipe_params.pop('save_dtype')
|
||||||
|
save_torch_dtype = {"fp32": torch.float32, "fp16": torch.float16, "bf16": torch.bfloat16}.get(save_dtype)
|
||||||
|
recipe_params.update({"handlers": handlers}) # Add handlers, device and dtype are already in
|
||||||
|
for key in all_keys:
|
||||||
|
recipe = calc_mode_class.create_recipe(key=key, **recipe_params)
|
||||||
|
result = recipe.merge()
|
||||||
|
if isinstance(result, dict):
|
||||||
|
for r_key, r_tensor in result.items(): merged_state_dict[r_key] = r_tensor.to(save_torch_dtype).cpu().clone()
|
||||||
|
else: merged_state_dict[key] = result.to(save_torch_dtype).cpu().clone()
|
||||||
|
pbar.update(1)
|
||||||
|
for handler in handlers.values(): handler.__exit__(None, None, None)
|
||||||
|
output_folder = "loras" if calc_mode == "SVD LoRA Extraction" else model_type
|
||||||
|
output_dir = folder_paths.get_folder_paths(output_folder)[0]
|
||||||
|
os.makedirs(output_dir, exist_ok=True)
|
||||||
|
output_filename = recipe_params.get("output_filename")
|
||||||
|
output_path = os.path.join(output_dir, f"{output_filename}.safetensors")
|
||||||
|
save_file(merged_state_dict, output_path, metadata=metadata)
|
||||||
|
return (f"{output_filename}.safetensors",)
|
||||||
|
|
||||||
|
class BaseTwoMerger(MergerLogic):
|
||||||
|
FUNCTION = "merge"; CATEGORY = "ModelUtils/Merging"
|
||||||
|
RETURN_TYPES = ("STRING", "STRING",); RETURN_NAMES = ("output_filename", "documentation",)
|
||||||
|
|
||||||
|
def merge(self, execution_mode, model_a, model_b, calc_mode, alpha, beta, gamma, seed, output_filename, save_dtype, process_device):
|
||||||
|
doc = load_documentation_from_file('merger_2_model_modes.md')
|
||||||
|
if execution_mode == "DOCUMENTATION ONLY":
|
||||||
|
return ("Documentation mode active. No merge performed.", doc)
|
||||||
|
|
||||||
|
recipe_params = {
|
||||||
|
"model_a": model_a, "model_b": model_b, "calc_mode": calc_mode,
|
||||||
|
"alpha": alpha, "beta": beta, "gamma": gamma, "seed": seed,
|
||||||
|
"output_filename": output_filename, "save_dtype": save_dtype,
|
||||||
|
"device": process_device, "dtype": torch.float32
|
||||||
|
}
|
||||||
|
model_names = {"model_a": model_a, "model_b": model_b}
|
||||||
|
filename, = self._execute_merge(model_names, calc_mode, TWO_MODEL_MODES, recipe_params, self.MODEL_TYPE)
|
||||||
|
return (filename, doc)
|
||||||
|
|
||||||
|
class BaseThreeMerger(MergerLogic):
|
||||||
|
FUNCTION = "merge"; CATEGORY = "ModelUtils/Merging"
|
||||||
|
RETURN_TYPES = ("STRING", "STRING",); RETURN_NAMES = ("output_filename", "documentation",)
|
||||||
|
|
||||||
|
def merge(self, execution_mode, model_a, model_b, model_c, calc_mode, alpha, beta, gamma, delta, seed, output_filename, save_dtype, process_device):
|
||||||
|
doc = load_documentation_from_file('merger_3_model_modes.md')
|
||||||
|
if execution_mode == "DOCUMENTATION ONLY":
|
||||||
|
return ("Documentation mode active. No merge performed.", doc)
|
||||||
|
|
||||||
|
recipe_params = {
|
||||||
|
"model_a": model_a, "model_b": model_b, "model_c": model_c, "calc_mode": calc_mode,
|
||||||
|
"alpha": alpha, "beta": beta, "gamma": gamma, "delta": delta, "seed": seed,
|
||||||
|
"output_filename": output_filename, "save_dtype": save_dtype,
|
||||||
|
"device": process_device, "dtype": torch.float32
|
||||||
|
}
|
||||||
|
model_names = {"model_a": model_a, "model_b": model_b, "model_c": model_c}
|
||||||
|
filename, = self._execute_merge(model_names, calc_mode, THREE_MODEL_MODES, recipe_params, self.MODEL_TYPE)
|
||||||
|
return (filename, doc)
|
||||||
|
|
||||||
|
# --- Concrete 2-Model Nodes ---
|
||||||
|
class CheckpointTwoMerger(BaseTwoMerger):
|
||||||
|
MODEL_TYPE = "checkpoints"
|
||||||
|
@classmethod
|
||||||
|
def INPUT_TYPES(s): return _create_two_model_inputs(s.MODEL_TYPE)
|
||||||
|
class ModelTwoMerger(BaseTwoMerger):
|
||||||
|
MODEL_TYPE = "diffusion_models"
|
||||||
|
@classmethod
|
||||||
|
def INPUT_TYPES(s): return _create_two_model_inputs(s.MODEL_TYPE)
|
||||||
|
class TextEncoderTwoMerger(BaseTwoMerger):
|
||||||
|
MODEL_TYPE = "text_encoders"
|
||||||
|
@classmethod
|
||||||
|
def INPUT_TYPES(s): return _create_two_model_inputs(s.MODEL_TYPE)
|
||||||
|
class LoRATwoMerger(BaseTwoMerger):
|
||||||
|
MODEL_TYPE = "loras"
|
||||||
|
@classmethod
|
||||||
|
def INPUT_TYPES(s): return _create_two_model_inputs(s.MODEL_TYPE)
|
||||||
|
class EmbeddingTwoMerger(BaseTwoMerger):
|
||||||
|
MODEL_TYPE = "embeddings"
|
||||||
|
@classmethod
|
||||||
|
def INPUT_TYPES(s): return _create_two_model_inputs(s.MODEL_TYPE)
|
||||||
|
|
||||||
|
# --- Concrete 3-Model Nodes ---
|
||||||
|
class CheckpointThreeMerger(BaseThreeMerger):
|
||||||
|
MODEL_TYPE = "checkpoints"
|
||||||
|
@classmethod
|
||||||
|
def INPUT_TYPES(s): return _create_three_model_inputs(s.MODEL_TYPE)
|
||||||
|
class ModelThreeMerger(BaseThreeMerger):
|
||||||
|
MODEL_TYPE = "diffusion_models"
|
||||||
|
@classmethod
|
||||||
|
def INPUT_TYPES(s): return _create_three_model_inputs(s.MODEL_TYPE)
|
||||||
|
class TextEncoderThreeMerger(BaseThreeMerger):
|
||||||
|
MODEL_TYPE = "text_encoders"
|
||||||
|
@classmethod
|
||||||
|
def INPUT_TYPES(s): return _create_three_model_inputs(s.MODEL_TYPE)
|
||||||
|
class LoRAThreeMerger(BaseThreeMerger):
|
||||||
|
MODEL_TYPE = "loras"
|
||||||
|
@classmethod
|
||||||
|
def INPUT_TYPES(s): return _create_three_model_inputs(s.MODEL_TYPE)
|
||||||
|
class EmbeddingThreeMerger(BaseThreeMerger):
|
||||||
|
MODEL_TYPE = "embeddings"
|
||||||
|
@classmethod
|
||||||
|
def INPUT_TYPES(s): return _create_three_model_inputs(s.MODEL_TYPE)
|
||||||
|
|
||||||
|
__all__ = [
|
||||||
|
"CheckpointTwoMerger", "ModelTwoMerger", "TextEncoderTwoMerger", "LoRATwoMerger", "EmbeddingTwoMerger",
|
||||||
|
"CheckpointThreeMerger", "ModelThreeMerger", "TextEncoderThreeMerger", "LoRAThreeMerger", "EmbeddingThreeMerger"
|
||||||
|
]
|
||||||
@@ -0,0 +1,241 @@
|
|||||||
|
import torch
|
||||||
|
import scipy.ndimage
|
||||||
|
import torch.nn.functional as F
|
||||||
|
|
||||||
|
# ################# #
|
||||||
|
# MERGE OPERATORS
|
||||||
|
# ################# #
|
||||||
|
class Operation:
|
||||||
|
def __init__(self, key, *sources):
|
||||||
|
self.key = key
|
||||||
|
self.sources = tuple(sources)
|
||||||
|
self.merge_func = self.recurse
|
||||||
|
self.alpha = None
|
||||||
|
self.beta = None
|
||||||
|
self.gamma = None
|
||||||
|
self.delta = None
|
||||||
|
self.seed = None
|
||||||
|
|
||||||
|
def __eq__(self, other):
|
||||||
|
return (type(self), self.key, self.alpha, self.beta, self.gamma, self.delta, self.seed, self.sources) == \
|
||||||
|
(type(other), other.key, other.alpha, other.beta, other.gamma, other.delta, other.seed, other.sources)
|
||||||
|
|
||||||
|
def __hash__(self):
|
||||||
|
return hash((type(self), self.key, self.alpha, self.beta, self.gamma, self.delta, self.seed, self.sources))
|
||||||
|
|
||||||
|
def oper(self, *args) -> torch.Tensor:
|
||||||
|
raise NotImplementedError
|
||||||
|
|
||||||
|
def recurse(self, operation):
|
||||||
|
source_tensors = [source_oper.merge() for source_oper in operation.sources]
|
||||||
|
return operation.oper(*source_tensors)
|
||||||
|
|
||||||
|
def merge(self):
|
||||||
|
return self.merge_func(self)
|
||||||
|
|
||||||
|
class LoadTensor(Operation):
|
||||||
|
def __init__(self, key, model_name, handlers, device, dtype):
|
||||||
|
super().__init__(key)
|
||||||
|
self.model_name = model_name
|
||||||
|
self.handlers = handlers
|
||||||
|
self.device = device
|
||||||
|
self.dtype = dtype
|
||||||
|
|
||||||
|
def merge(self) -> torch.Tensor:
|
||||||
|
if self.model_name not in self.handlers:
|
||||||
|
raise ValueError(f"Model '{self.model_name}' is required for this mode but was not provided.")
|
||||||
|
return self.handlers[self.model_name].get_tensor(self.key).to(device=self.device, dtype=self.dtype)
|
||||||
|
|
||||||
|
class Multiply(Operation):
|
||||||
|
def __init__(self, key, alpha, *sources):
|
||||||
|
super().__init__(key, *sources)
|
||||||
|
self.alpha = alpha
|
||||||
|
def oper(self, a) -> torch.Tensor:
|
||||||
|
return a * self.alpha
|
||||||
|
class Add(Operation):
|
||||||
|
def oper(self, a, b) -> torch.Tensor:
|
||||||
|
return a + b
|
||||||
|
class Sub(Operation):
|
||||||
|
def oper(self, a, b) -> torch.Tensor:
|
||||||
|
return a - b
|
||||||
|
|
||||||
|
class SVD(Operation):
|
||||||
|
def __init__(self, key, alpha, beta, gamma, *sources):
|
||||||
|
super().__init__(key, *sources)
|
||||||
|
self.alpha, self.beta, self.gamma = int(alpha), int(beta), gamma
|
||||||
|
def oper(self, a, b) -> torch.Tensor:
|
||||||
|
diff, weights, conv2d = a - b, {}, len(a.size()) == 4
|
||||||
|
kernel_size = None if not conv2d else a.size()[2:4]
|
||||||
|
conv2d_3x3 = conv2d and kernel_size != (1, 1)
|
||||||
|
rank = self.alpha if not conv2d_3x3 or self.beta is None else self.beta
|
||||||
|
rank = min(rank, a.size()[1], a.size()[0])
|
||||||
|
matrix = diff.flatten(start_dim=1) if conv2d_3x3 else diff.squeeze() if conv2d else diff
|
||||||
|
U, S, Vh = torch.linalg.svd(matrix)
|
||||||
|
U, S, Vh = U[:, :rank], S[:rank], Vh[:rank, :]
|
||||||
|
U = U @ torch.diag(S)
|
||||||
|
dist = torch.cat([U.flatten(), Vh.flatten()])
|
||||||
|
hi_val = torch.quantile(dist, self.gamma)
|
||||||
|
U, Vh = U.clamp(-hi_val, hi_val), Vh.clamp(-hi_val, hi_val)
|
||||||
|
if conv2d:
|
||||||
|
Vh = Vh.reshape(rank, a.size()[1], *kernel_size) if conv2d_3x3 else Vh.reshape(rank, a.size()[1], 1, 1)
|
||||||
|
U = U.reshape(a.size()[0], rank, 1, 1)
|
||||||
|
weights_sd = {f"{self.key}.lora_up.weight": U, f"{self.key}.lora_down.weight": Vh, f"{self.key}.alpha": torch.tensor(float(rank))}
|
||||||
|
return weights_sd
|
||||||
|
|
||||||
|
class Smooth(Operation):
|
||||||
|
def oper(self, a) -> torch.Tensor:
|
||||||
|
filtered = scipy.ndimage.median_filter(a.detach().cpu().to(torch.float32).numpy(), size=3)
|
||||||
|
filtered = scipy.ndimage.gaussian_filter(filtered, sigma=1)
|
||||||
|
return torch.tensor(filtered, dtype=a.dtype, device=a.device)
|
||||||
|
class TrainDiff(Operation):
|
||||||
|
def oper(self, a, b, c) -> torch.Tensor:
|
||||||
|
if torch.allclose(b.float(), c.float()): return torch.zeros_like(a)
|
||||||
|
diff_bc = b.float() - c.float()
|
||||||
|
dist_bc, dist_ab = torch.abs(diff_bc), torch.abs(b.float() - a.float())
|
||||||
|
scale = torch.where(dist_bc + dist_ab != 0, dist_ab / (dist_bc + dist_ab), 0.0)
|
||||||
|
return (torch.sign(diff_bc) * torch.abs(scale) * torch.abs(diff_bc)).to(a.dtype) * 1.8
|
||||||
|
class ExtractOp(Operation):
|
||||||
|
def __init__(self, key, alpha, beta, gamma, *args):
|
||||||
|
super().__init__(key, *args)
|
||||||
|
self.alpha, self.beta, self.gamma = alpha, beta, gamma
|
||||||
|
def oper(self, base: torch.Tensor, a: torch.Tensor, b: torch.Tensor) -> torch.Tensor:
|
||||||
|
base_f = base.float() if base is not None else 0
|
||||||
|
a_f, b_f = a.float() - base_f, b.float() - base_f
|
||||||
|
c = torch.cosine_similarity(a_f.flatten(), b_f.flatten(), 0).clamp(-1, 1)
|
||||||
|
d = ((c + 1) / 2)**self.gamma
|
||||||
|
return (torch.lerp(a_f, b_f, self.alpha) * torch.lerp(d, 1 - d, self.beta)).to(a.dtype)
|
||||||
|
class Similarities(ExtractOp):
|
||||||
|
def oper(self, a: torch.Tensor, b: torch.Tensor) -> torch.Tensor: return super().oper(None, a, b)
|
||||||
|
class PowerUpOp(Operation):
|
||||||
|
def __init__(self, key, alpha, seed, *sources):
|
||||||
|
super().__init__(key, *sources)
|
||||||
|
self.alpha, self.seed = alpha, seed
|
||||||
|
def oper(self, a, b):
|
||||||
|
delta = b - a
|
||||||
|
rng = torch.Generator(device=delta.device).manual_seed(self.seed)
|
||||||
|
m = torch.bernoulli(torch.full_like(delta, 1 - self.alpha), generator=rng)
|
||||||
|
return (m * delta) / (1 - self.alpha) if (1 - self.alpha) > 0 else torch.zeros_like(delta)
|
||||||
|
class InterpolateDifference(Operation):
|
||||||
|
def __init__(self, key, alpha, beta, gamma, seed, *sources):
|
||||||
|
super().__init__(key, *sources)
|
||||||
|
self.alpha, self.beta, self.gamma, self.seed = alpha, beta, gamma, seed
|
||||||
|
def oper(self, a, b):
|
||||||
|
alpha, delta = max(self.alpha, 0.001), torch.abs(a - b)
|
||||||
|
max_delta = torch.max(delta)
|
||||||
|
if max_delta == 0: return a
|
||||||
|
diff = ((max_delta - delta) / max_delta if self.beta != 1 else delta / max_delta) ** (1 / alpha - 1)
|
||||||
|
diff = torch.nan_to_num(diff)
|
||||||
|
rng = torch.Generator(device=diff.device).manual_seed(self.seed)
|
||||||
|
mask = torch.lerp(torch.bernoulli(torch.clamp(diff, 0, 1), generator=rng), diff, self.gamma)
|
||||||
|
return a * (1 - mask) + b * mask
|
||||||
|
|
||||||
|
# ################# #
|
||||||
|
# CALCULATION MODES
|
||||||
|
# ################# #
|
||||||
|
class CalcMode:
|
||||||
|
name = 'calcmode'; description = 'description'; models_used = []; param_docs = {}
|
||||||
|
def create_recipe(self, key, **kwargs) -> Operation: raise NotImplementedError
|
||||||
|
|
||||||
|
class WeightSum(CalcMode):
|
||||||
|
name = 'Weight-Sum'
|
||||||
|
description = 'A * (1 - α) + B * α. Simple linear interpolation.'
|
||||||
|
models_used = ['A', 'B']
|
||||||
|
param_docs = {'alpha': 'Interpolation weight. 0.0 is 100% Model A, 1.0 is 100% Model B.'}
|
||||||
|
def create_recipe(self, key, **kwargs):
|
||||||
|
loader_args = {"handlers": kwargs['handlers'], "device": kwargs['device'], "dtype": kwargs['dtype']}
|
||||||
|
a = LoadTensor(key, kwargs['model_a'], **loader_args)
|
||||||
|
b = LoadTensor(key, kwargs['model_b'], **loader_args)
|
||||||
|
if kwargs['alpha'] >= 1: return b
|
||||||
|
if kwargs['alpha'] <= 0: return a
|
||||||
|
c = Multiply(key, 1 - kwargs['alpha'], a)
|
||||||
|
d = Multiply(key, kwargs['alpha'], b)
|
||||||
|
return Add(key, c, d)
|
||||||
|
class AddDifference(CalcMode):
|
||||||
|
name = 'Add-Difference'
|
||||||
|
description = 'A + (B - C) * α. Applies the difference between B and C to A.'
|
||||||
|
models_used = ['A', 'B', 'C']
|
||||||
|
param_docs = {'alpha': 'Multiplier for the (B - C) difference.', 'beta': 'Smoothing (0=Off, 1=On).'}
|
||||||
|
def create_recipe(self, key, **kwargs):
|
||||||
|
loader_args = {"handlers": kwargs['handlers'], "device": kwargs['device'], "dtype": kwargs['dtype']}
|
||||||
|
a = LoadTensor(key, kwargs['model_a'], **loader_args)
|
||||||
|
b = LoadTensor(key, kwargs['model_b'], **loader_args)
|
||||||
|
c = LoadTensor(key, kwargs['model_c'], **loader_args)
|
||||||
|
diff = Sub(key, b, c)
|
||||||
|
if kwargs['beta'] == 1: diff = Smooth(key, diff)
|
||||||
|
diffm = Multiply(key, kwargs['alpha'], diff)
|
||||||
|
return Add(key, a, diffm)
|
||||||
|
class TrainDifference(CalcMode):
|
||||||
|
name = 'Train-Difference'
|
||||||
|
description = 'A + (B - C) * α, using tensor distances.'
|
||||||
|
models_used = ['A', 'B', 'C']
|
||||||
|
param_docs = {'alpha': 'Multiplier for the calculated difference.'}
|
||||||
|
def create_recipe(self, key, **kwargs):
|
||||||
|
loader_args = {"handlers": kwargs['handlers'], "device": kwargs['device'], "dtype": kwargs['dtype']}
|
||||||
|
a = LoadTensor(key, kwargs['model_a'], **loader_args)
|
||||||
|
b = LoadTensor(key, kwargs['model_b'], **loader_args)
|
||||||
|
c = LoadTensor(key, kwargs['model_c'], **loader_args)
|
||||||
|
diff = TrainDiff(key, a, b, c)
|
||||||
|
diffm = Multiply(key, kwargs['alpha'], diff)
|
||||||
|
return Add(key, a, diffm)
|
||||||
|
class InterpDifference(CalcMode):
|
||||||
|
name = 'Comparative-Interpolation'
|
||||||
|
description = 'Interpolates A and B based on relative tensor value differences.'
|
||||||
|
models_used = ['A', 'B']
|
||||||
|
param_docs = {'alpha': 'Curve strength.', 'beta': 'Style (0=Similarity, 1=Difference).', 'gamma': 'Mix (0=Random, 1=Linear).'}
|
||||||
|
def create_recipe(self, key, **kwargs):
|
||||||
|
loader_args = {"handlers": kwargs['handlers'], "device": kwargs['device'], "dtype": kwargs['dtype']}
|
||||||
|
if key.startswith('cond_stage_model.transformer.text_model.embeddings'): return LoadTensor(key, kwargs['model_a'], **loader_args)
|
||||||
|
a = LoadTensor(key, kwargs['model_a'], **loader_args)
|
||||||
|
b = LoadTensor(key, kwargs['model_b'], **loader_args)
|
||||||
|
return InterpolateDifference(key, kwargs['alpha'], kwargs['beta'], kwargs['gamma'], kwargs['seed'], a, b)
|
||||||
|
class Extract(CalcMode):
|
||||||
|
name = 'Extract-Features'
|
||||||
|
description = 'Adds features from B and C to A, based on their similarity.'
|
||||||
|
models_used = ['A', 'B', 'C']
|
||||||
|
param_docs = {'alpha': 'Weighting B vs C.', 'beta': 'Similarity vs dissimilarity.', 'gamma': 'Similarity bias.', 'delta': 'Multiplier for final features.'}
|
||||||
|
def create_recipe(self, key, **kwargs):
|
||||||
|
loader_args = {"handlers": kwargs['handlers'], "device": kwargs['device'], "dtype": kwargs['dtype']}
|
||||||
|
a = LoadTensor(key, kwargs['model_a'], **loader_args)
|
||||||
|
b = LoadTensor(key, kwargs['model_b'], **loader_args)
|
||||||
|
c = LoadTensor(key, kwargs['model_c'], **loader_args)
|
||||||
|
extracted = ExtractOp(key, kwargs['alpha'], kwargs['beta'], kwargs['gamma'] * 15, a, b, c)
|
||||||
|
multiplied = Multiply(key, kwargs['delta'], extracted)
|
||||||
|
return Add(key, a, multiplied)
|
||||||
|
class AddDisimilarity(CalcMode):
|
||||||
|
name = 'Add-Dissimilarities'
|
||||||
|
description = 'Adds dissimilar features between B and C to model A.'
|
||||||
|
models_used = ['A', 'B', 'C']
|
||||||
|
param_docs = {'alpha': 'Weighting B vs C.', 'beta': 'Multiplier for final features.', 'gamma': 'Similarity bias.'}
|
||||||
|
def create_recipe(self, key, **kwargs):
|
||||||
|
loader_args = {"handlers": kwargs['handlers'], "device": kwargs['device'], "dtype": kwargs['dtype']}
|
||||||
|
a = LoadTensor(key, kwargs['model_a'], **loader_args)
|
||||||
|
b = LoadTensor(key, kwargs['model_b'], **loader_args)
|
||||||
|
c = LoadTensor(key, kwargs['model_c'], **loader_args)
|
||||||
|
extracted = Similarities(key, kwargs['alpha'], 1, kwargs['gamma'] * 15, b, c)
|
||||||
|
multiplied = Multiply(key, kwargs['beta'], extracted)
|
||||||
|
return Add(key, a, multiplied)
|
||||||
|
class PowerUp(CalcMode):
|
||||||
|
name = 'Power-Up (DARE)'
|
||||||
|
description = 'Adds capabilities of B to A using Drop and Rescale (DARE).'
|
||||||
|
models_used = ['A', 'B']
|
||||||
|
param_docs = {'alpha': 'Dropout rate (proportion of weights from B to *drop*).', 'beta': 'Multiplier for the final difference.'}
|
||||||
|
def create_recipe(self, key, **kwargs):
|
||||||
|
loader_args = {"handlers": kwargs['handlers'], "device": kwargs['device'], "dtype": kwargs['dtype']}
|
||||||
|
a = LoadTensor(key, kwargs['model_a'], **loader_args)
|
||||||
|
b = LoadTensor(key, kwargs['model_b'], **loader_args)
|
||||||
|
deltahat = PowerUpOp(key, kwargs['alpha'], kwargs['seed'], a, b)
|
||||||
|
res = Multiply(key, kwargs['beta'], deltahat)
|
||||||
|
return Add(key, a, res)
|
||||||
|
class SVD(CalcMode):
|
||||||
|
name = 'SVD LoRA Extraction'
|
||||||
|
description = 'Extracts the difference between B and A into a LoRA file.'
|
||||||
|
models_used = ['A', 'B']
|
||||||
|
param_docs = {'alpha': 'Rank for standard layers.', 'beta': 'Rank for 3x3 conv layers.', 'gamma': 'Clamp quantile for weights.'}
|
||||||
|
def create_recipe(self, key, **kwargs):
|
||||||
|
loader_args = {"handlers": kwargs['handlers'], "device": kwargs['device'], "dtype": kwargs['dtype']}
|
||||||
|
a = LoadTensor(key, kwargs['model_a'], **loader_args)
|
||||||
|
b = LoadTensor(key, kwargs['model_b'], **loader_args)
|
||||||
|
return SVD(key, kwargs['alpha'], kwargs['beta'], kwargs['gamma'], a, b)
|
||||||
|
|
||||||
|
TWO_MODEL_MODES = [WeightSum(), InterpDifference(), PowerUp(), SVD()]
|
||||||
|
THREE_MODEL_MODES = [AddDifference(), TrainDifference(), Extract(), AddDisimilarity()]
|
||||||
@@ -0,0 +1,80 @@
|
|||||||
|
import json
|
||||||
|
import struct
|
||||||
|
import torch
|
||||||
|
|
||||||
|
class MemoryEfficientSafeOpen:
|
||||||
|
def __init__(self, filename, device='cpu'):
|
||||||
|
self.filename = filename
|
||||||
|
self.device = device
|
||||||
|
self.header, self.header_size = self._read_header()
|
||||||
|
self.file = open(filename, "rb")
|
||||||
|
|
||||||
|
def __enter__(self):
|
||||||
|
return self
|
||||||
|
|
||||||
|
def __exit__(self, exc_type, exc_val, exc_tb):
|
||||||
|
self.file.close()
|
||||||
|
|
||||||
|
def keys(self):
|
||||||
|
return [k for k in self.header.keys() if k != "__metadata__"]
|
||||||
|
|
||||||
|
def get_tensor(self, key):
|
||||||
|
if key not in self.header:
|
||||||
|
raise KeyError(f"Tensor '{key}' not found in the file")
|
||||||
|
|
||||||
|
metadata = self.header[key]
|
||||||
|
offset_start, offset_end = metadata["data_offsets"]
|
||||||
|
|
||||||
|
tensor_bytes = None
|
||||||
|
if offset_start != offset_end:
|
||||||
|
self.file.seek(self.header_size + 8 + offset_start)
|
||||||
|
tensor_bytes = self.file.read(offset_end - offset_start)
|
||||||
|
|
||||||
|
return self._deserialize_tensor(tensor_bytes, metadata)
|
||||||
|
|
||||||
|
def _read_header(self):
|
||||||
|
with open(self.filename, "rb") as f:
|
||||||
|
header_size = struct.unpack("<Q", f.read(8))[0]
|
||||||
|
header_json = f.read(header_size).decode("utf-8")
|
||||||
|
return json.loads(header_json), header_size
|
||||||
|
|
||||||
|
def _deserialize_tensor(self, tensor_bytes, metadata):
|
||||||
|
dtype_str = metadata["dtype"]
|
||||||
|
shape = metadata["shape"]
|
||||||
|
dtype = self._get_torch_dtype(dtype_str)
|
||||||
|
|
||||||
|
if tensor_bytes is None:
|
||||||
|
byte_tensor = torch.empty(0, dtype=torch.uint8)
|
||||||
|
else:
|
||||||
|
byte_tensor = torch.frombuffer(bytearray(tensor_bytes), dtype=torch.uint8)
|
||||||
|
|
||||||
|
if dtype_str in ["F8_E5M2", "F8_E4M3"]:
|
||||||
|
return self._convert_float8(byte_tensor, dtype_str, shape)
|
||||||
|
|
||||||
|
return byte_tensor.view(dtype).reshape(shape)
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _get_torch_dtype(dtype_str):
|
||||||
|
dtype_map = {
|
||||||
|
"F64": torch.float64, "F32": torch.float32, "F16": torch.float16, "BF16": torch.bfloat16,
|
||||||
|
"I64": torch.int64, "I32": torch.int32, "I16": torch.int16, "I8": torch.int8,
|
||||||
|
"U8": torch.uint8, "BOOL": torch.bool,
|
||||||
|
}
|
||||||
|
if hasattr(torch, "float8_e5m2"):
|
||||||
|
dtype_map["F8_E5M2"] = torch.float8_e5m2
|
||||||
|
if hasattr(torch, "float8_e4m3fn"):
|
||||||
|
dtype_map["F8_E4M3"] = torch.float8_e4m3fn
|
||||||
|
|
||||||
|
dtype = dtype_map.get(dtype_str)
|
||||||
|
if dtype is None:
|
||||||
|
raise ValueError(f"Unsupported dtype: {dtype_str}")
|
||||||
|
return dtype
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _convert_float8(byte_tensor, dtype_str, shape):
|
||||||
|
if dtype_str == "F8_E5M2" and hasattr(torch, "float8_e5m2"):
|
||||||
|
return byte_tensor.view(torch.float8_e5m2).reshape(shape)
|
||||||
|
elif dtype_str == "F8_E4M3" and hasattr(torch, "float8_e4m3fn"):
|
||||||
|
return byte_tensor.view(torch.float8_e4m3fn).reshape(shape)
|
||||||
|
else:
|
||||||
|
raise ValueError(f"Unsupported float8 type: {dtype_str}. Your PyTorch version may be too old.")
|
||||||
+23
-43
@@ -1,46 +1,14 @@
|
|||||||
import torch
|
|
||||||
from safetensors import safe_open
|
|
||||||
from safetensors.torch import save_file
|
|
||||||
import os
|
import os
|
||||||
import folder_paths
|
import folder_paths
|
||||||
from comfy.model_management import get_torch_device
|
from .utils import convert_pt_to_safetensors, load_metadata_from_safetensors
|
||||||
|
|
||||||
|
|
||||||
def convert_pt_to_safetensors(pt_path, safe_path):
|
|
||||||
try:
|
|
||||||
model = torch.load(pt_path, map_location="cpu")
|
|
||||||
if "state_dict" in model:
|
|
||||||
state_dict = model["state_dict"]
|
|
||||||
elif "model" in model:
|
|
||||||
state_dict = model["model"]
|
|
||||||
else:
|
|
||||||
state_dict = model
|
|
||||||
state_dict = {k.replace("state_dict.", ""): v for k, v in state_dict.items()}
|
|
||||||
metadata = {"format": "pt"}
|
|
||||||
save_file(state_dict, safe_path, metadata)
|
|
||||||
return True, ""
|
|
||||||
except Exception as e:
|
|
||||||
return False, str(e)
|
|
||||||
|
|
||||||
def load_metadata_from_safetensors(safetensors_file: str) -> dict:
|
|
||||||
try:
|
|
||||||
with safe_open(safetensors_file, framework="pt", device="cpu") as f:
|
|
||||||
model_weights = {}
|
|
||||||
for key in f.keys():
|
|
||||||
model_weights[key] = f.get_tensor(key)
|
|
||||||
metadata = f.metadata()
|
|
||||||
if metadata is None:
|
|
||||||
metadata = {}
|
|
||||||
return model_weights, metadata
|
|
||||||
except Exception as e:
|
|
||||||
print(f"Error loading safetensors file: {e}")
|
|
||||||
return {}, {}
|
|
||||||
|
|
||||||
class BaseMetaKeys:
|
class BaseMetaKeys:
|
||||||
RETURN_TYPES = ("STRING", "STRING")
|
RETURN_TYPES = ("STRING", "STRING")
|
||||||
RETURN_NAMES = ("metadata", "keys")
|
RETURN_NAMES = ("metadata", "keys")
|
||||||
FUNCTION = "get_metakeys"
|
FUNCTION = "get_metakeys"
|
||||||
CATEGORY = "utils"
|
CATEGORY = "ModelUtils/Keys"
|
||||||
DESCRIPTION = "Loads a model and returns its metadata and layer names."
|
DESCRIPTION = "Loads a model and returns its metadata and layer names."
|
||||||
|
|
||||||
def _get_metakeys(self, model_name, model_type):
|
def _get_metakeys(self, model_name, model_type):
|
||||||
@@ -68,29 +36,29 @@ class BaseMetaKeys:
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
class UNetMetaKeys(BaseMetaKeys):
|
class ModelMetaKeys(BaseMetaKeys):
|
||||||
@classmethod
|
@classmethod
|
||||||
def INPUT_TYPES(s):
|
def INPUT_TYPES(s):
|
||||||
return {
|
return {
|
||||||
"required": {
|
"required": {
|
||||||
"unet_name": (folder_paths.get_filename_list("diffusion_models"), ),
|
"diffusionmodel_name": (folder_paths.get_filename_list("diffusion_models"), ),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
def get_metakeys(self, unet_name):
|
def get_metakeys(self, diffusionmodel_name):
|
||||||
return self._get_metakeys(unet_name, "diffusion_models")
|
return self._get_metakeys(diffusionmodel_name, "diffusion_models")
|
||||||
|
|
||||||
class CLIPMetaKeys(BaseMetaKeys):
|
class TextEncoderMetaKeys(BaseMetaKeys):
|
||||||
@classmethod
|
@classmethod
|
||||||
def INPUT_TYPES(s):
|
def INPUT_TYPES(s):
|
||||||
return {
|
return {
|
||||||
"required": {
|
"required": {
|
||||||
"clip_name": (folder_paths.get_filename_list("text_encoders"), ),
|
"textencoder_name": (folder_paths.get_filename_list("text_encoders"), ),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
def get_metakeys(self, clip_name):
|
def get_metakeys(self, textencoder_name):
|
||||||
return self._get_metakeys(clip_name, "text_encoders")
|
return self._get_metakeys(textencoder_name, "text_encoders")
|
||||||
|
|
||||||
class LoRAMetaKeys(BaseMetaKeys):
|
class LoRAMetaKeys(BaseMetaKeys):
|
||||||
@classmethod
|
@classmethod
|
||||||
@@ -115,4 +83,16 @@ class CheckpointMetaKeys(BaseMetaKeys):
|
|||||||
def get_metakeys(self, ckpt_name):
|
def get_metakeys(self, ckpt_name):
|
||||||
return self._get_metakeys(ckpt_name, "checkpoints")
|
return self._get_metakeys(ckpt_name, "checkpoints")
|
||||||
|
|
||||||
__all__ = ("UNetMetaKeys", "CLIPMetaKeys", "LoRAMetaKeys", "CheckpointMetaKeys")
|
class EmbeddingMetaKeys(BaseMetaKeys):
|
||||||
|
@classmethod
|
||||||
|
def INPUT_TYPES(s):
|
||||||
|
return {
|
||||||
|
"required": {
|
||||||
|
"embedding": (folder_paths.get_filename_list("embeddings"), ),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
def get_metakeys(self, embedding):
|
||||||
|
return self._get_metakeys(embedding, "embeddings")
|
||||||
|
|
||||||
|
__all__ = ("ModelMetaKeys", "TextEncoderMetaKeys", "LoRAMetaKeys", "CheckpointMetaKeys", "EmbeddingMetaKeys")
|
||||||
|
|||||||
@@ -1,31 +0,0 @@
|
|||||||
from comfy.comfy_types import IO, ComfyNodeABC, InputTypeDict
|
|
||||||
import comfy.model_management as mm
|
|
||||||
|
|
||||||
class OffloadModelsNode(ComfyNodeABC):
|
|
||||||
@classmethod
|
|
||||||
def INPUT_TYPES(s) -> InputTypeDict:
|
|
||||||
return {
|
|
||||||
"required": {
|
|
||||||
"any": (IO.ANY, {}),
|
|
||||||
"force": (IO.BOOLEAN, {"default": False, "tooltip": "If True, forcibly unloads models from GPU."}),
|
|
||||||
"enable_offload": (IO.BOOLEAN, {"default": False, "tooltip": "If True, calls ComfyUI's `unload_all_models()` function."}),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
RETURN_TYPES = (IO.ANY, )
|
|
||||||
RETURN_NAMES = ("any", )
|
|
||||||
FUNCTION = 'function'
|
|
||||||
CATEGORY = 'advanced'
|
|
||||||
|
|
||||||
|
|
||||||
def function(self, any, force, enable_offload):
|
|
||||||
if enable_offload == True:
|
|
||||||
print("OffloadModels: `enable_offload` is True. Calling `mm.unload_all_models()`.")
|
|
||||||
mm.unload_all_models()
|
|
||||||
if Force == True:
|
|
||||||
mm.soft_empty_cache(Force=True)
|
|
||||||
else:
|
|
||||||
mm.soft_empty_cache()
|
|
||||||
return (any,)
|
|
||||||
|
|
||||||
__all__ = ("OffloadModelsNode")
|
|
||||||
@@ -0,0 +1,127 @@
|
|||||||
|
import os
|
||||||
|
import re
|
||||||
|
import folder_paths
|
||||||
|
from .utils import convert_pt_to_safetensors, load_metadata_from_safetensors
|
||||||
|
from safetensors.torch import save_file
|
||||||
|
|
||||||
|
class BasePruneKeys:
|
||||||
|
RETURN_TYPES = ("STRING",)
|
||||||
|
RETURN_NAMES = ("output_path",)
|
||||||
|
FUNCTION = "prune_keys"
|
||||||
|
CATEGORY = "ModelUtils/Keys"
|
||||||
|
DESCRIPTION = "Loads a model, removes specified keys, and saves it as a new safetensors file."
|
||||||
|
|
||||||
|
def _prune_keys(self, model_name, model_type, keys_to_prune_str, use_regex, output_filename):
|
||||||
|
model_path = folder_paths.get_full_path_or_raise(model_type, model_name)
|
||||||
|
|
||||||
|
if model_path.endswith(('.pt', '.pth', '.bin', '.ckpt')):
|
||||||
|
temp_safe_path = model_path + ".safetensors"
|
||||||
|
if not os.path.exists(temp_safe_path):
|
||||||
|
conversion_successful, error_message = convert_pt_to_safetensors(model_path, temp_safe_path)
|
||||||
|
if not conversion_successful:
|
||||||
|
raise Exception(f"Conversion failed: {error_message}")
|
||||||
|
model_path_to_load = temp_safe_path
|
||||||
|
else:
|
||||||
|
model_path_to_load = model_path
|
||||||
|
|
||||||
|
model_weights, metadata = load_metadata_from_safetensors(model_path_to_load)
|
||||||
|
|
||||||
|
patterns = [p.strip() for p in keys_to_prune_str.strip().split('\n') if p.strip()]
|
||||||
|
|
||||||
|
if not patterns:
|
||||||
|
raise ValueError("No keys/patterns provided to prune.")
|
||||||
|
|
||||||
|
pruned_tensors = {}
|
||||||
|
for key, tensor in model_weights.items():
|
||||||
|
is_match = False
|
||||||
|
if use_regex:
|
||||||
|
if any(re.search(pattern, key) for pattern in patterns):
|
||||||
|
is_match = True
|
||||||
|
else:
|
||||||
|
if any(pattern in key for pattern in patterns):
|
||||||
|
is_match = True
|
||||||
|
|
||||||
|
if not is_match:
|
||||||
|
pruned_tensors[key] = tensor
|
||||||
|
|
||||||
|
model_dir = folder_paths.get_folder_paths(model_type)[0]
|
||||||
|
output_path = os.path.join(model_dir, f"{output_filename.strip()}.safetensors")
|
||||||
|
|
||||||
|
save_file(pruned_tensors, output_path, metadata)
|
||||||
|
|
||||||
|
return (output_path,)
|
||||||
|
|
||||||
|
class ModelPruneKeys(BasePruneKeys):
|
||||||
|
@classmethod
|
||||||
|
def INPUT_TYPES(s):
|
||||||
|
return {
|
||||||
|
"required": {
|
||||||
|
"diffusionmodel_name": (folder_paths.get_filename_list("diffusion_models"), ),
|
||||||
|
"keys_to_prune": ("STRING", {"multiline": True, "default": ""}),
|
||||||
|
"use_regex": ("BOOLEAN", {"default": False}),
|
||||||
|
"output_filename": ("STRING", {"default": "pruned_model"}),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
def prune_keys(self, diffusionmodel_name, keys_to_prune, use_regex, output_filename):
|
||||||
|
return self._prune_keys(diffusionmodel_name, "diffusion_models", keys_to_prune, use_regex, output_filename)
|
||||||
|
|
||||||
|
class TextEncoderPruneKeys(BasePruneKeys):
|
||||||
|
@classmethod
|
||||||
|
def INPUT_TYPES(s):
|
||||||
|
return {
|
||||||
|
"required": {
|
||||||
|
"textencoder_name": (folder_paths.get_filename_list("text_encoders"), ),
|
||||||
|
"keys_to_prune": ("STRING", {"multiline": True, "default": ""}),
|
||||||
|
"use_regex": ("BOOLEAN", {"default": False}),
|
||||||
|
"output_filename": ("STRING", {"default": "pruned_textencoder"}),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
def prune_keys(self, textencoder_name, keys_to_prune, use_regex, output_filename):
|
||||||
|
return self._prune_keys(textencoder_name, "text_encoders", keys_to_prune, use_regex, output_filename)
|
||||||
|
|
||||||
|
class LoRAPruneKeys(BasePruneKeys):
|
||||||
|
@classmethod
|
||||||
|
def INPUT_TYPES(s):
|
||||||
|
return {
|
||||||
|
"required": {
|
||||||
|
"lora_name": (folder_paths.get_filename_list("loras"), ),
|
||||||
|
"keys_to_prune": ("STRING", {"multiline": True, "default": ""}),
|
||||||
|
"use_regex": ("BOOLEAN", {"default": False}),
|
||||||
|
"output_filename": ("STRING", {"default": "pruned_lora"}),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
def prune_keys(self, lora_name, keys_to_prune, use_regex, output_filename):
|
||||||
|
return self._prune_keys(lora_name, "loras", keys_to_prune, use_regex, output_filename)
|
||||||
|
|
||||||
|
class CheckpointPruneKeys(BasePruneKeys):
|
||||||
|
@classmethod
|
||||||
|
def INPUT_TYPES(s):
|
||||||
|
return {
|
||||||
|
"required": {
|
||||||
|
"ckpt_name": (folder_paths.get_filename_list("checkpoints"), ),
|
||||||
|
"keys_to_prune": ("STRING", {"multiline": True, "default": ""}),
|
||||||
|
"use_regex": ("BOOLEAN", {"default": False}),
|
||||||
|
"output_filename": ("STRING", {"default": "pruned_checkpoint"}),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
def prune_keys(self, ckpt_name, keys_to_prune, use_regex, output_filename):
|
||||||
|
return self._prune_keys(ckpt_name, "checkpoints", keys_to_prune, use_regex, output_filename)
|
||||||
|
|
||||||
|
class EmbeddingPruneKeys(BasePruneKeys):
|
||||||
|
@classmethod
|
||||||
|
def INPUT_TYPES(s):
|
||||||
|
return {
|
||||||
|
"required": {
|
||||||
|
"embedding": (folder_paths.get_filename_list("embeddings"), ),
|
||||||
|
"keys_to_prune": ("STRING", {"multiline": True, "default": ""}),
|
||||||
|
"use_regex": ("BOOLEAN", {"default": False}),
|
||||||
|
"output_filename": ("STRING", {"default": "pruned_embedding"}),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
def prune_keys(self, embedding, keys_to_prune, use_regex, output_filename):
|
||||||
|
return self._prune_keys(embedding, "embeddings", keys_to_prune, use_regex, output_filename)
|
||||||
@@ -0,0 +1,122 @@
|
|||||||
|
import os
|
||||||
|
import folder_paths
|
||||||
|
from .utils import convert_pt_to_safetensors, load_metadata_from_safetensors
|
||||||
|
from safetensors.torch import save_file
|
||||||
|
|
||||||
|
class BaseRenameKeys:
|
||||||
|
RETURN_TYPES = ("STRING",)
|
||||||
|
RETURN_NAMES = ("output_path",)
|
||||||
|
FUNCTION = "rename_keys"
|
||||||
|
CATEGORY = "ModelUtils/Keys"
|
||||||
|
DESCRIPTION = "Loads a model, renames specified keys, and saves it as a new safetensors file."
|
||||||
|
|
||||||
|
def _rename_keys(self, model_name, model_type, old_keys_str, new_keys_str, output_filename):
|
||||||
|
model_path = folder_paths.get_full_path_or_raise(model_type, model_name)
|
||||||
|
|
||||||
|
if model_path.endswith(('.pt', '.pth', '.bin', '.ckpt')):
|
||||||
|
temp_safe_path = model_path + ".safetensors"
|
||||||
|
if not os.path.exists(temp_safe_path):
|
||||||
|
conversion_successful, error_message = convert_pt_to_safetensors(model_path, temp_safe_path)
|
||||||
|
if not conversion_successful:
|
||||||
|
raise Exception(f"Conversion failed: {error_message}")
|
||||||
|
model_path_to_load = temp_safe_path
|
||||||
|
else:
|
||||||
|
model_path_to_load = model_path
|
||||||
|
|
||||||
|
model_weights, metadata = load_metadata_from_safetensors(model_path_to_load)
|
||||||
|
|
||||||
|
old_keys = [key.strip() for key in old_keys_str.strip().split('\n') if key.strip()]
|
||||||
|
new_keys = [key.strip() for key in new_keys_str.strip().split('\n') if key.strip()]
|
||||||
|
|
||||||
|
if len(old_keys) != len(new_keys):
|
||||||
|
raise ValueError("The number of old keys must match the number of new keys.")
|
||||||
|
|
||||||
|
key_map = dict(zip(old_keys, new_keys))
|
||||||
|
|
||||||
|
original_keys = list(model_weights.keys())
|
||||||
|
renamed_tensors = {}
|
||||||
|
for key in original_keys:
|
||||||
|
new_key = key_map.get(key, key)
|
||||||
|
renamed_tensors[new_key] = model_weights[key]
|
||||||
|
|
||||||
|
model_dir = folder_paths.get_folder_paths(model_type)[0]
|
||||||
|
output_path = os.path.join(model_dir, f"{output_filename.strip()}.safetensors")
|
||||||
|
|
||||||
|
save_file(renamed_tensors, output_path, metadata)
|
||||||
|
|
||||||
|
return (output_path,)
|
||||||
|
|
||||||
|
class ModelRenameKeys(BaseRenameKeys):
|
||||||
|
@classmethod
|
||||||
|
def INPUT_TYPES(s):
|
||||||
|
return {
|
||||||
|
"required": {
|
||||||
|
"diffusionmodel_name": (folder_paths.get_filename_list("diffusion_models"), ),
|
||||||
|
"old_keys": ("STRING", {"multiline": True, "default": ""}),
|
||||||
|
"new_keys": ("STRING", {"multiline": True, "default": ""}),
|
||||||
|
"output_filename": ("STRING", {"default": "renamed_model"}),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
def rename_keys(self, diffusionmodel_name, old_keys, new_keys, output_filename):
|
||||||
|
return self._rename_keys(diffusionmodel_name, "diffusion_models", old_keys, new_keys, output_filename)
|
||||||
|
|
||||||
|
class TextEncoderRenameKeys(BaseRenameKeys):
|
||||||
|
@classmethod
|
||||||
|
def INPUT_TYPES(s):
|
||||||
|
return {
|
||||||
|
"required": {
|
||||||
|
"textencoder_name": (folder_paths.get_filename_list("text_encoders"), ),
|
||||||
|
"old_keys": ("STRING", {"multiline": True, "default": ""}),
|
||||||
|
"new_keys": ("STRING", {"multiline": True, "default": ""}),
|
||||||
|
"output_filename": ("STRING", {"default": "renamed_textencoder"}),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
def rename_keys(self, textencoder_name, old_keys, new_keys, output_filename):
|
||||||
|
return self._rename_keys(textencoder_name, "text_encoders", old_keys, new_keys, output_filename)
|
||||||
|
|
||||||
|
class LoRARenameKeys(BaseRenameKeys):
|
||||||
|
@classmethod
|
||||||
|
def INPUT_TYPES(s):
|
||||||
|
return {
|
||||||
|
"required": {
|
||||||
|
"lora_name": (folder_paths.get_filename_list("loras"), ),
|
||||||
|
"old_keys": ("STRING", {"multiline": True, "default": ""}),
|
||||||
|
"new_keys": ("STRING", {"multiline": True, "default": ""}),
|
||||||
|
"output_filename": ("STRING", {"default": "renamed_lora"}),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
def rename_keys(self, lora_name, old_keys, new_keys, output_filename):
|
||||||
|
return self._rename_keys(lora_name, "loras", old_keys, new_keys, output_filename)
|
||||||
|
|
||||||
|
class CheckpointRenameKeys(BaseRenameKeys):
|
||||||
|
@classmethod
|
||||||
|
def INPUT_TYPES(s):
|
||||||
|
return {
|
||||||
|
"required": {
|
||||||
|
"ckpt_name": (folder_paths.get_filename_list("checkpoints"), ),
|
||||||
|
"old_keys": ("STRING", {"multiline": True, "default": ""}),
|
||||||
|
"new_keys": ("STRING", {"multiline": True, "default": ""}),
|
||||||
|
"output_filename": ("STRING", {"default": "renamed_checkpoint"}),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
def rename_keys(self, ckpt_name, old_keys, new_keys, output_filename):
|
||||||
|
return self._rename_keys(ckpt_name, "checkpoints", old_keys, new_keys, output_filename)
|
||||||
|
|
||||||
|
class EmbeddingRenameKeys(BaseRenameKeys):
|
||||||
|
@classmethod
|
||||||
|
def INPUT_TYPES(s):
|
||||||
|
return {
|
||||||
|
"required": {
|
||||||
|
"embedding": (folder_paths.get_filename_list("embeddings"), ),
|
||||||
|
"old_keys": ("STRING", {"multiline": True, "default": ""}),
|
||||||
|
"new_keys": ("STRING", {"multiline": True, "default": ""}),
|
||||||
|
"output_filename": ("STRING", {"default": "renamed_embedding"}),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
def rename_keys(self, embedding, old_keys, new_keys, output_filename):
|
||||||
|
return self._rename_keys(embedding, "embeddings", old_keys, new_keys, output_filename)
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
import torch
|
||||||
|
from safetensors import safe_open
|
||||||
|
from safetensors.torch import save_file
|
||||||
|
from comfy.model_management import get_torch_device
|
||||||
|
|
||||||
|
def convert_pt_to_safetensors(pt_path, safe_path):
|
||||||
|
try:
|
||||||
|
model = torch.load(pt_path, map_location="cpu")
|
||||||
|
if "state_dict" in model:
|
||||||
|
state_dict = model["state_dict"]
|
||||||
|
elif "model" in model:
|
||||||
|
state_dict = model["model"]
|
||||||
|
else:
|
||||||
|
state_dict = model
|
||||||
|
state_dict = {k.replace("state_dict.", ""): v for k, v in state_dict.items()}
|
||||||
|
metadata = {"format": "pt"}
|
||||||
|
save_file(state_dict, safe_path, metadata)
|
||||||
|
return True, ""
|
||||||
|
except Exception as e:
|
||||||
|
return False, str(e)
|
||||||
|
|
||||||
|
def load_metadata_from_safetensors(safetensors_file: str) -> dict:
|
||||||
|
try:
|
||||||
|
with safe_open(safetensors_file, framework="pt", device="cpu") as f:
|
||||||
|
model_weights = {}
|
||||||
|
for key in f.keys():
|
||||||
|
model_weights[key] = f.get_tensor(key)
|
||||||
|
metadata = f.metadata()
|
||||||
|
if metadata is None:
|
||||||
|
metadata = {}
|
||||||
|
return model_weights, metadata
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Error loading safetensors file: {e}")
|
||||||
|
return {}, {}
|
||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
[project]
|
[project]
|
||||||
name = "ComfyUI-ModelUtils"
|
name = "ComfyUI-ModelUtils"
|
||||||
description = "[WIP]Custom nodes for handling, inspecting, modifying and creating various model files."
|
description = "[WIP]Custom nodes for handling, inspecting, modifying and creating various model files."
|
||||||
version = "0.1.3"
|
version = "0.1.6"
|
||||||
license = { file = "LICENSE" }
|
license = { file = "LICENSE" }
|
||||||
|
|
||||||
[project.urls]
|
[project.urls]
|
||||||
|
|||||||
Reference in New Issue
Block a user