Unverified Commit 725a3849 authored by AUTOMATIC1111's avatar AUTOMATIC1111 Committed by GitHub
Browse files

Merge branch 'dev' into pr/xyz-sort-001

parents c84118d7 8863b31d

.gitignore

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,4 +32,4 @@ notification.mp3 
/extensions

/extensions

/test/stdout.txt

/test/stdout.txt

/test/stderr.txt

/test/stderr.txt

/cache.json
 
/cache.json*

README.md

+1 −0
Original line number Original line Diff line number Diff line
@@ -120,6 +120,7 @@ sudo pacman -S wget git python3 
bash <(wget -qO- https://raw.githubusercontent.com/AUTOMATIC1111/stable-diffusion-webui/master/webui.sh)

bash <(wget -qO- https://raw.githubusercontent.com/AUTOMATIC1111/stable-diffusion-webui/master/webui.sh)

```

```

3. Run `webui.sh`.

3. Run `webui.sh`.

4. Check `webui-user.sh` for options.

### Installation on Apple Silicon

### Installation on Apple Silicon





Find the instructions [here](https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Installation-on-Apple-Silicon).

Find the instructions [here](https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Installation-on-Apple-Silicon).

environment-wsl2.yaml

+5 −5
Original line number Original line Diff line number Diff line
@@ -4,8 +4,8 @@ channels: 
  - defaults

  - defaults

dependencies:

dependencies:

  - python=3.10

  - python=3.10

  - pip=22.2.2

  - pip=23.0

  - cudatoolkit=11.3

  - cudatoolkit=11.8

  - pytorch=1.12.1

  - pytorch=2.0

  - torchvision=0.13.1

  - torchvision=0.15

  - numpy=1.23.1
 
  - numpy=1.23
 
 No newline at end of file

extensions-builtin/Lora/extra_networks_lora.py

+1 −1
Original line number Original line Diff line number Diff line
@@ -8,7 +8,7 @@ class ExtraNetworkLora(extra_networks.ExtraNetwork): 
    def activate(self, p, params_list):

    def activate(self, p, params_list):

        additional = shared.opts.sd_lora

        additional = shared.opts.sd_lora





        if additional != "" and additional in lora.available_loras and len([x for x in params_list if x.items[0] == additional]) == 0:

        if additional != "None" and additional in lora.available_loras and len([x for x in params_list if x.items[0] == additional]) == 0:

            p.all_prompts = [x + f"<lora:{additional}:{shared.opts.extra_networks_default_multiplier}>" for x in p.all_prompts]

            p.all_prompts = [x + f"<lora:{additional}:{shared.opts.extra_networks_default_multiplier}>" for x in p.all_prompts]

            params_list.append(extra_networks.ExtraNetworkParams(items=[additional, shared.opts.extra_networks_default_multiplier]))

            params_list.append(extra_networks.ExtraNetworkParams(items=[additional, shared.opts.extra_networks_default_multiplier]))

extensions-builtin/Lora/scripts/lora_script.py

+1 −1
Original line number Original line Diff line number Diff line
@@ -52,5 +52,5 @@ script_callbacks.on_before_ui(before_ui) 








shared.options_templates.update(shared.options_section(('extra_networks', "Extra Networks"), {

shared.options_templates.update(shared.options_section(('extra_networks', "Extra Networks"), {

    "sd_lora": shared.OptionInfo("None", "Add Lora to prompt", gr.Dropdown, lambda: {"choices": [""] + [x for x in lora.available_loras]}, refresh=lora.list_available_loras),

    "sd_lora": shared.OptionInfo("None", "Add Lora to prompt", gr.Dropdown, lambda: {"choices": ["None"] + [x for x in lora.available_loras]}, refresh=lora.list_available_loras),

}))
 
}))

CRA Git | Maintained and supported by SUSTech CRA and CCSE