Skip to content

Add conditions_embeddings argument to TransformerBlock, TransformerLayer for DiT (diffusion transformer)#4134

Merged
huvunvidia merged 1 commit intoNVIDIA:mainfrom
huvunvidia:huvu/diffusion_condition_embeddings_main
Apr 10, 2026
Merged

Add conditions_embeddings argument to TransformerBlock, TransformerLayer for DiT (diffusion transformer)#4134
huvunvidia merged 1 commit intoNVIDIA:mainfrom
huvunvidia:huvu/diffusion_condition_embeddings_main

Conversation

@huvunvidia
Copy link
Copy Markdown
Contributor

What does this PR do ?

The PR is for introducing an extra argument conditions_embeddings for TransformerLayer, TransformerBlock.
This argument is for providing timesteps embeddings for all diffusion models.
Currently, to inject timesteps embeddings, we need workaround method:

  • Wan/Cosmos text-to-video: using attention_mask as a place holder (link), which is not a good practice
  • FLUX: overriding TransformerLayer to support that argument, and avoid TransformerBlock all together (link)

Since this timesteps/conditions embeddings are used by almost all diffusion models, it would be reasonable to add official argument for it.

Contribution process

Pre-checks

  • I have added relevant unit tests
  • I have added relevant functional tests
  • I have added proper typing to my code Typing guidelines
  • I have added relevant documentation
  • I have run the autoformatter.sh on my PR

Code review

Feel free to message or comment the @mcore-oncall to help accelerate your merge into main. The less complex your PR is, the faster it will be approved and merged!

All PRs start as draft. If you open a non-draft PR, it will be automatically converted to draft.

Step 1: Mark PR as "Ready for Review"

  1. When your PR is ready, click Ready for Review.
  2. An oncall reviewer is auto-assigned and expert reviewers are notified based on your changes.
    • Some PRs may jump straight to step 2. This is determined by .github/CODEOWNERS.

⚠️ Only mark as ready once merge-conflicts are resolved and the CI is passing.
Final Review might get declined if these requirements are not fulfilled.

Step 2: Final Review

For PRs that change megatron/core, once all expert reviewers have approved, the Final Review label is applied automatically and final reviewers are assigned.

For PRs outside megatron/core, this step is skipped.

Step 3: Approved

Once all required reviewers have approved, the Approved label is applied automatically.

Merge

Any member of mcore-engineers will be able to merge your PR.

For MRs into `dev` branch The proposed review process for `dev` branch is under active discussion.

MRs are mergable after one approval by either eharper@nvidia.com or zijiey@nvidia.com.

@copy-pr-bot
Copy link
Copy Markdown

copy-pr-bot bot commented Apr 3, 2026

This pull request requires additional validation before any workflows can run on NVIDIA's runners.

Pull request vetters can view their responsibilities here.

Contributors can view more details about this message here.

@huvunvidia huvunvidia requested review from a team as code owners April 3, 2026 19:39
@svcnvidia-nemo-ci svcnvidia-nemo-ci marked this pull request as draft April 3, 2026 19:39
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 3, 2026

This PR has been automatically converted to draft because all PRs must start as drafts.

When you are ready for review, click Ready for Review to begin the review process. This will:

  1. Add the oncall reviewer (optional reviewer)
  2. Add required review teams based on your changes

See the contribution guide for more details.

@huvunvidia
Copy link
Copy Markdown
Contributor Author

/ok to test 03d7ba3

@svcnvidia-nemo-ci svcnvidia-nemo-ci added this to the Core 0.16 milestone Apr 3, 2026
@huvunvidia huvunvidia marked this pull request as ready for review April 3, 2026 20:39
@svcnvidia-nemo-ci svcnvidia-nemo-ci requested a review from a team April 3, 2026 20:39
@svcnvidia-nemo-ci svcnvidia-nemo-ci added Final Review PR is in the "final review" stage complexity: low labels Apr 3, 2026
@svcnvidia-nemo-ci svcnvidia-nemo-ci added Approved All necessary approvals have been made and removed Final Review PR is in the "final review" stage labels Apr 10, 2026
@huvunvidia huvunvidia enabled auto-merge April 10, 2026 20:49
@huvunvidia huvunvidia added this pull request to the merge queue Apr 10, 2026
@svcnvidia-nemo-ci
Copy link
Copy Markdown

🔄 Merge queue validation started!

You can track the progress here: https://github.com/NVIDIA/Megatron-LM/actions/runs/24263754507

Merged via the queue into NVIDIA:main with commit 1daa19f Apr 10, 2026
69 of 71 checks passed
@huvunvidia huvunvidia deleted the huvu/diffusion_condition_embeddings_main branch April 10, 2026 21:47
ko3n1g added a commit to ko3n1g/Megatron-LM that referenced this pull request Apr 13, 2026
…formerLayer for DiT (diffusion transformer) (NVIDIA#4134)"

This reverts commit 1daa19f.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Approved All necessary approvals have been made complexity: low

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants