Merge branch 'master' of https://github.com/espnet/espnet into tse_re…

…cipe
espnet · Jul 14, 2024 · bfd3000 · bfd3000
2 parents 7d6abf1 + 639d3b5
commit bfd3000
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 13 deletions.
diff --git a/.github/workflows/ci_on_centos7.yml → .github/workflows/ci_on_centos7_yml.eol b/.github/workflows/ci_on_centos7.yml → .github/workflows/ci_on_centos7_yml.eol
diff --git a/.gitignore b/.gitignore
@@ -18,6 +18,7 @@ tmp*
 __pycache__/
 check_autopep8
 .coverage
+.coverage.*
 htmlcov
 coverage.xml*
 test_utils/bats-core/

diff --git a/README.md b/README.md
@@ -9,7 +9,6 @@
 |ubuntu/python3.8/pip|||[![ci on ubuntu](https://github.com/espnet/espnet/actions/workflows/ci_on_ubuntu.yml/badge.svg)](https://github.com/espnet/espnet/actions/workflows/ci_on_ubuntu.yml?query=branch%3Amaster)|[![ci on ubuntu](https://github.com/espnet/espnet/actions/workflows/ci_on_ubuntu.yml/badge.svg)](https://github.com/espnet/espnet/actions/workflows/ci_on_ubuntu.yml?query=branch%3Amaster)|
 |ubuntu/python3.7/pip|[![ci on ubuntu](https://github.com/espnet/espnet/actions/workflows/ci_on_ubuntu.yml/badge.svg)](https://github.com/espnet/espnet/actions/workflows/ci_on_ubuntu.yml?query=branch%3Amaster)|[![ci on ubuntu](https://github.com/espnet/espnet/actions/workflows/ci_on_ubuntu.yml/badge.svg)](https://github.com/espnet/espnet/actions/workflows/ci_on_ubuntu.yml?query=branch%3Amaster)|||
 |debian11/python3.10/conda||[![ci on debian11](https://github.com/espnet/espnet/actions/workflows/ci_on_debian11.yml/badge.svg)](https://github.com/espnet/espnet/actions/workflows/ci_on_debian11.yml?query=branch%3Amaster)|||
-|centos7/python3.10/conda||[![ci on centos7](https://github.com/espnet/espnet/actions/workflows/ci_on_centos7.yml/badge.svg)](https://github.com/espnet/espnet/actions/workflows/ci_on_centos7.yml?query=branch%3Amaster)|||
 |windows/python3.10/pip||||[![ci on windows](https://github.com/espnet/espnet/actions/workflows/ci_on_windows.yml/badge.svg)](https://github.com/espnet/espnet/actions/workflows/ci_on_windows.yml?query=branch%3Amaster)|
 |macos/python3.10/pip||||[![ci on macos](https://github.com/espnet/espnet/actions/workflows/ci_on_macos.yml/badge.svg)](https://github.com/espnet/espnet/actions/workflows/ci_on_macos.yml?query=branch%3Amaster)|
 |macos/python3.10/conda||||[![ci on macos](https://github.com/espnet/espnet/actions/workflows/ci_on_macos.yml/badge.svg)](https://github.com/espnet/espnet/actions/workflows/ci_on_macos.yml?query=branch%3Amaster)|

diff --git a/egs2/acesinger/svs1/local/download_wget.sh b/egs2/acesinger/svs1/local/download_wget.sh
@@ -5,6 +5,4 @@
 # $1 = file ID
 # $2 = file name
 
-URL="https://docs.google.com/uc?export=download&id=$1"
-
-wget --load-cookies /tmp/cookies.txt "https://docs.google.com/uc?export=download&confirm=$(wget --quiet --save-cookies /tmp/cookies.txt --keep-session-cookies --no-check-certificate $URL -O- | sed -rn 's/.*confirm=([0-9A-Za-z_]+).*/\1\n/p')&id=$1" -O $2 && rm -rf /tmp/cookies.txt
+gdown $1 -O $2
diff --git a/egs2/voxceleb/spk1/README.md b/egs2/voxceleb/spk1/README.md
@@ -4,7 +4,7 @@ Overall results
 | Model (conf name) | EER(%) | minDCF | Note | Huggingface |
 |---|---|---|---|---|
 | [conf/train_xvector.yaml](conf/train_xvector.yaml) | 1.81 | 0.1251 | | https://huggingface.co/espnet/voxcelebs12_xvector_mel |
-| [conf/train_mfa_conformer.yaml](conf/train_mfa_conformer.yaml) | 0.862 | 0.0627 | | https://huggingface.co/espnet/voxcelebs12_mfaconformer_mel |
+| [conf/train_mfa_conformer.yaml](conf/train_mfa_conformer.yaml) | 0.782 | 0.0656 | | https://huggingface.co/espnet/voxcelebs12_mfaconformer_mel |
 | [conf/train_ECAPA_mel.yaml](conf/train_ECAPA_mel.yaml) | 0.856 | 0.0666 | | https://huggingface.co/espnet/voxcelebs12_ecapa_mel |
 | [conf/train_rawnet3.yaml](conf/train_rawnet3.yaml) | 0.739 | 0.0581 | | https://huggingface.co/espnet/voxcelebs12_rawnet3 |
 | [conf/train_SKA_mel.yaml](conf/train_SKA_mel.yaml) | 0.729 | 0.0457 | | https://huggingface.co/espnet/voxcelebs12_ska_mel |

diff --git a/tools/Makefile b/tools/Makefile
@@ -273,5 +273,7 @@ clean_extra:
 	rm -rf hts_engine_API.done open_jtalk.done pyopenjtalk.done
 	rm -rf muskits.done
 	rm -rf rvad_fast.done
+	rm -rf chainer espeak-ng festival MBROLA ParallelWaveGAN
+	rm -rf py3mmseg sctk* speech_tools sph2pipe* ._mwerSegmenter
 	rm -rf nkf mecab swig moses mwerSegmenter
 	rm -rf PESQ PESQ.zip
diff --git a/tools/installers/install_fairseq.sh b/tools/installers/install_fairseq.sh
@@ -39,14 +39,8 @@ echo "[INFO] torch_version=${torch_version}"
 if "$(pt_plus 1.8.0)" && "${python_36_plus}"; then
 
     rm -rf fairseq
-
-    # FairSeq Commit id when making this PR: `commit 313ff0581561c7725ea9430321d6af2901573dfb`
-    # git clone --depth 1 https://github.com/pytorch/fairseq.git
-    # TODO(jiatong): to fix after the issue #4035 is fixed in fairseq
-    git clone https://github.com/pytorch/fairseq.git
-    cd fairseq
-    git checkout -b sync_commit 313ff0581561c7725ea9430321d6af2901573dfb
-    cd ..
+    # NOTE(nelson): using custom fairseq for espnet
+    git clone https://github.com/espnet/fairseq.git
     python3 -m pip install --editable ./fairseq
     python3 -m pip install filelock