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] Fix num_images_per_prompt in controlnet #1936

Merged
merged 3 commits into from
Jul 13, 2023

Conversation

LeoXing1996
Copy link
Collaborator

Thanks for your contribution and we appreciate it a lot. The following instructions would make your pull request more healthy and more easily get feedback. If you do not understand some items, don't worry, just make the pull request and seek help from maintainers.

Motivation

Related to #1927

Modification

If number control is 1, the control will be repeated for num_images_per_prompt * len(prompt) times.
Otherwise the number control must equal to number of prompt, and will be repeated for num_images_per_prompt times.

Unit tests are revised as well.

BC-breaking (Optional)

Does the modification introduce changes that break the backward-compatibility of the downstream repositories?
If so, please describe how it breaks the compatibility and how the downstream projects should modify their code to keep compatibility with this PR.

Use cases (Optional)

If this PR introduces a new feature, it is better to list some use cases here, and update the documentation.

Checklist

Submitting this pull request means that,

Before PR:

  • I have read and followed the workflow indicated in the CONTRIBUTING.md to create this PR.
  • Pre-commit or linting tools indicated in CONTRIBUTING.md are used to fix the potential lint issues.
  • Bug fixes are covered by unit tests, the case that causes the bug should be added in the unit tests.
  • New functionalities are covered by complete unit tests. If not, please add more unit test to ensure the correctness.
  • The documentation has been modified accordingly, including docstring or example tutorials.

After PR:

  • If the modification has potential influence on downstream or other related projects, this PR should be tested with some of those projects.
  • CLA has been signed and all committers have signed the CLA in this PR.

@codecov
Copy link

codecov bot commented Jul 13, 2023

Codecov Report

Patch coverage: 50.00% and project coverage change: -0.01 ⚠️

Comparison is base (71d4195) 82.59% compared to head (f100531) 82.59%.

❗ Current head f100531 differs from pull request most recent head 89a5e7b. Consider uploading reports for the commit 89a5e7b to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1936      +/-   ##
==========================================
- Coverage   82.59%   82.59%   -0.01%     
==========================================
  Files         413      413              
  Lines       27811    27812       +1     
  Branches     4366     4366              
==========================================
- Hits        22971    22970       -1     
+ Misses       3895     3893       -2     
- Partials      945      949       +4     
Flag Coverage Δ
unittests 82.59% <50.00%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
mmagic/models/editors/controlnet/controlnet.py 47.36% <50.00%> (-0.46%) ⬇️

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@LeoXing1996 LeoXing1996 force-pushed the leoxing/fix-prepare-control branch from 3b5e576 to eb04a59 Compare July 13, 2023 03:33
Copy link
Collaborator

@zengyh1900 zengyh1900 left a comment

Choose a reason for hiding this comment

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

lgtm.

@zengyh1900 zengyh1900 merged commit 9d37453 into open-mmlab:main Jul 13, 2023
@LeoXing1996 LeoXing1996 deleted the leoxing/fix-prepare-control branch July 13, 2023 07:43
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.

2 participants