From 0d9384c8c0161259192cc3d676ca0d60e0d18e5c Mon Sep 17 00:00:00 2001
From: zhifu gao <zhifu.gzf@alibaba-inc.com>
Date: 星期一, 11 三月 2024 22:32:26 +0800
Subject: [PATCH] Dev gzf (#1474)

---
 funasr/auto/auto_model.py |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/funasr/auto/auto_model.py b/funasr/auto/auto_model.py
index c4bab03..a18224f 100644
--- a/funasr/auto/auto_model.py
+++ b/funasr/auto/auto_model.py
@@ -155,9 +155,8 @@
             device = "cpu"
             kwargs["batch_size"] = 1
         kwargs["device"] = device
-        
-        if kwargs.get("ncpu", None):
-            torch.set_num_threads(kwargs.get("ncpu"))
+
+        torch.set_num_threads(kwargs.get("ncpu", 4))
         
         # build tokenizer
         tokenizer = kwargs.get("tokenizer", None)
@@ -476,11 +475,13 @@
                calib_num: int = 100,
                opset_version: int = 14,
                **cfg):
-        os.environ['EXPORTING_MODEL'] = 'TRUE'
+    
+        device = cfg.get("device", "cpu")
+        model = self.model.to(device=device)
         kwargs = self.kwargs
         deep_update(kwargs, cfg)
+        kwargs["device"] = device
         del kwargs["model"]
-        model = self.model
         model.eval()
 
         batch_size = 1
@@ -493,11 +494,19 @@
                 export_dir = export_utils.export_onnx(
                                         model=model,
                                         data_in=data_list,
+                                        quantize=quantize,
+                                        fallback_num=fallback_num,
+                                        calib_num=calib_num,
+                                        opset_version=opset_version,
                                         **kwargs)
             else:
                 export_dir = export_utils.export_torchscripts(
                                         model=model,
                                         data_in=data_list,
+                                        quantize=quantize,
+                                        fallback_num=fallback_num,
+                                        calib_num=calib_num,
+                                        opset_version=opset_version,
                                         **kwargs)
 
         return export_dir
\ No newline at end of file

--
Gitblit v1.9.1