From a3f3f90d686c46c83b133900d97fdc12f85dd5c0 Mon Sep 17 00:00:00 2001 From: "jiangyu.xzy" Date: Sat, 10 Dec 2022 01:02:36 +0800 Subject: [PATCH 1/3] fix demo service dataloader bug Link: https://code.alibaba-inc.com/Ali-MaaS/MaaS-lib/codereview/11049894 * fix dataloader bug * fix dataloader bug --- modelscope/pipelines/audio/asr_inference_pipeline.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modelscope/pipelines/audio/asr_inference_pipeline.py b/modelscope/pipelines/audio/asr_inference_pipeline.py index 137d3ceb..ae04f726 100644 --- a/modelscope/pipelines/audio/asr_inference_pipeline.py +++ b/modelscope/pipelines/audio/asr_inference_pipeline.py @@ -150,6 +150,7 @@ class AutomaticSpeechRecognitionPipeline(Pipeline): cmd['token_num_relax'] = token_num_relax cmd['decoding_ind'] = decoding_ind cmd['decoding_mode'] = decoding_mode + cmd['num_workers'] = 0 elif self.framework == Frameworks.tf: cmd['fs']['model_fs'] = inputs['model_config']['fs'] @@ -259,6 +260,7 @@ class AutomaticSpeechRecognitionPipeline(Pipeline): minlenratio=cmd['minlenratio'], beam_size=cmd['beam_size'], ngpu=cmd['ngpu'], + num_workers=cmd['num_workers'], ctc_weight=cmd['ctc_weight'], lm_weight=cmd['lm_weight'], penalty=cmd['penalty'], From 9011ebe051e885f651a75497052f8da4e36dc771 Mon Sep 17 00:00:00 2001 From: "wenmeng.zwm" Date: Mon, 12 Dec 2022 10:20:31 +0800 Subject: [PATCH 2/3] bump version to 1.1.2 --- modelscope/version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modelscope/version.py b/modelscope/version.py index 5df99dd8..5aee02d7 100644 --- a/modelscope/version.py +++ b/modelscope/version.py @@ -1,5 +1,5 @@ # Make sure to modify __release_datetime__ to release time when making official release. -__version__ = '1.1.1' +__version__ = '1.1.2' # default release datetime for branches under active development is set # to be a time far-far-away-into-the-future -__release_datetime__ = '2022-12-08 00:00:00' +__release_datetime__ = '2022-12-13 00:00:00' From 42f060172d727a6314c7d3f96380257af35157fa Mon Sep 17 00:00:00 2001 From: "xingjun.wxj" Date: Wed, 14 Dec 2022 21:21:01 +0800 Subject: [PATCH 3/3] [to #42322933] Fix timeout issue for uni-fold list_oss_objects api MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 下载uni-fold数据集，因为包含百万以上的objects，在调用list_objects接口时需要至少300s，所以全量下载数据集时 有用户反馈报超时错误 2. 目前hub api中因为采用了统一的self.session.get接口，默认timeout被设置为了60s 3. 修改timeout=1800 link: https://code.alibaba-inc.com/Ali-MaaS/MaaS-lib/codereview/11097756 --- modelscope/hub/api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modelscope/hub/api.py b/modelscope/hub/api.py index b871a713..bb275a95 100644 --- a/modelscope/hub/api.py +++ b/modelscope/hub/api.py @@ -610,7 +610,7 @@ class HubApi: f'MaxLimit={max_limit}&Revision={revision}&Recursive={is_recursive}&FilterDir={is_filter_dir}' cookies = ModelScopeConfig.get_cookies() - resp = self.session.get(url=url, cookies=cookies) + resp = self.session.get(url=url, cookies=cookies, timeout=1800) resp = resp.json() raise_on_error(resp) resp = resp['Data']