Merge branch 'master' into fix/train-preprocess-keep-ratio

1 files changed, 7 insertions, 2 deletions

diff --git a/modules/hypernetworks/ui.py b/modules/hypernetworks/ui.py
index e0741d08..e6f50a1f 100644
--- a/modules/hypernetworks/ui.py
+++ b/modules/hypernetworks/ui.py
@@ -10,9 +10,13 @@ from modules import sd_hijack, shared, devices
 from modules.hypernetworks import hypernetwork

 

 

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

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

+    # Remove illegal characters from name.

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

+

     fn = os.path.join(shared.cmd_opts.hypernetwork_dir, f"{name}.pt")

-    assert not os.path.exists(fn), f"file {fn} already exists"

+    if not overwrite_old:

+        assert not os.path.exists(fn), f"file {fn} already exists"

 

     if type(layer_structure) == str:

         layer_structure = [float(x.strip()) for x in layer_structure.split(",")]

@@ -22,6 +26,7 @@ def create_hypernetwork(name, enable_sizes, layer_structure=None, add_layer_norm
         enable_sizes=[int(x) for x in enable_sizes],

         layer_structure=layer_structure,

         add_layer_norm=add_layer_norm,

+        activation_func=activation_func,

     )

     hypernet.save(fn)