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.

Sign up for GitHub

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

Jump to bottom

Muskit: rename & reorganize features #4668

Merged
merged 4 commits into from
Sep 27, 2022
Merged

Muskit: rename & reorganize features #4668

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5dfc4f9
rename & reorganize features
A-Quarter-Mile Sep 27, 2022
99fd1e7
Update espnet2/train/preprocessor.py
A-Quarter-Mile Sep 27, 2022
2b7ac55
Update espnet2/train/preprocessor.py
A-Quarter-Mile Sep 27, 2022
3f26d18
add TODO
A-Quarter-Mile Sep 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions egs2/TEMPLATE/svs1/pyscripts/feats
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../TEMPLATE/asr1/pyscripts/feats
1 change: 1 addition & 0 deletions egs2/TEMPLATE/svs1/utils
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../tools/kaldi/egs/wsj/s5/utils/
33 changes: 25 additions & 8 deletions espnet2/bin/svs_inference.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
from espnet2.torch_utils.set_all_random_seed import set_all_random_seed

from espnet2.svs.naive_rnn.naive_rnn import NaiveRNN
from espnet2.svs.naive_rnn.naive_rnn_dp import NaiveRNNDP
# from espnet2.svs.glu_transformer.glu_transformer import GLU_Transformer
# from espnet2.svs.xiaoice.XiaoiceSing import XiaoiceSing
# from espnet2.svs.xiaoice.XiaoiceSing import XiaoiceSing_noDP
Expand Down Expand Up @@ -94,11 +95,16 @@ def __init__(
def __call__(
self,
text: torch.Tensor,
score: Optional[torch.Tensor],
durations: Union[torch.Tensor, np.ndarray] = None,
singing: torch.Tensor = None,
label_lab: Optional[torch.Tensor] = None,
ftshijt marked this conversation as resolved.
Show resolved Hide resolved
midi_lab: Optional[torch.Tensor] = None,
tempo_lab: Optional[torch.Tensor] = None,
beat_lab: Optional[torch.Tensor] = None,
label_xml: Optional[torch.Tensor] = None,
ftshijt marked this conversation as resolved.
Show resolved Hide resolved
midi_xml: Optional[torch.Tensor] = None,
tempo_xml: Optional[torch.Tensor] = None,
beat_xml: Optional[torch.Tensor] = None,
pitch: Optional[torch.Tensor] = None,
tempo: Optional[torch.Tensor] = None,
energy: Optional[torch.Tensor] = None,
spembs: Union[torch.Tensor, np.ndarray] = None,
sids: Optional[torch.Tensor] = None,
Expand All @@ -117,14 +123,25 @@ def __call__(

batch = dict(
text=text,
score=score,
)
if durations is not None:
batch.update(durations=durations)
if label_lab is not None:
batch.update(label_lab=label_lab)
if label_xml is not None:
batch.update(label_xml=label_xml)
if midi_lab is not None:
batch.update(midi_lab=midi_lab)
if midi_xml is not None:
batch.update(midi_xml=midi_xml)
if pitch is not None:
batch.update(pitch=pitch)
if tempo is not None:
batch.update(tempo=tempo)
if tempo_lab is not None:
batch.update(tempo_lab=tempo_lab)
if tempo_xml is not None:
batch.update(tempo_xml=tempo_xml)
if beat_lab is not None:
batch.update(beat_lab=beat_lab)
if beat_xml is not None:
batch.update(beat_xml=beat_xml)
if energy is not None:
batch.update(energy=energy)
if spembs is not None:
Expand Down