diff options
| author | papuSpartan <30642826+papuSpartan@users.noreply.github.com> | 2022-11-07 03:05:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-07 03:05:28 +0000 |
| commit | 00ebc26c4e2962a31e067539d89cd695d999539a (patch) | |
| tree | 4c2d46e00ffcc5b606f4841926b3a61fed903f00 /modules/extras.py | |
| parent | 86d35526a13a0e2432ab71d1d40b191615d3e343 (diff) | |
| parent | 804d9fb83d0c63ca3acd36378707ce47b8f12599 (diff) | |
| download | stable-diffusion-webui-gfx803-00ebc26c4e2962a31e067539d89cd695d999539a.tar.gz stable-diffusion-webui-gfx803-00ebc26c4e2962a31e067539d89cd695d999539a.tar.bz2 stable-diffusion-webui-gfx803-00ebc26c4e2962a31e067539d89cd695d999539a.zip | |
Merge branch 'AUTOMATIC1111:master' into master
Diffstat (limited to 'modules/extras.py')
| -rw-r--r-- | modules/extras.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/extras.py b/modules/extras.py index 8e2ab35c..71b93a06 100644 --- a/modules/extras.py +++ b/modules/extras.py @@ -136,12 +136,13 @@ def run_extras(extras_mode, resize_mode, image, image_folder, input_dir, output_ def run_upscalers_blend(params: List[UpscaleParams], image: Image.Image, info: str) -> Tuple[Image.Image, str]:
blended_result: Image.Image = None
+ image_hash: str = hash(np.array(image.getdata()).tobytes())
for upscaler in params:
upscale_args = (upscaler.upscaler_idx, upscaling_resize, resize_mode,
upscaling_resize_w, upscaling_resize_h, upscaling_crop)
- cache_key = LruCache.Key(image_hash=hash(np.array(image.getdata()).tobytes()),
+ cache_key = LruCache.Key(image_hash=image_hash,
info_hash=hash(info),
- args_hash=hash((upscale_args, upscale_first)))
+ args_hash=hash(upscale_args))
cached_entry = cached_images.get(cache_key)
if cached_entry is None:
res = upscale(image, *upscale_args)
|