From bda3527dbb21d2288f34240def3505e33ad804d3 Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期五, 24 三月 2023 10:36:37 +0800
Subject: [PATCH] funasr_onnx funasr_torch
---
funasr/runtime/python/onnxruntime/funasr_onnx/utils/timestamp_utils.py | 0
funasr/runtime/python/libtorch/funasr_torch/utils/postprocess_utils.py | 0
funasr/runtime/python/libtorch/funasr_torch/__init__.py | 0
funasr/runtime/python/libtorch/funasr_torch/utils/__init__.py | 0
funasr/runtime/python/libtorch/README.md | 5 +++--
funasr/runtime/python/onnxruntime/funasr_onnx/utils/__init__.py | 0
funasr/runtime/python/onnxruntime/funasr_onnx/utils/utils.py | 0
funasr/runtime/python/onnxruntime/demo.py | 2 +-
funasr/runtime/python/libtorch/funasr_torch/utils/timestamp_utils.py | 0
funasr/runtime/python/onnxruntime/funasr_onnx/paraformer_bin.py | 4 +---
funasr/runtime/python/utils/infer.py | 4 ++--
funasr/runtime/python/onnxruntime/funasr_onnx/__init__.py | 0
funasr/runtime/python/libtorch/funasr_torch/paraformer_bin.py | 0
funasr/runtime/python/onnxruntime/setup.py | 8 ++++----
funasr/runtime/python/libtorch/funasr_torch/utils/compute_wer.py | 0
funasr/runtime/python/onnxruntime/funasr_onnx/utils/frontend.py | 0
funasr/runtime/python/onnxruntime/funasr_onnx/utils/postprocess_utils.py | 0
funasr/runtime/python/libtorch/demo.py | 2 +-
funasr/runtime/python/libtorch/setup.py | 6 +++---
funasr/runtime/python/onnxruntime/README.md | 8 ++++----
/dev/null | 4 ----
funasr/runtime/python/grpc/grpc_server.py | 2 +-
funasr/runtime/python/libtorch/funasr_torch/utils/frontend.py | 0
funasr/runtime/python/libtorch/funasr_torch/utils/utils.py | 0
funasr/runtime/python/utils/test_rtf.py | 4 ++--
25 files changed, 22 insertions(+), 27 deletions(-)
diff --git a/funasr/runtime/python/grpc/grpc_server.py b/funasr/runtime/python/grpc/grpc_server.py
index 0fdf30c..d0be6f0 100644
--- a/funasr/runtime/python/grpc/grpc_server.py
+++ b/funasr/runtime/python/grpc/grpc_server.py
@@ -24,7 +24,7 @@
self.inference_16k_pipeline = pipeline(task=Tasks.auto_speech_recognition, model=model, vad_model=vad_model, punc_model=punc_model)
elif self.backend == "onnxruntime":
try:
- from rapid_paraformer.paraformer_onnx import Paraformer
+ from funasr_onnx import Paraformer
except ImportError:
raise ImportError(f"Please install onnxruntime environment")
self.inference_16k_pipeline = Paraformer(model_dir=onnx_dir)
diff --git a/funasr/runtime/python/libtorch/README.md b/funasr/runtime/python/libtorch/README.md
index cf5bbcc..b14268f 100644
--- a/funasr/runtime/python/libtorch/README.md
+++ b/funasr/runtime/python/libtorch/README.md
@@ -27,10 +27,11 @@
```
-2. Install the `torch_paraformer`.
+2. Install the `funasr_torch`.
```shell
git clone https://github.com/alibaba/FunASR.git && cd FunASR
cd funasr/runtime/python/libtorch
+ python setup.py build
python setup.py install
```
@@ -41,7 +42,7 @@
- Output: `List[str]`: recognition result.
- Example:
```python
- from torch_paraformer import Paraformer
+ from funasr_torch 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/libtorch/demo.py b/funasr/runtime/python/libtorch/demo.py
index 640260f..58285a7 100644
--- a/funasr/runtime/python/libtorch/demo.py
+++ b/funasr/runtime/python/libtorch/demo.py
@@ -1,5 +1,5 @@
-from torch_paraformer import Paraformer
+from funasr_torch 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/libtorch/torch_paraformer/__init__.py b/funasr/runtime/python/libtorch/funasr_torch/__init__.py
similarity index 100%
rename from funasr/runtime/python/libtorch/torch_paraformer/__init__.py
rename to funasr/runtime/python/libtorch/funasr_torch/__init__.py
diff --git a/funasr/runtime/python/libtorch/torch_paraformer/paraformer_bin.py b/funasr/runtime/python/libtorch/funasr_torch/paraformer_bin.py
similarity index 100%
rename from funasr/runtime/python/libtorch/torch_paraformer/paraformer_bin.py
rename to funasr/runtime/python/libtorch/funasr_torch/paraformer_bin.py
diff --git a/funasr/runtime/python/libtorch/torch_paraformer/utils/__init__.py b/funasr/runtime/python/libtorch/funasr_torch/utils/__init__.py
similarity index 100%
rename from funasr/runtime/python/libtorch/torch_paraformer/utils/__init__.py
rename to funasr/runtime/python/libtorch/funasr_torch/utils/__init__.py
diff --git a/funasr/runtime/python/libtorch/torch_paraformer/utils/compute_wer.py b/funasr/runtime/python/libtorch/funasr_torch/utils/compute_wer.py
similarity index 100%
rename from funasr/runtime/python/libtorch/torch_paraformer/utils/compute_wer.py
rename to funasr/runtime/python/libtorch/funasr_torch/utils/compute_wer.py
diff --git a/funasr/runtime/python/libtorch/torch_paraformer/utils/frontend.py b/funasr/runtime/python/libtorch/funasr_torch/utils/frontend.py
similarity index 100%
rename from funasr/runtime/python/libtorch/torch_paraformer/utils/frontend.py
rename to funasr/runtime/python/libtorch/funasr_torch/utils/frontend.py
diff --git a/funasr/runtime/python/libtorch/torch_paraformer/utils/postprocess_utils.py b/funasr/runtime/python/libtorch/funasr_torch/utils/postprocess_utils.py
similarity index 100%
rename from funasr/runtime/python/libtorch/torch_paraformer/utils/postprocess_utils.py
rename to funasr/runtime/python/libtorch/funasr_torch/utils/postprocess_utils.py
diff --git a/funasr/runtime/python/libtorch/torch_paraformer/utils/timestamp_utils.py b/funasr/runtime/python/libtorch/funasr_torch/utils/timestamp_utils.py
similarity index 100%
rename from funasr/runtime/python/libtorch/torch_paraformer/utils/timestamp_utils.py
rename to funasr/runtime/python/libtorch/funasr_torch/utils/timestamp_utils.py
diff --git a/funasr/runtime/python/libtorch/torch_paraformer/utils/utils.py b/funasr/runtime/python/libtorch/funasr_torch/utils/utils.py
similarity index 100%
rename from funasr/runtime/python/libtorch/torch_paraformer/utils/utils.py
rename to funasr/runtime/python/libtorch/funasr_torch/utils/utils.py
diff --git a/funasr/runtime/python/libtorch/setup.py b/funasr/runtime/python/libtorch/setup.py
index c50e497..a00d4b2 100644
--- a/funasr/runtime/python/libtorch/setup.py
+++ b/funasr/runtime/python/libtorch/setup.py
@@ -14,8 +14,8 @@
setuptools.setup(
- name='torch_paraformer',
- version='0.0.1',
+ name='funasr_torch',
+ version='0.0.2',
platforms="Any",
url="https://github.com/alibaba-damo-academy/FunASR.git",
author="Speech Lab, Alibaba Group, China",
@@ -31,7 +31,7 @@
"PyYAML>=5.1.2", "torch-quant >= 0.4.0"],
packages=find_packages(include=["torch_paraformer*"]),
keywords=[
- 'funasr,paraformer'
+ 'funasr,paraformer, funasr_torch'
],
classifiers=[
'Programming Language :: Python :: 3.6',
diff --git a/funasr/runtime/python/onnxruntime/README.md b/funasr/runtime/python/onnxruntime/README.md
index e2a09f1..96b144e 100644
--- a/funasr/runtime/python/onnxruntime/README.md
+++ b/funasr/runtime/python/onnxruntime/README.md
@@ -32,8 +32,8 @@
```
-2. Install the `rapid_paraformer`.
- - Build the rapid_paraformer `whl`
+2. Install the `funasr_onnx`.
+ - Build the funasr_onnx `whl`
```shell
git clone https://github.com/alibaba/FunASR.git && cd FunASR
cd funasr/runtime/python/onnxruntime
@@ -41,7 +41,7 @@
```
- Install the build `whl`
```bash
- pip install dist/rapid_paraformer-0.0.1-py3-none-any.whl
+ pip install dist/funasr_onnx-0.0.2-py3-none-any.whl
```
3. Run the demo.
@@ -50,7 +50,7 @@
- Output: `List[str]`: recognition result.
- Example:
```python
- from rapid_paraformer import Paraformer
+ from funasr_onnx 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/debug.png b/funasr/runtime/python/onnxruntime/debug.png
deleted file mode 100644
index f2522d0..0000000
--- a/funasr/runtime/python/onnxruntime/debug.png
+++ /dev/null
Binary files differ
diff --git a/funasr/runtime/python/onnxruntime/demo.py b/funasr/runtime/python/onnxruntime/demo.py
index 1b887da..248d2e1 100644
--- a/funasr/runtime/python/onnxruntime/demo.py
+++ b/funasr/runtime/python/onnxruntime/demo.py
@@ -1,5 +1,5 @@
-from rapid_paraformer import Paraformer
+from funasr_onnx import Paraformer
#model_dir = "/Users/shixian/code/funasr/export/damo/speech_paraformer-large-vad-punc_asr_nat-zh-cn-16k-common-vocab8404-pytorch"
#model_dir = "/Users/shixian/code/funasr/export/damo/speech_paraformer-large_asr_nat-zh-cn-16k-common-vocab8404-pytorch"
diff --git a/funasr/runtime/python/libtorch/torch_paraformer/__init__.py b/funasr/runtime/python/onnxruntime/funasr_onnx/__init__.py
similarity index 100%
copy from funasr/runtime/python/libtorch/torch_paraformer/__init__.py
copy to funasr/runtime/python/onnxruntime/funasr_onnx/__init__.py
diff --git a/funasr/runtime/python/onnxruntime/rapid_paraformer/paraformer_onnx.py b/funasr/runtime/python/onnxruntime/funasr_onnx/paraformer_bin.py
similarity index 98%
rename from funasr/runtime/python/onnxruntime/rapid_paraformer/paraformer_onnx.py
rename to funasr/runtime/python/onnxruntime/funasr_onnx/paraformer_bin.py
index 5567940..cbdb8d9 100644
--- a/funasr/runtime/python/onnxruntime/rapid_paraformer/paraformer_onnx.py
+++ b/funasr/runtime/python/onnxruntime/funasr_onnx/paraformer_bin.py
@@ -1,7 +1,5 @@
# -*- encoding: utf-8 -*-
-# @Author: SWHL
-# @Contact: liekkaskono@163.com
-from cgitb import text
+
import os.path
from pathlib import Path
from typing import List, Union, Tuple
diff --git a/funasr/runtime/python/onnxruntime/rapid_paraformer/utils/__init__.py b/funasr/runtime/python/onnxruntime/funasr_onnx/utils/__init__.py
similarity index 100%
rename from funasr/runtime/python/onnxruntime/rapid_paraformer/utils/__init__.py
rename to funasr/runtime/python/onnxruntime/funasr_onnx/utils/__init__.py
diff --git a/funasr/runtime/python/onnxruntime/rapid_paraformer/utils/frontend.py b/funasr/runtime/python/onnxruntime/funasr_onnx/utils/frontend.py
similarity index 100%
rename from funasr/runtime/python/onnxruntime/rapid_paraformer/utils/frontend.py
rename to funasr/runtime/python/onnxruntime/funasr_onnx/utils/frontend.py
diff --git a/funasr/runtime/python/onnxruntime/rapid_paraformer/utils/postprocess_utils.py b/funasr/runtime/python/onnxruntime/funasr_onnx/utils/postprocess_utils.py
similarity index 100%
rename from funasr/runtime/python/onnxruntime/rapid_paraformer/utils/postprocess_utils.py
rename to funasr/runtime/python/onnxruntime/funasr_onnx/utils/postprocess_utils.py
diff --git a/funasr/runtime/python/onnxruntime/rapid_paraformer/utils/timestamp_utils.py b/funasr/runtime/python/onnxruntime/funasr_onnx/utils/timestamp_utils.py
similarity index 100%
rename from funasr/runtime/python/onnxruntime/rapid_paraformer/utils/timestamp_utils.py
rename to funasr/runtime/python/onnxruntime/funasr_onnx/utils/timestamp_utils.py
diff --git a/funasr/runtime/python/onnxruntime/rapid_paraformer/utils/utils.py b/funasr/runtime/python/onnxruntime/funasr_onnx/utils/utils.py
similarity index 100%
rename from funasr/runtime/python/onnxruntime/rapid_paraformer/utils/utils.py
rename to funasr/runtime/python/onnxruntime/funasr_onnx/utils/utils.py
diff --git a/funasr/runtime/python/onnxruntime/rapid_paraformer/__init__.py b/funasr/runtime/python/onnxruntime/rapid_paraformer/__init__.py
deleted file mode 100644
index f1b5c29..0000000
--- a/funasr/runtime/python/onnxruntime/rapid_paraformer/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- encoding: utf-8 -*-
-# @Author: SWHL
-# @Contact: liekkaskono@163.com
-from .paraformer_onnx import Paraformer
diff --git a/funasr/runtime/python/onnxruntime/setup.py b/funasr/runtime/python/onnxruntime/setup.py
index 299910f..d7c655c 100644
--- a/funasr/runtime/python/onnxruntime/setup.py
+++ b/funasr/runtime/python/onnxruntime/setup.py
@@ -12,17 +12,17 @@
return readme
-MODULE_NAME = 'rapid_paraformer'
+MODULE_NAME = 'funasr_onnx'
VERSION_NUM = '0.0.1'
setuptools.setup(
name=MODULE_NAME,
version=VERSION_NUM,
platforms="Any",
- description="Using paraformer with ONNXRuntime",
- author="FunASR",
+ url="https://github.com/alibaba-damo-academy/FunASR.git",
+ author="Speech Lab, Alibaba Group, China",
author_email="funasr@list.alibaba-inc.com",
- url="https://github.com/alibaba-damo-academy/FunASR",
+ description="FunASR: A Fundamental End-to-End Speech Recognition Toolkit",
license='MIT',
long_description=get_readme(),
long_description_content_type='text/markdown',
diff --git a/funasr/runtime/python/utils/infer.py b/funasr/runtime/python/utils/infer.py
index f5b2233..e27e393 100644
--- a/funasr/runtime/python/utils/infer.py
+++ b/funasr/runtime/python/utils/infer.py
@@ -15,9 +15,9 @@
args = parser.parse_args()
-from funasr.runtime.python.libtorch.torch_paraformer import Paraformer
+from funasr.runtime.python.libtorch.funasr_torch import Paraformer
if args.backend == "onnx":
- from funasr.runtime.python.onnxruntime.rapid_paraformer import Paraformer
+ from funasr.runtime.python.onnxruntime.funasr_onnx import Paraformer
model = Paraformer(args.model_dir, batch_size=1, quantize=args.quantize, intra_op_num_threads=args.intra_op_num_threads)
diff --git a/funasr/runtime/python/utils/test_rtf.py b/funasr/runtime/python/utils/test_rtf.py
index 536ee2d..391a0ac 100644
--- a/funasr/runtime/python/utils/test_rtf.py
+++ b/funasr/runtime/python/utils/test_rtf.py
@@ -14,9 +14,9 @@
args = parser.parse_args()
-from funasr.runtime.python.libtorch.torch_paraformer import Paraformer
+from funasr.runtime.python.libtorch.funasr_torch import Paraformer
if args.backend == "onnx":
- from funasr.runtime.python.onnxruntime.rapid_paraformer import Paraformer
+ from funasr.runtime.python.onnxruntime.funasr_onnx import Paraformer
model = Paraformer(args.model_dir, batch_size=1, quantize=args.quantize, intra_op_num_threads=args.intra_op_num_threads)
--
Gitblit v1.9.1