From a7f81afb11d76d2ed61de2054484dbb3ee98db33 Mon Sep 17 00:00:00 2001 From: wangcanlong Date: Sat, 6 Aug 2022 20:38:03 +0800 Subject: [PATCH] solve conflicts --- docs/requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 871a045bf..247a313f6 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -18,7 +18,7 @@ librosa==0.8.1 loguru matplotlib nara_wpe -onnxruntime +onnxruntime==1.10.0 pandas paddlenlp paddlespeech_feat diff --git a/setup.py b/setup.py index 6e465ffc0..ceb91dbc3 100644 --- a/setup.py +++ b/setup.py @@ -44,7 +44,7 @@ base = [ "loguru", "matplotlib", "nara_wpe", - "onnxruntime", + "onnxruntime==1.10.0", "opencc", "pandas", "paddlenlp",