From 74339f318500b55231d107cc3ffdd998965581d0 Mon Sep 17 00:00:00 2001 From: speech_asr Date: Thu, 9 Feb 2023 16:02:22 +0800 Subject: [PATCH 1/5] update readme --- README.md | 2 +- docs/installation.md | 2 +- docs_cn/installation.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 0a43e4ae2..08af2a017 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ pip config set global.index-url https://mirror.sjtu.edu.cn/pypi/web/simple Install or upgrade modelscope. ``` 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 ``` For more details about modelscope, please see [modelscope installation](https://modelscope.cn/docs/%E7%8E%AF%E5%A2%83%E5%AE%89%E8%A3%85) diff --git a/docs/installation.md b/docs/installation.md index 1eb813b21..61d06b568 100755 --- a/docs/installation.md +++ b/docs/installation.md @@ -26,7 +26,7 @@ For more versions, please see [https://pytorch.org/get-started/locally](https:// - 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 fc747808e..a722798d4 100755 --- a/docs_cn/installation.md +++ b/docs_cn/installation.md @@ -26,7 +26,7 @@ pip config set global.index-url https://mirror.sjtu.edu.cn/pypi/web/simple 安装或更新ModelScope ``` 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仓库，并安装剩余所需依赖 From 62d3a36db4676b98473c1e5cbad2ef5c700370b6 Mon Sep 17 00:00:00 2001 From: speech_asr Date: Thu, 9 Feb 2023 16:19:33 +0800 Subject: [PATCH 2/5] update readme --- docs_cn/installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs_cn/installation.md b/docs_cn/installation.md index a722798d4..90e62725e 100755 --- a/docs_cn/installation.md +++ b/docs_cn/installation.md @@ -12,7 +12,7 @@ conda activate funasr - 安装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) From df4584ebc6c885910b897dd000644191081d074c Mon Sep 17 00:00:00 2001 From: speech_asr Date: Thu, 9 Feb 2023 16:21:04 +0800 Subject: [PATCH 3/5] update github.io --- docs_cn/installation.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs_cn/installation.md b/docs_cn/installation.md index 90e62725e..a31bc0140 100755 --- a/docs_cn/installation.md +++ b/docs_cn/installation.md @@ -5,6 +5,7 @@ FunASR的安装十分便捷，下面将给出详细的安装步骤： ``` 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 ``` From 376cef97dd8e6727d2f0135d1e312a3a9143883f Mon Sep 17 00:00:00 2001 From: speech_asr Date: Thu, 9 Feb 2023 16:28:24 +0800 Subject: [PATCH 4/5] update github.io --- README.md | 35 ++--------------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index 08af2a017..1ac3f6edb 100644 --- a/README.md +++ b/README.md @@ -25,42 +25,11 @@ ## Installation -- Install Conda: -``` 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 -``` - -- Install Pytorch (version >= 1.7.0): -``` sh -pip3 install torch torchvision torchaudio -``` -For more versions, please see [https://pytorch.org/get-started/locally](https://pytorch.org/get-started/locally) - -- Install ModelScope: - -If you are in the area of China, you could set the source to speedup the downloading. - -``` sh -pip config set global.index-url https://mirror.sjtu.edu.cn/pypi/web/simple -``` - -Install or upgrade modelscope. -``` sh -pip install "modelscope[audio_asr]" --upgrade -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html -``` - -For more details about modelscope, please see [modelscope installation](https://modelscope.cn/docs/%E7%8E%AF%E5%A2%83%E5%AE%89%E8%A3%85) - -- Install FunASR and other packages: - ``` sh git clone https://github.com/alibaba/FunASR.git && cd FunASR pip install --editable ./ ``` +For more details, please ref to [installation](https://github.com/alibaba-damo-academy/FunASR/wiki) ## Usage For users who are new to FunASR and ModelScope, please refer to [FunASR Docs](https://alibaba-damo-academy.github.io/FunASR/index.html). @@ -106,4 +75,4 @@ This project is licensed under the [The MIT License](https://opensource.org/lice booktitle={INTERSPEECH}, year={2022} } -``` +``` \ No newline at end of file From ca1a92af0e5ae43b90cb7c724b3ff2e252ceb7ee Mon Sep 17 00:00:00 2001 From: speech_asr Date: Thu, 9 Feb 2023 16:47:46 +0800 Subject: [PATCH 5/5] update setup --- setup.py | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/setup.py b/setup.py index 39272e326..521059041 100644 --- a/setup.py +++ b/setup.py @@ -12,11 +12,11 @@ from setuptools import setup 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 @@ requirements = { "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.14", @@ -43,7 +43,7 @@ requirements = { ], # 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 @@ requirements = { # 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 @@ requirements = { "torch_optimizer", "fairscale", "transformers", - "gtn==0.0.0", + # "gtn==0.0.0", ], "setup": [ "numpy<=1.21.3",