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

Muskits CI fixing #4672

Merged
merged 2 commits into from
Sep 28, 2022
Merged

Muskits CI fixing #4672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d013b58
fix CI in shell checks / import error of muskit dependency
ftshijt Sep 28, 2022
0da5a98
Merge branch 'espnet:muskits' into muskits
ftshijt Sep 28, 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
6 changes: 3 additions & 3 deletions egs2/ofuton_p_utagoe_db/svs1/local/data.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ fi

mkdir -p ${OFUTON}

train_set=tr_no_dev
train_dev=dev
recog_set=eval
train_set="tr_no_dev"
train_dev="dev"
recog_set="eval"

if [ ${stage} -le 0 ] && [ ${stop_stage} -ge 0 ]; then
log "stage 0: Data Download"
Expand Down
11 changes: 10 additions & 1 deletion espnet2/train/dataset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,13 @@
)
from espnet2.fileio.rttm import RttmReader
from espnet2.fileio.sound_scp import SoundScpReader
from espnet2.fileio.xml_scp import XMLScpReader
from espnet2.utils.sized_dict import SizedDict

try:
from espnet2.fileio.xml_scp import XMLScpReader
except ImportError or ModuleNotFoundError:
XMLScpReader = None # cannot load XML reader, need instal Muskit


class AdapterForSoundScpReader(collections.abc.Mapping):
def __init__(self, loader, dtype=None):
Expand Down Expand Up @@ -192,6 +196,11 @@ def xml_loader(path, float_dtype=None):
# utterance_id_A /some/where/a.mid
# utterance_id_B /some/where/b.midi

assert XMLScpReader is not None, (
"Cannot load XMLScpReader. ",
"Please install Muskit modules via ",
"tools/installers/install_muskit.sh",
)
loader = XMLScpReader(fname=path)

# MIDIScpReader.__getitem__() returns ndarray
Expand Down