From a136a8ea63f2246cac5a08e2e835c158ff1897c6 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Sun, 30 Apr 2023 18:44:12 -0400 Subject: [PATCH] update --- installer.py | 10 ++++------ scripts/xyz_grid.py | 3 --- style.css | 33 +++++++++++++++++---------------- 3 files changed, 21 insertions(+), 25 deletions(-) diff --git a/installer.py b/installer.py index 8be8980e1..a7760f81e 100644 --- a/installer.py +++ b/installer.py @@ -75,8 +75,6 @@ def installed(package, friendly: str = None): ok = ok and spec is not None if ok: version = pkg_resources.get_distribution(p[0]).version - if args.use_ipex and p[0] == "pytorch_lightning": - p[1] = "1.8.6" log.debug(f"Package version found: {p[0]} {version}") if len(p) > 1: ok = ok and version == p[1] @@ -191,17 +189,17 @@ def check_python(): # check torch version def check_torch(): if shutil.which('nvidia-smi') is not None or os.path.exists(os.path.join(os.environ.get('SystemRoot') or r'C:\Windows', 'System32', 'nvidia-smi.exe')): - log.info('nVidia toolkit detected') + log.info('nVidia CUDA toolkit detected') torch_command = os.environ.get('TORCH_COMMAND', 'torch torchaudio torchvision --index-url https://download.pytorch.org/whl/cu118') xformers_package = os.environ.get('XFORMERS_PACKAGE', 'xformers==0.0.17' if opts.get('cross_attention_optimization', '') == 'xFormers' else 'none') elif shutil.which('rocminfo') is not None or os.path.exists('/opt/rocm/bin/rocminfo'): - log.info('AMD toolkit detected') + log.info('AMD ROCm toolkit detected') os.environ.setdefault('HSA_OVERRIDE_GFX_VERSION', '10.3.0') torch_command = os.environ.get('TORCH_COMMAND', 'torch torchvision torchaudio --index-url https://download.pytorch.org/whl/rocm5.4.2') xformers_package = os.environ.get('XFORMERS_PACKAGE', 'none') elif shutil.which('sycl-ls') is not None or os.path.exists('/opt/intel/oneapi') or args.use_ipex: - log.info('Intel toolkit detected') - torch_command = os.environ.get('TORCH_COMMAND', 'torch==1.13.0a0+git6c9b55e torchvision==0.14.1a0 intel_extension_for_pytorch==1.13.120+xpu --index-url https://developer.intel.com/ipex-whl-stable-xpu') + log.info('Intel OneAPI Toolkit detected') + torch_command = os.environ.get('TORCH_COMMAND', 'torch==1.13.0a0+git6c9b55e torchvision==0.14.1a0 intel_extension_for_pytorch==1.13.120+xpu -f https://developer.intel.com/ipex-whl-stable-xpu') xformers_package = os.environ.get('XFORMERS_PACKAGE', 'none') else: machine = platform.machine() diff --git a/scripts/xyz_grid.py b/scripts/xyz_grid.py index d216d2fef..389560501 100644 --- a/scripts/xyz_grid.py +++ b/scripts/xyz_grid.py @@ -446,9 +446,6 @@ class Script(scripts.Script): current_values = axis_values_dropdown if has_choices: choices = choices() - if len(choices) > 12: - has_choices = False - if has_choices: if isinstance(current_values,str): current_values = current_values.split(",") current_values = list(filter(lambda x: x in choices, current_values)) diff --git a/style.css b/style.css index 996ad15d2..c0fe31146 100644 --- a/style.css +++ b/style.css @@ -1,28 +1,29 @@ :root, .dark{ --checkbox-label-gap: 0.25em 0.1em; --section-header-text-size: 12pt; --block-background-fill: transparent;} -.block.padded:not(.gradio-accordion) { padding: 0 !important; } div.gradio-container{ max-width: unset !important; } -.hidden{ display: none; } -.compact{ background: transparent !important; padding: 0 !important; } div.form{ border-width: 0; box-shadow: none; background: transparent; overflow: visible; gap: 0.5em; } -.block.gradio-dropdown, .block.gradio-slider, .block.gradio-checkbox, .block.gradio-textbox, .block.gradio-radio, .block.gradio-checkboxgroup, .block.gradio-number, .block.gradio-colorpicker { border-width: 0 !important; box-shadow: none !important;} -.gap.compact{ padding: 0; gap: 0.2em 0; } div.compact{ gap: 1em; } -.gradio-dropdown label span:not(.has-info), .gradio-textbox label span:not(.has-info), .gradio-number label span:not(.has-info) { margin-bottom: 0; } -.gradio-dropdown ul.options{ z-index: 3000; min-width: fit-content; max-width: inherit; white-space: nowrap; } -.gradio-dropdown ul.options li.item { padding: 0.05em 0; } -.gradio-dropdown ul.options li.item:not(:has(.hide)) { background-color: var(--neutral-100); } +div.gradio-html.min{ min-height: 0; } +.block.gradio-checkbox { margin: 0.75em 1.5em 0 0; } +.block.gradio-dropdown, .block.gradio-slider, .block.gradio-checkbox, .block.gradio-textbox, .block.gradio-radio, .block.gradio-checkboxgroup, .block.gradio-number, .block.gradio-colorpicker { border-width: 0 !important; box-shadow: none !important;} +.block.gradio-gallery{ background: var(--input-background-fill); } +.block.padded:not(.gradio-accordion) { padding: 0 !important; } +.compact{ background: transparent !important; padding: 0 !important; } .dark .gradio-dropdown ul.options li.item:not(:has(.hide)) { background-color: var(--neutral-900); } -.gradio-dropdown div.wrap.wrap.wrap.wrap{ box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.05); } -.gradio-dropdown:not(.multiselect) .wrap-inner.wrap-inner.wrap-inner{ flex-wrap: unset; } +.gap.compact{ padding: 0; gap: 0.2em 0; } +.gradio-container .prose a, .gradio-container .prose a:visited{ color: unset; text-decoration: none; } .gradio-dropdown .single-select{ white-space: nowrap; overflow: hidden; } .gradio-dropdown .token-remove.remove-all.remove-all{ display: none; } +.gradio-dropdown div.wrap.wrap.wrap.wrap{ box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.05); } +.gradio-dropdown label span:not(.has-info), .gradio-textbox label span:not(.has-info), .gradio-number label span:not(.has-info) { margin-bottom: 0; } +.gradio-dropdown ul.options li.item { padding: 0.05em 0; } +.gradio-dropdown ul.options li.item:not(:has(.hide)) { background-color: var(--neutral-100); } +.gradio-dropdown ul.options{ z-index: 3000; min-width: fit-content; max-width: inherit; white-space: nowrap; } +.gradio-dropdown:not(.multiselect) .wrap-inner.wrap-inner.wrap-inner{ flex-wrap: unset; } .gradio-dropdown.multiselect .token-remove.remove-all.remove-all{ display: flex; } -.gradio-slider input[type="number"]{ width: 6em; } -.block.gradio-checkbox { margin: 0.75em 1.5em 0 0; } +.gradio-dropdown.multiselect div.wrap-inner { overflow-x: hidden; overflow-y: auto; max-height: 50vh; overflow-wrap: anywhere; } .gradio-html div.wrap{ height: 100%; } -div.gradio-html.min{ min-height: 0; } -.block.gradio-gallery{ background: var(--input-background-fill); } -.gradio-container .prose a, .gradio-container .prose a:visited{ color: unset; text-decoration: none; } +.gradio-slider input[type="number"]{ width: 6em; } +.hidden{ display: none; } /* general styled components */ .gradio-button.tool{ max-width: 2.2em; min-width: 2.2em !important; height: 2.4em; align-self: end; line-height: 1em; border-radius: 0.5em; }