From 580b11b57ac4b62f7e2acda73813a4e10e8e4cd3 Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期二, 10 十月 2023 17:17:29 +0800
Subject: [PATCH] v0.8.0
---
funasr/build_utils/build_model_from_file.py | 17 ++---------------
1 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/funasr/build_utils/build_model_from_file.py b/funasr/build_utils/build_model_from_file.py
index 6130e71..65e0d5f 100644
--- a/funasr/build_utils/build_model_from_file.py
+++ b/funasr/build_utils/build_model_from_file.py
@@ -11,18 +11,6 @@
from funasr.models.base_model import FunASRModel
-def load_checkpoint(checkpoint_path, use_cuda=1):
- if use_cuda:
- checkpoint = torch.load(checkpoint_path)
- else:
- checkpoint = torch.load(
- checkpoint_path, map_location=lambda storage, loc: storage)
- return checkpoint
-
-def reload_ss_for_eval(model, checkpoint_path, use_cuda=False):
- checkpoint = load_checkpoint(checkpoint_path, use_cuda)
- model.load_state_dict(checkpoint['model'], strict=False)
-
def build_model_from_file(
config_file: Union[Path, str] = None,
model_file: Union[Path, str] = None,
@@ -82,9 +70,8 @@
model.load_state_dict(model_dict)
else:
model_dict = torch.load(model_file, map_location=device)
- if task_name == 'ss':
- reload_ss_for_eval(model, model_file, use_cuda=True)
- logging.info("model is loaded from path: {}".format(model_file))
+ if task_name == "ss":
+ model_dict = model_dict['model']
if task_name == "diar" and mode == "sond":
model_dict = fileter_model_dict(model_dict, model.state_dict())
if task_name == "vad":
--
Gitblit v1.9.1