From 434708cff4edb8ca157c6fb7e39aa1926fb25223 Mon Sep 17 00:00:00 2001 From: lym0302 Date: Thu, 24 Feb 2022 20:14:07 +0800 Subject: [PATCH] set device cpu, test=doc --- demos/speech_server/conf/asr/asr.yaml | 2 +- demos/speech_server/conf/asr/asr_pd.yaml | 2 +- demos/speech_server/conf/tts/tts.yaml | 2 +- demos/speech_server/conf/tts/tts_pd.yaml | 4 ++-- paddlespeech/server/conf/asr/asr.yaml | 2 +- paddlespeech/server/conf/asr/asr_pd.yaml | 2 +- paddlespeech/server/conf/tts/tts.yaml | 2 +- paddlespeech/server/conf/tts/tts_pd.yaml | 4 ++-- paddlespeech/server/engine/asr/python/asr_engine.py | 5 ++++- paddlespeech/server/engine/tts/python/tts_engine.py | 5 ++++- 10 files changed, 18 insertions(+), 12 deletions(-) diff --git a/demos/speech_server/conf/asr/asr.yaml b/demos/speech_server/conf/asr/asr.yaml index b1ef558d..1a805142 100644 --- a/demos/speech_server/conf/asr/asr.yaml +++ b/demos/speech_server/conf/asr/asr.yaml @@ -5,4 +5,4 @@ cfg_path: # [optional] ckpt_path: # [optional] decode_method: 'attention_rescoring' force_yes: True -device: 'gpu:3' # set 'gpu:id' or 'cpu' +device: 'cpu' # set 'gpu:id' or 'cpu' diff --git a/demos/speech_server/conf/asr/asr_pd.yaml b/demos/speech_server/conf/asr/asr_pd.yaml index 21bf7177..6cddb450 100644 --- a/demos/speech_server/conf/asr/asr_pd.yaml +++ b/demos/speech_server/conf/asr/asr_pd.yaml @@ -15,7 +15,7 @@ decode_method: force_yes: True am_predictor_conf: - device: 'gpu:3' # set 'gpu:id' or 'cpu' + device: 'cpu' # set 'gpu:id' or 'cpu' enable_mkldnn: True switch_ir_optim: True diff --git a/demos/speech_server/conf/tts/tts.yaml b/demos/speech_server/conf/tts/tts.yaml index 8d45aec5..19e8874e 100644 --- a/demos/speech_server/conf/tts/tts.yaml +++ b/demos/speech_server/conf/tts/tts.yaml @@ -29,4 +29,4 @@ voc_stat: # OTHERS # ################################################################## lang: 'zh' -device: 'gpu:3' # set 'gpu:id' or 'cpu' +device: 'cpu' # set 'gpu:id' or 'cpu' diff --git a/demos/speech_server/conf/tts/tts_pd.yaml b/demos/speech_server/conf/tts/tts_pd.yaml index ecfa3a3b..97df5261 100644 --- a/demos/speech_server/conf/tts/tts_pd.yaml +++ b/demos/speech_server/conf/tts/tts_pd.yaml @@ -15,7 +15,7 @@ speaker_dict: spk_id: 0 am_predictor_conf: - device: 'gpu:3' # set 'gpu:id' or 'cpu' + device: 'cpu' # set 'gpu:id' or 'cpu' enable_mkldnn: False switch_ir_optim: False @@ -30,7 +30,7 @@ voc_params: # the pdiparams file of your vocoder static model (XX.pdipparams) voc_sample_rate: 24000 voc_predictor_conf: - device: 'gpu:3' # set 'gpu:id' or 'cpu' + device: 'cpu' # set 'gpu:id' or 'cpu' enable_mkldnn: False switch_ir_optim: False diff --git a/paddlespeech/server/conf/asr/asr.yaml b/paddlespeech/server/conf/asr/asr.yaml index b1ef558d..1a805142 100644 --- a/paddlespeech/server/conf/asr/asr.yaml +++ b/paddlespeech/server/conf/asr/asr.yaml @@ -5,4 +5,4 @@ cfg_path: # [optional] ckpt_path: # [optional] decode_method: 'attention_rescoring' force_yes: True -device: 'gpu:3' # set 'gpu:id' or 'cpu' +device: 'cpu' # set 'gpu:id' or 'cpu' diff --git a/paddlespeech/server/conf/asr/asr_pd.yaml b/paddlespeech/server/conf/asr/asr_pd.yaml index 21bf7177..6cddb450 100644 --- a/paddlespeech/server/conf/asr/asr_pd.yaml +++ b/paddlespeech/server/conf/asr/asr_pd.yaml @@ -15,7 +15,7 @@ decode_method: force_yes: True am_predictor_conf: - device: 'gpu:3' # set 'gpu:id' or 'cpu' + device: 'cpu' # set 'gpu:id' or 'cpu' enable_mkldnn: True switch_ir_optim: True diff --git a/paddlespeech/server/conf/tts/tts.yaml b/paddlespeech/server/conf/tts/tts.yaml index 8d45aec5..19e8874e 100644 --- a/paddlespeech/server/conf/tts/tts.yaml +++ b/paddlespeech/server/conf/tts/tts.yaml @@ -29,4 +29,4 @@ voc_stat: # OTHERS # ################################################################## lang: 'zh' -device: 'gpu:3' # set 'gpu:id' or 'cpu' +device: 'cpu' # set 'gpu:id' or 'cpu' diff --git a/paddlespeech/server/conf/tts/tts_pd.yaml b/paddlespeech/server/conf/tts/tts_pd.yaml index cd4b8583..019c7ed6 100644 --- a/paddlespeech/server/conf/tts/tts_pd.yaml +++ b/paddlespeech/server/conf/tts/tts_pd.yaml @@ -15,7 +15,7 @@ speaker_dict: spk_id: 0 am_predictor_conf: - device: 'gpu:3' # set 'gpu:id' or 'cpu' + device: 'cpu' # set 'gpu:id' or 'cpu' enable_mkldnn: False switch_ir_optim: False @@ -30,7 +30,7 @@ voc_params: # the pdiparams file of your vocoder static model (XX.pdipparams) voc_sample_rate: 24000 #must match the model voc_predictor_conf: - device: 'gpu:3' # set 'gpu:id' or 'cpu' + device: 'cpu' # set 'gpu:id' or 'cpu' enable_mkldnn: False switch_ir_optim: False diff --git a/paddlespeech/server/engine/asr/python/asr_engine.py b/paddlespeech/server/engine/asr/python/asr_engine.py index 60040051..9fac487d 100644 --- a/paddlespeech/server/engine/asr/python/asr_engine.py +++ b/paddlespeech/server/engine/asr/python/asr_engine.py @@ -53,7 +53,10 @@ class ASREngine(BaseEngine): self.executor = ASRServerExecutor() self.config = get_config(config_file) - paddle.set_device(self.config.device) + if self.config.device is None: + paddle.set_device(paddle.get_device()) + else: + paddle.set_device(self.config.device) self.executor._init_from_path( self.config.model, self.config.lang, self.config.sample_rate, self.config.cfg_path, self.config.decode_method, diff --git a/paddlespeech/server/engine/tts/python/tts_engine.py b/paddlespeech/server/engine/tts/python/tts_engine.py index e11cfb1d..508a1f35 100644 --- a/paddlespeech/server/engine/tts/python/tts_engine.py +++ b/paddlespeech/server/engine/tts/python/tts_engine.py @@ -54,7 +54,10 @@ class TTSEngine(BaseEngine): try: self.config = get_config(config_file) - paddle.set_device(self.config.device) + if self.config.device is None: + paddle.set_device(paddle.get_device()) + else: + paddle.set_device(self.config.device) self.executor._init_from_path( am=self.config.am, -- GitLab