From 28a19dbc4e85d3b8a4ec2ef7483bba64d422b43f Mon Sep 17 00:00:00 2001
From: aky15 <ankeyu.aky@11.17.44.249>
Date: 星期三, 12 四月 2023 18:03:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main' into dev_aky
---
funasr/bin/diar_inference_launch.py | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/funasr/bin/diar_inference_launch.py b/funasr/bin/diar_inference_launch.py
index c3e210b..85e4518 100755
--- a/funasr/bin/diar_inference_launch.py
+++ b/funasr/bin/diar_inference_launch.py
@@ -127,19 +127,24 @@
def inference_launch(mode, **kwargs):
if mode == "sond":
from funasr.bin.sond_inference import inference_modelscope
- return inference_modelscope(**kwargs)
+ return inference_modelscope(mode=mode, **kwargs)
elif mode == "sond_demo":
from funasr.bin.sond_inference import inference_modelscope
param_dict = {
"extract_profile": True,
"sv_train_config": "sv.yaml",
- "sv_model_file": "sv.pth",
+ "sv_model_file": "sv.pb",
}
- if "param_dict" in kwargs:
- kwargs["param_dict"].update(param_dict)
+ if "param_dict" in kwargs and kwargs["param_dict"] is not None:
+ for key in param_dict:
+ if key not in kwargs["param_dict"]:
+ kwargs["param_dict"][key] = param_dict[key]
else:
kwargs["param_dict"] = param_dict
- return inference_modelscope(**kwargs)
+ return inference_modelscope(mode=mode, **kwargs)
+ elif mode == "eend-ola":
+ from funasr.bin.eend_ola_inference import inference_modelscope
+ return inference_modelscope(mode=mode, **kwargs)
else:
logging.info("Unknown decoding mode: {}".format(mode))
return None
--
Gitblit v1.9.1