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

Fixed missing copy import in rnnt_decoder.py #8580

Merged
merged 2 commits into from
Mar 5, 2024

Conversation

isaac-mcfadyen
Copy link
Contributor

What does this PR do ?

When using compute_timestamps with RNNT models, an error is encountered because of a missing copy import (where copy is Python's built-in copy module).

Collection: ASR

Changelog

Jenkins CI

To run Jenkins, a NeMo User with write access must comment jenkins on the PR.

Before your PR is "Ready for review"

Pre checks:

  • Make sure you read and followed Contributor guidelines
  • Did you write any new necessary tests?
    • Not applicable, tiny bugfix.
  • 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.

Signed-off-by: Isaac McFadyen <isaac@imcf.me>
@github-actions github-actions bot added the ASR label Mar 4, 2024
Copy link
Collaborator

@titu1994 titu1994 left a comment

Choose a reason for hiding this comment

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

Thanks !

@titu1994 titu1994 merged commit 7a7ebb1 into NVIDIA:main Mar 5, 2024
4 checks passed
pzelasko pushed a commit that referenced this pull request Mar 7, 2024
* Added copy import to rnnt_decoding.py

Signed-off-by: Isaac McFadyen <isaac@imcf.me>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Signed-off-by: Isaac McFadyen <isaac@imcf.me>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>
zpx01 pushed a commit to zpx01/NeMo that referenced this pull request Mar 8, 2024
* Added copy import to rnnt_decoding.py

Signed-off-by: Isaac McFadyen <isaac@imcf.me>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Signed-off-by: Isaac McFadyen <isaac@imcf.me>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: Zeeshan Patel <zeeshanp@berkeley.edu>
Agoniii pushed a commit to Agoniii/NeMo that referenced this pull request Mar 15, 2024
* Added copy import to rnnt_decoding.py

Signed-off-by: Isaac McFadyen <isaac@imcf.me>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Signed-off-by: Isaac McFadyen <isaac@imcf.me>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: Agoniii <815244047@qq.com>
JRD971000 pushed a commit that referenced this pull request Mar 15, 2024
* Added copy import to rnnt_decoding.py

Signed-off-by: Isaac McFadyen <isaac@imcf.me>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Signed-off-by: Isaac McFadyen <isaac@imcf.me>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: ataghibakhsh <ataghibakhsh@nvidia.com>
pablo-garay pushed a commit that referenced this pull request Mar 19, 2024
* Added copy import to rnnt_decoding.py

Signed-off-by: Isaac McFadyen <isaac@imcf.me>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Signed-off-by: Isaac McFadyen <isaac@imcf.me>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: Pablo Garay <pagaray@nvidia.com>
pzelasko added a commit that referenced this pull request Apr 16, 2024
…t-only) dataloading (#8581)

* wip

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Partially working config groups

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Working test with abasic group in the input config

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Working test with nested groups in input config

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Working test with specifying a YAML path for input_cfg

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* a very rough example of text dataloading via lhotse

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Cleaner integration of multimodal audio/text loading that allows to control the effective audio vs text size (requires latest lhotse)

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* remove obsolete test

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Fix an import in export_utils.py (#8571)

Signed-off-by: w4-jinhyeonkim <131935801+w4-jinhyeonkim@users.noreply.github.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Yttm deprecation (#8322)

* yttm deprecation init commit

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

* removed tests

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* bug fix

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

* path fix

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

* fixing path

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

* updated tests to spm

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

* updated Jenkinsfile

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

* new model with spm in tests

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

* yttm removed

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

* updated aayn config

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

---------

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Fixed missing copy import in rnnt_decoder.py (#8580)

* Added copy import to rnnt_decoding.py

Signed-off-by: Isaac McFadyen <isaac@imcf.me>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Signed-off-by: Isaac McFadyen <isaac@imcf.me>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Fix bug in RNNT Joint WER calculation for fused batch (#8587)

Signed-off-by: smajumdar <titu1994@gmail.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Fixed Context Parallel HtoD sync (#8557)

* Fixed cp HtoD sync

Signed-off-by: Selvaraj Anandaraj <selvaraja@login-eos02.eos.clusters.nvidia.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Signed-off-by: Selvaraj Anandaraj <selvaraja@login-eos02.eos.clusters.nvidia.com>
Co-authored-by: Selvaraj Anandaraj <selvaraja@login-eos02.eos.clusters.nvidia.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* change default and add key to config files (#8594)

Signed-off-by: Chen Cui <chcui@nvidia.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Fix triton import guards (#8552)

* Fix triton import guards

Signed-off-by: Michal Futrega <mfutrega@nvidia.com>

* Update attention.py

Signed-off-by: Michal Futrega <mfutrega@nvidia.com>

---------

Signed-off-by: Michal Futrega <mfutrega@nvidia.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Add config key for dropout position in LoRA adapter (#8583)

Signed-off-by: Michal Futrega <mfutrega@nvidia.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* fix ia3 mlp infused adapter (#8597)

Signed-off-by: Chen Cui <chcui@nvidia.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Prevent Redundant Gather for LoRA Sequence Parallel (#8602)

* enable layernorm output gathered

Signed-off-by: Chen Cui <chcui@nvidia.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Signed-off-by: Chen Cui <chcui@nvidia.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Accelerate `transcribe_speech.py` for short-form data: pre-sorting support (#8564)

* POC using bucketing in transcribe_speech.py

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* extend to multi task aed

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* fixes for aed multi task text/lang field selectors

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* remove assert

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* fix

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* expose option for bucket buffer size

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* fixes, ctc support

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* support pre-sorting manifests in transcribe_speech.py

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* cleanup

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* reorder transcriptions back to original manifest order

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* remove bucketing entirely

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* code review changes

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* code review changes--amend

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* refactor text_field/lang_field passing

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Fix reordering bug; disable presorting for multi task for now

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Add support for presort + multi task model

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Code reviews

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Fix jenkins tests, add user-friendly error msg for canary

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

---------

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* fix tests

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Bump min required lhotse version

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Add some documentation about this config format and the multimodal features

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Add caution about multiple shards

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Address Tom's code review

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Add copyright header

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Fix (hopefully) issue with forced ascii encoding in CI

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Support resolving input_cfg path into config contents

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Code review changes in docs

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Fix unicode decode error

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

---------

Signed-off-by: Piotr Żelasko <petezor@gmail.com>
Signed-off-by: w4-jinhyeonkim <131935801+w4-jinhyeonkim@users.noreply.github.com>
Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>
Signed-off-by: Isaac McFadyen <isaac@imcf.me>
Signed-off-by: smajumdar <titu1994@gmail.com>
Signed-off-by: Selvaraj Anandaraj <selvaraja@login-eos02.eos.clusters.nvidia.com>
Signed-off-by: Chen Cui <chcui@nvidia.com>
Signed-off-by: Michal Futrega <mfutrega@nvidia.com>
Co-authored-by: w4-jinhyeonkim <131935801+w4-jinhyeonkim@users.noreply.github.com>
Co-authored-by: Aleksey Grinchuk (Oleksii Hrinchuk) <grinchuk.alexey@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Isaac McFadyen <isaac@imcf.me>
Co-authored-by: Somshubra Majumdar <titu1994@gmail.com>
Co-authored-by: Selvaraj Anandaraj <anandaraj@wisc.edu>
Co-authored-by: Selvaraj Anandaraj <selvaraja@login-eos02.eos.clusters.nvidia.com>
Co-authored-by: Chen Cui <chcui@nvidia.com>
Co-authored-by: Michal Futrega <mfutrega@nvidia.com>
Co-authored-by: Pablo Garay <palenq@gmail.com>
xingyaoww pushed a commit to xingyaoww/NeMo that referenced this pull request Apr 23, 2024
…t-only) dataloading (NVIDIA#8581)

* wip

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Partially working config groups

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Working test with abasic group in the input config

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Working test with nested groups in input config

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Working test with specifying a YAML path for input_cfg

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* a very rough example of text dataloading via lhotse

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Cleaner integration of multimodal audio/text loading that allows to control the effective audio vs text size (requires latest lhotse)

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* remove obsolete test

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Fix an import in export_utils.py (NVIDIA#8571)

Signed-off-by: w4-jinhyeonkim <131935801+w4-jinhyeonkim@users.noreply.github.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Yttm deprecation (NVIDIA#8322)

* yttm deprecation init commit

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

* removed tests

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* bug fix

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

* path fix

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

* fixing path

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

* updated tests to spm

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

* updated Jenkinsfile

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

* new model with spm in tests

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

* yttm removed

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

* updated aayn config

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

---------

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Fixed missing copy import in rnnt_decoder.py (NVIDIA#8580)

* Added copy import to rnnt_decoding.py

Signed-off-by: Isaac McFadyen <isaac@imcf.me>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Signed-off-by: Isaac McFadyen <isaac@imcf.me>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Fix bug in RNNT Joint WER calculation for fused batch (NVIDIA#8587)

Signed-off-by: smajumdar <titu1994@gmail.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Fixed Context Parallel HtoD sync (NVIDIA#8557)

* Fixed cp HtoD sync

Signed-off-by: Selvaraj Anandaraj <selvaraja@login-eos02.eos.clusters.nvidia.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Signed-off-by: Selvaraj Anandaraj <selvaraja@login-eos02.eos.clusters.nvidia.com>
Co-authored-by: Selvaraj Anandaraj <selvaraja@login-eos02.eos.clusters.nvidia.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* change default and add key to config files (NVIDIA#8594)

Signed-off-by: Chen Cui <chcui@nvidia.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Fix triton import guards (NVIDIA#8552)

* Fix triton import guards

Signed-off-by: Michal Futrega <mfutrega@nvidia.com>

* Update attention.py

Signed-off-by: Michal Futrega <mfutrega@nvidia.com>

---------

Signed-off-by: Michal Futrega <mfutrega@nvidia.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Add config key for dropout position in LoRA adapter (NVIDIA#8583)

Signed-off-by: Michal Futrega <mfutrega@nvidia.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* fix ia3 mlp infused adapter (NVIDIA#8597)

Signed-off-by: Chen Cui <chcui@nvidia.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Prevent Redundant Gather for LoRA Sequence Parallel (NVIDIA#8602)

* enable layernorm output gathered

Signed-off-by: Chen Cui <chcui@nvidia.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Signed-off-by: Chen Cui <chcui@nvidia.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Accelerate `transcribe_speech.py` for short-form data: pre-sorting support (NVIDIA#8564)

* POC using bucketing in transcribe_speech.py

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* extend to multi task aed

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* fixes for aed multi task text/lang field selectors

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* remove assert

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* fix

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* expose option for bucket buffer size

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* fixes, ctc support

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* support pre-sorting manifests in transcribe_speech.py

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* cleanup

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* reorder transcriptions back to original manifest order

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* remove bucketing entirely

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* code review changes

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* code review changes--amend

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* refactor text_field/lang_field passing

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Fix reordering bug; disable presorting for multi task for now

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Add support for presort + multi task model

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Code reviews

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Fix jenkins tests, add user-friendly error msg for canary

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

---------

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* fix tests

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Bump min required lhotse version

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Add some documentation about this config format and the multimodal features

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Add caution about multiple shards

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Address Tom's code review

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Add copyright header

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Fix (hopefully) issue with forced ascii encoding in CI

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Support resolving input_cfg path into config contents

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Code review changes in docs

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Fix unicode decode error

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

---------

Signed-off-by: Piotr Żelasko <petezor@gmail.com>
Signed-off-by: w4-jinhyeonkim <131935801+w4-jinhyeonkim@users.noreply.github.com>
Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>
Signed-off-by: Isaac McFadyen <isaac@imcf.me>
Signed-off-by: smajumdar <titu1994@gmail.com>
Signed-off-by: Selvaraj Anandaraj <selvaraja@login-eos02.eos.clusters.nvidia.com>
Signed-off-by: Chen Cui <chcui@nvidia.com>
Signed-off-by: Michal Futrega <mfutrega@nvidia.com>
Co-authored-by: w4-jinhyeonkim <131935801+w4-jinhyeonkim@users.noreply.github.com>
Co-authored-by: Aleksey Grinchuk (Oleksii Hrinchuk) <grinchuk.alexey@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Isaac McFadyen <isaac@imcf.me>
Co-authored-by: Somshubra Majumdar <titu1994@gmail.com>
Co-authored-by: Selvaraj Anandaraj <anandaraj@wisc.edu>
Co-authored-by: Selvaraj Anandaraj <selvaraja@login-eos02.eos.clusters.nvidia.com>
Co-authored-by: Chen Cui <chcui@nvidia.com>
Co-authored-by: Michal Futrega <mfutrega@nvidia.com>
Co-authored-by: Pablo Garay <palenq@gmail.com>
alxzhang-amazon pushed a commit to alxzhang-amazon/NeMo that referenced this pull request Apr 26, 2024
…t-only) dataloading (NVIDIA#8581)

* wip

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Partially working config groups

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Working test with abasic group in the input config

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Working test with nested groups in input config

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Working test with specifying a YAML path for input_cfg

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* a very rough example of text dataloading via lhotse

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Cleaner integration of multimodal audio/text loading that allows to control the effective audio vs text size (requires latest lhotse)

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* remove obsolete test

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Fix an import in export_utils.py (NVIDIA#8571)

Signed-off-by: w4-jinhyeonkim <131935801+w4-jinhyeonkim@users.noreply.github.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Yttm deprecation (NVIDIA#8322)

* yttm deprecation init commit

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

* removed tests

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* bug fix

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

* path fix

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

* fixing path

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

* updated tests to spm

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

* updated Jenkinsfile

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

* new model with spm in tests

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

* yttm removed

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

* updated aayn config

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

---------

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Fixed missing copy import in rnnt_decoder.py (NVIDIA#8580)

* Added copy import to rnnt_decoding.py

Signed-off-by: Isaac McFadyen <isaac@imcf.me>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Signed-off-by: Isaac McFadyen <isaac@imcf.me>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Fix bug in RNNT Joint WER calculation for fused batch (NVIDIA#8587)

Signed-off-by: smajumdar <titu1994@gmail.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Fixed Context Parallel HtoD sync (NVIDIA#8557)

* Fixed cp HtoD sync

Signed-off-by: Selvaraj Anandaraj <selvaraja@login-eos02.eos.clusters.nvidia.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Signed-off-by: Selvaraj Anandaraj <selvaraja@login-eos02.eos.clusters.nvidia.com>
Co-authored-by: Selvaraj Anandaraj <selvaraja@login-eos02.eos.clusters.nvidia.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* change default and add key to config files (NVIDIA#8594)

Signed-off-by: Chen Cui <chcui@nvidia.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Fix triton import guards (NVIDIA#8552)

* Fix triton import guards

Signed-off-by: Michal Futrega <mfutrega@nvidia.com>

* Update attention.py

Signed-off-by: Michal Futrega <mfutrega@nvidia.com>

---------

Signed-off-by: Michal Futrega <mfutrega@nvidia.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Add config key for dropout position in LoRA adapter (NVIDIA#8583)

Signed-off-by: Michal Futrega <mfutrega@nvidia.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* fix ia3 mlp infused adapter (NVIDIA#8597)

Signed-off-by: Chen Cui <chcui@nvidia.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Prevent Redundant Gather for LoRA Sequence Parallel (NVIDIA#8602)

* enable layernorm output gathered

Signed-off-by: Chen Cui <chcui@nvidia.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Signed-off-by: Chen Cui <chcui@nvidia.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Accelerate `transcribe_speech.py` for short-form data: pre-sorting support (NVIDIA#8564)

* POC using bucketing in transcribe_speech.py

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* extend to multi task aed

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* fixes for aed multi task text/lang field selectors

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* remove assert

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* fix

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* expose option for bucket buffer size

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* fixes, ctc support

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* support pre-sorting manifests in transcribe_speech.py

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* cleanup

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* reorder transcriptions back to original manifest order

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* remove bucketing entirely

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* code review changes

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* code review changes--amend

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* refactor text_field/lang_field passing

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Fix reordering bug; disable presorting for multi task for now

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Add support for presort + multi task model

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Code reviews

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Fix jenkins tests, add user-friendly error msg for canary

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

---------

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* fix tests

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Bump min required lhotse version

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Add some documentation about this config format and the multimodal features

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Add caution about multiple shards

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Address Tom's code review

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Add copyright header

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Fix (hopefully) issue with forced ascii encoding in CI

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Support resolving input_cfg path into config contents

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Code review changes in docs

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Fix unicode decode error

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

---------

Signed-off-by: Piotr Żelasko <petezor@gmail.com>
Signed-off-by: w4-jinhyeonkim <131935801+w4-jinhyeonkim@users.noreply.github.com>
Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>
Signed-off-by: Isaac McFadyen <isaac@imcf.me>
Signed-off-by: smajumdar <titu1994@gmail.com>
Signed-off-by: Selvaraj Anandaraj <selvaraja@login-eos02.eos.clusters.nvidia.com>
Signed-off-by: Chen Cui <chcui@nvidia.com>
Signed-off-by: Michal Futrega <mfutrega@nvidia.com>
Co-authored-by: w4-jinhyeonkim <131935801+w4-jinhyeonkim@users.noreply.github.com>
Co-authored-by: Aleksey Grinchuk (Oleksii Hrinchuk) <grinchuk.alexey@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Isaac McFadyen <isaac@imcf.me>
Co-authored-by: Somshubra Majumdar <titu1994@gmail.com>
Co-authored-by: Selvaraj Anandaraj <anandaraj@wisc.edu>
Co-authored-by: Selvaraj Anandaraj <selvaraja@login-eos02.eos.clusters.nvidia.com>
Co-authored-by: Chen Cui <chcui@nvidia.com>
Co-authored-by: Michal Futrega <mfutrega@nvidia.com>
Co-authored-by: Pablo Garay <palenq@gmail.com>
suiyoubi pushed a commit that referenced this pull request May 2, 2024
…t-only) dataloading (#8581)

* wip

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Partially working config groups

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Working test with abasic group in the input config

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Working test with nested groups in input config

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Working test with specifying a YAML path for input_cfg

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* a very rough example of text dataloading via lhotse

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Cleaner integration of multimodal audio/text loading that allows to control the effective audio vs text size (requires latest lhotse)

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* remove obsolete test

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Fix an import in export_utils.py (#8571)

Signed-off-by: w4-jinhyeonkim <131935801+w4-jinhyeonkim@users.noreply.github.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Yttm deprecation (#8322)

* yttm deprecation init commit

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

* removed tests

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* bug fix

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

* path fix

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

* fixing path

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

* updated tests to spm

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

* updated Jenkinsfile

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

* new model with spm in tests

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

* yttm removed

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

* updated aayn config

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>

---------

Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Fixed missing copy import in rnnt_decoder.py (#8580)

* Added copy import to rnnt_decoding.py

Signed-off-by: Isaac McFadyen <isaac@imcf.me>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Signed-off-by: Isaac McFadyen <isaac@imcf.me>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Fix bug in RNNT Joint WER calculation for fused batch (#8587)

Signed-off-by: smajumdar <titu1994@gmail.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Fixed Context Parallel HtoD sync (#8557)

* Fixed cp HtoD sync

Signed-off-by: Selvaraj Anandaraj <selvaraja@login-eos02.eos.clusters.nvidia.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Signed-off-by: Selvaraj Anandaraj <selvaraja@login-eos02.eos.clusters.nvidia.com>
Co-authored-by: Selvaraj Anandaraj <selvaraja@login-eos02.eos.clusters.nvidia.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* change default and add key to config files (#8594)

Signed-off-by: Chen Cui <chcui@nvidia.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Fix triton import guards (#8552)

* Fix triton import guards

Signed-off-by: Michal Futrega <mfutrega@nvidia.com>

* Update attention.py

Signed-off-by: Michal Futrega <mfutrega@nvidia.com>

---------

Signed-off-by: Michal Futrega <mfutrega@nvidia.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Add config key for dropout position in LoRA adapter (#8583)

Signed-off-by: Michal Futrega <mfutrega@nvidia.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* fix ia3 mlp infused adapter (#8597)

Signed-off-by: Chen Cui <chcui@nvidia.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Prevent Redundant Gather for LoRA Sequence Parallel (#8602)

* enable layernorm output gathered

Signed-off-by: Chen Cui <chcui@nvidia.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Signed-off-by: Chen Cui <chcui@nvidia.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Accelerate `transcribe_speech.py` for short-form data: pre-sorting support (#8564)

* POC using bucketing in transcribe_speech.py

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* extend to multi task aed

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* fixes for aed multi task text/lang field selectors

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* remove assert

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* fix

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* expose option for bucket buffer size

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* fixes, ctc support

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* support pre-sorting manifests in transcribe_speech.py

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* cleanup

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* reorder transcriptions back to original manifest order

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* remove bucketing entirely

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* code review changes

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* code review changes--amend

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* refactor text_field/lang_field passing

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Fix reordering bug; disable presorting for multi task for now

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Add support for presort + multi task model

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Code reviews

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Fix jenkins tests, add user-friendly error msg for canary

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

---------

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* fix tests

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Bump min required lhotse version

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Add some documentation about this config format and the multimodal features

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Add caution about multiple shards

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Address Tom's code review

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Add copyright header

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Fix (hopefully) issue with forced ascii encoding in CI

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Support resolving input_cfg path into config contents

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Code review changes in docs

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* Fix unicode decode error

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

---------

Signed-off-by: Piotr Żelasko <petezor@gmail.com>
Signed-off-by: w4-jinhyeonkim <131935801+w4-jinhyeonkim@users.noreply.github.com>
Signed-off-by: AlexGrinch <grinchuk.alexey@gmail.com>
Signed-off-by: Isaac McFadyen <isaac@imcf.me>
Signed-off-by: smajumdar <titu1994@gmail.com>
Signed-off-by: Selvaraj Anandaraj <selvaraja@login-eos02.eos.clusters.nvidia.com>
Signed-off-by: Chen Cui <chcui@nvidia.com>
Signed-off-by: Michal Futrega <mfutrega@nvidia.com>
Co-authored-by: w4-jinhyeonkim <131935801+w4-jinhyeonkim@users.noreply.github.com>
Co-authored-by: Aleksey Grinchuk (Oleksii Hrinchuk) <grinchuk.alexey@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Isaac McFadyen <isaac@imcf.me>
Co-authored-by: Somshubra Majumdar <titu1994@gmail.com>
Co-authored-by: Selvaraj Anandaraj <anandaraj@wisc.edu>
Co-authored-by: Selvaraj Anandaraj <selvaraja@login-eos02.eos.clusters.nvidia.com>
Co-authored-by: Chen Cui <chcui@nvidia.com>
Co-authored-by: Michal Futrega <mfutrega@nvidia.com>
Co-authored-by: Pablo Garay <palenq@gmail.com>
Signed-off-by: Ao Tang <aot@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.

None yet

2 participants