Unverified Commit 8edb9144 authored by AUTOMATIC1111's avatar AUTOMATIC1111 Committed by GitHub
Browse files

Merge branch 'dev' into test-fp8

parents ea272152 60186c7b

modules/errors.py

+2 −2
Original line number Diff line number Diff line
@@ -107,8 +107,8 @@ def check_versions(): 
    import torch

    import gradio



    expected_torch_version = "2.1.0"

    expected_xformers_version = "0.0.22.post7"

    expected_torch_version = "2.1.2"

    expected_xformers_version = "0.0.23.post1"

    expected_gradio_version = "3.41.2"



    if version.parse(torch.__version__) < version.parse(expected_torch_version):

modules/launch_utils.py

+2 −2
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ def requirements_met(requirements_file): 


def prepare_environment():

    torch_index_url = os.environ.get('TORCH_INDEX_URL', "https://download.pytorch.org/whl/cu121")

    torch_command = os.environ.get('TORCH_COMMAND', f"pip install torch==2.1.0 torchvision==0.16.0 --extra-index-url {torch_index_url}")

    torch_command = os.environ.get('TORCH_COMMAND', f"pip install torch==2.1.2 torchvision==0.16.2 --extra-index-url {torch_index_url}")

    if args.use_ipex:

        if platform.system() == "Windows":

            # The "Nuullll/intel-extension-for-pytorch" wheels were built from IPEX source for Intel Arc GPU: https://github.com/intel/intel-extension-for-pytorch/tree/xpu-main
@@ -338,7 +338,7 @@ def prepare_environment(): 
            torch_command = os.environ.get('TORCH_COMMAND', f"pip install torch==2.0.0a0 intel-extension-for-pytorch==2.0.110+gitba7f6c1 --extra-index-url {torch_index_url}")

    requirements_file = os.environ.get('REQS_FILE', "requirements_versions.txt")



    xformers_package = os.environ.get('XFORMERS_PACKAGE', 'xformers==0.0.22.post7')

    xformers_package = os.environ.get('XFORMERS_PACKAGE', 'xformers==0.0.23.post1')

    clip_package = os.environ.get('CLIP_PACKAGE', "https://github.com/openai/CLIP/archive/d50d76daa670286dd6cacf3bcd80b5e4823fc8e1.zip")

    openclip_package = os.environ.get('OPENCLIP_PACKAGE', "https://github.com/mlfoundations/open_clip/archive/bb6e834e9c70d9c27d0dc3ecedeebeaeb1ffad6b.zip")

modules/shared_options.py

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ options_templates.update(options_section(('ui', "Live previews", "ui"), { 
    "live_preview_content": OptionInfo("Prompt", "Live preview subject", gr.Radio, {"choices": ["Combined", "Prompt", "Negative prompt"]}),

    "live_preview_refresh_period": OptionInfo(1000, "Progressbar and preview update period").info("in milliseconds"),

    "live_preview_fast_interrupt": OptionInfo(False, "Return image with chosen live preview method on interrupt").info("makes interrupts faster"),

    "js_live_preview_in_modal_lightbox": OptionInfo(True, "Show Live preview in full page image viewer"),

    "js_live_preview_in_modal_lightbox": OptionInfo(False, "Show Live preview in full page image viewer"),

}))



options_templates.update(options_section(('sampler-params', "Sampler parameters", "sd"), {

CRA Git | Maintained and supported by SUSTech CRA and CCSE