Merge pull request #19 from ashleykleynhans/dev

Merge dev

Author: ashleykleynhans

Dockerfile

@@ -29,6 +29,7 @@ RUN apt update && \
       libxrender1 \
       libxext6 \
       ffmpeg \
+      bc \
       libgoogle-perftools4 \
       libtcmalloc-minimal4 \
       procps && \

docs/building.md

@@ -4,7 +4,7 @@ You can either build this Docker image yourself, your alternatively,
 you can use my pre-built image:
 
 ```
-ashleykza/runpod-worker-a1111:2.4.6
+ashleykza/runpod-worker-a1111:2.5.0
 ```
 
 If you choose to build it yourself:

docs/installing.md

@@ -42,6 +42,9 @@ git clone --depth=1 https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
 apt update
 apt -y upgrade
 
+# Install bc package
+apt -y install bc
+
 # Ensure Python version is 3.10.12
 python3 -V
 
@@ -51,8 +54,8 @@ python3 -m venv /workspace/venv
 source /workspace/venv/bin/activate
 
 # Install Torch and xformers
-pip3 install --no-cache-dir torch==2.0.1+cu118 torchvision torchaudio --index-url https://download.pytorch.org/whl/cu118
-pip3 install --no-cache-dir xformers==0.0.22
+pip3 install --no-cache-dir torch==2.1.2+cu118 torchvision torchaudio --index-url https://download.pytorch.org/whl/cu118
+pip3 install --no-cache-dir xformers==0.0.23.post1 --index-url https://download.pytorch.org/whl/cu118
 
 # Install A1111 Web UI
 wget https://raw.githubusercontent.com/ashleykleynhans/runpod-worker-a1111/main/install-automatic.py
@@ -64,7 +67,6 @@ git clone --depth=1 https://github.com/Mikubill/sd-webui-controlnet.git extensio
 
 # Clone the ReActor Extension
 git clone https://github.com/Gourieff/sd-webui-reactor.git extensions/sd-webui-reactor
-git checkout v0.6.1
 
 # Clone the After Detailer Extension
 git clone --depth=1 https://github.com/Bing-su/adetailer.git extensions/adetailer
@@ -75,6 +77,7 @@ pip3 install -r requirements.txt
 
 # Install dependencies for ReActor
 cd /workspace/stable-diffusion-webui/extensions/sd-webui-reactor
+git checkout v0.6.1
 pip3 install -r requirements.txt
 pip3 install onnxruntime-gpu
 
@@ -118,7 +121,7 @@ wget https://huggingface.co/lllyasviel/sd_control_collection/resolve/main/diffus
 6. Download InstantID ControlNet models:
 ```bash
 wget -O ip-adapter_instant_id_sdxl.bin "https://huggingface.co/InstantX/InstantID/resolve/main/ip-adapter.bin?download=true"
-wget -O control_instant_id_sdxl.safetensors"https://huggingface.co/InstantX/InstantID/resolve/main/ControlNetModel/diffusion_pytorch_model.safetensors?download=true"
+wget -O control_instant_id_sdxl.safetensors "https://huggingface.co/InstantX/InstantID/resolve/main/ControlNetModel/diffusion_pytorch_model.safetensors?download=true"
 ```
 7. Create logs directory:
 ```bash
@@ -142,6 +145,6 @@ cd /workspace/stable-diffusion-webui
 10. Wait for the Web UI to start up, and download the models. You shoud
     see something like this when it is ready:
 ```
-Model loaded in 16.9s (calculate hash: 8.0s, load weights from disk: 0.4s, create model: 2.1s, apply weights to model: 2.6s, apply half(): 2.6s, move model to device: 0.7s, calculate empty prompt: 0.3s).
+Model loaded in 20.8s (calculate hash: 15.6s, create model: 3.5s, apply weights to model: 0.8s, apply half(): 0.1s, calculate empty prompt: 0.5s).
 ```
 11. Press Ctrl-C to exit, and then you can terminate the pod.

scripts/install.sh

@@ -13,16 +13,19 @@ echo "Installing Ubuntu updates"
 apt update
 apt -y upgrade
 
+echo "Installing bc package"
+apt -y install bc
+
 echo "Creating and activating venv"
 cd stable-diffusion-webui
 python3 -m venv /workspace/venv
 source /workspace/venv/bin/activate
 
 echo "Installing Torch"
-pip3 install --no-cache-dir torch==2.0.1+cu118 torchvision torchaudio --index-url https://download.pytorch.org/whl/cu118
+pip3 install --no-cache-dir torch==2.1.2+cu118 torchvision torchaudio --index-url https://download.pytorch.org/whl/cu118
 
 echo "Installing xformers"
-pip3 install --no-cache-dir xformers==0.0.22
+pip3 install --no-cache-dir xformers==0.0.23.post1 --index-url https://download.pytorch.org/whl/cu118
 
 echo "Installing A1111 Web UI"
 wget https://raw.githubusercontent.com/ashleykleynhans/runpod-worker-a1111/main/install-automatic.py
@@ -97,7 +100,7 @@ wget https://huggingface.co/lllyasviel/sd_control_collection/resolve/main/diffus
 
 echo "Downloading InstantID ControlNet models"
 wget -O ip-adapter_instant_id_sdxl.bin "https://huggingface.co/InstantX/InstantID/resolve/main/ip-adapter.bin?download=true"
-wget -O control_instant_id_sdxl.safetensors"https://huggingface.co/InstantX/InstantID/resolve/main/ControlNetModel/diffusion_pytorch_model.safetensors?download=true"
+wget -O control_instant_id_sdxl.safetensors "https://huggingface.co/InstantX/InstantID/resolve/main/ControlNetModel/diffusion_pytorch_model.safetensors?download=true"
 
 echo "Downloading Upscalers"
 mkdir -p /workspace/stable-diffusion-webui/models/ESRGAN

tests/txt2img_reactor.py

@@ -49,11 +49,11 @@
                             'CUDA',                             #20 #20 CPU or CUDA (if you have it), CPU - by default,
                             True,                               #21 Face Mask Correction
                             0,                                  #22 Select Source, 0 - Image, 1 - Face Model, 2 - Source Folder
-                            None,                               #23 Filename of the face model (from "models/reactor/faces"), e.g. elena.safetensors
-                            '/workspace/PATH_TO_FACES_IMAGES',  #24 The path to the folder containing source faces images, don't forger to set #22 to 2
-                            None,                               #25 skip it for API
-                            True,                               #26 Randomly select an image from the path
-                            True                                #27 Force Upscale even if no face found
+                            #None,                               #23 Filename of the face model (from "models/reactor/faces"), e.g. elena.safetensors
+                            #'/workspace/PATH_TO_FACES_IMAGES',  #24 The path to the folder containing source faces images, don't forger to set #22 to 2
+                            #None,                               #25 skip it for API
+                            #True,                               #26 Randomly select an image from the path
+                            #True                                #27 Force Upscale even if no face found
                         ]
                     }
                 }