From 7d7a6bf6d1a8605308262ed2e87b062d48ea237b Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Tue, 8 Oct 2024 10:01:38 -0400 Subject: [PATCH] fix controlnet Signed-off-by: Vladimir Mandic --- extensions-builtin/sdnext-modernui | 2 +- installer.py | 4 ++-- modules/ui_sections.py | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/extensions-builtin/sdnext-modernui b/extensions-builtin/sdnext-modernui index 0a0948670..184eadf28 160000 --- a/extensions-builtin/sdnext-modernui +++ b/extensions-builtin/sdnext-modernui @@ -1 +1 @@ -Subproject commit 0a09486705033e800d9d427f77c4e6ad2bb5f7dc +Subproject commit 184eadf28999ac0004d0a2dbd2d3100fee1aabff diff --git a/installer.py b/installer.py index e48f255c2..2fd19fc19 100644 --- a/installer.py +++ b/installer.py @@ -599,7 +599,7 @@ def install_rocm_zluda(): if gfx_ver is not None: os.environ.setdefault('HSA_OVERRIDE_GFX_VERSION', gfx_ver) else: - log.warning(f'ROCm: gfx={device.name} could not auto-detect HSA version') + log.warning(f'ROCm: device={device.name} could not auto-detect HSA version') return torch_command @@ -905,7 +905,7 @@ def install_extensions(force=False): if not args.skip_extensions: commit = extensions_commit.get(os.path.basename(ext), None) if commit is not None: - log.debug(f'Extension force: name={ext} commit={commit}') + log.debug(f'Extension force: name="{ext}" commit={commit}') res.append(git(f'checkout {commit}', os.path.join(folder, ext))) run_extension_installer(os.path.join(folder, ext)) pkg_resources._initialize_master_working_set() # pylint: disable=protected-access diff --git a/modules/ui_sections.py b/modules/ui_sections.py index 67520aa71..739286bd1 100644 --- a/modules/ui_sections.py +++ b/modules/ui_sections.py @@ -360,8 +360,9 @@ def create_resize_inputs(tab, images, accordion=True, latent=False, non_zero=Tru with gr.Row(): with gr.Column(elem_id=f"{tab}_column_size_fixed"): with gr.Row(): - width = gr.Slider(minimum=64 if non_zero else 0, maximum=8192, step=8, label=f"Width {prefix}" if non_zero else "Resize width", value=1024 if non_zero else 0, elem_id=f"{tab}_resize_width") - height = gr.Slider(minimum=64 if non_zero else 0, maximum=8192, step=8, label=f"Height {prefix}" if non_zero else "Resize height", value=1024 if non_zero else 0, elem_id=f"{tab}_resize_height") + suffix = '_resize' if tab != 'img2img' else '' + width = gr.Slider(minimum=64 if non_zero else 0, maximum=8192, step=8, label=f"Width {prefix}" if non_zero else "Resize width", value=1024 if non_zero else 0, elem_id=f"{tab}{suffix}_width") + height = gr.Slider(minimum=64 if non_zero else 0, maximum=8192, step=8, label=f"Height {prefix}" if non_zero else "Resize height", value=1024 if non_zero else 0, elem_id=f"{tab}{suffix}_height") ar_list = ['AR'] + [x.strip() for x in shared.opts.aspect_ratios.split(',') if x.strip() != ''] ar_dropdown = gr.Dropdown(show_label=False, interactive=True, choices=ar_list, value=ar_list[0], elem_id=f"{tab}_resize_ar", elem_classes=["ar-dropdown"]) for c in [ar_dropdown, width, height]: