Implement Adaptive noise scale

Author: bmaltais

dreambooth_gui.py

@@ -104,7 +104,7 @@ def save_configuration(
     caption_dropout_rate,
     optimizer,
     optimizer_args,
-    noise_offset,
+    noise_offset_type,noise_offset,adaptive_noise_scale,
     multires_noise_iterations,
     multires_noise_discount,
     sample_every_n_steps,
@@ -222,7 +222,7 @@ def open_configuration(
     caption_dropout_rate,
     optimizer,
     optimizer_args,
-    noise_offset,
+    noise_offset_type,noise_offset,adaptive_noise_scale,
     multires_noise_iterations,
     multires_noise_discount,
     sample_every_n_steps,
@@ -323,7 +323,7 @@ def train_model(
     caption_dropout_rate,
     optimizer,
     optimizer_args,
-    noise_offset,
+    noise_offset_type,noise_offset,adaptive_noise_scale,
     multires_noise_iterations,
     multires_noise_discount,
     sample_every_n_steps,
@@ -387,15 +387,15 @@ def train_model(
         )
         lr_warmup = '0'
 
-    if float(noise_offset) > 0 and (
-        multires_noise_iterations > 0 or multires_noise_discount > 0
-    ):
-        output_message(
-            msg="noise offset and multires_noise can't be set at the same time. Only use one or the other.",
-            title='Error',
-            headless=headless_bool,
-        )
-        return
+    # if float(noise_offset) > 0 and (
+    #     multires_noise_iterations > 0 or multires_noise_discount > 0
+    # ):
+    #     output_message(
+    #         msg="noise offset and multires_noise can't be set at the same time. Only use one or the other.",
+    #         title='Error',
+    #         headless=headless_bool,
+    #     )
+    #     return
 
     # Get a list of all subfolders in train_data_dir, excluding hidden folders
     subfolders = [
@@ -582,7 +582,9 @@ def train_model(
         bucket_reso_steps=bucket_reso_steps,
         caption_dropout_every_n_epochs=caption_dropout_every_n_epochs,
         caption_dropout_rate=caption_dropout_rate,
+        noise_offset_type=noise_offset_type,
         noise_offset=noise_offset,
+        adaptive_noise_scale=adaptive_noise_scale,
         multires_noise_iterations=multires_noise_iterations,
         multires_noise_discount=multires_noise_discount,
         additional_parameters=additional_parameters,
@@ -805,7 +807,7 @@ def dreambooth_tab(
                 bucket_reso_steps,
                 caption_dropout_every_n_epochs,
                 caption_dropout_rate,
-                noise_offset,
+                noise_offset_type,noise_offset,adaptive_noise_scale,
                 multires_noise_iterations,
                 multires_noise_discount,
                 additional_parameters,
@@ -912,7 +914,7 @@ def dreambooth_tab(
         caption_dropout_rate,
         optimizer,
         optimizer_args,
-        noise_offset,
+        noise_offset_type,noise_offset,adaptive_noise_scale,
         multires_noise_iterations,
         multires_noise_discount,
         sample_every_n_steps,

finetune_gui.py

@@ -103,7 +103,7 @@ def save_configuration(
     caption_dropout_rate,
     optimizer,
     optimizer_args,
-    noise_offset,
+    noise_offset_type,noise_offset,adaptive_noise_scale,
     multires_noise_iterations,
     multires_noise_discount,
     sample_every_n_steps,
@@ -227,7 +227,7 @@ def open_configuration(
     caption_dropout_rate,
     optimizer,
     optimizer_args,
-    noise_offset,
+    noise_offset_type,noise_offset,adaptive_noise_scale,
     multires_noise_iterations,
     multires_noise_discount,
     sample_every_n_steps,
@@ -334,7 +334,7 @@ def train_model(
     caption_dropout_rate,
     optimizer,
     optimizer_args,
-    noise_offset,
+    noise_offset_type,noise_offset,adaptive_noise_scale,
     multires_noise_iterations,
     multires_noise_discount,
     sample_every_n_steps,
@@ -358,15 +358,15 @@ def train_model(
     ):
         return
 
-    if float(noise_offset) > 0 and (
-        multires_noise_iterations > 0 or multires_noise_discount > 0
-    ):
-        output_message(
-            msg="noise offset and multires_noise can't be set at the same time. Only use one or the other.",
-            title='Error',
-            headless=headless_bool,
-        )
-        return
+    # if float(noise_offset) > 0 and (
+    #     multires_noise_iterations > 0 or multires_noise_discount > 0
+    # ):
+    #     output_message(
+    #         msg="noise offset and multires_noise can't be set at the same time. Only use one or the other.",
+    #         title='Error',
+    #         headless=headless_bool,
+    #     )
+    #     return
 
     if optimizer == 'Adafactor' and lr_warmup != '0':
         output_message(
@@ -532,7 +532,9 @@ def train_model(
         bucket_reso_steps=bucket_reso_steps,
         caption_dropout_every_n_epochs=caption_dropout_every_n_epochs,
         caption_dropout_rate=caption_dropout_rate,
+        noise_offset_type=noise_offset_type,
         noise_offset=noise_offset,
+        adaptive_noise_scale=adaptive_noise_scale,
         multires_noise_iterations=multires_noise_iterations,
         multires_noise_discount=multires_noise_discount,
         additional_parameters=additional_parameters,
@@ -771,7 +773,7 @@ def finetune_tab(headless=False):
                 bucket_reso_steps,
                 caption_dropout_every_n_epochs,
                 caption_dropout_rate,
-                noise_offset,
+                noise_offset_type,noise_offset,adaptive_noise_scale,
                 multires_noise_iterations,
                 multires_noise_discount,
                 additional_parameters,
@@ -871,7 +873,7 @@ def finetune_tab(headless=False):
         caption_dropout_rate,
         optimizer,
         optimizer_args,
-        noise_offset,
+        noise_offset_type,noise_offset,adaptive_noise_scale,
         multires_noise_iterations,
         multires_noise_discount,
         sample_every_n_steps,