Skip to content

Conversation

@StAlKeR7779
Copy link
Contributor

Inpaint node still used by canvas, so fixed it to new model manager api.
Other old generation code deleted.

@psychedelicious
Copy link
Contributor

The old txt2img and img2img are still used by canvas, pls do not delete

StAlKeR7779 and others added 6 commits June 19, 2023 15:57
Instead of manually creating every node and edge, we can simply copy/paste the base graph from node editor, then sub in parameters.

This is a much more intelligible process. We still need to handle seed, img2img fit and controlnet separately.
- Add graph builders for canvas txt2img & img2img - they are mostly copy and paste from the linear graph builders but different in a few ways that are very tricky to work around. Just made totally new functions for them.
- Canvas txt2img and img2img support ControlNet (not inpaint/outpaint). There's no way to determine in real-time which mode the canvas is in just yet, so we cannot disable the ControlNet UI when the mode will be inpaint/outpaint - it will always display. It's possible to determine this in near-real-time, will add this at some point.
- Canvas inpaint/outpaint migrated to use model loader, though inpaint/outpaint are still using the non-latents nodes.
@psychedelicious psychedelicious force-pushed the fix/inpaint_new_manager branch from 84794d8 to 41442eb Compare June 19, 2023 05:57
@psychedelicious
Copy link
Contributor

@blessedcoolant
Can you please test this all tabs?

Everything should be working, including controlnet on canvas txt2img and img2img modes.

Controlnet does not work on canvas inpaint/outpaint, but since we don't have real-time generation mode detection yet, we can't disable the controlnet UI when the mode is inpaint/outpaint.

This will supersede the changes you made to add the model loader to the linear graph builders.

@blessedcoolant
Copy link
Collaborator

@blessedcoolant Can you please test this all tabs?

Everything should be working, including controlnet on canvas txt2img and img2img modes.

Controlnet does not work on canvas inpaint/outpaint, but since we don't have real-time generation mode detection yet, we can't disable the controlnet UI when the mode is inpaint/outpaint.

This will supersede the changes you made to add the model loader to the linear graph builders.

Will give it a test run in a few. And I'll sync up the changes on the MM pr later.

@psychedelicious
Copy link
Contributor

Tests need to be updated now that the TextToImageInvocation and ImageToImageInvocation nodes no longer exist

@blessedcoolant
Copy link
Collaborator

  • Text To Image - Works
  • Text To Image w/ ControlNet - Works
  • Image To Image - Works
  • Image To Image w/ ControlNet - Works
  • Canvas Text To Image - Works
  • Canvas Image To Image - Works
  • Canvas Inpainting - Works
  • Canvas Outpainting - Works
  • Canvas Text To Image w/ ControlNet - Works
  • Canvas Image To Image w/ ControlNet - Works
  • Canvas Inpainting w/ ControlNet - Shouldnt work and doesn't. Works as expected.
  • Canvas Outpainting w/ ControlNet - Shouldnt work and doesn't. Works as expected.

Everything seems to be in order. @psychedelicious

@blessedcoolant blessedcoolant merged commit 1a7fe17 into main Jun 19, 2023
@blessedcoolant blessedcoolant deleted the fix/inpaint_new_manager branch June 19, 2023 11:01
keturn added a commit that referenced this pull request Aug 6, 2023
orphaned since #3550 removed the LazilyLoadedModelGroup code, probably unused since ModelCache took over responsibility for sequential offload somewhere around #3335.
keturn added a commit that referenced this pull request Aug 6, 2023
orphaned since #3550 removed the LazilyLoadedModelGroup code, probably unused since ModelCache took over responsibility for sequential offload somewhere around #3335.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants