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

---
 funasr/bin/inference.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/funasr/bin/inference.py b/funasr/bin/inference.py
index 21938e6..3aab31a 100644
--- a/funasr/bin/inference.py
+++ b/funasr/bin/inference.py
@@ -405,7 +405,7 @@
                 spk_embedding = result['spk_embedding']
                 labels = self.cb_model(spk_embedding, oracle_num=self.preset_spk_num)
                 del result['spk_embedding']
-                sv_output = postprocess(all_segments, None, labels, spk_embedding)
+                sv_output = postprocess(all_segments, None, labels, spk_embedding.cpu())
                 if self.spk_mode == 'vad_segment':
                     sentence_list = []
                     for res, vadsegment in zip(restored_data, vadsegments):

--
Gitblit v1.9.1