Skip to content

Commit ac22fe1

Browse files
authored
Merge branch 'main' into tde/meta_init_tied_embeddings
2 parents 54fc1e6 + 894b511 commit ac22fe1

78 files changed

Lines changed: 1609 additions & 646 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/copy-pr-bot.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
enabled: true
22
auto_sync_draft: false
33
auto_sync_ready: true
4-
trustees_override: ["AAnoosheh", "ArEsKay3", "Autumn1998", "BestJuly", "BoxiangW", "CarlosGomes98", "ChenhanYu", "Connor-XY", "DanialTaheri", "FDecaYed", "HaochenYuan", "ISEEKYAN", "JF-D", "JRD971000", "Leili", "Mellonta", "Phlip79", "QiZhangNV", "RPrenger", "ShriyaRishab", "WanZzzzzz", "Wohox", "XiaodaNV", "YangFei1990", "YigongQin", "ZhiyuLi-Nvidia", "abhinav-khattar", "adistomar", "ahmadki", "alokpathy", "ananthsub", "anlthms", "aroshanghias-nvd", "ashehper", "asolergi-nv", "athitten", "balasaajay", "buptzyb", "chtruong814", "cjld", "cspades", "cuichenx", "deepakn94", "desh2608", "dimapihtar", "dingqingy-nv", "duncanriach", "ehosseiniasl", "erhoo82", "ericharper", "fanshiqing", "faradawn", "fitsumreda", "freewym", "frsun-nvda", "gautham-kollu", "gdengk", "goelarushi", "guihong-nv", "guyueh1", "hexinw-nvidia", "huvunvidia", "hxbai", "ilml", "jalbericiola", "janEbert", "jaredcasper", "jiaji-huang", "jiemingz", "jingqiny-99", "jkamalu", "jon-barker", "jstjohn", "jupiterepoch", "kajalj22", "kamran-nvidia", "kevalmorabia97", "kevjshih", "kingformatty", "ko3n1g", "ksivaman", "kunlunl", "kvareddy", "kwangjunahn", "kwyss-nvidia", "lauradang", "layalir", "lhb8125", "liding-nv", "lmcafee-nvidia", "maanug-nv", "macandro96", "mathemakitten", "matthieule", "mchrzanowski", "mehraakash", "minitu", "mkhona-nvidia", "nanz-nv", "nathan-nvidia", "niyunsheng", "ntajbakhsh", "nvcsathe", "nvegesna-netizen", "parthmannan", "philipcmonk", "prajwal1210", "pthombre", "rapatel", "rhewett-nv", "rogerwaleffe", "sajadn", "sancha", "santhnm2", "santiagoakle", "sbak5", "shanmugamr1992", "sharathts", "sheliang-nv", "shengf-nv", "shifangx", "shjwudp", "sidsingh-nvidia", "skyw", "sraman-rgb", "sudhakarsingh27", "svcnvidia-nemo-ci", "tdene", "theothermike", "tomlifu", "trintamaki", "tylerpoon", "vasunvidia", "wanyingw", "wdykas", "wujingyue", "xiaoyao0115", "xuantengh", "xuwchen", "yaox12", "yaoyu-33", "yashaswikarnati", "yeyu-nvidia", "yobibyte", "youngeunkwon0405", "yqwangustc", "yueshen2016", "yuzhongw-nvidia", "zhehuaichen", "zhongbozhu"]
4+
trustees_override: ["AAnoosheh", "ArEsKay3", "Autumn1998", "BestJuly", "BoxiangW", "CarlosGomes98", "ChenhanYu", "Connor-XY", "DanialTaheri", "FDecaYed", "HaochenYuan", "ISEEKYAN", "JF-D", "JRD971000", "Leili", "Mellonta", "Phlip79", "QiZhangNV", "RPrenger", "ShriyaRishab", "WanZzzzzz", "Wohox", "XiaodaNV", "YangFei1990", "YigongQin", "ZhiyuLi-Nvidia", "abhinav-khattar", "adistomar", "ahmadki", "alokpathy", "ananthsub", "anlthms", "aroshanghias-nvd", "ashehper", "asolergi-nv", "athitten", "balasaajay", "buptzyb", "chtruong814", "cjld", "cspades", "cuichenx", "deepakn94", "desh2608", "dimapihtar", "dingqingy-nv", "duncanriach", "ehosseiniasl", "erhoo82", "ericharper", "fanshiqing", "faradawn", "fitsumreda", "freewym", "frsun-nvda", "gautham-kollu", "gdengk", "goelarushi", "guihong-nv", "guyueh1", "hexinw-nvidia", "huvunvidia", "hxbai", "ilml", "jalbericiola", "janEbert", "jaredcasper", "jiaji-huang", "jiemingz", "jingqiny-99", "jkamalu", "jon-barker", "jstjohn", "jupiterepoch", "kajalj22", "kamran-nvidia", "kevalmorabia97", "kevjshih", "kingformatty", "ko3n1g", "ksivaman", "kunlunl", "kvareddy", "kwangjunahn", "kwyss-nvidia", "lauradang", "layalir", "lhb8125", "liding-nv", "lmcafee-nvidia", "maanug-nv", "macandro96", "mathemakitten", "matthieule", "mchrzanowski", "mehraakash", "minitu", "mkhona-nvidia", "nanz-nv", "nathan-nvidia", "niyunsheng", "ntajbakhsh", "nvcsathe", "nvegesna-netizen", "parthmannan", "philipcmonk", "prajwal1210", "pthombre", "rapatel", "rhewett-nv", "rogerwaleffe", "sajadn", "sancha", "santhnm2", "santiagoakle", "sbak5", "shanmugamr1992", "sharathts", "sheliang-nv", "shengf-nv", "shifangx", "shjwudp", "sidsingh-nvidia", "skyw", "sraman-rgb", "sudhakarsingh27", "svcnvidia-nemo-ci", "tdene", "theothermike", "tomlifu", "trintamaki", "tylerpoon", "vasunvidia", "wanyingw", "wdykas", "wujingyue", "xiaoyao0115", "xrennvidia", "xuantengh", "xuwchen", "yaox12", "yaoyu-33", "yashaswikarnati", "yeyu-nvidia", "yobibyte", "youngeunkwon0405", "yqwangustc", "yueshen2016", "yuzhongw-nvidia", "zhehuaichen", "zhongbozhu"]

‎docs/mcore-inference-user-guide.md‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -447,9 +447,12 @@ sp = SamplingParams(
447447
448448
`InferenceConfig.logprobs_mode` controls *which* log-probs you get:
449449
`'raw_logprobs'` (default) returns the unmodified model log-probs, while
450-
`'processed_logprobs'` returns log-probs after temperature, top-k, and top-p have
451-
been applied. `'processed_logprobs'` is not yet supported with speculative
452-
decoding.
450+
`'processed_logprobs'` returns log-probs of sampled tokens after temperature,
451+
top-k, and top-p have been applied. The mode applies to both the selected-token
452+
log-probs and the top-N log-probs (`top_n_logprobs`). Prompt log-probs, including
453+
prompt top-N log-probs, are always raw in both modes, because prompt tokens were
454+
not sampled from the processed distribution.
455+
`'processed_logprobs'` is not yet supported with speculative decoding.
453456

454457
### Engine Configuration
455458

‎examples/multimodal/model_converter/vision_model_tester.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def run_mcore_vision(model_path):
5555

5656
args = parse_and_validate_args(extra_args_provider=add_multimodal_extra_args)
5757
set_run_config(inference_cfg_container_from_args(args, build_model_config=False))
58-
initialize_megatron(training=True)
58+
initialize_megatron(training=False)
5959

6060
def wrapped_model_provider(pre_process, post_process):
6161
return model_provider(pre_process, post_process, parallel_output=False)

‎examples/multimodal/run_text_generation.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -851,7 +851,7 @@ def eval_tasks():
851851
"""Vision language model text generation for single or batch tasks."""
852852
args = parse_and_validate_args(extra_args_provider=add_text_generation_args)
853853
set_run_config(inference_cfg_container_from_args(args, build_model_config=False))
854-
initialize_megatron(training=True)
854+
initialize_megatron(training=False)
855855

856856
args = get_args()
857857

‎examples/post_training/modelopt/convert_model.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def check_arguments():
113113
# Temporary args/config duplication during the training-loop refactor:
114114
# migrated settings use config; remaining settings still use legacy args.
115115
set_run_config(inference_cfg_container_from_args(args, build_model_config=False))
116-
initialize_megatron(training=True)
116+
initialize_megatron(training=False)
117117
check_arguments()
118118

119119
args = get_args()

‎examples/post_training/modelopt/export.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def add_modelopt_export_args(parser):
7070
# Temporary args/config duplication during the training-loop refactor:
7171
# migrated settings use config; remaining settings still use legacy args.
7272
set_run_config(inference_cfg_container_from_args(args, build_model_config=False))
73-
initialize_megatron(training=True)
73+
initialize_megatron(training=False)
7474

7575
args = get_args()
7676

‎examples/post_training/modelopt/generate.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def get_conversations(example):
8484
# Temporary args/config duplication during the training-loop refactor:
8585
# migrated settings use config; remaining settings still use legacy args.
8686
set_run_config(inference_cfg_container_from_args(args, build_model_config=False))
87-
initialize_megatron(training=True)
87+
initialize_megatron(training=False)
8888

8989
check_arguments()
9090

‎examples/post_training/modelopt/mmlu.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def add_mmlu_args(parser):
8686
# Temporary args/config duplication during the training-loop refactor:
8787
# migrated settings use config; remaining settings still use legacy args.
8888
set_run_config(inference_cfg_container_from_args(args, build_model_config=False))
89-
initialize_megatron(training=True)
89+
initialize_megatron(training=False)
9090

9191
args = get_args()
9292

‎examples/post_training/modelopt/offline_feature_extract.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def extract_feature(dataset, model, output_dir, idx_start, idx_end):
5353
# Temporary args/config duplication during the training-loop refactor:
5454
# migrated settings use config; remaining settings still use legacy args.
5555
set_run_config(inference_cfg_container_from_args(args, build_model_config=False))
56-
initialize_megatron(training=True)
56+
initialize_megatron(training=False)
5757

5858
args = get_args()
5959
tokenizer = get_tokenizer()

‎examples/post_training/modelopt/prune.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ def get_params(model):
181181
# Temporary args/config duplication during the training-loop refactor:
182182
# migrated settings use config; remaining settings still use legacy args.
183183
set_run_config(inference_cfg_container_from_args(args, build_model_config=False))
184-
initialize_megatron(training=True)
184+
initialize_megatron(training=False)
185185

186186
args = get_args()
187187
check_arguments(args)

0 commit comments

Comments
 (0)