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

Nemotron export - fixing megatron_export.py #9625

Merged
merged 5 commits into from
Jul 8, 2024

Conversation

borisfom
Copy link
Collaborator

@borisfom borisfom commented Jul 5, 2024

What does this PR do ?

Updates Apex module replacements we do inside export() with Megatron Core modules replacement.

Collection: [Note which collection this PR will affect]

NLP

Changelog

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

Usage

python3 examples/nlp/language_modeling/megatron_export.py model_type=gpt gpt_model_file=Nemotron-3-8B-Base-4k.nemo onnx_model=Nemotron-3-8B-Base-4k.nemo

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
  • [X ] 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 the NLP label Jul 5, 2024
Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>
@borisfom borisfom force-pushed the nemotron-export branch 2 times, most recently from eb6e92c to aae6024 Compare July 6, 2024 00:49
@github-actions github-actions bot removed the NLP label Jul 6, 2024
@borisfom borisfom requested a review from ericharper July 6, 2024 00:49
Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>
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!

@ericharper ericharper merged commit 9b91df5 into NVIDIA:main Jul 8, 2024
112 checks passed
marcromeyn pushed a commit that referenced this pull request Jul 9, 2024
* Nemotron ONNX export fixed

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>

* Cleanup

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>

* Addressing code review comments

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>

---------

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>
Co-authored-by: Eric Harper <complex451@gmail.com>
marcromeyn added a commit that referenced this pull request Jul 11, 2024
* Nemotron export - fixing megatron_export.py  (#9625)

* Nemotron ONNX export fixed

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>

* Cleanup

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>

* Addressing code review comments

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>

---------

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>
Co-authored-by: Eric Harper <complex451@gmail.com>

* Including all trainable-params in a PEFT-checkpoint

* Apply isort and black reformatting

Signed-off-by: marcromeyn <marcromeyn@users.noreply.github.com>

* Small fixes to make model-importer work

* Fixing failing tests

---------

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>
Signed-off-by: marcromeyn <marcromeyn@users.noreply.github.com>
Co-authored-by: Boris Fomitchev <borisfom@users.noreply.github.com>
Co-authored-by: Eric Harper <complex451@gmail.com>
Co-authored-by: marcromeyn <marcromeyn@users.noreply.github.com>
Co-authored-by: Chen Cui <chcui@nvidia.com>
github-actions bot pushed a commit that referenced this pull request Jul 11, 2024
* Nemotron export - fixing megatron_export.py  (#9625)

* Nemotron ONNX export fixed

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>

* Cleanup

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>

* Addressing code review comments

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>

---------

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>
Co-authored-by: Eric Harper <complex451@gmail.com>

* Including all trainable-params in a PEFT-checkpoint

* Apply isort and black reformatting

Signed-off-by: marcromeyn <marcromeyn@users.noreply.github.com>

* Small fixes to make model-importer work

* Fixing failing tests

---------

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>
Signed-off-by: marcromeyn <marcromeyn@users.noreply.github.com>
Co-authored-by: Boris Fomitchev <borisfom@users.noreply.github.com>
Co-authored-by: Eric Harper <complex451@gmail.com>
Co-authored-by: marcromeyn <marcromeyn@users.noreply.github.com>
Co-authored-by: Chen Cui <chcui@nvidia.com>
marcromeyn pushed a commit that referenced this pull request Jul 11, 2024
* Nemotron ONNX export fixed

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>

* Cleanup

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>

* Addressing code review comments

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>

---------

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>
Co-authored-by: Eric Harper <complex451@gmail.com>
jomitchellnv pushed a commit to jomitchellnv/NeMo that referenced this pull request Jul 11, 2024
* Nemotron ONNX export fixed

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>

* Cleanup

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>

* Addressing code review comments

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>

---------

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>
Co-authored-by: Eric Harper <complex451@gmail.com>
jomitchellnv pushed a commit to jomitchellnv/NeMo that referenced this pull request Jul 11, 2024
* Nemotron ONNX export fixed

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>

* Cleanup

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>

* Addressing code review comments

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>

---------

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>
Co-authored-by: Eric Harper <complex451@gmail.com>
Signed-off-by: Jonathan Mitchell <jomitchell@nvidia.com>
maanug-nv pushed a commit that referenced this pull request Jul 14, 2024
* Nemotron export - fixing megatron_export.py  (#9625)

* Nemotron ONNX export fixed

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>

* Cleanup

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>

* Addressing code review comments

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>

---------

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>
Co-authored-by: Eric Harper <complex451@gmail.com>

* Including all trainable-params in a PEFT-checkpoint

* Apply isort and black reformatting

Signed-off-by: marcromeyn <marcromeyn@users.noreply.github.com>

* Small fixes to make model-importer work

* Fixing failing tests

---------

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>
Signed-off-by: marcromeyn <marcromeyn@users.noreply.github.com>
Co-authored-by: Boris Fomitchev <borisfom@users.noreply.github.com>
Co-authored-by: Eric Harper <complex451@gmail.com>
Co-authored-by: marcromeyn <marcromeyn@users.noreply.github.com>
Co-authored-by: Chen Cui <chcui@nvidia.com>
ashors1 added a commit that referenced this pull request Jul 15, 2024
…#9691)

* Nemotron export - fixing megatron_export.py  (#9625)

* Nemotron ONNX export fixed



* Cleanup



* Addressing code review comments



---------




* Including all trainable-params in a PEFT-checkpoint

* Apply isort and black reformatting



* Small fixes to make model-importer work

* Fixing failing tests

---------

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>
Signed-off-by: marcromeyn <marcromeyn@users.noreply.github.com>
Co-authored-by: Marc Romeyn <mromeijn@nvidia.com>
Co-authored-by: Boris Fomitchev <borisfom@users.noreply.github.com>
Co-authored-by: Eric Harper <complex451@gmail.com>
Co-authored-by: marcromeyn <marcromeyn@users.noreply.github.com>
Co-authored-by: Chen Cui <chcui@nvidia.com>
Co-authored-by: ashors1 <ashors@nvidia.com>
nikitaved pushed a commit to nikitaved/NeMo that referenced this pull request Jul 16, 2024
…#9650) (NVIDIA#9691)

* Nemotron export - fixing megatron_export.py  (NVIDIA#9625)

* Nemotron ONNX export fixed



* Cleanup



* Addressing code review comments



---------




* Including all trainable-params in a PEFT-checkpoint

* Apply isort and black reformatting



* Small fixes to make model-importer work

* Fixing failing tests

---------

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>
Signed-off-by: marcromeyn <marcromeyn@users.noreply.github.com>
Co-authored-by: Marc Romeyn <mromeijn@nvidia.com>
Co-authored-by: Boris Fomitchev <borisfom@users.noreply.github.com>
Co-authored-by: Eric Harper <complex451@gmail.com>
Co-authored-by: marcromeyn <marcromeyn@users.noreply.github.com>
Co-authored-by: Chen Cui <chcui@nvidia.com>
Co-authored-by: ashors1 <ashors@nvidia.com>
pablo-garay pushed a commit that referenced this pull request Jul 16, 2024
* add NemoQueryLLMPyTorch class for triton query of in-framework models

* nemo_export.py changes to better support in-framework models

* separate out in-framework version of triton deploy script

* add generate() function to MegatronLLMDeployable to allow for direct use in export tests

* use NemoQueryLLMPyTorch in deploy tests

* add warning message for when MegatronLLMDeployable overrides transformer_engine

* remove enable_streaming argument from deploy_inframework_triton.py since MegatronLLMDeployable does not support streaming
add query_inframework.py since original query.py does not work with in-framework deployments

* Apply isort and black reformatting

Signed-off-by: jukim-nv <jukim-nv@users.noreply.github.com>

* skip trtllm support check if in_framework testing

* remove unused imports

* run_existing_checkpoints was passing wrong prompts argument for in-framework mode

* Nemotron export - fixing megatron_export.py  (#9625)

* Nemotron ONNX export fixed

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>

* Cleanup

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>

* Addressing code review comments

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>

---------

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>
Co-authored-by: Eric Harper <complex451@gmail.com>

* support lora when kv_channel != hidden_size / num_heads (#9636)

* fix unused import in query_inframework.py

* fixing coding style

Signed-off-by: Onur Yilmaz <oyilmaz@nvidia.com>

---------

Signed-off-by: jukim-nv <jukim-nv@users.noreply.github.com>
Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>
Signed-off-by: Onur Yilmaz <oyilmaz@nvidia.com>
Co-authored-by: Justin Kim <jukim@nvidia.com>
Co-authored-by: jukim-nv <jukim-nv@users.noreply.github.com>
Co-authored-by: Boris Fomitchev <borisfom@users.noreply.github.com>
Co-authored-by: Eric Harper <complex451@gmail.com>
Co-authored-by: Ao Tang <aot@nvidia.com>
ertkonuk pushed a commit that referenced this pull request Jul 19, 2024
* Nemotron ONNX export fixed

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>

* Cleanup

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>

* Addressing code review comments

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>

---------

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>
Co-authored-by: Eric Harper <complex451@gmail.com>
Signed-off-by: Tugrul Konuk <ertkonuk@gmail.com>
ertkonuk pushed a commit that referenced this pull request Jul 19, 2024
…#9691)

* Nemotron export - fixing megatron_export.py  (#9625)

* Nemotron ONNX export fixed



* Cleanup



* Addressing code review comments



---------




* Including all trainable-params in a PEFT-checkpoint

* Apply isort and black reformatting



* Small fixes to make model-importer work

* Fixing failing tests

---------

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>
Signed-off-by: marcromeyn <marcromeyn@users.noreply.github.com>
Co-authored-by: Marc Romeyn <mromeijn@nvidia.com>
Co-authored-by: Boris Fomitchev <borisfom@users.noreply.github.com>
Co-authored-by: Eric Harper <complex451@gmail.com>
Co-authored-by: marcromeyn <marcromeyn@users.noreply.github.com>
Co-authored-by: Chen Cui <chcui@nvidia.com>
Co-authored-by: ashors1 <ashors@nvidia.com>
Signed-off-by: Tugrul Konuk <ertkonuk@gmail.com>
malay-nagda pushed a commit to malay-nagda/NeMo that referenced this pull request Jul 26, 2024
…#9650) (NVIDIA#9691)

* Nemotron export - fixing megatron_export.py  (NVIDIA#9625)

* Nemotron ONNX export fixed

* Cleanup

* Addressing code review comments

---------

* Including all trainable-params in a PEFT-checkpoint

* Apply isort and black reformatting

* Small fixes to make model-importer work

* Fixing failing tests

---------

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>
Signed-off-by: marcromeyn <marcromeyn@users.noreply.github.com>
Co-authored-by: Marc Romeyn <mromeijn@nvidia.com>
Co-authored-by: Boris Fomitchev <borisfom@users.noreply.github.com>
Co-authored-by: Eric Harper <complex451@gmail.com>
Co-authored-by: marcromeyn <marcromeyn@users.noreply.github.com>
Co-authored-by: Chen Cui <chcui@nvidia.com>
Co-authored-by: ashors1 <ashors@nvidia.com>
Signed-off-by: Malay Nagda <malayn@malayn-mlt.client.nvidia.com>
tonyjie pushed a commit to tonyjie/NeMo that referenced this pull request Aug 6, 2024
* Nemotron ONNX export fixed

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>

* Cleanup

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>

* Addressing code review comments

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>

---------

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>
Co-authored-by: Eric Harper <complex451@gmail.com>
Signed-off-by: tonyjie <jl4257@cornell.edu>
tonyjie pushed a commit to tonyjie/NeMo that referenced this pull request Aug 6, 2024
…#9650) (NVIDIA#9691)

* Nemotron export - fixing megatron_export.py  (NVIDIA#9625)

* Nemotron ONNX export fixed

* Cleanup

* Addressing code review comments

---------

* Including all trainable-params in a PEFT-checkpoint

* Apply isort and black reformatting

* Small fixes to make model-importer work

* Fixing failing tests

---------

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>
Signed-off-by: marcromeyn <marcromeyn@users.noreply.github.com>
Co-authored-by: Marc Romeyn <mromeijn@nvidia.com>
Co-authored-by: Boris Fomitchev <borisfom@users.noreply.github.com>
Co-authored-by: Eric Harper <complex451@gmail.com>
Co-authored-by: marcromeyn <marcromeyn@users.noreply.github.com>
Co-authored-by: Chen Cui <chcui@nvidia.com>
Co-authored-by: ashors1 <ashors@nvidia.com>
Signed-off-by: tonyjie <jl4257@cornell.edu>
monica-sekoyan pushed a commit that referenced this pull request Oct 14, 2024
…#9691)

* Nemotron export - fixing megatron_export.py  (#9625)

* Nemotron ONNX export fixed



* Cleanup



* Addressing code review comments



---------




* Including all trainable-params in a PEFT-checkpoint

* Apply isort and black reformatting



* Small fixes to make model-importer work

* Fixing failing tests

---------

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>
Signed-off-by: marcromeyn <marcromeyn@users.noreply.github.com>
Co-authored-by: Marc Romeyn <mromeijn@nvidia.com>
Co-authored-by: Boris Fomitchev <borisfom@users.noreply.github.com>
Co-authored-by: Eric Harper <complex451@gmail.com>
Co-authored-by: marcromeyn <marcromeyn@users.noreply.github.com>
Co-authored-by: Chen Cui <chcui@nvidia.com>
Co-authored-by: ashors1 <ashors@nvidia.com>
hainan-xv pushed a commit to hainan-xv/NeMo that referenced this pull request Nov 5, 2024
* Nemotron ONNX export fixed

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>

* Cleanup

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>

* Addressing code review comments

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>

---------

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>
Co-authored-by: Eric Harper <complex451@gmail.com>
Signed-off-by: Hainan Xu <hainanx@nvidia.com>
hainan-xv pushed a commit to hainan-xv/NeMo that referenced this pull request Nov 5, 2024
…#9650) (NVIDIA#9691)

* Nemotron export - fixing megatron_export.py  (NVIDIA#9625)

* Nemotron ONNX export fixed



* Cleanup



* Addressing code review comments



---------




* Including all trainable-params in a PEFT-checkpoint

* Apply isort and black reformatting



* Small fixes to make model-importer work

* Fixing failing tests

---------

Signed-off-by: Boris Fomitchev <bfomitchev@nvidia.com>
Signed-off-by: marcromeyn <marcromeyn@users.noreply.github.com>
Co-authored-by: Marc Romeyn <mromeijn@nvidia.com>
Co-authored-by: Boris Fomitchev <borisfom@users.noreply.github.com>
Co-authored-by: Eric Harper <complex451@gmail.com>
Co-authored-by: marcromeyn <marcromeyn@users.noreply.github.com>
Co-authored-by: Chen Cui <chcui@nvidia.com>
Co-authored-by: ashors1 <ashors@nvidia.com>
Signed-off-by: Hainan Xu <hainanx@nvidia.com>
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.

2 participants