Skip to content

Reorganize order of operations in inference context and text generation controller - #2929

Merged
tdene merged 20 commits into
NVIDIA:mainfrom
tdene:tde/active_mask_refactor
Apr 29, 2026
Merged

Reorganize order of operations in inference context and text generation controller#2929
tdene merged 20 commits into
NVIDIA:mainfrom
tdene:tde/active_mask_refactor

Conversation

@tdene

@tdene tdene commented Jan 13, 2026

Copy link
Copy Markdown
Contributor

What does this PR do ?

This PR cleans up the order of operations in order to easily enable future optimizations.

In addition, this PR adds some common sugar that is used by multiple such optimizations.

Contribution process

flowchart LR
    A[Pre-checks] --> B[PR Tests]
    subgraph Code Review/Approval
        C1[Expert Review] --> C2[Final Review]
    end
    B --> C1
    C2 --> D[Merge]
Loading

Pre-checks

  • I want this PR in a versioned release and have added the appropriate Milestone (e.g., Core 0.8)
  • 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

The following process is enforced via the CODEOWNERS file for changes into megatron/core. For changes outside of megatron/core, it is up to the PR author whether or not to tag the Final Reviewer team.

For MRs into `main` branch

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!

(Step 1): Add PR label Expert Review

(Step 2): Collect the expert reviewers reviews

  1. Attach the Expert Review label when your PR is ready for review.
  2. GitHub auto-assigns expert reviewers based on your changes. They will get notified and pick up your PR soon.

⚠️ Only proceed to the next step once all reviewers have approved, merge-conflict are resolved and the CI is passing.
Final Review might get declined if these requirements are not fulfilled.

(Step 3): Final Review

  1. Add Final Review label
  2. GitHub auto-assigns final reviewers based on your changes. They will get notified and pick up your PR soon.

(Optional Step 4): Cherry-pick into release branch

If this PR also needs to be merged into core_r* release branches, after this PR has been merged, select Cherry-pick to open a new PR into the release branch.

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.

Merging your PR

Any member of core-adlr and core-nemo will be able to merge your PR.

@copy-pr-bot

copy-pr-bot Bot commented Jan 13, 2026

Copy link
Copy Markdown

Auto-sync is disabled for draft pull requests in this repository. Workflows must be run manually.

Contributors can view more details about this message here.

@tdene
tdene force-pushed the tde/active_mask_refactor branch from f938a05 to 0c2c1c5 Compare January 13, 2026 16:53
@tdene
tdene marked this pull request as ready for review January 13, 2026 16:54
@tdene
tdene requested review from a team as code owners January 13, 2026 16:54
@ko3n1g
ko3n1g requested a review from a team January 13, 2026 16:54
@ko3n1g ko3n1g added this to the Core 0.16 milestone Jan 13, 2026
@tdene tdene changed the title Refactor the building of active-masked tensors in context Reorganize the building of active-masked tensors in context Jan 13, 2026
@tdene
tdene force-pushed the tde/active_mask_refactor branch from 0c2c1c5 to 63c19dc Compare January 14, 2026 14:38
@Phlip79 Phlip79 added Expert Review [deprecated] Apply this label to indicate that your PR is ready for expert review. complexity: medium and removed Expert Review [deprecated] Apply this label to indicate that your PR is ready for expert review. labels Jan 14, 2026

@Phlip79 Phlip79 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Please add tests for the new logic.

Comment thread megatron/core/inference/contexts/dynamic_context.py Outdated
Comment thread megatron/core/inference/contexts/dynamic_context.py
Comment thread megatron/core/inference/contexts/dynamic_context.py
Comment thread megatron/core/inference/contexts/dynamic_context.py Outdated
@tdene
tdene marked this pull request as draft March 2, 2026 22:32
+ context.num_prefill_requests
)
else:
logits_seq_len = active_request_count

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can we consolidate this with the last_token_logits function in the context? I suspect either this code or that code will be redundant now but I'm not sure what the exact implications are

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I believe this is done.

@svcnvidia-nemo-ci svcnvidia-nemo-ci added the Final Review PR is in the "final review" stage label Apr 29, 2026
@tdene
tdene enabled auto-merge April 29, 2026 16:51
@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 29, 2026
@svcnvidia-nemo-ci

Copy link
Copy Markdown
Contributor

🔄 Merge queue validation started!

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

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: medium

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants