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

V0.5.0 forward merge #340

Merged
merged 12 commits into from
Nov 4, 2024
Merged

V0.5.0 forward merge #340

merged 12 commits into from
Nov 4, 2024

Conversation

ayushdg
Copy link
Collaborator

@ayushdg ayushdg commented Oct 30, 2024

Description

Merge in changes from the 0.5.0 release into main.
Specifically excludes the changes around our requirements.txt being pinned to specific versions in the previous release.

Also bumps our current version to 0.6.0.dev0 for folks installing from source.

Usage

N/A

Checklist

  • I am familiar with the Contributing Guide.
  • New or Existing tests cover these changes.
  • The documentation is up to date with these changes.

ryantwolf and others added 10 commits September 9, 2024 12:57
Signed-off-by: Ryan Wolf <[email protected]>
* pin to 24.8

Signed-off-by: Praateek Mahajan <[email protected]>

* remove nemo_toolkit

Signed-off-by: Praateek Mahajan <[email protected]>

* restrict spacy

Signed-off-by: Praateek Mahajan <[email protected]>

* unrestrict spacy

Signed-off-by: Praateek Mahajan <[email protected]>

* restrict spacy + numpy

Signed-off-by: Praateek Mahajan <[email protected]>

---------

Signed-off-by: Praateek Mahajan <[email protected]>
* Change download for NSFW model

Signed-off-by: Ryan Wolf <[email protected]>

* Fix model init

Signed-off-by: Ryan Wolf <[email protected]>

* Fix embedding size

Signed-off-by: Ryan Wolf <[email protected]>

---------

Signed-off-by: Ryan Wolf <[email protected]>
Signed-off-by: Ayush Dattagupta <[email protected]>
@ayushdg ayushdg added the meta General NeMo-Curator maintenance/packaging label Oct 30, 2024
@ayushdg ayushdg added the gpuci Run GPU CI/CD on PR label Oct 30, 2024
@ayushdg
Copy link
Collaborator Author

ayushdg commented Oct 30, 2024

Not sure if the DCO errors are applicable here or not. Seems to be some weird mismatch in expected email addresses from an old commit. I'm tempted to set DCO to pass unless someone has suggestions.

@VibhuJawa
Copy link
Collaborator

Not sure if the DCO errors are applicable here or not. Seems to be some weird mismatch in expected email addresses from an old commit. I'm tempted to set DCO to pass unless someone has suggestions.

I think that is fine, but if you want to, you can always rebase and fix commit message for that commit with that email

Copy link
Collaborator

@ryantwolf ryantwolf left a comment

Choose a reason for hiding this comment

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

Yeah I'm fine setting the DCO to pass. Do you know which commit in particular is causing problems?

@ayushdg
Copy link
Collaborator Author

ayushdg commented Oct 30, 2024

Yeah I'm fine setting the DCO to pass. Do you know which commit in particular is causing problems?

Commit sha: 1dddfed, Author: Praateek Mahajan, Committer: GitHub; Can not find "Praateek Mahajan [email protected]", in ["Praateek Mahajan [email protected]", "Praateek Mahajan [email protected]", "Praateek Mahajan [email protected]", "Praateek Mahajan [email protected]", "Praateek Mahajan [email protected]", "Praateek Mahajan [email protected]"].
Commit sha: 017ff97, Author: Praateek Mahajan, Committer: GitHub; Expected "Praateek Mahajan [email protected]", but got "Praateek Mahajan [email protected]".

It's a commit that's already in the other branch untouched by the merge.

@ryantwolf
Copy link
Collaborator

hold off one second until Tanay gets his fix in.

@ayushdg ayushdg marked this pull request as draft October 31, 2024 19:23
@ayushdg ayushdg marked this pull request as ready for review October 31, 2024 22:28
@ayushdg ayushdg added gpuci Run GPU CI/CD on PR and removed gpuci Run GPU CI/CD on PR labels Oct 31, 2024
@ryantwolf
Copy link
Collaborator

@ayushdg I think we're good now, any reservations on merging?

@ayushdg ayushdg merged commit 5c03c7c into NVIDIA:main Nov 4, 2024
5 checks passed
@ayushdg
Copy link
Collaborator Author

ayushdg commented Nov 4, 2024

Nope. I also think I understand the source of the DCO confusion. When merging in a PR, GitHub UI asks for an email address to associate with the merge commit into the branch. If that email address doesn't typically match the email addresses used by a developer for signing off commits, DCO gets a bit thrown off, because we now have a squash & merge commit from a different email address than the one used to sign off commits in the git history.

vinay-raman pushed a commit to vinay-raman/NeMo-Curator that referenced this pull request Nov 26, 2024
* Bump version

Signed-off-by: Ryan Wolf <[email protected]>

* Pin Rapids to 24.8 for 0.5.0 Release  (NVIDIA#273)

* pin to 24.8

Signed-off-by: Praateek Mahajan <[email protected]>

* remove nemo_toolkit

Signed-off-by: Praateek Mahajan <[email protected]>

* restrict spacy

Signed-off-by: Praateek Mahajan <[email protected]>

* unrestrict spacy

Signed-off-by: Praateek Mahajan <[email protected]>

* restrict spacy + numpy

Signed-off-by: Praateek Mahajan <[email protected]>

---------

Signed-off-by: Praateek Mahajan <[email protected]>

* Fix tutorial for release (NVIDIA#277)

Signed-off-by: Ryan Wolf <[email protected]>

* Fix nworkers for tinystories tutorial (NVIDIA#280)

Signed-off-by: Ryan Wolf <[email protected]>

* Pin to 24.8.x instead of 24.8 (NVIDIA#282)

Signed-off-by: Praateek Mahajan <[email protected]>

* Change NSFW Model (NVIDIA#307)

* Change download for NSFW model

Signed-off-by: Ryan Wolf <[email protected]>

* Fix model init

Signed-off-by: Ryan Wolf <[email protected]>

* Fix embedding size

Signed-off-by: Ryan Wolf <[email protected]>

---------

Signed-off-by: Ryan Wolf <[email protected]>

* Bump version to 0.6.0.dev0

Signed-off-by: Ayush Dattagupta <[email protected]>

* added error handling (NVIDIA#343)

Signed-off-by: Tanay Varshney <[email protected]>

---------

Signed-off-by: Ryan Wolf <[email protected]>
Signed-off-by: Praateek Mahajan <[email protected]>
Signed-off-by: Ayush Dattagupta <[email protected]>
Signed-off-by: Tanay Varshney <[email protected]>
Co-authored-by: Ryan Wolf <[email protected]>
Co-authored-by: Praateek Mahajan <[email protected]>
Co-authored-by: Tanay Varshney <[email protected]>
Signed-off-by: Vinay Raman <[email protected]>
ruchaa-apte pushed a commit to ruchaa-apte/NeMo-Curator that referenced this pull request Dec 13, 2024
* Bump version

Signed-off-by: Ryan Wolf <[email protected]>

* Pin Rapids to 24.8 for 0.5.0 Release  (NVIDIA#273)

* pin to 24.8

Signed-off-by: Praateek Mahajan <[email protected]>

* remove nemo_toolkit

Signed-off-by: Praateek Mahajan <[email protected]>

* restrict spacy

Signed-off-by: Praateek Mahajan <[email protected]>

* unrestrict spacy

Signed-off-by: Praateek Mahajan <[email protected]>

* restrict spacy + numpy

Signed-off-by: Praateek Mahajan <[email protected]>

---------

Signed-off-by: Praateek Mahajan <[email protected]>

* Fix tutorial for release (NVIDIA#277)

Signed-off-by: Ryan Wolf <[email protected]>

* Fix nworkers for tinystories tutorial (NVIDIA#280)

Signed-off-by: Ryan Wolf <[email protected]>

* Pin to 24.8.x instead of 24.8 (NVIDIA#282)

Signed-off-by: Praateek Mahajan <[email protected]>

* Change NSFW Model (NVIDIA#307)

* Change download for NSFW model

Signed-off-by: Ryan Wolf <[email protected]>

* Fix model init

Signed-off-by: Ryan Wolf <[email protected]>

* Fix embedding size

Signed-off-by: Ryan Wolf <[email protected]>

---------

Signed-off-by: Ryan Wolf <[email protected]>

* Bump version to 0.6.0.dev0

Signed-off-by: Ayush Dattagupta <[email protected]>

* added error handling (NVIDIA#343)

Signed-off-by: Tanay Varshney <[email protected]>

---------

Signed-off-by: Ryan Wolf <[email protected]>
Signed-off-by: Praateek Mahajan <[email protected]>
Signed-off-by: Ayush Dattagupta <[email protected]>
Signed-off-by: Tanay Varshney <[email protected]>
Co-authored-by: Ryan Wolf <[email protected]>
Co-authored-by: Praateek Mahajan <[email protected]>
Co-authored-by: Tanay Varshney <[email protected]>
Signed-off-by: Rucha Apte <[email protected]>
@ayushdg ayushdg deleted the v0.5.0_forward_merge branch January 28, 2025 19:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
gpuci Run GPU CI/CD on PR meta General NeMo-Curator maintenance/packaging
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants