Merge pull request #4673 from ftshijt/muskits

Muskits CI fix
espnet · Sep 28, 2022 · ae53356 · ae53356
2 parents caa924b + 65b39bc
commit ae53356
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/tools/Makefile b/tools/Makefile
@@ -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
@@ -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
 

diff --git a/tools/check_install.py b/tools/check_install.py
@@ -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:

diff --git a/tools/installers/install_muskit.sh b/tools/installers/install_muskit.sh
@@ -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
@@ -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
@@ -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
@@ -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
@@ -52,4 +50,3 @@ else
     echo "music21 is already installed"
 fi
 
-touch muskit.done