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

enables default data step in megatron parallel to operate on a wider variety of tensors #9641

Merged
merged 6 commits into from
Jul 10, 2024

Conversation

jomitchellnv
Copy link
Contributor

…variety of tensors coming out of the dataloader

Add more flexibility to the default data step inside megatron parallel.

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

Collection: [Note which collection this PR will affect]

Changelog

  • Megatron parallel's default data step can operate on wrapped tuples and unwrapped items coming directly out of the dataloader

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)

…variety of tensors coming out of the dataloader
nemo/lightning/megatron_parallel.py Fixed Show resolved Hide resolved
@jomitchellnv jomitchellnv force-pushed the jm/default-data-step branch from 3f53682 to 70cd4c4 Compare July 8, 2024 18:57
nemo/lightning/megatron_parallel.py Dismissed Show dismissed Hide dismissed
# Canonical case.
case batch:
pass
# If the dataloader_iter is empty, return None.
Copy link
Collaborator

Choose a reason for hiding this comment

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

This comment is not what happens anymore. Now in your else you say raise ValueError(...):. Are we sure we don't want to pass through a None on the iter? Otherwise we should prob change line 79 or 84 to return None and drop the ValueError piece.

Copy link
Collaborator

@jstjohn jstjohn Jul 8, 2024

Choose a reason for hiding this comment

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

Actually what I hope would happen is that the match(dataloader_iter) would trigger an StopIteration or whatever it is exception rather than returning None. The StopIteration exception ideally would raise through this function (what happens now on the match) and be handled elsewhere. So I think your case _ should never get hit...

Copy link
Collaborator

@jstjohn jstjohn Jul 8, 2024

Choose a reason for hiding this comment

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

Maybe a better error message on line 84 would be "None batch returned at the end of iteration rather than a StopIteration exception being raised, why?"

Copy link
Contributor Author

Choose a reason for hiding this comment

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

So I only added this to be past the linter. I updated the comment so that its more accurate. My only concern would be how it plays out with drop_last=True since maybe that would dump some None's?

@ericharper ericharper requested a review from marcromeyn July 8, 2024 20:36
marcromeyn
marcromeyn previously approved these changes Jul 9, 2024
than just dictionaries

Signed-off-by: Jonathan Mitchell <[email protected]>
@jomitchellnv jomitchellnv force-pushed the jm/default-data-step branch from 14c5733 to 5971ff5 Compare July 9, 2024 22:57
@marcromeyn marcromeyn self-requested a review July 10, 2024 08:19
@marcromeyn marcromeyn merged commit f5d5221 into NVIDIA:main Jul 10, 2024
197 of 200 checks passed
marcromeyn added a commit that referenced this pull request Jul 11, 2024
…variety of tensors (#9641)

* enables default data step in megatron parallel to operate on a wider variety of tensors coming out of the dataloader

* handles the case where a batch is empty

* Apply isort and black reformatting

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

* Allows the default data step to operate on more types
than just dictionaries

Signed-off-by: Jonathan Mitchell <[email protected]>

---------

Signed-off-by: jomitchellnv <[email protected]>
Signed-off-by: Jonathan Mitchell <[email protected]>
Co-authored-by: jomitchellnv <[email protected]>
Co-authored-by: Marc Romeyn <[email protected]>
marcromeyn added a commit that referenced this pull request Jul 11, 2024
…variety of tensors (#9641)

* enables default data step in megatron parallel to operate on a wider variety of tensors coming out of the dataloader

* handles the case where a batch is empty

* Apply isort and black reformatting

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

* Allows the default data step to operate on more types
than just dictionaries

Signed-off-by: Jonathan Mitchell <[email protected]>

---------

Signed-off-by: jomitchellnv <[email protected]>
Signed-off-by: Jonathan Mitchell <[email protected]>
Co-authored-by: jomitchellnv <[email protected]>
Co-authored-by: Marc Romeyn <[email protected]>
maanug-nv pushed a commit that referenced this pull request Jul 14, 2024
…variety of tensors (#9641)

* enables default data step in megatron parallel to operate on a wider variety of tensors coming out of the dataloader

* handles the case where a batch is empty

* Apply isort and black reformatting

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

* Allows the default data step to operate on more types
than just dictionaries

Signed-off-by: Jonathan Mitchell <[email protected]>

---------

Signed-off-by: jomitchellnv <[email protected]>
Signed-off-by: Jonathan Mitchell <[email protected]>
Co-authored-by: jomitchellnv <[email protected]>
Co-authored-by: Marc Romeyn <[email protected]>
ertkonuk pushed a commit that referenced this pull request Jul 19, 2024
…variety of tensors (#9641)

* enables default data step in megatron parallel to operate on a wider variety of tensors coming out of the dataloader

* handles the case where a batch is empty

* Apply isort and black reformatting

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

* Allows the default data step to operate on more types
than just dictionaries

Signed-off-by: Jonathan Mitchell <[email protected]>

---------

Signed-off-by: jomitchellnv <[email protected]>
Signed-off-by: Jonathan Mitchell <[email protected]>
Co-authored-by: jomitchellnv <[email protected]>
Co-authored-by: Marc Romeyn <[email protected]>
Signed-off-by: Tugrul Konuk <[email protected]>
tonyjie pushed a commit to tonyjie/NeMo that referenced this pull request Aug 6, 2024
…variety of tensors (NVIDIA#9641)

* enables default data step in megatron parallel to operate on a wider variety of tensors coming out of the dataloader

* handles the case where a batch is empty

* Apply isort and black reformatting

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

* Allows the default data step to operate on more types
than just dictionaries

Signed-off-by: Jonathan Mitchell <[email protected]>

---------

Signed-off-by: jomitchellnv <[email protected]>
Signed-off-by: Jonathan Mitchell <[email protected]>
Co-authored-by: jomitchellnv <[email protected]>
Co-authored-by: Marc Romeyn <[email protected]>
Signed-off-by: tonyjie <[email protected]>
monica-sekoyan pushed a commit that referenced this pull request Oct 14, 2024
…variety of tensors (#9641)

* enables default data step in megatron parallel to operate on a wider variety of tensors coming out of the dataloader

* handles the case where a batch is empty

* Apply isort and black reformatting

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

* Allows the default data step to operate on more types
than just dictionaries

Signed-off-by: Jonathan Mitchell <[email protected]>

---------

Signed-off-by: jomitchellnv <[email protected]>
Signed-off-by: Jonathan Mitchell <[email protected]>
Co-authored-by: jomitchellnv <[email protected]>
Co-authored-by: Marc Romeyn <[email protected]>
hainan-xv pushed a commit to hainan-xv/NeMo that referenced this pull request Nov 5, 2024
…variety of tensors (NVIDIA#9641)

* enables default data step in megatron parallel to operate on a wider variety of tensors coming out of the dataloader

* handles the case where a batch is empty

* Apply isort and black reformatting

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

* Allows the default data step to operate on more types
than just dictionaries

Signed-off-by: Jonathan Mitchell <[email protected]>

---------

Signed-off-by: jomitchellnv <[email protected]>
Signed-off-by: Jonathan Mitchell <[email protected]>
Co-authored-by: jomitchellnv <[email protected]>
Co-authored-by: Marc Romeyn <[email protected]>
Signed-off-by: Hainan Xu <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants