Merge 2ee6688b14 into f6d5068ac0

README.md

@@ -31,8 +31,7 @@
 [github-downloads-latest-shield]: https://img.shields.io/github/downloads/comfyanonymous/ComfyUI/latest/total?style=flat&label=downloads%40latest
 [github-downloads-link]: https://github.com/comfyanonymous/ComfyUI/releases
 
-<img width="1590" height="795" alt="ComfyUI Screenshot" src="https://github.com/user-attachments/assets/36e065e0-bfae-4456-8c7f-8369d5ea48a2" />
-<br>
+<img width="1590" height="795" alt="ComfyUI Screenshot" src="https://github.com/user-attachments/assets/4aab0bef-b413-4595-9766-a2c134676d27" />
 </div>
 
 ComfyUI is the AI creation engine for visual professionals who demand control over every model, every parameter, and every output. Its powerful and modular node graph interface empowers creatives to generate images, videos, 3D models, audio, and more...

comfy/cli_args.py

@@ -91,7 +91,6 @@ parser.add_argument("--directml", type=int, nargs="?", metavar="DIRECTML_DEVICE"
 
 parser.add_argument("--oneapi-device-selector", type=str, default=None, metavar="SELECTOR_STRING", help="Sets the oneAPI device(s) this instance will use.")
 parser.add_argument("--supports-fp8-compute", action="store_true", help="ComfyUI will act like if the device supports fp8 compute.")
-parser.add_argument("--enable-triton-backend", action="store_true", help="ComfyUI will enable the use of Triton backend in comfy-kitchen. Is disabled at launch by default.")
 
 class LatentPreviewMethod(enum.Enum):
     NoPreviews = "none"

comfy/quant_ops.py

@@ -1,8 +1,6 @@
 import torch
 import logging
 
-from comfy.cli_args import args
-
 try:
     import comfy_kitchen as ck
     from comfy_kitchen.tensor import (
@@ -23,15 +21,7 @@ try:
             ck.registry.disable("cuda")
             logging.warning("WARNING: You need pytorch with cu130 or higher to use optimized CUDA operations.")
 
-    if args.enable_triton_backend:
-        try:
-            import triton
-            logging.info("Found triton %s. Enabling comfy-kitchen triton backend.", triton.__version__)
-        except ImportError as e:
-            logging.error(f"Failed to import triton, Error: {e}, the comfy-kitchen triton backend will not be available.")
-            ck.registry.disable("triton")
-    else:
-        ck.registry.disable("triton")
+    ck.registry.disable("triton")
     for k, v in ck.list_backends().items():
         logging.info(f"Found comfy_kitchen backend {k}: {v}")
 except ImportError as e:

comfy_extras/nodes_compositing.py

@@ -202,11 +202,14 @@ class JoinImageWithAlpha(io.ComfyNode):
 
     @classmethod
     def execute(cls, image: torch.Tensor, alpha: torch.Tensor) -> io.NodeOutput:
-        batch_size = max(len(image), len(alpha))
+        batch_size = min(len(image), len(alpha))
+        out_images = []
+
         alpha = 1.0 - resize_mask(alpha, image.shape[1:])
-        alpha = comfy.utils.repeat_to_batch_size(alpha, batch_size)
-        image = comfy.utils.repeat_to_batch_size(image, batch_size)
-        return io.NodeOutput(torch.cat((image[..., :3], alpha.unsqueeze(-1)), dim=-1))
+        for i in range(batch_size):
+           out_images.append(torch.cat((image[i][:,:,:3], alpha[i].unsqueeze(2)), dim=2))
+
+        return io.NodeOutput(torch.stack(out_images))
 
 
 class CompositingExtension(ComfyExtension):

comfy_extras/nodes_primitive.py

@@ -49,7 +49,7 @@ class Int(io.ComfyNode):
             display_name="Int",
             category="utils/primitive",
             inputs=[
-                io.Int.Input("value", min=-sys.maxsize, max=sys.maxsize, control_after_generate=io.ControlAfterGenerate.fixed),
+                io.Int.Input("value", min=-sys.maxsize, max=sys.maxsize, control_after_generate=True),
             ],
             outputs=[io.Int.Output()],
         )

node_helpers.py

@@ -86,6 +86,6 @@ def image_alpha_fix(destination, source):
     if destination.shape[-1] < source.shape[-1]:
         source = source[...,:destination.shape[-1]]
     elif destination.shape[-1] > source.shape[-1]:
-        source = torch.nn.functional.pad(source, (0, 1))
-        source[..., -1] = 1.0
+        destination = torch.nn.functional.pad(destination, (0, 1))
+        destination[..., -1] = 1.0
     return destination, source

nodes.py

@@ -1754,49 +1754,57 @@ class LoadImage:
 
         return True
 
-
-class LoadImageMask(LoadImage):
+class LoadImageMask:
     ESSENTIALS_CATEGORY = "Image Tools"
     SEARCH_ALIASES = ["import mask", "alpha mask", "channel mask"]
 
     _color_channels = ["alpha", "red", "green", "blue"]
-
     @classmethod
     def INPUT_TYPES(s):
-        types = super().INPUT_TYPES()
-        return {
-            "required": {
-                **types["required"],
-                "channel": (s._color_channels, )
-            }
-        }
+        input_dir = folder_paths.get_input_directory()
+        files = [f for f in os.listdir(input_dir) if os.path.isfile(os.path.join(input_dir, f))]
+        return {"required":
+                    {"image": (sorted(files), {"image_upload": True}),
+                     "channel": (s._color_channels, ), }
+                }
 
     CATEGORY = "mask"
+
     RETURN_TYPES = ("MASK",)
-    FUNCTION = "load_image_mask"
-
-    def load_image_mask(self, image, channel):
-        image_tensor, mask_tensor = super().load_image(image)
+    FUNCTION = "load_image"
+    def load_image(self, image, channel):
+        image_path = folder_paths.get_annotated_filepath(image)
+        i = node_helpers.pillow(Image.open, image_path)
+        i = node_helpers.pillow(ImageOps.exif_transpose, i)
+        if i.getbands() != ("R", "G", "B", "A"):
+            if i.mode == 'I':
+                i = i.point(lambda i: i * (1 / 255))
+            i = i.convert("RGBA")
+        mask = None
         c = channel[0].upper()
-
-        if c == 'A':
-            return (mask_tensor,)
-
-        channel_idx = {'R': 0, 'G': 1, 'B': 2}.get(c, 0)
-
-        if channel_idx < image_tensor.shape[-1]:
-            return (image_tensor[..., channel_idx].clone(),)
+        if c in i.getbands():
+            mask = np.array(i.getchannel(c)).astype(np.float32) / 255.0
+            mask = torch.from_numpy(mask)
+            if c == 'A':
+                mask = 1. - mask
         else:
-            empty_mask = torch.zeros(
-                image_tensor.shape[:-1],
-                dtype=image_tensor.dtype,
-                device=image_tensor.device
-            )
-            return (empty_mask,)
+            mask = torch.zeros((64,64), dtype=torch.float32, device="cpu")
+        return (mask.unsqueeze(0),)
 
     @classmethod
     def IS_CHANGED(s, image, channel):
-        return super().IS_CHANGED(image)
+        image_path = folder_paths.get_annotated_filepath(image)
+        m = hashlib.sha256()
+        with open(image_path, 'rb') as f:
+            m.update(f.read())
+        return m.digest().hex()
+
+    @classmethod
+    def VALIDATE_INPUTS(s, image):
+        if not folder_paths.exists_annotated_filepath(image):
+            return "Invalid image file: {}".format(image)
+
+        return True
 
 
 class LoadImageOutput(LoadImage):

server.py

@@ -1,4 +1,3 @@
-import errno
 import os
 import sys
 import asyncio
@@ -1246,13 +1245,7 @@ class PromptServer():
             address = addr[0]
             port = addr[1]
             site = web.TCPSite(runner, address, port, ssl_context=ssl_ctx)
-            try:
-                await site.start()
-            except OSError as e:
-                if e.errno == errno.EADDRINUSE:
-                    logging.error(f"Port {port} is already in use on address {address}. Please close the other application or use a different port with --port.")
-                    raise SystemExit(1)
-                raise
+            await site.start()
 
             if not hasattr(self, 'address'):
                 self.address = address #TODO: remove this