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

PeFT fix for distOpt #9392

Merged
merged 4 commits into from
Jun 10, 2024
Merged

PeFT fix for distOpt #9392

merged 4 commits into from
Jun 10, 2024

Conversation

akoumpa
Copy link
Member

@akoumpa akoumpa commented Jun 5, 2024

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)

@akoumpa akoumpa self-assigned this Jun 5, 2024
@akoumpa akoumpa force-pushed the akoumparouli/mcore_dist_opt_peft_fix branch 3 times, most recently from 19b0f96 to 32206a2 Compare June 5, 2024 18:57
@akoumpa akoumpa requested a review from cuichenx June 6, 2024 06:09
@akoumpa akoumpa marked this pull request as ready for review June 6, 2024 06:09
@akoumpa akoumpa force-pushed the akoumparouli/mcore_dist_opt_peft_fix branch from a70c89c to 53f0761 Compare June 6, 2024 20:18
@akoumpa
Copy link
Member Author

akoumpa commented Jun 6, 2024

This is now ready; Tested DDP, TP=2, PP=2 apex & distOpt.
There was a small bug in get_model_module_list that was also fixed.

Copy link
Collaborator

@cuichenx cuichenx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changes in nlp_adapter_mixins.py look good to me!
@ericharper or @dimapihtar could you review the changes in megatron_base_model.py?

@@ -316,15 +316,18 @@ def _wrap_model_for_O2(self):
args.pop('module')

def get_model_module_list(self):
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dimapihtar Need your feedback for this change.

This function extracts the .module from the model; when we wrap a model with MCoreDDP or Float16Module, the model can be accessed via .module attribute; however those classes can be combined, so it's possible to have <obj>.module.module, thus the recursive call.

Signed-off-by: Alexandros Koumparoulis <akoumparouli@nvidia.com>
Signed-off-by: Alexandros Koumparoulis <akoumparouli@nvidia.com>
Signed-off-by: Alexandros Koumparoulis <akoumparouli@nvidia.com>
Signed-off-by: Alexandros Koumparoulis <akoumparouli@nvidia.com>
@akoumpa akoumpa force-pushed the akoumparouli/mcore_dist_opt_peft_fix branch from 87a1822 to cf27140 Compare June 7, 2024 06:03
Copy link
Collaborator

@ericharper ericharper left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks!

@pablo-garay
Copy link
Collaborator

@akoumpa akoumpa merged commit b7408dc into main Jun 10, 2024
134 of 135 checks passed
@akoumpa akoumpa deleted the akoumparouli/mcore_dist_opt_peft_fix branch June 10, 2024 01:47
janekl pushed a commit that referenced this pull request Jun 12, 2024
* PeFT fix for distOpt

Signed-off-by: Alexandros Koumparoulis <akoumparouli@nvidia.com>

* fix get_model_module_list for McoreDDP

Signed-off-by: Alexandros Koumparoulis <akoumparouli@nvidia.com>

* fix get_peft_state_dict

Signed-off-by: Alexandros Koumparoulis <akoumparouli@nvidia.com>

* Simplify extract_module

Signed-off-by: Alexandros Koumparoulis <akoumparouli@nvidia.com>

---------

Signed-off-by: Alexandros Koumparoulis <akoumparouli@nvidia.com>
Signed-off-by: Jan Lasek <janek.lasek@gmail.com>
@cuichenx cuichenx mentioned this pull request Jun 14, 2024
8 tasks
JesusPaz pushed a commit to JesusPaz/NeMo that referenced this pull request Jun 18, 2024
* PeFT fix for distOpt

Signed-off-by: Alexandros Koumparoulis <akoumparouli@nvidia.com>

* fix get_model_module_list for McoreDDP

Signed-off-by: Alexandros Koumparoulis <akoumparouli@nvidia.com>

* fix get_peft_state_dict

Signed-off-by: Alexandros Koumparoulis <akoumparouli@nvidia.com>

* Simplify extract_module

Signed-off-by: Alexandros Koumparoulis <akoumparouli@nvidia.com>

---------

Signed-off-by: Alexandros Koumparoulis <akoumparouli@nvidia.com>
rohitrango pushed a commit to rohitrango/NeMo that referenced this pull request Jun 25, 2024
* PeFT fix for distOpt

Signed-off-by: Alexandros Koumparoulis <akoumparouli@nvidia.com>

* fix get_model_module_list for McoreDDP

Signed-off-by: Alexandros Koumparoulis <akoumparouli@nvidia.com>

* fix get_peft_state_dict

Signed-off-by: Alexandros Koumparoulis <akoumparouli@nvidia.com>

* Simplify extract_module

Signed-off-by: Alexandros Koumparoulis <akoumparouli@nvidia.com>

---------

Signed-off-by: Alexandros Koumparoulis <akoumparouli@nvidia.com>
@ko3n1g ko3n1g mentioned this pull request Jul 18, 2024
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants