Skip to content

chore: nightly sync main into dev (07_05_2026) - #4684

Closed
svcnvidia-nemo-ci wants to merge 113 commits into
devfrom
main2dev/07_05_2026
Closed

chore: nightly sync main into dev (07_05_2026)#4684
svcnvidia-nemo-ci wants to merge 113 commits into
devfrom
main2dev/07_05_2026

Conversation

@svcnvidia-nemo-ci

Copy link
Copy Markdown
Contributor

Summary

This PR syncs main into dev, merging 109 commits from main.

Python lines: +35569 / -10794 across 265 files

Files where main's version was taken over the merge

Per the nightly-sync skill, these files have known semantic conflicts where dev's version references args/APIs main has removed:

  • 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

Files restored from main

  • megatron/core/pipeline_parallel/hybrid_cp_schedule.py — needed by main's HybridCPDataLoaderWrapper

Special-case merges

  • megatron/core/datasets/data_schedule.py — kept dev's classes (BasePackingScheduler, DpBalancedScheduler, DefaultDynamicCPScheduler, wrap_data_iterator, get_batch_on_this_rank_for_sequence_packing) and appended main's HybridCPDataLoaderWrapper class. Added imports for Any, List, and BalancedCPScheduler to support both class sets.

Files deleted from main accepted

These were intentionally removed on main (PR #4207, #4322, etc.):

  • megatron/legacy/model/__init__.py
  • megatron/legacy/model/transformer.py
  • tools/checkpoint/loader_legacy.py
  • tools/checkpoint/loader_llama_mistral.py

(Plus the rest of megatron/legacy/model/* automatically deleted by the merge.)

Files explicitly NOT taken from main

Per the skill, the dependency-management triple stays on dev:

  • pyproject.toml
  • uv.lock
  • docker/Dockerfile.ci.dev

.github/CODEOWNERS left at dev's version (verified empty diff).

Git source reconciliation

pyproject.toml [tool.uv.sources]: dev includes fast-hadamard-transform (not on main) and a different nvidia-resiliency-ext revision. Dev's nvrx.py uses getattr(...) for the symbols main expects, so dev's revision is compatible.

Test plan

  • CI passes on this branch (PR linting + unit tests + functional tests + MBridge)
  • Linting passes (tools/autoformat.sh CHECK_ONLY=true)

minitu and others added 30 commits April 22, 2026 18:02
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-authored-by: Xin Yao <xiny@nvidia.com>
Co-authored-by: john2 <john2@jrlogin01.jureca>
Signed-off-by: Charlie Truong <chtruong@nvidia.com>
Co-authored-by: root <root@nvl72098-T17.cm.cluster>
Co-authored-by: William Dykas <wdykas@oci-hsg-cs-001-vscode-03.cm.cluster>
Co-authored-by: root <root@nvl72160-T13.cm.cluster>
…classmethod (#3812)

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-authored-by: Dmytro Pykhtar <37850217+dimapihtar@users.noreply.github.com>
Signed-off-by: oliver könig <okoenig@nvidia.com>
#4403)

Co-authored-by: Antoni-Joan Solergibert <asolergibert@nvidia.com>
Co-authored-by: Philip Petrakian <ppetrakian@nvidia.com>
Signed-off-by: Maanu Grover <maanug@nvidia.com>
Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com>
Signed-off-by: dimapihtar <dpykhtar@nvidia.com>
Signed-off-by: dimapihtar <dpykhtar@nvidia.com>
Co-authored-by: Siddharth Singh <sidsingh@nvidia.com>
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
…ss curve gaps for latent MoE models (#4433)

Signed-off-by: root <jiemingz@nvidia.com>
…4158)

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
…4422)

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Signed-off-by: rprenger <rprenger@nvidia.com>
Signed-off-by: qiyuw <qiyuw@nvidia.com>
Co-authored-by: Antoni-Joan Solergibert <asolergibert@nvidia.com>
Signed-off-by: Keshav Santhanam <ksanthanam@nvidia.com>
@copy-pr-bot

copy-pr-bot Bot commented May 7, 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.

@svcnvidia-nemo-ci svcnvidia-nemo-ci added Run functional tests Run MBridge tests Attach this for testing this PR against MBridge main labels May 7, 2026
@svcnvidia-nemo-ci

Copy link
Copy Markdown
Contributor Author

/ok to test b23d336

@svcnvidia-nemo-ci

Copy link
Copy Markdown
Contributor Author

/ok to test 00b94ee

@svcnvidia-nemo-ci

Copy link
Copy Markdown
Contributor Author

/ok to test ecfab37

@svcnvidia-nemo-ci

Copy link
Copy Markdown
Contributor Author

/ok to test 37d5fe8

# Conflicts:
#	megatron/core/distributed/param_and_grad_buffer.py
@svcnvidia-nemo-ci

Copy link
Copy Markdown
Contributor Author

/ok to test 1977862

@svcnvidia-nemo-ci

Copy link
Copy Markdown
Contributor Author

/ok to test c0ba83d

@svcnvidia-nemo-ci

Copy link
Copy Markdown
Contributor Author

/ok to test e7c249b

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.