The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.
Proportional scale latent and image
Jairo Correa593b7069e7cc
diff --git a/nodes.py b/nodes.pyindex 115862607..0882185a4 100644--- a/nodes.py+++ b/nodes.py@@ -967,8 +967,8 @@ class LatentUpscale:@classmethoddef INPUT_TYPES(s):return {"required": { "samples": ("LATENT",), "upscale_method": (s.upscale_methods,),- "width": ("INT", {"default": 512, "min": 64, "max": MAX_RESOLUTION, "step": 8}),- "height": ("INT", {"default": 512, "min": 64, "max": MAX_RESOLUTION, "step": 8}),+ "width": ("INT", {"default": 512, "min": 0, "max": MAX_RESOLUTION, "step": 8}),+ "height": ("INT", {"default": 512, "min": 0, "max": MAX_RESOLUTION, "step": 8}),"crop": (s.crop_methods,)}}RETURN_TYPES = ("LATENT",)FUNCTION = "upscale"@@ -976,8 +976,22 @@ class LatentUpscale:CATEGORY = "latent"def upscale(self, samples, upscale_method, width, height, crop):- s = samples.copy()- s["samples"] = comfy.utils.common_upscale(samples["samples"], width // 8, height // 8, upscale_method, crop)+ if width == 0 and height == 0:+ s = samples+ else:+ s = samples.copy()++ if width == 0:+ height = max(64, height)+ width = max(64, round(samples["samples"].shape[3] * height / samples["samples"].shape[2]))+ elif height == 0:+ width = max(64, width)+ height = max(64, round(samples["samples"].shape[2] * width / samples["samples"].shape[3]))+ else:+ width = max(64, width)+ height = max(64, height)++ s["samples"] = comfy.utils.common_upscale(samples["samples"], width // 8, height // 8, upscale_method, crop)return (s,)class LatentUpscaleBy:@@ -1429,8 +1443,8 @@ class ImageScale:@classmethoddef INPUT_TYPES(s):return {"required": { "image": ("IMAGE",), "upscale_method": (s.upscale_methods,),- "width": ("INT", {"default": 512, "min": 1, "max": MAX_RESOLUTION, "step": 1}),- "height": ("INT", {"default": 512, "min": 1, "max": MAX_RESOLUTION, "step": 1}),+ "width": ("INT", {"default": 512, "min": 0, "max": MAX_RESOLUTION, "step": 1}),+ "height": ("INT", {"default": 512, "min": 0, "max": MAX_RESOLUTION, "step": 1}),"crop": (s.crop_methods,)}}RETURN_TYPES = ("IMAGE",)FUNCTION = "upscale"@@ -1438,9 +1452,18 @@ class ImageScale:CATEGORY = "image/upscaling"def upscale(self, image, upscale_method, width, height, crop):- samples = image.movedim(-1,1)- s = comfy.utils.common_upscale(samples, width, height, upscale_method, crop)- s = s.movedim(1,-1)+ if width == 0 and height == 0:+ s = image+ else:+ samples = image.movedim(-1,1)++ if width == 0:+ width = max(1, round(samples.shape[3] * height / samples.shape[2]))+ elif height == 0:+ height = max(1, round(samples.shape[2] * width / samples.shape[3]))++ s = comfy.utils.common_upscale(samples, width, height, upscale_method, crop)+ s = s.movedim(1,-1)return (s,)class ImageScaleBy: