Unverified Commit 51517f3e authored by AUTOMATIC1111's avatar AUTOMATIC1111 Committed by GitHub
Browse files

Merge pull request #6936 from EllangoK/master

Fixes minor typos around run_modelmerger
parents c1928cdd f2ae2529
Loading
Loading
Loading
Loading
+7 −7
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ def create_config(ckpt_result, config_source, a, b, c):
    shutil.copyfile(cfg, checkpoint_filename)


chckpoint_dict_skip_on_merge = ["cond_stage_model.transformer.text_model.embeddings.position_ids"]
checkpoint_dict_skip_on_merge = ["cond_stage_model.transformer.text_model.embeddings.position_ids"]


def to_half(tensor, enable):
@@ -303,7 +303,7 @@ def run_modelmerger(id_task, primary_model_name, secondary_model_name, tertiary_
    def add_difference(theta0, theta1_2_diff, alpha):
        return theta0 + (alpha * theta1_2_diff)

    def filename_weighed_sum():
    def filename_weighted_sum():
        a = primary_model_info.model_name
        b = secondary_model_info.model_name
        Ma = round(1 - multiplier, 2)
@@ -311,7 +311,7 @@ def run_modelmerger(id_task, primary_model_name, secondary_model_name, tertiary_

        return f"{Ma}({a}) + {Mb}({b})"

    def filename_add_differnece():
    def filename_add_difference():
        a = primary_model_info.model_name
        b = secondary_model_info.model_name
        c = tertiary_model_info.model_name
@@ -323,8 +323,8 @@ def run_modelmerger(id_task, primary_model_name, secondary_model_name, tertiary_
        return primary_model_info.model_name

    theta_funcs = {
        "Weighted sum": (filename_weighed_sum, None, weighted_sum),
        "Add difference": (filename_add_differnece, get_difference, add_difference),
        "Weighted sum": (filename_weighted_sum, None, weighted_sum),
        "Add difference": (filename_add_difference, get_difference, add_difference),
        "No interpolation": (filename_nothing, None, None),
    }
    filename_generator, theta_func1, theta_func2 = theta_funcs[interp_method]
@@ -362,7 +362,7 @@ def run_modelmerger(id_task, primary_model_name, secondary_model_name, tertiary_
        shared.state.textinfo = 'Merging B and C'
        shared.state.sampling_steps = len(theta_1.keys())
        for key in tqdm.tqdm(theta_1.keys()):
            if key in chckpoint_dict_skip_on_merge:
            if key in checkpoint_dict_skip_on_merge:
                continue

            if 'model' in key:
@@ -387,7 +387,7 @@ def run_modelmerger(id_task, primary_model_name, secondary_model_name, tertiary_
    for key in tqdm.tqdm(theta_0.keys()):
        if theta_1 and 'model' in key and key in theta_1:

            if key in chckpoint_dict_skip_on_merge:
            if key in checkpoint_dict_skip_on_merge:
                continue

            a = theta_0[key]