Merge pull request #2100 from Jackwaterveg/develop_dev

[s2t] support --nxpu for all s2t models

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

@@ -35,12 +35,6 @@ if __name__ == "__main__":
     # save jit model to
     parser.add_argument(
         "--export_path", type=str, help="path of the jit model to save")
-    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)
 

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

@@ -35,12 +35,6 @@ if __name__ == "__main__":
     # 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())
 

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

@@ -38,12 +38,6 @@ if __name__ == "__main__":
     #load jit model from
     parser.add_argument(
         "--export_path", type=str, help="path of the jit model to save")
-    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

@@ -31,12 +31,6 @@ def main(config, args):
 
 if __name__ == "__main__":
     parser = default_argument_parser()
-    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())
 

paddlespeech/s2t/training/cli.py

@@ -82,6 +82,12 @@ def default_argument_parser(parser=None):
         type=int,
         default=1,
         help="number of parallel processes. 0 for cpu.")
+    train_group.add_argument(
+        '--nxpu',
+        type=int,
+        default=0,
+        choices=[0, 1],
+        help="if nxpu == 0 and ngpu == 0, use cpu.")
     train_group.add_argument(
         "--config", metavar="CONFIG_FILE", help="config file.")
     train_group.add_argument(