From 4dc3a1b011e1e72eb737417b8e0e0bec7a7e3a6e Mon Sep 17 00:00:00 2001
From: aky15 <ankeyu.aky@11.17.44.249>
Date: 星期二, 21 三月 2023 15:12:21 +0800
Subject: [PATCH] resolve conflict

---
 funasr/runtime/python/libtorch/setup.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/funasr/runtime/python/libtorch/setup.py b/funasr/runtime/python/libtorch/setup.py
index 0f9e40d..c50e497 100644
--- a/funasr/runtime/python/libtorch/setup.py
+++ b/funasr/runtime/python/libtorch/setup.py
@@ -28,7 +28,7 @@
     install_requires=["librosa", "onnxruntime>=1.7.0",
                       "scipy", "numpy>=1.19.3",
                       "typeguard", "kaldi-native-fbank",
-                      "PyYAML>=5.1.2"],
+                      "PyYAML>=5.1.2", "torch-quant >= 0.4.0"],
     packages=find_packages(include=["torch_paraformer*"]),
     keywords=[
         'funasr,paraformer'

--
Gitblit v1.9.1