Skip to content

chore: nightly sync main into dev (15_05_2026) - #4823

Closed
svcnvidia-nemo-ci wants to merge 42 commits into
devfrom
main2dev/15_05_2026
Closed

chore: nightly sync main into dev (15_05_2026)#4823
svcnvidia-nemo-ci wants to merge 42 commits into
devfrom
main2dev/15_05_2026

Conversation

@svcnvidia-nemo-ci

Copy link
Copy Markdown
Contributor

Summary

Nightly sync of main into dev. Merges 40 commits from main into the
current dev tip.

  • Python lines: +10866 / -2638 across 145 files
  • Merge strategy: git merge origin/main -X theirs --no-edit from origin/dev
  • 40 conflict files resolved (full surgical diff inside <details> below)

Files restored from dev (must NOT take main's version)

  • .github/CODEOWNERS — dev's reviewer config differs intentionally
  • pyproject.toml, uv.lock, docker/Dockerfile.ci.dev — tightly coupled
    dependency triple that includes dev-only entries (fast-hadamard-transform,
    dev's TransformerEngine revision, etc.)

Files explicitly overridden from main

Per the nightly-sync skill, these are known sources of semantic conflicts
where dev's versions reference args/APIs that main removed or renamed:

  • megatron/training/training.py
  • megatron/training/initialize.py
  • megatron/training/utils.py
  • megatron/training/datasets/data_samplers.py
  • megatron/core/optimizer/layer_wise_optimizer.py

API mismatches detected and fixed

The merge produced two call sites where main's caller used the now-renamed
off_interface.group_commit(...) static method; dev's
FineGrainedActivationOffloadingInterface only exposes the instance-method
group_offload(...). Switched both to the dev-style pattern that saves the
context-manager handle and calls .group_offload(...) on it:

  • megatron/core/transformer/attention.py (linear_proj output offload)
  • megatron/core/transformer/multi_latent_attention.py (attn_proj output
    offload)

Also removed a duplicate import of ArgumentGroupFactory in
megatron/training/arguments.py introduced by the merge.

Files in main intentionally NOT restored

  • .github/workflows/multi-approval-bot.yml — dev deleted in PR ci: Remove multi-approval action from dev branch #3576
    ("ci: Remove multi-approval action from dev branch")
  • tests/test_utils/recipes/h100/bert.yaml, t5.yaml — never referenced
    by anything in dev's tree (documented in prior sync commit 40d3094)

pyproject.toml git source reconciliation

Compared [tool.uv.sources] in main vs dev. No NEW git sources appear in
main that are missing from dev. Differences (TransformerEngine and
nvidia-resiliency-ext revisions) are intentional dev pins; keeping dev's
versions.

Formatting

Ran black --skip-magic-trailing-comma --skip-string-normalization then
isort (pinned 5.13.2 to match CI) on every changed Python file. Both
tools verify idempotent.

Conflict resolutions (remerge-diff)

40 files — full surgical diff

(Diff omitted for brevity; reviewers can reproduce with
git show --remerge-diff <merge-sha>.)

Test plan

  • Unit tests pass
  • Functional tests pass
  • MBridge tests pass
  • Internal GitLab CI pass

🤖 Generated with Claude Code

nschank and others added 30 commits May 10, 2026 20:59
Co-authored-by: Antoni-Joan Solergibert <asolergibert@nvidia.com>
…ename seq_len (#4094)" (#4718)

Signed-off-by: oliver könig <okoenig@nvidia.com>
…al tests` (#4730)

Signed-off-by: oliver könig <okoenig@nvidia.com>
Signed-off-by: oliver könig <okoenig@nvidia.com>
Signed-off-by: oliver könig <okoenig@nvidia.com>
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Signed-off-by: oliver könig <okoenig@nvidia.com>
Signed-off-by: Shivanjan Chakravorty <shivanjanc@nvidia.com>
Co-authored-by: Cory Ye <44509866+cspades@users.noreply.github.com>
Signed-off-by: Maanu Grover <maanug@nvidia.com>
Signed-off-by: oliver könig <okoenig@nvidia.com>
Co-authored-by: oliver könig <okoenig@nvidia.com>
Signed-off-by: Shivanjan Chakravorty <shivanjanc@nvidia.com>
Signed-off-by: Ajay Balasa <abalasa@nvidia.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
Signed-off-by: Maanu Grover <maanug@nvidia.com>
Signed-off-by: Chen Cui <chcui@nvidia.com>
Co-authored-by: Tuomas Rintamaki <trintamaki@nvidia.com>
Co-authored-by: Tyler Poon <tylerpoon@gmail.com>
Co-authored-by: Collin McCarthy <cmccarthy@nvidia.com>
Co-authored-by: Matthieu Le <matthieul@nvidia.com>
Co-authored-by: Piotr Zelasko <pzelasko@nvidia.com>
Co-authored-by: Ehsan Hosseini Asl <ehosseiniasl@nvidia.com>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-authored-by: Siddharth Singh <sidsingh@nvidia.com>
Signed-off-by: dimapihtar <dpykhtar@nvidia.com>
…parallel_size * expert_tensor_parallel_size (#4678)

Signed-off-by: dimapihtar <dpykhtar@nvidia.com>
Co-authored-by: Jorge Albericio <jalbericiola@nvidia.com>
#4509)

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Signed-off-by: Maanu Grover <maanug@nvidia.com>
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Co-authored-by: William Dykas <wdykas@oci-hsg-cs-001-vscode-03.cm.cluster>
@svcnvidia-nemo-ci

Copy link
Copy Markdown
Contributor Author

/ok to test 732f382

@svcnvidia-nemo-ci

Copy link
Copy Markdown
Contributor Author

/ok to test 6d3abeb

@svcnvidia-nemo-ci

Copy link
Copy Markdown
Contributor Author

Superseded by today's nightly sync.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Run functional tests Run MBridge tests Attach this for testing this PR against MBridge main

Projects

None yet

Development

Successfully merging this pull request may close these issues.