features updates

unused code removed from outpainting mk2

2 files changed, 33 insertions, 59 deletions

diff --git a/README.md b/README.md
index 219288ac..5ded94f9 100644
--- a/README.md
+++ b/README.md
@@ -11,44 +11,56 @@ Check the [custom scripts](https://github.com/AUTOMATIC1111/stable-diffusion-web
 - One click install and run script (but you still must install python and git)

 - Outpainting

 - Inpainting

-- Prompt matrix

+- Prompt

 - Stable Diffusion upscale

-- Attention

-- Loopback

-- X/Y plot

+- Attention, specify parts of text that the model should pay more attention to

+    - a man in a ((txuedo)) - will pay more attentinoto tuxedo

+    - a man in a (txuedo:1.21) - alternative syntax

+- Loopback, run img2img procvessing multiple times

+- X/Y plot, a way to draw a 2 dimensional plot of images with different parameters

 - Textual Inversion

+    - have as many embeddings as you want and use any names you like for them

+    - use multiple embeddings with different numbers of vectors per token

+    - works with half precision floating point numbers

 - Extras tab with:

     - GFPGAN, neural network that fixes faces

     - CodeFormer, face restoration tool as an alternative to GFPGAN

     - RealESRGAN, neural network upscaler

-    - ESRGAN, neural network with a lot of third party models

+    - ESRGAN, neural network upscaler with a lot of third party models

     - SwinIR, neural network upscaler

     - LDSR, Latent diffusion super resolution upscaling

 - Resizing aspect ratio options

 - Sampling method selection

 - Interrupt processing at any time

-- 4GB video card support

-- Correct seeds for batches

+- 4GB video card support (also reports of 2GB working)

+- Correct seeds for batches 

 - Prompt length validation

-- Generation parameters added as text to PNG

-- Tab to view an existing picture's generation parameters

+     - get length of prompt in tokensas you type

+     - get a warning after geenration if some text was truncated

+- Generation parameters

+     - parameters you used to generate images are saved with that image

+     - in PNG chunks for PNG, in EXIF for JPEG

+     - can drag the image to PNG info tab to restore generation parameters and automatically copy them into UI

+     - can be disabled in settings

 - Settings page

-- Running custom code from UI

+- Running arbitrary python code from UI (must run with commandline flag to enable)

 - Mouseover hints for most UI elements

 - Possible to change defaults/mix/max/step values for UI elements via text config

 - Random artist button

-- Tiling support: UI checkbox to create images that can be tiled like textures

+- Tiling support, a checkbox to create images that can be tiled like textures

 - Progress bar and live image generation preview

-- Negative prompt

-- Styles

-- Variations

-- Seed resizing

-- CLIP interrogator

-- Prompt Editing

-- Batch Processing

+- Negative prompt, an extra text field that allows you to list what you don't want to see in generated image

+- Styles, a way to save part of prompt and easily apply them via dropdown later

+- Variations, a way to generate same image but with tiny differences

+- Seed resizing, a way to generate same image but at slightly different resolution

+- CLIP interrogator, a button that tries to guess prompt from an image

+- Prompt Editing, a way to change prompt mid-generation, say to start making a watermelon and switch to anime girl midway

+- Batch Processing, process a group of files using img2img

 - Img2img Alternative

-- Highres Fix

-- LDSR Upscaling

+- Highres Fix, a convenience option to produce high resolution pictures in one click without usual distortions

+- Reloading checkpoints on the fly

+- Checkpoint Merger, a tab that allows you to merge two checkpoints into one

+- [Custom scripts](https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Custom-Scripts) with many extensions from community

 

 ## Installation and Running

 Make sure the required [dependencies](https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Dependencies) are met and follow the instructions available for both [NVidia](https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Install-and-Run-on-NVidia-GPUs) (recommended) and [AMD](https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Install-and-Run-on-AMD-GPUs) GPUs.

diff --git a/scripts/outpainting_mk_2.py b/scripts/outpainting_mk_2.py
index 9719bb8f..11613ca3 100644
--- a/scripts/outpainting_mk_2.py
+++ b/scripts/outpainting_mk_2.py
@@ -11,46 +11,8 @@ from modules import images, processing, devices
 from modules.processing import Processed, process_images

 from modules.shared import opts, cmd_opts, state

 

-#  https://github.com/parlance-zz/g-diffuser-bot

-def expand(x, dir, amount, power=0.75):

-    is_left = dir == 3

-    is_right = dir == 1

-    is_up = dir == 0

-    is_down = dir == 2

-

-    if is_left or is_right:

-        noise = np.zeros((x.shape[0], amount, 3), dtype=float)

-        indexes = np.random.random((x.shape[0], amount)) ** power * (1 - np.arange(amount) / amount)

-        if is_right:

-            indexes = 1 - indexes

-        indexes = (indexes * (x.shape[1] - 1)).astype(int)

-

-        for row in range(x.shape[0]):

-            if is_left:

-                noise[row] = x[row][indexes[row]]

-            else:

-                noise[row] = np.flip(x[row][indexes[row]], axis=0)

-

-        x = np.concatenate([noise, x] if is_left else [x, noise], axis=1)

-        return x

-

-    if is_up or is_down:

-        noise = np.zeros((amount, x.shape[1], 3), dtype=float)

-        indexes = np.random.random((x.shape[1], amount)) ** power * (1 - np.arange(amount) / amount)

-        if is_down:

-            indexes = 1 - indexes

-        indexes = (indexes * x.shape[0] - 1).astype(int)

-

-        for row in range(x.shape[1]):

-            if is_up:

-                noise[:, row] = x[:, row][indexes[row]]

-            else:

-                noise[:, row] = np.flip(x[:, row][indexes[row]], axis=0)

-

-        x = np.concatenate([noise, x] if is_up else [x, noise], axis=0)

-        return x

-

 

+# this function is taken from https://github.com/parlance-zz/g-diffuser-bot

 def get_matched_noise(_np_src_image, np_mask_rgb, noise_q=1, color_variation=0.05):

     # helper fft routines that keep ortho normalization and auto-shift before and after fft

     def _fft2(data):