diff --git a/demos/speech_server/conf/asr/asr.yaml b/demos/speech_server/conf/asr/asr.yaml index b1ef558dc8a4c9aa16de61943abfe066b8192860..1a805142a9a1a85b2dfd67a22e216c236bcc9664 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 21bf7177227e1c27f0c7baf1929a2d03420b6042..6cddb4503fc253ba98585d5e0a9d8a079a26aeaf 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 8d45aec529ad86f0278b9c972ec7ca6efefb8e1f..19e8874e31c04d99cef2cfb66ab1f86f6605d12e 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 ecfa3a3ba710022113ac893b77b0e31886918889..97df526132a8f12210db91c49fb51258ab976c35 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 b1ef558dc8a4c9aa16de61943abfe066b8192860..1a805142a9a1a85b2dfd67a22e216c236bcc9664 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 21bf7177227e1c27f0c7baf1929a2d03420b6042..6cddb4503fc253ba98585d5e0a9d8a079a26aeaf 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 8d45aec529ad86f0278b9c972ec7ca6efefb8e1f..19e8874e31c04d99cef2cfb66ab1f86f6605d12e 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 cd4b8583c78696f310206c27c5c69c7754716f2f..019c7ed6a96c97a32fc7b474ab82d8b72d4b4006 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 60040051ccb53d96d9a0a71770ff22fb7fca093e..9fac487d777a684abf609e87da2c93e00dd83cb8 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 e11cfb1d1671ae26816a8974c1d55bf0d39e3c06..508a1f35e6de5e1773843f12549dd97794a7a653 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,