chore: nightly sync main into dev (02_07_2026)#5627
Draft
svcnvidia-nemo-ci wants to merge 74 commits into
Draft
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>
Author
|
/ok to test cd117b3 |
d37b35e to
cd117b3
Compare
cd117b3 to
d086376
Compare
Author
|
/ok to test d086376 |
d086376 to
9efd37c
Compare
Author
|
/ok to test 5871bc8 |
Signed-off-by: svcnvidia-nemo-ci <svcnvidia-nemo-ci@users.noreply.github.com> # Conflicts: # .github/copy-pr-bot.yaml # .github/scripts/oncall_manager.py # .github/scripts/sync_team_usergroups.py # docker/Dockerfile.ci.dev # docs/user-guide/features/fine_grained_activation_offloading.md # examples/bert/pretrain_bert.py # examples/inference/advanced/gpt_dynamic_inference.py # examples/post_training/modelopt/finetune.py # gpt_builders.py # megatron/core/datasets/gpt_dataset.py # megatron/core/distributed/fsdp/src/megatron_fsdp/megatron_fsdp.py # megatron/core/distributed/fsdp/src/megatron_fsdp/param_and_grad_buffer.py # megatron/core/inference/engines/dynamic_engine.py # megatron/core/models/gpt/experimental_attention_variant_module_specs.py # megatron/core/models/gpt/gpt_model.py # megatron/core/models/hybrid/hybrid_block.py # megatron/core/models/hybrid/hybrid_model.py # megatron/core/pipeline_parallel/fine_grained_activation_offload.py # megatron/core/pipeline_parallel/schedules.py # megatron/core/ssm/gated_delta_net.py # megatron/core/transformer/attention.py # megatron/core/transformer/cuda_graphs.py # megatron/core/transformer/experimental_attention_variant/dsa.py # megatron/core/transformer/experimental_attention_variant/dsa_kernels.py # megatron/core/transformer/module.py # megatron/core/transformer/moe/experts.py # megatron/core/transformer/multi_latent_attention.py # megatron/core/transformer/transformer_block.py # megatron/core/transformer/transformer_config.py # megatron/core/transformer/transformer_layer.py # megatron/core/utils.py # megatron/elastification/pretrain_hybrid_flex.py # megatron/inference/utils.py # megatron/rl/agent/api.py # megatron/rl/agent/reward_only_agent.py # megatron/rl/inference/megatron.py # megatron/rl/rl_utils.py # megatron/training/argument_utils.py # megatron/training/arguments.py # megatron/training/checkpointing.py # megatron/training/config/__init__.py # megatron/training/config/container.py # megatron/training/distillation/utils_logits.py # megatron/training/models/gpt.py # megatron/training/models/hybrid.py # megatron/training/training.py # megatron/training/utils/common_utils.py # megatron/training/yaml_arguments.py # pretrain_gpt.py # pretrain_hybrid.py # pyproject.toml # tests/unit_tests/inference/test_mtp_cuda_graph_inference.py # tests/unit_tests/pipeline_parallel/test_fine_grained_activation_offloading.py # tests/unit_tests/ssm/test_hybrid_block.py # tests/unit_tests/transformer/experimental_attention_variant/test_absorbed_mla.py # tests/unit_tests/transformer/experimental_attention_variant/test_attention_variant_dsa.py # tools/bert_embedding/embed.py # tools/run_inference_performance_test.py # tools/trigger_internal_ci.py # train_rl.py # uv.lock
Author
|
/ok to test e2dce1e |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Nightly sync of
mainintodevfor 02_07_2026.mainmerged intodev.uv.lock, etc.).Merge strategy
Started from
origin/devand rangit merge origin/main --no-edit, then resolvedeach conflict preserving recent dev-only additions while incorporating main's
incoming changes. The dev-feature-preservation pre-push guard passes (no dev-only
code silently dropped).
Per the nightly-sync policy, the sync is dev-preferring for shared code that both
branches evolved: where
mainrefactored/reorganized codedevalso touched,dev'sversion is kept to protect in-flight dev work;
main's genuinely-new files, symbols andfeatures are brought in. This keeps the dev-feature-preservation guard green.
Files taken from
main(override list)These files reference dev-only args/APIs that were reconciled by taking
main's version:megatron/training/training.py— took main's version; renamedargs.hybrid_context_parallel→args.dynamic_context_parallelto match the mergedargs namespace (dev's arg name;
hybrid_context_parallelis a deprecated config alias).megatron/training/initialize.py— main's version; already usesdynamic_context_parallel/min_dynamic_context_parallel_size, consistent with themerged
parallel_state.initialize_model_parallelsignature.Dependency triple + CODEOWNERS
Kept dev's
pyproject.toml,uv.lock,docker/Dockerfile.ci.dev, and.github/CODEOWNERSverbatim (verified byte-identical to
origin/dev). Git-source reconciliation:mainadds amamba-ssmgit source and bumpsflash_mla/transformer-engine/emerging_optimizers;dev pins
mamba-ssm~=2.2from PyPI and is ahead onemerging_optimizers(v0.3.0). Nomerged main code was found to require a symbol only present at main's git revisions, so
dev's triple is kept unchanged.
API-mismatch fixes
megatron/training/checkpointing.py(kept dev's) — addeddp_group,expt_dp_group,and
rng_state_key_prefixcompatibility parameters tosave_checkpoint/load_checkpointso main's
training.pyprocess-group-threaded call sites work against dev's checkpoint path..github/copy-pr-bot.yaml— merged the trustees list as a union (kept dev-onlywplfplus main's newly-added trustees).test_fused_mla_training_hooks_use_fused_down_projectionunit test(verified it passes against the merged
FusedMLASelfAttention.backward_dw→_backward_output_proj→linear_proj.backward_dwcall chain).Files deleted in dev and intentionally NOT restored
Verified each was deleted intentionally on
dev(or removed bymain) and nothing in themerged tree imports them:
.github/workflows/multi-approval-bot.yml— dev removed the multi-approval action (ci: Remove multi-approval action from dev branch #3576).tests/test_utils/recipes/h100/bert.yaml,t5.yaml— dev refactored functional tests.tests/unit_tests/inference/engines/test_cg_admission_gating.py— dev deleted it;the merged engine does not expose the
_cg_admission_gating_active/_cg_admission_checkmethods the test requires.
Remerge diff
git show --remerge-diff HEADon the merge commit is large; a summary of the conflictresolutions is captured above. The full conflict set spanned 61 files across training,
core transformer, MoE, DSA/experimental attention, RL, FSDP, inference, and their tests.