chore: nightly sync main into dev (29_06_2026) - #5548
Conversation
Signed-off-by: ykarnati <ykarnati@nvidia.com> Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
Signed-off-by: Philip Petrakian <ppetrakian@nvidia.com>
Signed-off-by: wdykas <wdykas@nvidia.com>
Signed-off-by: ykarnati <ykarnati@nvidia.com> Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
Signed-off-by: Keshav Santhanam <ksanthanam@nvidia.com>
Signed-off-by: ykarnati <ykarnati@nvidia.com> Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Laura Dang <laurad@nvidia.com>
Signed-off-by: oliver könig <okoenig@nvidia.com> Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Deepak Narayanan <dnarayanan@nvidia.com> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: oliver könig <okoenig@nvidia.com> Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Teodor-Dumitru Ene <teodord.ene@gmail.com>
Signed-off-by: shanmugamr1992 <shanmugamr1992@gmail.com> Signed-off-by: Shanmugam Ramasamy <111910568+shanmugamr1992@users.noreply.github.com> Co-authored-by: shanmugamr1992 <shanmugamr1992@gmail.com> Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: Shanmugam Ramasamy <111910568+shanmugamr1992@users.noreply.github.com>
Signed-off-by: ykarnati <ykarnati@nvidia.com> Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
Signed-off-by: Charlie Truong <chtruong@nvidia.com>
Signed-off-by: Jingyue Wu <wujingyue@gmail.com>
Signed-off-by: Philip Petrakian <ppetrakian@nvidia.com>
Signed-off-by: Jingyue Wu <wujingyue@gmail.com>
…and remove legacy modelbuilder functions (#5169) Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Signed-off-by: oliver könig <okoenig@nvidia.com> Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: oliver könig <okoenig@nvidia.com> Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Hollow Man <hollowman@opensuse.org>
Signed-off-by: oliver könig <okoenig@nvidia.com>
Signed-off-by: yanghao.666 <yanghao.666@jd.com>
Signed-off-by: Philip Petrakian <ppetrakian@nvidia.com>
…ls) (#5469) Signed-off-by: ilml <tolong@nvidia.com>
Signed-off-by: ykarnati <ykarnati@nvidia.com>
Signed-off-by: Philip Petrakian <ppetrakian@nvidia.com>
Dev-superset sync: main is ahead with in-place refactors that the pre-push dev-feature guard requires deferring. Corrections so the suite tests dev's code consistently: - hybrid_layer_specs.py, install-test.yml -> dev (deferred main DSA-CP dsa_layer + megatron.training import-check that hit dev's unguarded yaml). - inference text_generation_controller.py + flashinfer_sampling.py -> dev (main's logprobs calculate_log_probs(sampling=) vs dev's signature). - Reverted all main-version unit/test_utils tests to dev and removed main-new tests for deferred features (RL granularity, MTP cuda-graph, modelopt spec, disaggregation, sink attn, MIMO, freeze-base-mtp, flashinfer check_equality #4961, community/slack utils). - pyproject.toml -> dev (dropped unused launch_on_gb200 marker). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Signed-off-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com>
|
/ok to test 7a7a729 |
452cc1d to
7a7a729
Compare
|
✅ Ready for human review. CI is green on HEAD Non-exempt checks (all terminal + green): 161 SUCCESS + 4 SKIPPED — all unit-test buckets, functional/integration tests (gpt / moe / hybrid, 100-step training + golden-value comparison), Documented pre-existing failures (verified, not sync-caused):
Resolution approach. The branch's API mismatches detected & fixed during CI iteration (so the suite tests dev's code consistently):
Files from main vs dev: No file was taken wholesale from |
|
Superseded by today's nightly sync. |
|
Superseded by today's nightly sync. |
|
Superseded by today's nightly sync. |
Summary
Nightly sync of
main→dev, merging 51 commits frommain(origin/dev..origin/main, merge-basefc4597c0c).The branch's
pre-pushdev-feature-preservation guard aborts if the merged tree drops any dev-only line in a non-override file. This sync is unusual:mainis genuinely ahead ofdevin several subsystems (dev lackslog_probs_kernel/logprobs_mode,inter_document_masking, checkpoint process-group threading, etc.), andmainrefactored shared code in place. Incorporating those refactors verbatim would replace (drop) dev's versions of those lines and trip the guard (1101 flagged lines on a naive full merge).To satisfy the guard, in-place divergences were resolved in dev's favor. This PR therefore contains:
Deferred main changes (kept dev's version to preserve dev-only lines)
rl_parallel_generation_tasksdesign.inter_document_maskingdata path (Add inter-document attention masking to GPTDataset #5298) — kept dev'sget_batch+ sequence-packing-scheduler.schedules.pyaux-loss-scale generalization — kept dev's DSA-indexer scaling.to_inference_configslimming — kept dev's RL inference path.mpu.get_*checkpointing._decoder_hidden_states_cache.logprobs_mode(Add logprobs_mode (raw/processed) to inference config #5419), oncall script consolidation (Narrow oncall responsibilities #5490).training.py,initialize.py) were also kept at dev's version for consistency with the dev-design core.main-new files brought in (dormant where their feature-core is deferred)
megatron/core/inference/disaggregation/*,megatron/training/config/inference_config.py,dsa_layout.py/dsa_masking.py,megatron/rl/rollout_granularity.py, FSDPexperimental/{fully_shard,module,parameter_group}.py,examples/mimo/*,.github/scripts/{community_request_assignee,github_slack_utils}.py, new functional/perf test recipes.Removed (half-integrated new files whose feature-core is deferred)
examples/mimo/model_providers/nemotron_moe_vlm.py(+ test) — importsmamba_stack_specabsent on dev.tests/unit_tests/distributed/megatron_fsdp/test_{cuda_graph,experimental_fully_shard}.py— importfully_shard/Placementsnot exported by dev's experimental__init__.Dependency triple & CODEOWNERS
uv.lockanddocker/Dockerfile.ci.devkept identical to dev.pyproject.tomldiffers from dev only by adding thelaunch_on_gb200pytest marker (used by main's GB200 tests; does not affectuv.lock)..github/CODEOWNERSunchanged (identical to dev).🤖 Generated with Claude Code
CI Status — ready for review
CI run on HEAD
7a7a72952. All non-exempt required checks are terminal and green (161 SUCCESS + 4 SKIPPED):Nemo_CICD_Test(aggregate gate): SUCCESSlinting,cicd-container-build(aws + gcp), wheel builds,copyright-check,pre-flight.Accepted pre-existing failures (verified against prior sync, not sync-caused)
DCO— ACTION_REQUIRED:maincarries 6 commits without aSigned-off-bytrailer (e.g.[skip ci]/chore: rotate oncall) which the sync brings in but cannot rewrite. The merge commit + fix commit are signed off. Prior merged sync chore: nightly sync main into dev (22_06_2026) #5430 had identicalDCOACTION_REQUIRED and merged intodev.cicd-mbridge-testing— FAILURE: downstream Megatron-Bridge pipeline. This merged tree is a dev-superset (no Megatron-LM-side API break introduced), and the prior merged sync chore: nightly sync main into dev (22_06_2026) #5430 had identicalcicd-mbridge-testingFAILURE with the sameRun MBridge testslabel and merged intodev.