From f918af66cfaa95196f8a861fe4a3f2b453a410da Mon Sep 17 00:00:00 2001
From: zhifu gao <zhifu.gzf@alibaba-inc.com>
Date: 星期四, 09 二月 2023 18:50:06 +0800
Subject: [PATCH] Merge pull request #86 from alibaba-damo-academy/dev
---
docs_cn/installation.md | 5 +++--
docs/installation.md | 2 +-
setup.py | 38 +++++++++++++++++++-------------------
README.md | 2 +-
4 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/README.md b/README.md
index c206fb6..c759b79 100644
--- a/README.md
+++ b/README.md
@@ -85,4 +85,4 @@
booktitle={INTERSPEECH},
year={2022}
}
-```
+```
\ No newline at end of file
diff --git a/docs/installation.md b/docs/installation.md
index 1eb813b..61d06b5 100755
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -26,7 +26,7 @@
- Install ModelScope
``` sh
-pip install "modelscope[audio]" -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html
+pip install "modelscope[audio_asr]" --upgrade -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html
```
- Install other packages
diff --git a/docs_cn/installation.md b/docs_cn/installation.md
index fc74780..a31bc01 100755
--- a/docs_cn/installation.md
+++ b/docs_cn/installation.md
@@ -5,6 +5,7 @@
``` sh
wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
sh Miniconda3-latest-Linux-x86_64.sh
+source ~/.bashrc
conda create -n funasr python=3.7
conda activate funasr
```
@@ -12,7 +13,7 @@
- 瀹夎Pytorch (鐗堟湰 >= 1.7.0):
```sh
-pip install torch torchvision torchaudio
+pip install torch torchaudio
```
鍏充簬鏇村鐨勭増鏈�, 璇峰弬鐓� [https://pytorch.org/get-started/locally](https://pytorch.org/get-started/locally)
@@ -26,7 +27,7 @@
瀹夎鎴栨洿鏂癕odelScope
``` sh
-pip install "modelscope[audio]" --upgrade -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html
+pip install "modelscope[audio_asr]" --upgrade -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html
```
- 涓嬭浇FunASR浠撳簱锛屽苟瀹夎鍓╀綑鎵�闇�渚濊禆
diff --git a/setup.py b/setup.py
index dcaeec0..67206f5 100644
--- a/setup.py
+++ b/setup.py
@@ -12,11 +12,11 @@
requirements = {
"install": [
"setuptools>=38.5.1",
- "configargparse>=1.2.1",
+ # "configargparse>=1.2.1",
"typeguard>=2.7.0",
"humanfriendly",
"scipy>=1.4.1",
- "filelock",
+ # "filelock",
"librosa>=0.8.0",
"jamo==0.4.1", # For kss
"PyYAML>=5.1.2",
@@ -27,13 +27,13 @@
"nltk>=3.4.5",
# ASR
"sentencepiece",
- "ctc-segmentation<1.8,>=1.6.6",
+ # "ctc-segmentation<1.8,>=1.6.6",
# TTS
- "pyworld>=0.2.10",
+ # "pyworld>=0.2.10",
"pypinyin<=0.44.0",
"espnet_tts_frontend",
# ENH
- "ci_sdr",
+ # "ci_sdr",
"pytorch_wpe",
"editdistance==0.5.2",
"tensorboard==1.15",
@@ -43,7 +43,7 @@
],
# train: The modules invoked when training only.
"train": [
- "pillow>=6.1.0",
+ # "pillow>=6.1.0",
"editdistance==0.5.2",
"wandb",
],
@@ -51,18 +51,18 @@
# but are invoked for the python scripts in each recipe
"recipe": [
"espnet_model_zoo",
- "gdown",
- "resampy",
- "pysptk>=0.1.17",
- "morfessor", # for zeroth-korean
- "youtube_dl", # for laborotv
- "nnmnkwii",
- "museval>=0.2.1",
- "pystoi>=0.2.2",
- "mir-eval>=0.6",
- "fastdtw",
- "nara_wpe>=0.0.5",
- "sacrebleu>=1.5.1",
+ # "gdown",
+ # "resampy",
+ # "pysptk>=0.1.17",
+ # "morfessor", # for zeroth-korean
+ # "youtube_dl", # for laborotv
+ # "nnmnkwii",
+ # "museval>=0.2.1",
+ # "pystoi>=0.2.2",
+ # "mir-eval>=0.6",
+ # "fastdtw",
+ # "nara_wpe>=0.0.5",
+ # "sacrebleu>=1.5.1",
],
# all: The modules should be optionally installled due to some reason.
# Please consider moving them to "install" occasionally
@@ -72,7 +72,7 @@
"torch_optimizer",
"fairscale",
"transformers",
- "gtn==0.0.0",
+ # "gtn==0.0.0",
],
"setup": [
"numpy<=1.21.3",
--
Gitblit v1.9.1