From 95cf2646fa6dae67bf53354f4ed5e81780d8fee9 Mon Sep 17 00:00:00 2001
From: zhifu gao <zhifu.gzf@alibaba-inc.com>
Date: 星期一, 11 三月 2024 14:43:08 +0800
Subject: [PATCH] onnx (#1460)

---
 runtime/python/onnxruntime/funasr_onnx/vad_bin.py |   25 +++++++++----------------
 1 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/runtime/python/onnxruntime/funasr_onnx/vad_bin.py b/runtime/python/onnxruntime/funasr_onnx/vad_bin.py
index 5892995..af32b1d 100644
--- a/runtime/python/onnxruntime/funasr_onnx/vad_bin.py
+++ b/runtime/python/onnxruntime/funasr_onnx/vad_bin.py
@@ -54,19 +54,15 @@
 		if not os.path.exists(model_file):
 			print(".onnx is not exist, begin to export onnx")
 			try:
-				from funasr.export.export_model import ModelExport
+				from funasr import AutoModel
 			except:
 				raise "You are exporting onnx, please install funasr and try it again. To install funasr, you could:\n" \
 				      "\npip3 install -U funasr\n" \
 				      "For the users in China, you could install with the command:\n" \
 				      "\npip3 install -U funasr -i https://mirror.sjtu.edu.cn/pypi/web/simple"
-			export_model = ModelExport(
-				cache_dir=cache_dir,
-				onnx=True,
-				device="cpu",
-				quant=quantize,
-			)
-			export_model.export(model_dir)
+			
+			model = AutoModel(model=cache_dir)
+			model_dir = model.export(type="onnx", quantize=quantize, device="cpu")
 		config_file = os.path.join(model_dir, 'vad.yaml')
 		cmvn_file = os.path.join(model_dir, 'vad.mvn')
 		config = read_yaml(config_file)
@@ -222,19 +218,16 @@
 		if not os.path.exists(model_file):
 			print(".onnx is not exist, begin to export onnx")
 			try:
-				from funasr.export.export_model import ModelExport
+				from funasr import AutoModel
 			except:
 				raise "You are exporting onnx, please install funasr and try it again. To install funasr, you could:\n" \
 				      "\npip3 install -U funasr\n" \
 				      "For the users in China, you could install with the command:\n" \
 				      "\npip3 install -U funasr -i https://mirror.sjtu.edu.cn/pypi/web/simple"
-			export_model = ModelExport(
-				cache_dir=cache_dir,
-				onnx=True,
-				device="cpu",
-				quant=quantize,
-			)
-			export_model.export(model_dir)
+			
+			model = AutoModel(model=cache_dir)
+			model_dir = model.export(type="onnx", quantize=quantize, device="cpu")
+			
 		config_file = os.path.join(model_dir, 'vad.yaml')
 		cmvn_file = os.path.join(model_dir, 'vad.mvn')
 		config = read_yaml(config_file)

--
Gitblit v1.9.1