Skip to content

bugfix: fix CFG negative prompt judgment & simplify variable names fo… #1256

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.

Sign up for GitHub

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

Open
yiming-l21 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

bugfix: fix CFG negative prompt judgment & simplify variable names fo… #1256

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions xllm/models/dit/npu/qwen_image_edit/pipeline_qwenimage_edit_plus.h
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,9 +271,7 @@ class QwenImageEditPlusPipelineImpl : public QwenImagePipelineBaseImpl {
auto seed = generation_params.seed >= 0 ? generation_params.seed : 42;

auto prompts = input.prompts;
auto prompts_2 = input.prompts_2;
auto negative_prompts = input.negative_prompts;
auto negative_prompts_2 = input.negative_prompts_2;
auto latents = input.latents;
if (latents.defined()) {
latents = latents.to(options_.device(), dtype_);
Expand All @@ -283,15 +281,13 @@ class QwenImageEditPlusPipelineImpl : public QwenImagePipelineBaseImpl {
if (prompt_embeds.defined()) {
prompt_embeds = prompt_embeds.to(options_.device(), dtype_);
}
auto pooled_prompt_embeds = input.pooled_prompt_embeds;
torch::Tensor prompt_embeds_mask;

auto negative_prompt_embeds = input.negative_prompt_embeds;
if (negative_prompt_embeds.defined()) {
negative_prompt_embeds =
negative_prompt_embeds.to(options_.device(), dtype_);
}
auto negative_pooled_prompt_embeds = input.negative_pooled_prompt_embeds;
torch::Tensor negative_prompt_embeds_mask;

std::vector<torch::Tensor> image_list;
Expand Down Expand Up @@ -385,7 +381,7 @@ class QwenImageEditPlusPipelineImpl : public QwenImagePipelineBaseImpl {
}
}

bool has_neg_prompt = negative_prompts.size() > 0;
bool has_neg_prompt = negative_prompts.size() > 0 || negative_prompt_embeds.defined();

bool do_true_cfg = (true_cfg_scale > 1.0) && has_neg_prompt;
// inplace update prompt_embeds and prompt_embeds_mask
Expand Down
Loading