Commit e2306361 authored by AUTOMATIC's avatar AUTOMATIC
Browse files

Merge branch 'dev' into release_candidate

parents 22bcc7be cd7f2b19

.gitignore

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

/test/stdout.txt

/test/stderr.txt

/cache.json
 
/cache.json*

/config_states/

README.md

+4 −3
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ Alternatively, use online services (like Google Colab): 
- [List of Online Services](https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Online-Services)



### Automatic Installation on Windows

1. Install [Python 3.10.6](https://www.python.org/downloads/windows/), checking "Add Python to PATH".

1. Install [Python 3.10.6](https://www.python.org/downloads/release/python-3106/) (Newer version of Python does not support torch), checking "Add Python to PATH".

2. Install [git](https://git-scm.com/download/win).

3. Download the stable-diffusion-webui repository, for example by running `git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git`.

4. Run `webui-user.bat` from Windows Explorer as normal, non-administrator, user.
@@ -115,11 +115,12 @@ sudo dnf install wget git python3 
# Arch-based:

sudo pacman -S wget git python3

```

2. To install in `/home/$(whoami)/stable-diffusion-webui/`, run:

2. Navigate to the directory you would like the webui to be installed and execute the following command:

```bash

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

```

3. Run `webui.sh`.

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

### 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 Diff line number Diff line
@@ -4,8 +4,8 @@ channels: 
  - defaults

dependencies:

  - python=3.10

  - pip=22.2.2

  - cudatoolkit=11.3

  - pytorch=1.12.1

  - torchvision=0.13.1

  - numpy=1.23.1
 
 No newline at end of file
 
  - pip=23.0

  - cudatoolkit=11.8

  - pytorch=2.0

  - torchvision=0.15

  - numpy=1.23

extensions-builtin/LDSR/scripts/ldsr_model.py

+13 −7
Original line number Diff line number Diff line
@@ -25,22 +25,28 @@ class UpscalerLDSR(Upscaler): 
        yaml_path = os.path.join(self.model_path, "project.yaml")

        old_model_path = os.path.join(self.model_path, "model.pth")

        new_model_path = os.path.join(self.model_path, "model.ckpt")

        safetensors_model_path = os.path.join(self.model_path, "model.safetensors")



        local_model_paths = self.find_models(ext_filter=[".ckpt", ".safetensors"])

        local_ckpt_path = next(iter([local_model for local_model in local_model_paths if local_model.endswith("model.ckpt")]), None)

        local_safetensors_path = next(iter([local_model for local_model in local_model_paths if local_model.endswith("model.safetensors")]), None)

        local_yaml_path = next(iter([local_model for local_model in local_model_paths if local_model.endswith("project.yaml")]), None)



        if os.path.exists(yaml_path):

            statinfo = os.stat(yaml_path)

            if statinfo.st_size >= 10485760:

                print("Removing invalid LDSR YAML file.")

                os.remove(yaml_path)



        if os.path.exists(old_model_path):

            print("Renaming model from model.pth to model.ckpt")

            os.rename(old_model_path, new_model_path)

        if os.path.exists(safetensors_model_path):

            model = safetensors_model_path



        if local_safetensors_path is not None and os.path.exists(local_safetensors_path):

            model = local_safetensors_path

        else:

            model = load_file_from_url(url=self.model_url, model_dir=self.model_path,

                                       file_name="model.ckpt", progress=True)

        yaml = load_file_from_url(url=self.yaml_url, model_dir=self.model_path,

                                  file_name="project.yaml", progress=True)

            model = local_ckpt_path if local_ckpt_path is not None else load_file_from_url(url=self.model_url, model_dir=self.model_path, file_name="model.ckpt", progress=True)



        yaml = local_yaml_path if local_yaml_path is not None else load_file_from_url(url=self.yaml_url, model_dir=self.model_path, file_name="project.yaml", progress=True)



        try:

            return LDSR(model, yaml)

extensions-builtin/Lora/extra_networks_lora.py

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

        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]

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE