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

Fix fastpitch test nightly #6730

Merged
merged 4 commits into from
May 26, 2023
Merged

Fix fastpitch test nightly #6730

merged 4 commits into from
May 26, 2023

Conversation

hsiehjackson
Copy link
Collaborator

What does this PR do ?

Fix multi-speaker FastPitch test nightly

Collection: [TTS]

Changelog

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

Usage

  • You can potentially add a usage example below

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)

hsiehjackson and others added 3 commits May 26, 2023 03:18
Signed-off-by: hsiehjackson <c2hsieh@ucsd.edu>
Signed-off-by: hsiehjackson <c2hsieh@ucsd.edu>
rlangman
rlangman previously approved these changes May 25, 2023
Comment on lines +46 to +51
speaker_id = None
reference_spec = None
reference_spec_lens = None

if hasattr(model.fastpitch, 'speaker_emb'):
speaker_id = 0
Copy link
Collaborator

Choose a reason for hiding this comment

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

Nitpick: could create a helper function to handle the branching logic easier, like:

def _get_inputs(model):
    if hasattr(model.fastpitch, 'speaker_emb'):
        return 0, None, None
    if not hasattr(model.fastpitch, 'speaker_encoder'):
        None, None, None
    ...

Copy link
Collaborator

Choose a reason for hiding this comment

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

agreed. but it seems this add-ons are only applied to fastpitch models, not all. It looks good to just keep as-is.

XuesongYang
XuesongYang previously approved these changes May 26, 2023
Copy link
Collaborator

@XuesongYang XuesongYang 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 for your quick fix.

Comment on lines +46 to +51
speaker_id = None
reference_spec = None
reference_spec_lens = None

if hasattr(model.fastpitch, 'speaker_emb'):
speaker_id = 0
Copy link
Collaborator

Choose a reason for hiding this comment

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

agreed. but it seems this add-ons are only applied to fastpitch models, not all. It looks good to just keep as-is.

@XuesongYang
Copy link
Collaborator

could you please also file the same PR to r1.19.0 branch?

Signed-off-by: hsiehjackson <c2hsieh@ucsd.edu>
@hsiehjackson hsiehjackson dismissed stale reviews from XuesongYang and rlangman via 91b88e2 May 26, 2023 19:28
@hsiehjackson hsiehjackson merged commit ee61a48 into main May 26, 2023
@hsiehjackson hsiehjackson deleted the fix-fastpitch-test branch May 26, 2023 22:06
hsiehjackson added a commit to hsiehjackson/NeMo that referenced this pull request Jun 2, 2023
* fix test fastpitch nightly

Signed-off-by: hsiehjackson <c2hsieh@ucsd.edu>

* Reformat

Signed-off-by: hsiehjackson <c2hsieh@ucsd.edu>

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

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

* Fix if elif condition

Signed-off-by: hsiehjackson <c2hsieh@ucsd.edu>

---------

Signed-off-by: hsiehjackson <c2hsieh@ucsd.edu>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: hsiehjackson <c2hsieh@ucsd.edu>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants