Merge branch 'master' into improved-hr-conflict-test

1 files changed, 10 insertions, 6 deletions

diff --git a/modules/ui.py b/modules/ui.py
index ffcf2769..9051a5ec 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -649,9 +649,9 @@ def create_ui():
                 (hr_negative_prompt, "Hires negative prompt"),

                 *modules.scripts.scripts_txt2img.infotext_fields

             ]

-            parameters_copypaste.add_paste_fields("txt2img", None, txt2img_paste_fields)

+            parameters_copypaste.add_paste_fields("txt2img", None, txt2img_paste_fields, override_settings)

             parameters_copypaste.register_paste_params_button(parameters_copypaste.ParamBinding(

-                paste_button=txt2img_paste, tabname="txt2img", source_text_component=txt2img_prompt, source_image_component=None, override_settings_component=override_settings,

+                paste_button=txt2img_paste, tabname="txt2img", source_text_component=txt2img_prompt, source_image_component=None,

             ))

 

             txt2img_preview_params = [

@@ -981,10 +981,10 @@ def create_ui():
                 (mask_blur, "Mask blur"),

                 *modules.scripts.scripts_img2img.infotext_fields

             ]

-            parameters_copypaste.add_paste_fields("img2img", init_img, img2img_paste_fields)

-            parameters_copypaste.add_paste_fields("inpaint", init_img_with_mask, img2img_paste_fields)

+            parameters_copypaste.add_paste_fields("img2img", init_img, img2img_paste_fields, override_settings)

+            parameters_copypaste.add_paste_fields("inpaint", init_img_with_mask, img2img_paste_fields, override_settings)

             parameters_copypaste.register_paste_params_button(parameters_copypaste.ParamBinding(

-                paste_button=img2img_paste, tabname="img2img", source_text_component=img2img_prompt, source_image_component=None, override_settings_component=override_settings,

+                paste_button=img2img_paste, tabname="img2img", source_text_component=img2img_prompt, source_image_component=None,

             ))

 

     modules.scripts.scripts_current = None

@@ -1209,6 +1209,8 @@ def create_ui():
                         create_image_every = gr.Number(label='Save an image to log directory every N steps, 0 to disable', value=500, precision=0, elem_id="train_create_image_every")

                         save_embedding_every = gr.Number(label='Save a copy of embedding to log directory every N steps, 0 to disable', value=500, precision=0, elem_id="train_save_embedding_every")

 

+                    use_weight = gr.Checkbox(label="Use PNG alpha channel as loss weight", value=False, elem_id="use_weight")

+

                     save_image_with_stored_embedding = gr.Checkbox(label='Save images with embedding in PNG chunks', value=True, elem_id="train_save_image_with_stored_embedding")

                     preview_from_txt2img = gr.Checkbox(label='Read parameters (prompt, etc...) from txt2img tab when making previews', value=False, elem_id="train_preview_from_txt2img")

 

@@ -1322,6 +1324,7 @@ def create_ui():
                 shuffle_tags,

                 tag_drop_out,

                 latent_sampling_method,

+                use_weight,

                 create_image_every,

                 save_embedding_every,

                 template_file,

@@ -1355,6 +1358,7 @@ def create_ui():
                 shuffle_tags,

                 tag_drop_out,

                 latent_sampling_method,

+                use_weight,

                 create_image_every,

                 save_embedding_every,

                 template_file,

@@ -1800,7 +1804,7 @@ def versions_html():
     return f"""

 python: <span title="{sys.version}">{python_version}</span>

  • 

-torch: {torch.__version__}

+torch: {getattr(torch, '__long_version__',torch.__version__)}

  • 

 xformers: {xformers_version}

  •