Merge branch 'AUTOMATIC1111:master' into master

1 files changed, 8 insertions, 5 deletions

diff --git a/modules/hypernetworks/ui.py b/modules/hypernetworks/ui.py
index e6f50a1f..aad09ffc 100644
--- a/modules/hypernetworks/ui.py
+++ b/modules/hypernetworks/ui.py
@@ -3,14 +3,15 @@ import os
 import re

 

 import gradio as gr

-

-import modules.textual_inversion.textual_inversion

 import modules.textual_inversion.preprocess

-from modules import sd_hijack, shared, devices

+import modules.textual_inversion.textual_inversion

+from modules import devices, sd_hijack, shared

 from modules.hypernetworks import hypernetwork

 

+not_available = ["hardswish", "multiheadattention"]

+keys = ["linear"] + list(x for x in hypernetwork.HypernetworkModule.activation_dict.keys() if x not in not_available)

 

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

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

     # Remove illegal characters from name.

     name = "".join( x for x in name if (x.isalnum() or x in "._- "))

 

@@ -25,8 +26,10 @@ def create_hypernetwork(name, enable_sizes, overwrite_old, layer_structure=None,
         name=name,

         enable_sizes=[int(x) for x in enable_sizes],

         layer_structure=layer_structure,

-        add_layer_norm=add_layer_norm,

         activation_func=activation_func,

+        weight_init=weight_init,

+        add_layer_norm=add_layer_norm,

+        use_dropout=use_dropout,

     )

     hypernet.save(fn)