Merge branch 'master' into support_any_resolution

1 files changed, 6 insertions, 9 deletions

diff --git a/modules/ui.py b/modules/ui.py
index 85e531af..36dd754e 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -478,9 +478,7 @@ def create_toprow(is_img2img):
         if is_img2img:

             with gr.Column(scale=1, elem_id="interrogate_col"):

                 button_interrogate = gr.Button('Interrogate\nCLIP', elem_id="interrogate")

-

-                if cmd_opts.deepdanbooru:

-                    button_deepbooru = gr.Button('Interrogate\nDeepBooru', elem_id="deepbooru")

+                button_deepbooru = gr.Button('Interrogate\nDeepBooru', elem_id="deepbooru")

 

         with gr.Column(scale=1):

             with gr.Row():

@@ -1004,11 +1002,10 @@ def create_ui(wrap_gradio_gpu_call):
                 outputs=[img2img_prompt],

             )

 

-            if cmd_opts.deepdanbooru:

-                img2img_deepbooru.click(

-                    fn=interrogate_deepbooru,

-                    inputs=[init_img],

-                    outputs=[img2img_prompt],

+            img2img_deepbooru.click(

+                fn=interrogate_deepbooru,

+                inputs=[init_img],

+                outputs=[img2img_prompt],

             )

 

 

@@ -1213,7 +1210,7 @@ def create_ui(wrap_gradio_gpu_call):
 

                 with gr.Tab(label="Create hypernetwork"):

                     new_hypernetwork_name = gr.Textbox(label="Name")

-                    new_hypernetwork_sizes = gr.CheckboxGroup(label="Modules", value=["768", "320", "640", "1280"], choices=["768", "320", "640", "1280"])

+                    new_hypernetwork_sizes = gr.CheckboxGroup(label="Modules", value=["768", "320", "640", "1280"], choices=["768", "1024", "320", "640", "1280"])

                     new_hypernetwork_layer_structure = gr.Textbox("1, 2, 1", label="Enter hypernetwork layer structure", placeholder="1st and last digit must be 1. ex:'1, 2, 1'")

                     new_hypernetwork_activation_func = gr.Dropdown(value="linear", label="Select activation function of hypernetwork. Recommended : Swish / Linear(none)", choices=modules.hypernetworks.ui.keys)

                     new_hypernetwork_initialization_option = gr.Dropdown(value = "Normal", label="Select Layer weights initialization. Recommended: Kaiming for relu-like, Xavier for sigmoid-like, Normal otherwise", choices=["Normal", "KaimingUniform", "KaimingNormal", "XavierUniform", "XavierNormal"])