From 54516aebcce048ecc452034bdebadc85e1c7523b Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期二, 21 二月 2023 16:06:09 +0800
Subject: [PATCH] Merge branch 'main' of https://github.com/RapidAI/FunASR into RapidAI-main add
---
funasr/runtime/python/onnxruntime/setup.py | 44 ++++++++++++++++++++++
funasr/runtime/python/onnxruntime/README.md | 0
funasr/runtime/python/onnxruntime/demo.py | 3 +
funasr/runtime/python/onnxruntime/rapid_paraformer/__init__.py | 3 +
funasr/runtime/python/onnxruntime/requirements.txt | 0
funasr/runtime/python/onnxruntime/rapid_paraformer/paraformer_onnx.py | 19 ++++-----
6 files changed, 56 insertions(+), 13 deletions(-)
diff --git a/funasr/runtime/python/onnxruntime/rapid_paraformer/README.md b/funasr/runtime/python/onnxruntime/README.md
similarity index 100%
rename from funasr/runtime/python/onnxruntime/rapid_paraformer/README.md
rename to funasr/runtime/python/onnxruntime/README.md
diff --git a/funasr/runtime/python/onnxruntime/rapid_paraformer/demo.py b/funasr/runtime/python/onnxruntime/demo.py
similarity index 88%
rename from funasr/runtime/python/onnxruntime/rapid_paraformer/demo.py
rename to funasr/runtime/python/onnxruntime/demo.py
index 5d658dd..e9c281c 100644
--- a/funasr/runtime/python/onnxruntime/rapid_paraformer/demo.py
+++ b/funasr/runtime/python/onnxruntime/demo.py
@@ -1,4 +1,5 @@
-from paraformer_onnx import Paraformer
+
+from rapid_paraformer import Paraformer
model_dir = "/nfs/zhifu.gzf/export/damo/speech_paraformer-large_asr_nat-zh-cn-16k-common-vocab8404-pytorch"
model = Paraformer(model_dir, batch_size=1)
diff --git a/funasr/runtime/python/onnxruntime/rapid_paraformer/__init__.py b/funasr/runtime/python/onnxruntime/rapid_paraformer/__init__.py
index d071b07..f1b5c29 100644
--- a/funasr/runtime/python/onnxruntime/rapid_paraformer/__init__.py
+++ b/funasr/runtime/python/onnxruntime/rapid_paraformer/__init__.py
@@ -1,3 +1,4 @@
# -*- encoding: utf-8 -*-
# @Author: SWHL
-# @Contact: liekkaskono@163.com
\ No newline at end of file
+# @Contact: liekkaskono@163.com
+from .paraformer_onnx import Paraformer
diff --git a/funasr/runtime/python/onnxruntime/rapid_paraformer/paraformer_onnx.py b/funasr/runtime/python/onnxruntime/rapid_paraformer/paraformer_onnx.py
index e0c622c..a786ef0 100644
--- a/funasr/runtime/python/onnxruntime/rapid_paraformer/paraformer_onnx.py
+++ b/funasr/runtime/python/onnxruntime/rapid_paraformer/paraformer_onnx.py
@@ -2,28 +2,27 @@
# @Author: SWHL
# @Contact: liekkaskono@163.com
import os.path
-import traceback
from pathlib import Path
from typing import List, Union, Tuple
import librosa
import numpy as np
-from utils.utils import (CharTokenizer, Hypothesis, ONNXRuntimeError,
- OrtInferSession, TokenIDConverter, get_logger,
- read_yaml)
-from utils.postprocess_utils import sentence_postprocess
-from utils.frontend import WavFrontend
+from .utils.utils import (CharTokenizer, Hypothesis, ONNXRuntimeError,
+ OrtInferSession, TokenIDConverter, get_logger,
+ read_yaml)
+from .utils.postprocess_utils import sentence_postprocess
+from .utils.frontend import WavFrontend
logging = get_logger()
class Paraformer():
- def __init__(self, model_dir: Union[str, Path]=None,
+ def __init__(self, model_dir: Union[str, Path] = None,
batch_size: int = 1,
- device_id: Union[str, int]="-1",
+ device_id: Union[str, int] = "-1",
):
-
+
if not Path(model_dir).exists():
raise FileNotFoundError(f'{model_dir} does not exist.')
@@ -140,5 +139,3 @@
text = texts[0]
# text = self.tokenizer.tokens2text(token)
return text
-
-
diff --git a/funasr/runtime/python/onnxruntime/rapid_paraformer/requirements.txt b/funasr/runtime/python/onnxruntime/requirements.txt
similarity index 100%
rename from funasr/runtime/python/onnxruntime/rapid_paraformer/requirements.txt
rename to funasr/runtime/python/onnxruntime/requirements.txt
diff --git a/funasr/runtime/python/onnxruntime/setup.py b/funasr/runtime/python/onnxruntime/setup.py
new file mode 100644
index 0000000..48e8bb0
--- /dev/null
+++ b/funasr/runtime/python/onnxruntime/setup.py
@@ -0,0 +1,44 @@
+# -*- encoding: utf-8 -*-
+from pathlib import Path
+import setuptools
+
+
+def get_readme():
+ root_dir = Path(__file__).resolve().parent
+ readme_path = str(root_dir / 'README.md')
+ print(readme_path)
+ with open(readme_path, 'r', encoding='utf-8') as f:
+ readme = f.read()
+ return readme
+
+
+MODULE_NAME = 'rapid_paraformer'
+VERSION_NUM = '0.0.1'
+
+setuptools.setup(
+ name=MODULE_NAME,
+ version=VERSION_NUM,
+ platforms="Any",
+ description="Using paraformer with ONNXRuntime",
+ author="SWHL",
+ author_email="liekkaskono@163.com",
+ url="https://github.com/alibaba-damo-academy/FunASR",
+ license='MIT',
+ long_description=get_readme(),
+ long_description_content_type='text/markdown',
+ include_package_data=True,
+ install_requires=["librosa", "onnxruntime>=1.7.0",
+ "scipy", "numpy>=1.19.3",
+ "typeguard", "kaldi-native-fbank"],
+ packages=[MODULE_NAME, f'{MODULE_NAME}.utils'],
+ keywords=[
+ 'funasr,asr'
+ ],
+ classifiers=[
+ 'Programming Language :: Python :: 3.6',
+ 'Programming Language :: Python :: 3.7',
+ 'Programming Language :: Python :: 3.8',
+ 'Programming Language :: Python :: 3.9',
+ 'Programming Language :: Python :: 3.10',
+ ],
+)
--
Gitblit v1.9.1