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 fix #4673

Merged
merged 3 commits into from
Sep 28, 2022
Merged

Muskits CI fix #4673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68b16e3
update black for tools
ftshijt Sep 28, 2022
8c85045
update installer
ftshijt Sep 28, 2022
65b39bc
Merge branch 'muskits' of https://github.com/ftshijt/espnet 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: 5 additions & 1 deletion tools/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ endif
all: kaldi showenv python conda_packages.done sctk.done sph2pipe.done check_install

python: activate_python.sh packaging.done espnet.done pytorch.done chainer.done fairscale.done torch_optimizer.done
extra: warp-transducer.done chainer_ctc.done nkf.done moses.done mwerSegmenter.done pesq kenlm.done pyopenjtalk.done py3mmseg.done beamformit.done fairseq.done s3prl.done k2.done transformers.done phonemizer.done longformer.done
extra: warp-transducer.done chainer_ctc.done nkf.done moses.done mwerSegmenter.done pesq kenlm.done pyopenjtalk.done py3mmseg.done beamformit.done fairseq.done s3prl.done k2.done transformers.done phonemizer.done longformer.done muskit.done

kaldi:
test -f kaldi/egs/wsj/s5/utils/parse_options.sh || git clone --depth 1 https://github.com/kaldi-asr/kaldi
Expand Down Expand Up @@ -202,6 +202,10 @@ longformer.done: espnet.done
. ./activate_python.sh && ./installers/install_longformer.sh
touch longformer.done

muskit.done: espnet.done
. ./activate_python.sh && ./installers/install_muskit.sh
touch muskit.done

check_install: python
. ./activate_python.sh; . ./extra_path.sh; python3 check_install.py

Expand Down
5 changes: 2 additions & 3 deletions tools/check_install.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,15 +128,14 @@ def main():
print(f"[ ] {name}")
if installer is not None:
to_install.append(f"Use '{installer}' to install {name}")
#check muskit install

# check muskit install
if os.path.exists("muskit.done"):
print(f"[x] muskit")
else:
print(f"[ ] muskit")
to_install.append(f"Use 'installers/install_muskit.sh' to install muskit")


print()
print("Executables:")
for name, installer in executable_list:
Expand Down
11 changes: 4 additions & 7 deletions tools/installers/install_muskit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ if [ $# != 0 ]; then
exit 1;
fi

rm -rf muskit.done

# Install ParallelWaveGAN
if ! python -c "import parallel_wavegan.version" &> /dev/null; then
if ! python3 -c "import parallel_wavegan.version" &> /dev/null; then
(
set -euo pipefail
rm -rf ParallelWaveGAN
Expand All @@ -23,7 +21,7 @@ else
fi

# Install pytsmod
if ! python -c "import pytsmod.version" &> /dev/null; then
if ! python3 -c "import pytsmod.version" &> /dev/null; then
(
set -euo pipefail
python3 -m pip install pytsmod
Expand All @@ -33,7 +31,7 @@ else
fi

# Install miditoolkit
if ! python -c "import miditoolkit.version" &> /dev/null; then
if ! python3 -c "import miditoolkit.version" &> /dev/null; then
(
set -euo pipefail
python3 -m pip install miditoolkit
Expand All @@ -43,7 +41,7 @@ else
fi

# Install music21
if ! python -c "import music21.version" &> /dev/null; then
if ! python3 -c "import music21.version" &> /dev/null; then
(
set -euo pipefail
python3 -m pip install music21
Expand All @@ -52,4 +50,3 @@ else
echo "music21 is already installed"
fi

touch muskit.done