Merge pull request #1951 from Zhangjingyu06/develop

deepspeech2 modify for kunlun

paddlespeech/s2t/exps/deepspeech2/bin/export.py

@@ -37,6 +37,12 @@ def main(config, args):
         "--export_path", type=str, help="path of the jit model to save")
     parser.add_argument(
         "--model_type", type=str, default='offline', help="offline/online")
+    parser.add_argument(
+        '--nxpu',
+        type=int,
+        default=0,
+        choices=[0, 1],
+        help="if nxpu == 0 and ngpu == 0, use cpu.")
     args = parser.parse_args()
     print("model_type:{}".format(args.model_type))
     print_arguments(args)

paddlespeech/s2t/exps/deepspeech2/bin/test.py

@@ -37,6 +37,12 @@ def main(config, args):
     # save asr result to 
     parser.add_argument(
         "--result_file", type=str, help="path of save the asr result")
+    parser.add_argument(
+        '--nxpu',
+        type=int,
+        default=0,
+        choices=[0, 1],
+        help="if nxpu == 0 and ngpu == 0, use cpu.")
     args = parser.parse_args()
     print_arguments(args, globals())
     print("model_type:{}".format(args.model_type))

paddlespeech/s2t/exps/deepspeech2/bin/test_export.py

@@ -40,6 +40,12 @@ def main(config, args):
         "--export_path", type=str, help="path of the jit model to save")
     parser.add_argument(
         "--model_type", type=str, default='offline', help='offline/online')
+    parser.add_argument(
+        '--nxpu',
+        type=int,
+        default=0,
+        choices=[0, 1],
+        help="if nxpu == 0 and ngpu == 0, use cpu.")
     parser.add_argument(
         "--enable-auto-log", action="store_true", help="use auto log")
     args = parser.parse_args()

paddlespeech/s2t/exps/deepspeech2/bin/train.py

@@ -33,6 +33,12 @@ def main(config, args):
     parser = default_argument_parser()
     parser.add_argument(
         "--model_type", type=str, default='offline', help='offline/online')
+    parser.add_argument(
+        '--nxpu',
+        type=int,
+        default=0,
+        choices=[0, 1],
+        help="if nxpu == 0 and ngpu == 0, use cpu.")
     args = parser.parse_args()
     print("model_type:{}".format(args.model_type))
     print_arguments(args, globals())

paddlespeech/s2t/training/trainer.py

@@ -112,7 +112,16 @@ def __init__(self, config, args):
         logger.info(f"Rank: {self.rank}/{self.world_size}")
 
         # set device
-        paddle.set_device('gpu' if self.args.ngpu > 0 else 'cpu')
+        if self.args.ngpu == 0:
+            if self.args.nxpu == 0:
+                paddle.set_device('cpu')
+            else:
+                paddle.set_device('xpu')
+        elif self.args.ngpu > 0:
+            paddle.set_device("gpu")
+        else:
+            raise Exception("invalid device")
+
         if self.parallel:
             self.init_parallel()