msb-public
/
PaddleSpeech
mirror of https://github.com/PaddlePaddle/PaddleSpeech
1
0
Code Issues Projects Releases Wiki Activity

fix Whisper cli model download path error.

Browse Source
pull/2679/head
zxcd 3 years ago
parent b4d802b77a
commit eadddfce11
4 changed files with 47 additions and 44 deletions
Show Stats Download Patch File Download Diff File

4
demos/whisper/README.md
Unescape View File

@ -61,7 +61,7 @@ Whisper model trained by OpenAI whisper https://github.com/openai/whisper
# to recognize text # to recognize text
text = whisper_executor( text = whisper_executor(
model='whisper-large', model='whisper',
task='transcribe', task='transcribe',
sample_rate=16000, sample_rate=16000,
config=None, # Set `config` and `ckpt_path` to None to use pretrained model. config=None, # Set `config` and `ckpt_path` to None to use pretrained model.
@ -72,7 +72,7 @@ Whisper model trained by OpenAI whisper https://github.com/openai/whisper
# to recognize text and translate to English # to recognize text and translate to English
feature = whisper_executor( feature = whisper_executor(
model='whisper-large', model='whisper',
task='translate', task='translate',
sample_rate=16000, sample_rate=16000,
config=None, # Set `config` and `ckpt_path` to None to use pretrained model. config=None, # Set `config` and `ckpt_path` to None to use pretrained model.

4
demos/whisper/README_cn.md
Unescape View File

@ -61,7 +61,7 @@ Whisper模型由OpenAI Whisper训练 https://github.com/openai/whisper
# 识别文本 # 识别文本
text = whisper_executor( text = whisper_executor(
model='whisper-large', model='whisper',
task='transcribe', task='transcribe',
sample_rate=16000, sample_rate=16000,
config=None, # Set `config` and `ckpt_path` to None to use pretrained model. config=None, # Set `config` and `ckpt_path` to None to use pretrained model.
@ -72,7 +72,7 @@ Whisper模型由OpenAI Whisper训练 https://github.com/openai/whisper
# 将语音翻译成英语 # 将语音翻译成英语
feature = whisper_executor( feature = whisper_executor(
model='whisper-large', model='whisper',
task='translate', task='translate',
sample_rate=16000, sample_rate=16000,
config=None, # Set `config` and `ckpt_path` to None to use pretrained model. config=None, # Set `config` and `ckpt_path` to None to use pretrained model.

11
paddlespeech/cli/whisper/infer.py
Unescape View File

@ -187,10 +187,13 @@ class WhisperExecutor(BaseExecutor):
with UpdateConfig(self.config): with UpdateConfig(self.config):
if "whisper" in model_type: if "whisper" in model_type:
resource_url = self.task_resource.res_dict['resuource_data'] resource_url = self.task_resource.res_dict['resource_data']
resource_md5 = self.task_resource.res_dict['resuource_data_md5'] resource_md5 = self.task_resource.res_dict['resource_data_md5']
resuource_path = self.task_resource.res_dict['resuource_path'] resource_path = self.task_resource.res_dict['resource_path']
self.download_resource(resource_url, resuource_path, resource_path = os.path.join(
os.path.dirname(os.path.abspath(__file__)), '../../',
resource_path)
self.download_resource(resource_url, resource_path,
resource_md5) resource_md5)
else: else:
raise Exception("wrong type") raise Exception("wrong type")

72
paddlespeech/resource/pretrained_models.py
Unescape View File

@ -479,12 +479,12 @@ whisper_dynamic_pretrained_models = {
'whisper-large-model.pdparams', 'whisper-large-model.pdparams',
'params': 'params':
'whisper-large-model.pdparams', 'whisper-large-model.pdparams',
'resuource_data': 'resource_data':
'https://paddlespeech.bj.bcebos.com/whisper/whisper_model_20221108/assets.tar', 'https://paddlespeech.bj.bcebos.com/whisper/whisper_model_20221108/assets.tar',
'resuource_data_md5': 'resource_data_md5':
'37a0a8abdb3641a51194f79567a93b61', '37a0a8abdb3641a51194f79567a93b61',
'resuource_path': 'resource_path':
'paddlespeech/s2t/models/whisper', 's2t/models/whisper',
}, },
}, },
"whisper-base-en-16k": { "whisper-base-en-16k": {
@ -501,12 +501,12 @@ whisper_dynamic_pretrained_models = {
'whisper-base-en-model.pdparams', 'whisper-base-en-model.pdparams',
'params': 'params':
'whisper-base-en-model.pdparams', 'whisper-base-en-model.pdparams',
'resuource_data': 'resource_data':
'https://paddlespeech.bj.bcebos.com/whisper/whisper_model_20221108/assets.tar', 'https://paddlespeech.bj.bcebos.com/whisper/whisper_model_20221108/assets.tar',
'resuource_data_md5': 'resource_data_md5':
'37a0a8abdb3641a51194f79567a93b61', '37a0a8abdb3641a51194f79567a93b61',
'resuource_path': 'resource_path':
'paddlespeech/s2t/models/whisper', 's2t/models/whisper',
}, },
}, },
"whisper-base-16k": { "whisper-base-16k": {
@ -523,12 +523,12 @@ whisper_dynamic_pretrained_models = {
'whisper-base-model.pdparams', 'whisper-base-model.pdparams',
'params': 'params':
'whisper-base-model.pdparams', 'whisper-base-model.pdparams',
'resuource_data': 'resource_data':
'https://paddlespeech.bj.bcebos.com/whisper/whisper_model_20221108/assets.tar', 'https://paddlespeech.bj.bcebos.com/whisper/whisper_model_20221108/assets.tar',
'resuource_data_md5': 'resource_data_md5':
'37a0a8abdb3641a51194f79567a93b61', '37a0a8abdb3641a51194f79567a93b61',
'resuource_path': 'resource_path':
'paddlespeech/s2t/models/whisper', 's2t/models/whisper',
}, },
}, },
"whisper-medium-en-16k": { "whisper-medium-en-16k": {
@ -545,12 +545,12 @@ whisper_dynamic_pretrained_models = {
'whisper-medium-en-model.pdparams', 'whisper-medium-en-model.pdparams',
'params': 'params':
'whisper-medium-en-model.pdparams', 'whisper-medium-en-model.pdparams',
'resuource_data': 'resource_data':
'https://paddlespeech.bj.bcebos.com/whisper/whisper_model_20221108/assets.tar', 'https://paddlespeech.bj.bcebos.com/whisper/whisper_model_20221108/assets.tar',
'resuource_data_md5': 'resource_data_md5':
'37a0a8abdb3641a51194f79567a93b61', '37a0a8abdb3641a51194f79567a93b61',
'resuource_path': 'resource_path':
'paddlespeech/s2t/models/whisper', 's2t/models/whisper',
}, },
}, },
"whisper-medium-16k": { "whisper-medium-16k": {
@ -567,12 +567,12 @@ whisper_dynamic_pretrained_models = {
'whisper-medium-model.pdparams', 'whisper-medium-model.pdparams',
'params': 'params':
'whisper-medium-model.pdparams', 'whisper-medium-model.pdparams',
'resuource_data': 'resource_data':
'https://paddlespeech.bj.bcebos.com/whisper/whisper_model_20221108/assets.tar', 'https://paddlespeech.bj.bcebos.com/whisper/whisper_model_20221108/assets.tar',
'resuource_data_md5': 'resource_data_md5':
'37a0a8abdb3641a51194f79567a93b61', '37a0a8abdb3641a51194f79567a93b61',
'resuource_path': 'resource_path':
'paddlespeech/s2t/models/whisper', 's2t/models/whisper',
}, },
}, },
"whisper-small-en-16k": { "whisper-small-en-16k": {
@ -589,12 +589,12 @@ whisper_dynamic_pretrained_models = {
'whisper-small-en-model.pdparams', 'whisper-small-en-model.pdparams',
'params': 'params':
'whisper-small-en-model.pdparams', 'whisper-small-en-model.pdparams',
'resuource_data': 'resource_data':
'https://paddlespeech.bj.bcebos.com/whisper/whisper_model_20221108/assets.tar', 'https://paddlespeech.bj.bcebos.com/whisper/whisper_model_20221108/assets.tar',
'resuource_data_md5': 'resource_data_md5':
'37a0a8abdb3641a51194f79567a93b61', '37a0a8abdb3641a51194f79567a93b61',
'resuource_path': 'resource_path':
'paddlespeech/s2t/models/whisper', 's2t/models/whisper',
}, },
}, },
"whisper-small-16k": { "whisper-small-16k": {
@ -611,12 +611,12 @@ whisper_dynamic_pretrained_models = {
'whisper-small-model.pdparams', 'whisper-small-model.pdparams',
'params': 'params':
'whisper-small-model.pdparams', 'whisper-small-model.pdparams',
'resuource_data': 'resource_data':
'https://paddlespeech.bj.bcebos.com/whisper/whisper_model_20221108/assets.tar', 'https://paddlespeech.bj.bcebos.com/whisper/whisper_model_20221108/assets.tar',
'resuource_data_md5': 'resource_data_md5':
'37a0a8abdb3641a51194f79567a93b61', '37a0a8abdb3641a51194f79567a93b61',
'resuource_path': 'resource_path':
'paddlespeech/s2t/models/whisper', 's2t/models/whisper',
}, },
}, },
"whisper-tiny-en-16k": { "whisper-tiny-en-16k": {
@ -633,12 +633,12 @@ whisper_dynamic_pretrained_models = {
'whisper-tiny-en-model.pdparams', 'whisper-tiny-en-model.pdparams',
'params': 'params':
'whisper-tiny-en-model.pdparams', 'whisper-tiny-en-model.pdparams',
'resuource_data': 'resource_data':
'https://paddlespeech.bj.bcebos.com/whisper/whisper_model_20221108/assets.tar', 'https://paddlespeech.bj.bcebos.com/whisper/whisper_model_20221108/assets.tar',
'resuource_data_md5': 'resource_data_md5':
'37a0a8abdb3641a51194f79567a93b61', '37a0a8abdb3641a51194f79567a93b61',
'resuource_path': 'resource_path':
'paddlespeech/s2t/models/whisper', 's2t/models/whisper',
}, },
}, },
"whisper-tiny-16k": { "whisper-tiny-16k": {
@ -655,12 +655,12 @@ whisper_dynamic_pretrained_models = {
'whisper-tiny-model.pdparams', 'whisper-tiny-model.pdparams',
'params': 'params':
'whisper-tiny-model.pdparams', 'whisper-tiny-model.pdparams',
'resuource_data': 'resource_data':
'https://paddlespeech.bj.bcebos.com/whisper/whisper_model_20221108/assets.tar', 'https://paddlespeech.bj.bcebos.com/whisper/whisper_model_20221108/assets.tar',
'resuource_data_md5': 'resource_data_md5':
'37a0a8abdb3641a51194f79567a93b61', '37a0a8abdb3641a51194f79567a93b61',
'resuource_path': 'resource_path':
'paddlespeech/s2t/models/whisper', 's2t/models/whisper',
}, },
}, },
} }

Write Preview
Loading…
Cancel
Save