Support for ComfyUI #384

PassiveLemon · 2023-04-02T04:25:41Z

As discussed in Discussion #367, this adds support for the newer ComfyUI. I forked the fork that would already add this but the maintainer of that fork hasn't implemented the changes needed to properly get the output function working, which I did. I believe everything is functional though I have not tested every single node.

I changed the table format for the README and a few other minor things for aesthetic reasons but if you want me to revert those, I will.

Map to existing auto and invoke folder structures

AbdBarho · 2023-04-03T10:21:15Z

Thank you, I unfortunately don't have time now to test this thoroughly, I will try to have it tested by the end of the week.

We would need to think about the folder hierarchy and try to not create new subfolders for every ui, otherwise we cannot re-use anything.

I still have to check the license stuff as mentioned in #367

it would be great if the changes were constrained to the comfy UI and only whats necessary in docker-compose.

The readme formatting could be reverted, it was like this because of a vscode extension I use.

PassiveLemon · 2023-04-03T15:27:22Z

Understood, I reverted all unnecessary changes to the code that doesn't affect anything. About the folder hierarchy, aren't the build scripts for each UI completely different anyways? I feel like it would be more of a hassle than its worth to try to make things reusable.

PassiveLemon · 2023-04-03T15:29:28Z

Unless you mean something like a master Dockerfile that can manage the similarities between the containers like the Pip packages but then also pass control to the individuals that manage the more UI specific configuration.

AbdBarho · 2023-04-03T16:05:41Z

Oh, by "re-using" I meant the actual models, since these are usually very large, it is redundant to re-download or copy them to every UI folder. Even though it would be the easiest solution.

PassiveLemon · 2023-04-03T16:32:09Z

I'm still slightly confused. Is there something that I need to change with this PR or is it suggesting something that could be worked on to provide compatibility between all UIs? This profile will use the same file structure as the others and symlink them to their appropriate locations in the container

AbdBarho · 2023-04-03T16:47:21Z

I am kind of referring to this:

MOUNTS["${ROOT}/models/clip_vision"]="/data/comfy/clip_vision"
MOUNTS["${ROOT}/models/controlnet"]="/data/config/auto/extensions/sd-webui-controlnet/models"
MOUNTS["${ROOT}/models/style_models"]="/data/comfy/style_models"
MOUNTS["${ROOT}/models/t2i_adapter"]="/data/comfy/t2i_adapter"

but don't worry, this is not your problem, this is a more general architecture question regarding this repo.

PassiveLemon · 2023-04-03T17:02:18Z

Oh I believe those are functions specific to ComfyUI so they are in their own directory to avoid confusion with the other UIs. As for this repo, let me know if you would like any help. I'm pretty much free for the next week or so.

gocom · 2023-04-14T10:46:43Z

services/comfy/Dockerfile

+
+RUN --mount=type=cache,target=/root/.cache/pip pip install torch==1.13.0 torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu117
+
+RUN apt update && apt install -y git && apt clean


May want to use/keep apt-get instead of apt. apt is an user-facing UI for apt-get and it's siblings, that isn't mean for scripts. From apt's man page (man apt):

SCRIPT USAGE AND DIFFERENCES FROM OTHER APT TOOLS The apt(8) commandline is designed as an end-user tool and it may change behavior between versions. While it tries not to break backward compatibility this is not guaranteed either if a change seems beneficial for interactive use. All features of apt(8) are available in dedicated APT tools like apt- get(8) and apt-cache(8) as well. apt(8) just changes the default value of some options (see apt.conf(5) and specifically the Binary scope). So you should prefer using these commands (potentially with some additional options enabled) in your scripts as they keep backward compatibility as much as possible.

I didn't know there was a difference in them. Since apt-get seems more suited for this, I switch back over to that. Thanks for that

Merges the new changes from the master with some modifications to make Comfy follow the OCI compliance

This reverts commit 55d0591.

This reverts commit 45916f4.

This reverts commit 4d05480.

This reverts commit 9cfb7e8.

I forgot that I merged the main files so those would show up in the edits. This should have fixed that

PassiveLemon · 2023-04-17T20:30:38Z

I have updated this to match the latest commits OCI compliance. I based most of it off of the Sygil service since it is the most similar in terms of structure.

LEv145 · 2023-04-18T16:55:47Z

You can add AMD, CPU, AMD6600 support like here:
comfyanonymous/ComfyUI#190

r7l · 2023-04-18T19:42:20Z

I've tried the Dockerfile and it blends in perfectly into this project.

As a suggestion: Quote the echo statement in entrypoint.sh.

The downside with comfy is that there isn't a plugin manager yet and lots of custom nodes would require additional git pull and pip install commands and such.

PassiveLemon · 2023-04-19T00:10:04Z

You can add AMD, CPU, AMD6600 support like here: comfyanonymous/ComfyUI#190

I'll let AbdBarho decide if and how this gets added as there are currently plans to organize stuff a little better.

I've tried the Dockerfile and it blends in perfectly into this project.

As a suggestion: Quote the echo statement in entrypoint.sh.

The downside with comfy is that there isn't a plugin manager yet and lots of custom nodes would require additional git pull and pip install commands and such.

All of the other profiles have the same echo command and it doesn't appear to cause any problems so I'll leave it as is. As for the custom nodes, I couldn't find any mention of git or pip so I am unsure if something will need to be done. I will have to think of a way to get that sorted if they do require external commands though.

AbdBarho · 2023-04-19T04:28:25Z

Hey! sorry for not being active, I am currently changing jobs so time is a bit tight, I will try to get to this in the evening today to do some initial testing.

You can add AMD, CPU, AMD6600 support like here:
comfyanonymous/ComfyUI#190

That is really great, maybe we need some testers since I don't have an AMD GPU.

The downside with comfy is that there isn't a plugin manager yet and lots of custom nodes would require additional git pull and pip install commands and such.

Maybe we can consider a startup.sh script similar to auto where you can do all of the magic there?

PassiveLemon · 2023-04-19T23:10:54Z

That is really great, maybe we need some testers since I don't have an AMD GPU.

How would you want this implemented? I'm thinking profiles like for auto-cpu but I don't want to crowd the compose file with 4 profiles for 1 UI.

Test 1 variables: - 3060 Ti - 20 steps - 7.5 cfg - euler_a - 4x 512x512 Test 1: Without: 16.43, 15.98, 15.59 - About 49 seconds total for 3 runs. With Xformers: 10.39, 10.22, 10.64 - About 30 seconds total for 3 runs. About 1.6x faster with Xformers -------------------- Test 2 variables: - 3060 Ti - 20 steps - 7.5 cfg - euler_a - 4x 1024x512 Test 1: Without Xformers: 53.25, 54.23, 53.53 - About 2.6 minutes total for 3 runs. With Xformers: 20.06, 20.42, 20.47 - About 1 minute total for 3 runs. About 2.6x faster with Xformers!!

PassiveLemon · 2023-04-20T20:31:14Z

Added support for Xformers (I ripped it from auto). Very good improvements in performance depending on image size. Details in the 'Xformers' commit.

AbdBarho · 2023-04-21T17:16:29Z

@PassiveLemon can you please allow to push into your branch? I want to do some final changes and merge this.

PassiveLemon · 2023-04-21T19:00:32Z

I invited you as a collaborator

AbdBarho · 2023-04-21T19:29:57Z

@PassiveLemon thank you for this PR

Would be great if you have any other improvements, we can always add them in other PRs!

PassiveLemon · 2023-04-21T20:05:42Z

I will try to help maintain this profile as Comfy is still very active and updated multiple times a day

As discussed in Discussion [AbdBarho#367](AbdBarho#367), this adds support for the newer ComfyUI. I forked the fork that would already add this but the maintainer of that fork hasn't implemented the changes needed to properly get the output function working, which I did. I believe everything is functional though I have not tested every single node. I changed the table format for the README and a few other minor things for aesthetic reasons but if you want me to revert those, I will. --------- Co-authored-by: Jonathan Kovacs <[email protected]> Co-authored-by: AbdBarho <[email protected]>

jkovacs-dev and others added 8 commits March 16, 2023 17:04

Add ComfyUI service.

3becc05

Update entrypoint.sh

1c3c134

Map to existing auto and invoke folder structures

1c6d295

Merge pull request #1 from jkovacs-dev/comfyui

1ace4e5

Map to existing auto and invoke folder structures

update

d4f1b87

update

2fc21ec

Update README.md

4ec2656

Update README.md

16a0fb9

PassiveLemon changed the title ~~Support for Comfyui~~ Support for ComfyUI Apr 2, 2023

PassiveLemon added 3 commits April 2, 2023 00:39

Update docker-compose.yml

c5ba892

Aesthetic changes

738851b

cleanup

ea82e7d

PassiveLemon added 2 commits April 3, 2023 11:18

Revert unnecessary changes

ff81ff2

Match formatting

797f12c

gocom reviewed Apr 14, 2023

View reviewed changes

PassiveLemon added 8 commits April 14, 2023 15:00

apt -> apt-get

8d78b57

added custom_nodes path

9cfb7e8

Merge + update

4d05480

Merges the new changes from the master with some modifications to make Comfy follow the OCI compliance

ComfyUI version update

45916f4

Final

55d0591

Revert "Final"

abf5173

This reverts commit 55d0591.

Revert "ComfyUI version update"

d99a798

This reverts commit 45916f4.

Revert "Merge + update"

4a8fc1d

This reverts commit 4d05480.

PassiveLemon added 2 commits April 17, 2023 16:22

Revert "added custom_nodes path"

54a2da5

This reverts commit 9cfb7e8.

Fix Final

f4aae9e

I forgot that I merged the main files so those would show up in the edits. This should have fixed that

LEv145 mentioned this pull request Apr 18, 2023

Feature request: docker-compose support comfyanonymous/ComfyUI#188

Open

AbdBarho mentioned this pull request Apr 19, 2023

Add Comfy UI #415

Closed

PassiveLemon added 2 commits April 20, 2023 15:02

Remove Torchaudio

06bcba6

AbdBarho added 5 commits April 21, 2023 21:18

add cpu

e6945ff

update readme

ac3cf97

add missing ignores

4926b2d

Add xformers, restructure code

8ed85c6

change some folders

74d0002

AbdBarho approved these changes Apr 21, 2023

View reviewed changes

AbdBarho merged commit 2a0de02 into AbdBarho:master Apr 21, 2023

LEv145 mentioned this pull request Apr 21, 2023

Init docker support (Nvidia and AMD) comfyanonymous/ComfyUI#190

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support for ComfyUI #384

Support for ComfyUI #384

PassiveLemon commented Apr 2, 2023 •

edited by AbdBarho

Loading

AbdBarho commented Apr 3, 2023

PassiveLemon commented Apr 3, 2023

PassiveLemon commented Apr 3, 2023

AbdBarho commented Apr 3, 2023

PassiveLemon commented Apr 3, 2023

AbdBarho commented Apr 3, 2023

PassiveLemon commented Apr 3, 2023

gocom Apr 14, 2023 •

edited

Loading

PassiveLemon Apr 14, 2023

PassiveLemon commented Apr 17, 2023

LEv145 commented Apr 18, 2023

r7l commented Apr 18, 2023

PassiveLemon commented Apr 19, 2023

AbdBarho commented Apr 19, 2023

PassiveLemon commented Apr 19, 2023

PassiveLemon commented Apr 20, 2023

AbdBarho commented Apr 21, 2023

PassiveLemon commented Apr 21, 2023

AbdBarho commented Apr 21, 2023 •

edited

Loading

PassiveLemon commented Apr 21, 2023


		RUN --mount=type=cache,target=/root/.cache/pip pip install torch==1.13.0 torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu117

		RUN apt update && apt install -y git && apt clean

Support for ComfyUI #384

Support for ComfyUI #384

Conversation

PassiveLemon commented Apr 2, 2023 • edited by AbdBarho Loading

AbdBarho commented Apr 3, 2023

PassiveLemon commented Apr 3, 2023

PassiveLemon commented Apr 3, 2023

AbdBarho commented Apr 3, 2023

PassiveLemon commented Apr 3, 2023

AbdBarho commented Apr 3, 2023

PassiveLemon commented Apr 3, 2023

gocom Apr 14, 2023 • edited Loading

Choose a reason for hiding this comment

PassiveLemon Apr 14, 2023

Choose a reason for hiding this comment

PassiveLemon commented Apr 17, 2023

LEv145 commented Apr 18, 2023

r7l commented Apr 18, 2023

PassiveLemon commented Apr 19, 2023

AbdBarho commented Apr 19, 2023

PassiveLemon commented Apr 19, 2023

PassiveLemon commented Apr 20, 2023

AbdBarho commented Apr 21, 2023

PassiveLemon commented Apr 21, 2023

AbdBarho commented Apr 21, 2023 • edited Loading

PassiveLemon commented Apr 21, 2023

PassiveLemon commented Apr 2, 2023 •

edited by AbdBarho

Loading

gocom Apr 14, 2023 •

edited

Loading

AbdBarho commented Apr 21, 2023 •

edited

Loading