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

[SVS] VISinger Plus #5741

Merged
merged 29 commits into from
May 22, 2024
Merged

[SVS] VISinger Plus #5741

merged 29 commits into from
May 22, 2024

Conversation

jerryuhoo
Copy link
Contributor

@jerryuhoo jerryuhoo commented Apr 10, 2024

What?

Use pre-trained SSL models as additional input information for VISinger 2.

Why?

SVS enhancement.

See also

@ftshijt

@mergify mergify bot added the ESPnet2 label Apr 10, 2024
Copy link
Collaborator

@ftshijt ftshijt left a comment

Choose a reason for hiding this comment

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

Many thanks for the great work. I left a few comments to further improve it~

espnet2/gan_svs/vits/generator.py Show resolved Hide resolved
espnet2/gan_svs/post_frontend/s3prl.py Outdated Show resolved Hide resolved
espnet2/gan_svs/espnet_model.py Outdated Show resolved Hide resolved
espnet2/gan_svs/vits/vits.py Outdated Show resolved Hide resolved
espnet2/gan_svs/vits/vits.py Outdated Show resolved Hide resolved
espnet2/tasks/gan_svs.py Outdated Show resolved Hide resolved
espnet2/gan_svs/post_frontend/s3prl.py Show resolved Hide resolved
@ftshijt ftshijt added this to the v.202405 milestone Apr 12, 2024
@jerryuhoo
Copy link
Contributor Author

I have resolved all comments. Please review when you have time @ftshijt, many thanks!

Copy link
Collaborator

@ftshijt ftshijt left a comment

Choose a reason for hiding this comment

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

Many thanks for your contribution!

A few minor comments as below. Also, it would be super helpful if you could add unit tests along with the new setup.

espnet2/gan_svs/espnet_model.py Outdated Show resolved Hide resolved
Comment on lines +96 to +99
if torch.cuda.is_available():
dev = "cuda"
else:
dev = "cpu"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Since it is a sub-module of the gan_svs model, we may not need to manually add the device setup?

espnet2/gan_svs/post_frontend/fused.py Outdated Show resolved Hide resolved
@ftshijt
Copy link
Collaborator

ftshijt commented May 21, 2024

After fixing the issue, we can safely merge the PR.

@ftshijt
Copy link
Collaborator

ftshijt commented May 21, 2024

Also, please fix the import CI error in the import test.

Copy link

codecov bot commented May 21, 2024

Codecov Report

Attention: Patch coverage is 19.44444% with 29 lines in your changes are missing coverage. Please review.

Project coverage is 54.27%. Comparing base (5180c85) to head (2cf7402).
Report is 13 commits behind head on master.

Current head 2cf7402 differs from pull request most recent head 154148d

Please upload reports for the commit 154148d to get more accurate results.

Files Patch % Lines
espnet2/tasks/gan_svs.py 0.00% 14 Missing ⚠️
espnet2/gan_svs/espnet_model.py 0.00% 8 Missing ⚠️
espnet2/gan_svs/vits/vits.py 45.45% 6 Missing ⚠️
espnet2/gan_svs/vits/generator.py 50.00% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           master    #5741       +/-   ##
===========================================
+ Coverage   32.51%   54.27%   +21.76%     
===========================================
  Files         768      767        -1     
  Lines       70372    70338       -34     
===========================================
+ Hits        22878    38173    +15295     
+ Misses      47494    32165    -15329     
Flag Coverage Δ
test_integration_espnet2 ?
test_python_espnet2 52.63% <19.44%> (?)
test_python_espnetez ?
test_utils 20.91% <ø> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ftshijt
Copy link
Collaborator

ftshijt commented May 22, 2024

Many thanks for the update and your great contribution! I will merge the PR, but please remember to submit another PR for CI test in the second stage.

@ftshijt ftshijt merged commit a94e8ac into espnet:master May 22, 2024
31 of 33 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants