Merge branch 'master' of github.com:AUTOMATIC1111/stable-diffusion-webui into gamepad

1 files changed, 4 insertions, 5 deletions

diff --git a/modules/hypernetworks/ui.py b/modules/hypernetworks/ui.py
index e7f9e593..76599f5a 100644
--- a/modules/hypernetworks/ui.py
+++ b/modules/hypernetworks/ui.py
@@ -9,15 +9,15 @@ from modules import devices, sd_hijack, shared
 not_available = ["hardswish", "multiheadattention"]

 keys = list(x for x in modules.hypernetworks.hypernetwork.HypernetworkModule.activation_dict.keys() if x not in not_available)

 

-def create_hypernetwork(name, enable_sizes, overwrite_old, layer_structure=None, activation_func=None, weight_init=None, add_layer_norm=False, use_dropout=False):

-    filename = modules.hypernetworks.hypernetwork.create_hypernetwork(name, enable_sizes, overwrite_old, layer_structure, activation_func, weight_init, add_layer_norm, use_dropout)

+

+def create_hypernetwork(name, enable_sizes, overwrite_old, layer_structure=None, activation_func=None, weight_init=None, add_layer_norm=False, use_dropout=False, dropout_structure=None):

+    filename = modules.hypernetworks.hypernetwork.create_hypernetwork(name, enable_sizes, overwrite_old, layer_structure, activation_func, weight_init, add_layer_norm, use_dropout, dropout_structure)

 

     return gr.Dropdown.update(choices=sorted([x for x in shared.hypernetworks.keys()])), f"Created: {filename}", ""

 

 

 def train_hypernetwork(*args):

-

-    initial_hypernetwork = shared.loaded_hypernetwork

+    shared.loaded_hypernetworks = []

 

     assert not shared.cmd_opts.lowvram, 'Training models with lowvram is not possible'

 

@@ -34,7 +34,6 @@ Hypernetwork saved to {html.escape(filename)}
     except Exception:

         raise

     finally:

-        shared.loaded_hypernetwork = initial_hypernetwork

         shared.sd_model.cond_stage_model.to(devices.device)

         shared.sd_model.first_stage_model.to(devices.device)

         sd_hijack.apply_optimizations()