From 6fa8ee48e117fa9c3bef450e02776e8c26b278e7 Mon Sep 17 00:00:00 2001
From: zhifu gao <zhifu.gzf@alibaba-inc.com>
Date: 星期六, 30 三月 2024 10:13:42 +0800
Subject: [PATCH] Dev gzf new (#1567)
---
funasr/auto/auto_model.py | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/funasr/auto/auto_model.py b/funasr/auto/auto_model.py
index c31308e..7adaae2 100644
--- a/funasr/auto/auto_model.py
+++ b/funasr/auto/auto_model.py
@@ -26,9 +26,11 @@
from funasr.train_utils.load_pretrained_model import load_pretrained_model
from funasr.utils import export_utils
-from funasr.models.campplus.utils import sv_chunk, postprocess, distribute_spk
-from funasr.models.campplus.cluster_backend import ClusterBackend
-
+try:
+ from funasr.models.campplus.utils import sv_chunk, postprocess, distribute_spk
+ from funasr.models.campplus.cluster_backend import ClusterBackend
+except:
+ pass
def prepare_data_iterator(data_in, input_len=None, data_type=None, key=None):
@@ -109,7 +111,7 @@
if vad_model is not None:
logging.info("Building VAD model.")
vad_kwargs["model"] = vad_model
- vad_kwargs["model_revision"] = kwargs.get("vad_model_revision", None)
+ vad_kwargs["model_revision"] = kwargs.get("vad_model_revision", "master")
vad_kwargs["device"] = kwargs["device"]
vad_model, vad_kwargs = self.build_model(**vad_kwargs)
@@ -119,7 +121,7 @@
if punc_model is not None:
logging.info("Building punc model.")
punc_kwargs["model"] = punc_model
- punc_kwargs["model_revision"] = kwargs.get("punc_model_revision", None)
+ punc_kwargs["model_revision"] = kwargs.get("punc_model_revision", "master")
punc_kwargs["device"] = kwargs["device"]
punc_model, punc_kwargs = self.build_model(**punc_kwargs)
@@ -129,7 +131,7 @@
if spk_model is not None:
logging.info("Building SPK model.")
spk_kwargs["model"] = spk_model
- spk_kwargs["model_revision"] = kwargs.get("spk_model_revision", None)
+ spk_kwargs["model_revision"] = kwargs.get("spk_model_revision", "master")
spk_kwargs["device"] = kwargs["device"]
spk_model, spk_kwargs = self.build_model(**spk_kwargs)
self.cb_model = ClusterBackend().to(kwargs["device"])
@@ -200,7 +202,7 @@
load_pretrained_model(
model=model,
path=init_param,
- ignore_init_mismatch=kwargs.get("ignore_init_mismatch", False),
+ ignore_init_mismatch=kwargs.get("ignore_init_mismatch", True),
oss_bucket=kwargs.get("oss_bucket", None),
scope_map=kwargs.get("scope_map", []),
excludes=kwargs.get("excludes", None),
--
Gitblit v1.9.1