From 1b5c15aa7cf65e6af7c68fe981c286a4538738b0 Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期一, 13 二月 2023 19:08:05 +0800
Subject: [PATCH] export model

---
 funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/README.md                  |    2 +-
 funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/utils/utils.py             |    2 +-
 funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/paraformer_onnx.py         |   13 ++-----------
 funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/requirements.txt           |    0 
 funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/utils/postprocess_utils.py |    0 
 funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/utils/__init__.py          |    0 
 funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/.gitignore                 |    0 
 funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/__init__.py                |    2 +-
 8 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/funasr/runtime/python/onnxruntime/paraformer/.gitignore b/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/.gitignore
similarity index 100%
rename from funasr/runtime/python/onnxruntime/paraformer/.gitignore
rename to funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/.gitignore
diff --git a/funasr/runtime/python/onnxruntime/paraformer/README.md b/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/README.md
similarity index 97%
rename from funasr/runtime/python/onnxruntime/paraformer/README.md
rename to funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/README.md
index fdfa95f..6f076ad 100644
--- a/funasr/runtime/python/onnxruntime/paraformer/README.md
+++ b/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/README.md
@@ -10,7 +10,7 @@
 
 
 ### Steps:
-1. Download the whole directory (`funasr/runtime/python/onnxruntime`) to the local.
+1. Download the whole directory (`funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer`) to the local.
 2. Install the related packages.
    ```bash
    pip install requirements.txt
diff --git a/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/__init__.py b/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/__init__.py
index 2640f5f..f1b5c29 100644
--- a/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/__init__.py
+++ b/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/__init__.py
@@ -1,4 +1,4 @@
 # -*- encoding: utf-8 -*-
 # @Author: SWHL
 # @Contact: liekkaskono@163.com
-from .rapid_paraformer import RapidParaformer
+from .paraformer_onnx import Paraformer
diff --git a/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/paraformer_onnx.py b/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/paraformer_onnx.py
index ca3d566..f8fe063 100644
--- a/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/paraformer_onnx.py
+++ b/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/paraformer_onnx.py
@@ -9,10 +9,10 @@
 import librosa
 import numpy as np
 
-from .utils import (CharTokenizer, Hypothesis, ONNXRuntimeError,
+from .utils.utils import (CharTokenizer, Hypothesis, ONNXRuntimeError,
                     OrtInferSession, TokenIDConverter, WavFrontend, get_logger,
                     read_yaml)
-from .postprocess_utils import sentence_postprocess
+from .utils.postprocess_utils import sentence_postprocess
 
 logging = get_logger()
 
@@ -139,13 +139,4 @@
         # text = self.tokenizer.tokens2text(token)
         return text
 
-
-if __name__ == '__main__':
-    project_dir = Path(__file__).resolve().parent.parent
-    model_dir = "/home/zhifu.gzf/.cache/modelscope/hub/damo/speech_paraformer-large_asr_nat-zh-cn-16k-common-vocab8404-pytorch"
-    model = Paraformer(model_dir)
-
-    wav_file = os.path.join(model_dir, 'example/asr_example.wav')
-    result = model(wav_file)
-    print(result)
 
diff --git a/funasr/runtime/python/onnxruntime/paraformer/requirements.txt b/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/requirements.txt
similarity index 100%
rename from funasr/runtime/python/onnxruntime/paraformer/requirements.txt
rename to funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/requirements.txt
diff --git a/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/utils/__init__.py b/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/utils/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/utils/__init__.py
diff --git a/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/postprocess_utils.py b/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/utils/postprocess_utils.py
similarity index 100%
rename from funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/postprocess_utils.py
rename to funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/utils/postprocess_utils.py
diff --git a/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/utils.py b/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/utils/utils.py
similarity index 98%
rename from funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/utils.py
rename to funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/utils/utils.py
index 5bc86f6..aa9d665 100644
--- a/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/utils.py
+++ b/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/utils/utils.py
@@ -13,7 +13,7 @@
                          SessionOptions, get_available_providers, get_device)
 from typeguard import check_argument_types
 
-from .kaldifeat import compute_fbank_feats
+from funasr.runtime.python.onnxruntime.paraformer.rapid_paraformer.kaldifeat import compute_fbank_feats
 import warnings
 
 root_dir = Path(__file__).resolve().parent

--
Gitblit v1.9.1