Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix .swap() by reverting improperly merged @classmethod change #4080

Merged
merged 2 commits into from
Aug 3, 2023

Conversation

damian0815
Copy link
Contributor

What type of PR is this? (check all applicable)

  • Refactor
  • Feature
  • Bug Fix
  • Optimization
  • Documentation Update
  • Community Node Submission

brings back .swap() (will not work with inpainting, sequential guidance, or xformers. untested with SDXL)

Copy link
Contributor

@JPPhoto JPPhoto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested with 1.5 models, works again!

@keturn
Copy link
Contributor

keturn commented Jul 30, 2023

SD 1.x results

Prompt: ("a cat in the forest", "a fantasy forest").and()
Result: ❌ operation completes without error, but only "a cat in the forest" is logged and the result looks equivalent to that part alone; the second term "a fantasy forest" seemingly having no impact at all.

Prompt: silhouette of a dancing (Elvis).swap(frog)
Result: ✅ behaving appropriately. Both terms logged, output is as expected.

Prompt: (pineapple, cogwheel).blend()
Result: ✅ behaving appropriately. Both terms logged, output is as expected (probably? I should have picked a blend I had a prior result for.)

SD 2.x results

Same as SD 1.x.

@keturn
Copy link
Contributor

keturn commented Jul 30, 2023

SDXL results

Exceptions all the way. Is that in scope here or should we consider it separately?

@damian0815
Copy link
Contributor Author

damian0815 commented Jul 31, 2023

thanks @keturn.

.and() support is being looked at by @StAlKeR7779 (there's not a PR AFAIK), so it's a known issue that that doesn't work.

i don't know what SDXL support should look like. i cannot run SDXL on my machine which makes me a poor candidate for looking into it.

Copy link
Collaborator

@lstein lstein left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@psychedelicious
Copy link
Collaborator

Merging as the missing pieces (.and() and SDXL) are both known WIP items.

@psychedelicious psychedelicious enabled auto-merge (rebase) August 2, 2023 23:55
@psychedelicious psychedelicious merged commit 4e0949f into invoke-ai:main Aug 3, 2023
8 checks passed
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.

5 participants