Skip to content

Fix H2D stream synchronization in optimizer offload - #3140

Merged
yaox12 merged 4 commits into
NVIDIA:mainfrom
tgkyrie:fix_overlap_cpu_optimizer_d2h_h2d_bug
Feb 1, 2026
Merged

Fix H2D stream synchronization in optimizer offload#3140
yaox12 merged 4 commits into
NVIDIA:mainfrom
tgkyrie:fix_overlap_cpu_optimizer_d2h_h2d_bug

Conversation

@tgkyrie

@tgkyrie tgkyrie commented Jan 29, 2026

Copy link
Copy Markdown
Contributor

In param_copy_back_gpu_hook, the H2D memcpy is enqueued on _h2d_stream, but the previous code incorrectly recorded an event on _d2h_stream and made the main stream wait on it. This does not guarantee the main stream waits for the H2D copy to complete, which can lead to race conditions.

This commit records the event on _h2d_stream instead, ensuring proper happens-before semantics between H2D memcpy and subsequent GPU operations.

What does this PR do ?

⚠️ For major changes (either in lines of code or in its impact), please make sure to first share a design doc with the team. If you're unsure what's the best way to do so, contact the @mcore-oncall.

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.

In param_copy_back_gpu_hook, the H2D memcpy is enqueued on _h2d_stream,
but the previous code incorrectly recorded an event on _d2h_stream and made
the main stream wait on it. This does not guarantee the main stream waits
for the H2D copy to complete, which can lead to race conditions.

This commit records the event on _h2d_stream instead, ensuring proper
happens-before semantics between H2D memcpy and subsequent GPU operations.
@tgkyrie
tgkyrie requested review from a team as code owners January 29, 2026 09:15
@copy-pr-bot

copy-pr-bot Bot commented Jan 29, 2026

Copy link
Copy Markdown

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.

@ko3n1g
ko3n1g requested a review from a team January 29, 2026 09:15

@dimapihtar dimapihtar left a comment

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.

LGTM. Thank you!

@dimapihtar dimapihtar added Expert Review [deprecated] Apply this label to indicate that your PR is ready for expert review. Final Review PR is in the "final review" stage complexity: low labels Jan 29, 2026
@dimapihtar

Copy link
Copy Markdown
Contributor

/ok to test 5430b04

@yaox12
yaox12 enabled auto-merge February 1, 2026 10:17
@yaox12

yaox12 commented Feb 1, 2026

Copy link
Copy Markdown
Member

/ok to test c4d772c

@yaox12
yaox12 added this pull request to the merge queue Feb 1, 2026
Merged via the queue into NVIDIA:main with commit ae67076 Feb 1, 2026
45 checks passed
daiyaanarfeen pushed a commit to daiyaanarfeen/Megatron-LM that referenced this pull request Feb 23, 2026
Co-authored-by: Dmytro Pykhtar <37850217+dimapihtar@users.noreply.github.com>
Co-authored-by: Xin Yao <xiny@nvidia.com>
yangbofun pushed a commit to xlm-research/Megatron-LM that referenced this pull request May 22, 2026
Co-authored-by: Dmytro Pykhtar <37850217+dimapihtar@users.noreply.github.com>
Co-authored-by: Xin Yao <xiny@nvidia.com>
terminator123 pushed a commit to 021ai/Megatron-LM that referenced this pull request Aug 3, 2026
Co-authored-by: Dmytro Pykhtar <37850217+dimapihtar@users.noreply.github.com>
Co-authored-by: Xin Yao <xiny@nvidia.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

community-request complexity: low Expert Review [deprecated] Apply this label to indicate that your PR is ready for expert review. Final Review PR is in the "final review" stage

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants