From d3e57fdc50b4bca11c60cee59eb2e9a50a90884f Mon Sep 17 00:00:00 2001
From: Daniel <znsoft@163.com>
Date: 星期六, 22 四月 2023 05:14:02 +0800
Subject: [PATCH] Merge branch 'alibaba-damo-academy:main' into main

---
 funasr/bin/lm_inference.py |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/funasr/bin/lm_inference.py b/funasr/bin/lm_inference.py
index 909cb02..76de6df 100644
--- a/funasr/bin/lm_inference.py
+++ b/funasr/bin/lm_inference.py
@@ -89,10 +89,9 @@
     **kwargs,
 ):
     assert check_argument_types()
-    logging.basicConfig(
-        level=log_level,
-        format="%(asctime)s (%(module)s:%(lineno)d) %(levelname)s: %(message)s",
-    )
+    ncpu = kwargs.get("ncpu", 1)
+    torch.set_num_threads(ncpu)
+
 
     if ngpu >= 1 and torch.cuda.is_available():
         device = "cuda"
@@ -129,8 +128,9 @@
         param_dict: dict = None,
     ):
         results = []
-        if output_dir_v2 is not None:
-            writer = DatadirWriter(output_dir_v2)
+        output_path = output_dir_v2 if output_dir_v2 is not None else output_dir
+        if output_path is not None:
+            writer = DatadirWriter(output_path)
         else:
             writer = None
 

--
Gitblit v1.9.1