From 8912e0696af069de47646fdb8a9d9c4e086e88b3 Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期日, 14 一月 2024 23:42:11 +0800
Subject: [PATCH] Resolve merge conflict

---
 examples/industrial_data_pretraining/bicif_paraformer/demo.py |   29 ++++++++++++++++++++++++-----
 1 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/examples/industrial_data_pretraining/bicif_paraformer/demo.py b/examples/industrial_data_pretraining/bicif_paraformer/demo.py
index 83e024e..57edb68 100644
--- a/examples/industrial_data_pretraining/bicif_paraformer/demo.py
+++ b/examples/industrial_data_pretraining/bicif_paraformer/demo.py
@@ -5,10 +5,29 @@
 
 from funasr import AutoModel
 
-model = AutoModel(model="../modelscope_models/speech_paraformer-large-vad-punc_asr_nat-zh-cn-16k-common-vocab8404-pytorch",
-                  vad_model="../modelscope_models/speech_fsmn_vad_zh-cn-16k-common-pytorch",
-                  punc_model="../modelscope_models/punc_ct-transformer_zh-cn-common-vocab272727-pytorch",
+model = AutoModel(model="damo/speech_paraformer-large-vad-punc_asr_nat-zh-cn-16k-common-vocab8404-pytorch",
+                    model_revision="v2.0.0",
+                    vad_model="damo/speech_fsmn_vad_zh-cn-16k-common-pytorch",
+                    vad_model_revision="v2.0.2",
+                    punc_model="damo/punc_ct-transformer_zh-cn-common-vocab272727-pytorch",
+                    punc_model_revision="v2.0.1",
+                    spk_model="/Users/shixian/code/modelscope_models/speech_campplus_sv_zh-cn_16k-common",
                   )
 
-res = model(input="../modelscope_models/speech_paraformer-large-vad-punc_asr_nat-zh-cn-16k-common-vocab8404-pytorch/example/asr_example.wav", batch_size_s=300, batch_size_threshold_s=60)
-print(res)
\ No newline at end of file
+res = model(input="https://isv-data.oss-cn-hangzhou.aliyuncs.com/ics/MaaS/ASR/test_audio/asr_vad_punc_example.wav", batch_size_s=300, batch_size_threshold_s=60)
+print(res)
+
+'''try asr with speaker label with
+model = AutoModel(model="damo/speech_paraformer-large-vad-punc_asr_nat-zh-cn-16k-common-vocab8404-pytorch",
+                    model_revision="v2.0.0",
+                    vad_model="damo/speech_fsmn_vad_zh-cn-16k-common-pytorch",
+                    vad_model_revision="v2.0.2",
+                    punc_model="damo/punc_ct-transformer_zh-cn-common-vocab272727-pytorch",
+                    punc_model_revision="v2.0.1",
+                    spk_model="/Users/shixian/code/modelscope_models/speech_campplus_sv_zh-cn_16k-common",
+                    spk_mode='punc_segment',
+                  )
+
+res = model(input="https://isv-data.oss-cn-hangzhou.aliyuncs.com/ics/MaaS/ASR/test_audio/asr_speaker_demo.wav", batch_size_s=300, batch_size_threshold_s=60)
+print(res)
+'''
\ No newline at end of file

--
Gitblit v1.9.1