Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Revert Mcore update since it caused regression (#11791)" #11799

Merged
merged 5 commits into from
Jan 16, 2025

Conversation

ko3n1g
Copy link
Collaborator

@ko3n1g ko3n1g commented Jan 9, 2025

This reverts commit 84b2bf0.

What does this PR do ?

Add a one line overview of what this PR aims to accomplish.

Collection: [Note which collection this PR will affect]

Changelog

  • Add specific line by line info of high level changes in this PR.

Usage

  • You can potentially add a usage example below
# Add a code snippet demonstrating how to use this 

GitHub Actions CI

The Jenkins CI system has been replaced by GitHub Actions self-hosted runners.

The GitHub Actions CI will run automatically when the "Run CICD" label is added to the PR.
To re-run CI remove and add the label again.
To run CI on an untrusted fork, a NeMo user with write access must first click "Approve and run".

Before your PR is "Ready for review"

Pre checks:

  • Make sure you read and followed Contributor guidelines
  • Did you write any new necessary tests?
  • Did you add or update any necessary documentation?
  • Does the PR affect components that are optional to install? (Ex: Numba, Pynini, Apex etc)
    • Reviewer: Does the PR have correct import guards for all optional libraries?

PR Type:

  • New Feature
  • Bugfix
  • Documentation

If you haven't finished some of the above items you can still open "Draft" PR.

Who can review?

Anyone in the community is free to review the PR once the checks have passed.
Contributor guidelines contains specific people who can review PRs to various areas.

Additional Information

  • Related to # (issue)

@github-actions github-actions bot added core Changes to NeMo Core NLP CI labels Jan 9, 2025
@ko3n1g
Copy link
Collaborator Author

ko3n1g commented Jan 9, 2025

Mcore commit bafab5a54b55f2f7309e6625cd0887756548a44b is also tested and works: #11796

Copy link
Contributor

github-actions bot commented Jan 9, 2025

[🤖]: Hi @ko3n1g 👋,

We wanted to let you know that a CICD pipeline for this PR just finished successfully

So it might be time to merge this PR or get some approvals

I'm just a bot so I'll leave it you what to do next.

//cc @pablo-garay @ko3n1g

@ko3n1g ko3n1g marked this pull request as ready for review January 10, 2025 16:08
@ko3n1g ko3n1g requested a review from pablo-garay as a code owner January 10, 2025 16:09
suiyoubi and others added 4 commits January 10, 2025 21:39
…lly (#11834)

* Use _get_mlp_module_spec from MCore rather than redefine

Signed-off-by: Jan Lasek <[email protected]>

* Apply isort and black reformatting

Signed-off-by: janekl <[email protected]>

* Update nemo/collections/nlp/models/language_modeling/megatron/gpt_layer_modelopt_spec.py

Co-authored-by: oliver könig <[email protected]>
Signed-off-by: Jan Lasek <[email protected]>

---------

Signed-off-by: Jan Lasek <[email protected]>
Signed-off-by: janekl <[email protected]>
Co-authored-by: janekl <[email protected]>
Co-authored-by: oliver könig <[email protected]>
Signed-off-by: Abhishree <[email protected]>
Signed-off-by: Jan Lasek <[email protected]>
Co-authored-by: Abhishree Thittenamane <[email protected]>
@ko3n1g ko3n1g added Run CICD and removed Run CICD labels Jan 13, 2025
Copy link
Contributor

beep boop 🤖: 🙏 The following files have warnings. In case you are familiar with these, please try helping us to improve the code base.


Your code was analyzed with PyLint. The following annotations have been identified:

************* Module nemo.collections.llm.gpt.model.gemma
nemo/collections/llm/gpt/model/gemma.py:41:0: C0115: Missing class docstring (missing-class-docstring)
nemo/collections/llm/gpt/model/gemma.py:62:0: C0115: Missing class docstring (missing-class-docstring)
nemo/collections/llm/gpt/model/gemma.py:71:0: C0115: Missing class docstring (missing-class-docstring)
nemo/collections/llm/gpt/model/gemma.py:79:0: C0115: Missing class docstring (missing-class-docstring)
nemo/collections/llm/gpt/model/gemma.py:83:0: C0115: Missing class docstring (missing-class-docstring)
nemo/collections/llm/gpt/model/gemma.py:87:0: C0115: Missing class docstring (missing-class-docstring)
nemo/collections/llm/gpt/model/gemma.py:107:0: C0115: Missing class docstring (missing-class-docstring)
nemo/collections/llm/gpt/model/gemma.py:127:4: C0116: Missing function or method docstring (missing-function-docstring)
nemo/collections/llm/gpt/model/gemma.py:140:4: C0116: Missing function or method docstring (missing-function-docstring)
nemo/collections/llm/gpt/model/gemma.py:146:4: C0116: Missing function or method docstring (missing-function-docstring)
nemo/collections/llm/gpt/model/gemma.py:178:0: C0115: Missing class docstring (missing-class-docstring)
nemo/collections/llm/gpt/model/gemma.py:197:4: C0116: Missing function or method docstring (missing-function-docstring)
nemo/collections/llm/gpt/model/gemma.py:210:4: C0116: Missing function or method docstring (missing-function-docstring)
nemo/collections/llm/gpt/model/gemma.py:214:4: C0116: Missing function or method docstring (missing-function-docstring)
************* Module nemo.collections.llm.recipes.gemma_2b
nemo/collections/llm/recipes/gemma_2b.py:14:0: W0611: Unused import os (unused-import)
************* Module nemo.collections.llm.recipes.gemma_7b
nemo/collections/llm/recipes/gemma_7b.py:14:0: W0611: Unused import os (unused-import)
************* Module nemo.collections.nlp.models.language_modeling.megatron_base_model
nemo/collections/nlp/models/language_modeling/megatron_base_model.py:104:0: C0301: Line too long (149/119) (line-too-long)
nemo/collections/nlp/models/language_modeling/megatron_base_model.py:112:0: C0301: Line too long (134/119) (line-too-long)
nemo/collections/nlp/models/language_modeling/megatron_base_model.py:254:0: C0301: Line too long (125/119) (line-too-long)
nemo/collections/nlp/models/language_modeling/megatron_base_model.py:272:0: C0301: Line too long (120/119) (line-too-long)
nemo/collections/nlp/models/language_modeling/megatron_base_model.py:347:0: C0301: Line too long (133/119) (line-too-long)
nemo/collections/nlp/models/language_modeling/megatron_base_model.py:611:0: C0301: Line too long (123/119) (line-too-long)
nemo/collections/nlp/models/language_modeling/megatron_base_model.py:666:0: C0301: Line too long (153/119) (line-too-long)
nemo/collections/nlp/models/language_modeling/megatron_base_model.py:838:0: C0301: Line too long (122/119) (line-too-long)
nemo/collections/nlp/models/language_modeling/megatron_base_model.py:976:0: C0301: Line too long (121/119) (line-too-long)
nemo/collections/nlp/models/language_modeling/megatron_base_model.py:995:0: C0301: Line too long (136/119) (line-too-long)
nemo/collections/nlp/models/language_modeling/megatron_base_model.py:1112:0: C0301: Line too long (195/119) (line-too-long)
nemo/collections/nlp/models/language_modeling/megatron_base_model.py:1169:0: C0301: Line too long (135/119) (line-too-long)
nemo/collections/nlp/models/language_modeling/megatron_base_model.py:1218:0: C0301: Line too long (120/119) (line-too-long)
nemo/collections/nlp/models/language_modeling/megatron_base_model.py:1301:0: C0301: Line too long (128/119) (line-too-long)
nemo/collections/nlp/models/language_modeling/megatron_base_model.py:331:4: C0116: Missing function or method docstring (missing-function-docstring)
nemo/collections/nlp/models/language_modeling/megatron_base_model.py:462:4: C0116: Missing function or method docstring (missing-function-docstring)
nemo/collections/nlp/models/language_modeling/megatron_base_model.py:467:4: C0116: Missing function or method docstring (missing-function-docstring)
nemo/collections/nlp/models/language_modeling/megatron_base_model.py:704:4: C0116: Missing function or method docstring (missing-function-docstring)
nemo/collections/nlp/models/language_modeling/megatron_base_model.py:756:4: C0116: Missing function or method docstring (missing-function-docstring)
nemo/collections/nlp/models/language_modeling/megatron_base_model.py:937:4: C0116: Missing function or method docstring (missing-function-docstring)
nemo/collections/nlp/models/language_modeling/megatron_base_model.py:1041:4: C0116: Missing function or method docstring (missing-function-docstring)
nemo/collections/nlp/models/language_modeling/megatron_base_model.py:1276:4: C0116: Missing function or method docstring (missing-function-docstring)
nemo/collections/nlp/models/language_modeling/megatron_base_model.py:1307:4: C0116: Missing function or method docstring (missing-function-docstring)
nemo/collections/nlp/models/language_modeling/megatron_base_model.py:1311:4: C0116: Missing function or method docstring (missing-function-docstring)
nemo/collections/nlp/models/language_modeling/megatron_base_model.py:1315:4: C0116: Missing function or method docstring (missing-function-docstring)
************* Module nemo.collections.nlp.models.language_modeling.megatron_retro_model
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:36:0: C0301: Line too long (199/119) (line-too-long)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:143:0: C0301: Line too long (191/119) (line-too-long)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:305:0: C0301: Line too long (126/119) (line-too-long)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:336:0: C0301: Line too long (140/119) (line-too-long)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:387:0: C0301: Line too long (123/119) (line-too-long)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:444:0: C0301: Line too long (206/119) (line-too-long)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:454:0: C0301: Line too long (124/119) (line-too-long)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:461:0: C0301: Line too long (210/119) (line-too-long)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:465:0: C0301: Line too long (161/119) (line-too-long)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:113:4: C0116: Missing function or method docstring (missing-function-docstring)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:15:0: W0611: Unused import itertools (unused-import)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:18:0: W0611: Unused import queue (unused-import)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:20:0: W0611: Unused import warnings (unused-import)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:21:0: W0611: Unused fields imported from dataclasses (unused-import)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:23:0: W0611: Unused Dict imported from typing (unused-import)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:23:0: W0611: Unused Iterator imported from typing (unused-import)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:23:0: W0611: Unused List imported from typing (unused-import)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:23:0: W0611: Unused Union imported from typing (unused-import)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:26:0: W0611: Unused CPUAccelerator imported from lightning.pytorch.accelerators (unused-import)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:38:0: W0611: Unused MegatronBaseModel imported from nemo.collections.nlp.models.language_modeling.megatron_base_model (unused-import)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:40:0: W0611: Unused build_model imported from nemo.collections.nlp.modules.common.megatron.build_model (unused-import)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:41:0: W0611: Unused Float16Module imported from nemo.collections.nlp.modules.common.megatron.module (unused-import)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:42:0: W0611: Unused get_all_params_for_weight_decay_optimization imported from nemo.collections.nlp.modules.common.megatron.utils (unused-import)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:42:0: W0611: Unused get_ltor_masks_and_position_ids imported from nemo.collections.nlp.modules.common.megatron.utils (unused-import)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:42:0: W0611: Unused get_params_for_weight_decay_optimization imported from nemo.collections.nlp.modules.common.megatron.utils (unused-import)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:49:0: W0611: Unused TextGenerationStrategy imported from nemo.collections.nlp.modules.common.text_generation_strategy (unused-import)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:50:0: W0611: Unused get_default_length_params imported from nemo.collections.nlp.modules.common.text_generation_utils (unused-import)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:50:0: W0611: Unused get_default_sampling_params imported from nemo.collections.nlp.modules.common.text_generation_utils (unused-import)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:50:0: W0611: Unused megatron_gpt_generate imported from nemo.collections.nlp.modules.common.text_generation_utils (unused-import)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:57:0: W0611: Unused LengthParam imported from nemo.collections.nlp.modules.common.transformer.text_generation (unused-import)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:57:0: W0611: Unused OutputType imported from nemo.collections.nlp.modules.common.transformer.text_generation (unused-import)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:57:0: W0611: Unused SamplingParam imported from nemo.collections.nlp.modules.common.transformer.text_generation (unused-import)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:57:0: W0611: Unused TextGeneration imported from nemo.collections.nlp.modules.common.transformer.text_generation (unused-import)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:63:0: W0611: Unused utils_funcs imported from nemo.collections.nlp.parts (unused-import)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:64:0: W0611: Unused activation_to_func imported from nemo.collections.nlp.parts.utils_funcs (unused-import)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:64:0: W0611: Unused get_last_rank imported from nemo.collections.nlp.parts.utils_funcs (unused-import)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:65:0: W0611: Unused Exportable imported from nemo.core.classes (unused-import)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:66:0: W0611: Unused PretrainedModelInfo imported from nemo.core.classes.common (unused-import)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:67:0: W0611: Unused ChannelType imported from nemo.core.neural_types (unused-import)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:67:0: W0611: Unused NeuralType imported from nemo.core.neural_types (unused-import)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:72:4: W0611: Unused InferenceParams imported from megatron.core (unused-import)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:81:4: W0611: Unused TransformerConfig imported from megatron.core.transformer.transformer_config (unused-import)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:82:4: W0611: Unused init_method_normal imported from megatron.core.utils (unused-import)
nemo/collections/nlp/models/language_modeling/megatron_retro_model.py:82:4: W0611: Unused scaled_init_method_normal imported from megatron.core.utils (unused-import)
************* Module scripts.checkpoint_converters.convert_bert_hf_to_nemo
scripts/checkpoint_converters/convert_bert_hf_to_nemo.py:65:0: C0301: Line too long (218/119) (line-too-long)
scripts/checkpoint_converters/convert_bert_hf_to_nemo.py:38:0: C0116: Missing function or method docstring (missing-function-docstring)
scripts/checkpoint_converters/convert_bert_hf_to_nemo.py:56:0: C0116: Missing function or method docstring (missing-function-docstring)
scripts/checkpoint_converters/convert_bert_hf_to_nemo.py:79:0: C0116: Missing function or method docstring (missing-function-docstring)

-----------------------------------
Your code has been rated at 9.43/10

Mitigation guide:

  • Add sensible and useful docstrings to functions and methods
  • For trivial methods like getter/setters, consider adding # pylint: disable=C0116 inside the function itself
  • To disable multiple functions/methods at once, put a # pylint: disable=C0116 before the first and a # pylint: enable=C0116 after the last.

By applying these rules, we reduce the occurance of this message in future.

Thank you for improving NeMo's documentation!

Copy link
Contributor

[🤖]: Hi @ko3n1g 👋,

We wanted to let you know that a CICD pipeline for this PR just finished successfully

So it might be time to merge this PR or get some approvals

I'm just a bot so I'll leave it you what to do next.

//cc @pablo-garay @ko3n1g

@pablo-garay pablo-garay merged commit fe2ae82 into main Jan 16, 2025
378 of 391 checks passed
@pablo-garay pablo-garay deleted the ko3n1g/chore/bump-mcore branch January 16, 2025 15:31
abhinavg4 pushed a commit that referenced this pull request Jan 30, 2025
)

* Revert "Revert Mcore update since it caused regression (#11791)"

This reverts commit 84b2bf0.

* Fix Gemma2 Attention init args (#11792)

* Use _get_mlp_module_spec from Megatron Core rather than redefine locally (#11834)

* Use _get_mlp_module_spec from MCore rather than redefine

Signed-off-by: Jan Lasek <[email protected]>

* Apply isort and black reformatting

Signed-off-by: janekl <[email protected]>

* Update nemo/collections/nlp/models/language_modeling/megatron/gpt_layer_modelopt_spec.py

Co-authored-by: oliver könig <[email protected]>
Signed-off-by: Jan Lasek <[email protected]>

---------

Signed-off-by: Jan Lasek <[email protected]>
Signed-off-by: janekl <[email protected]>
Co-authored-by: janekl <[email protected]>
Co-authored-by: oliver könig <[email protected]>

* Bugfix for output_generation_logits in tensorrtllm (#11820) (#11833)

Signed-off-by: Abhishree <[email protected]>
Signed-off-by: Jan Lasek <[email protected]>
Co-authored-by: Abhishree Thittenamane <[email protected]>

---------

Signed-off-by: Jan Lasek <[email protected]>
Signed-off-by: janekl <[email protected]>
Signed-off-by: Abhishree <[email protected]>
Co-authored-by: Ao Tang <[email protected]>
Co-authored-by: Jan Lasek <[email protected]>
Co-authored-by: janekl <[email protected]>
Co-authored-by: Abhishree Thittenamane <[email protected]>
Signed-off-by: Abhinav Garg <[email protected]>
youngeunkwon0405 pushed a commit to youngeunkwon0405/NeMo that referenced this pull request Feb 10, 2025
NVIDIA#11799)

* Revert "Revert Mcore update since it caused regression (NVIDIA#11791)"

This reverts commit 84b2bf0.

* Fix Gemma2 Attention init args (NVIDIA#11792)

* Use _get_mlp_module_spec from Megatron Core rather than redefine locally (NVIDIA#11834)

* Use _get_mlp_module_spec from MCore rather than redefine

Signed-off-by: Jan Lasek <[email protected]>

* Apply isort and black reformatting

Signed-off-by: janekl <[email protected]>

* Update nemo/collections/nlp/models/language_modeling/megatron/gpt_layer_modelopt_spec.py

Co-authored-by: oliver könig <[email protected]>
Signed-off-by: Jan Lasek <[email protected]>

---------

Signed-off-by: Jan Lasek <[email protected]>
Signed-off-by: janekl <[email protected]>
Co-authored-by: janekl <[email protected]>
Co-authored-by: oliver könig <[email protected]>

* Bugfix for output_generation_logits in tensorrtllm (NVIDIA#11820) (NVIDIA#11833)

Signed-off-by: Abhishree <[email protected]>
Signed-off-by: Jan Lasek <[email protected]>
Co-authored-by: Abhishree Thittenamane <[email protected]>

---------

Signed-off-by: Jan Lasek <[email protected]>
Signed-off-by: janekl <[email protected]>
Signed-off-by: Abhishree <[email protected]>
Co-authored-by: Ao Tang <[email protected]>
Co-authored-by: Jan Lasek <[email protected]>
Co-authored-by: janekl <[email protected]>
Co-authored-by: Abhishree Thittenamane <[email protected]>
Signed-off-by: Youngeun Kwon <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI core Changes to NeMo Core NLP Run CICD
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants