From 2779602177ae5374547c7a7e17de0b11a166326d Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期一, 29 四月 2024 15:08:46 +0800
Subject: [PATCH] Merge branch 'dev_gzf_exp' of github.com:alibaba-damo-academy/FunASR into dev_gzf_exp merge
---
funasr/utils/misc.py | 40 +++++++++++++++++++++++-----------------
1 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/funasr/utils/misc.py b/funasr/utils/misc.py
index ef18a61..5eaa4f8 100644
--- a/funasr/utils/misc.py
+++ b/funasr/utils/misc.py
@@ -1,67 +1,73 @@
import os
import io
import shutil
+import logging
from collections import OrderedDict
import numpy as np
from omegaconf import DictConfig, OmegaConf
+
def statistic_model_parameters(model, prefix=None):
var_dict = model.state_dict()
numel = 0
- for i, key in enumerate(sorted(list([x for x in var_dict.keys() if "num_batches_tracked" not in x]))):
+ for i, key in enumerate(
+ sorted(list([x for x in var_dict.keys() if "num_batches_tracked" not in x]))
+ ):
if prefix is None or key.startswith(prefix):
numel += var_dict[key].numel()
return numel
def int2vec(x, vec_dim=8, dtype=np.int32):
- b = ('{:0' + str(vec_dim) + 'b}').format(x)
+ b = ("{:0" + str(vec_dim) + "b}").format(x)
# little-endian order: lower bit first
- return (np.array(list(b)[::-1]) == '1').astype(dtype)
+ return (np.array(list(b)[::-1]) == "1").astype(dtype)
def seq2arr(seq, vec_dim=8):
return np.row_stack([int2vec(int(x), vec_dim) for x in seq])
-def load_scp_as_dict(scp_path, value_type='str', kv_sep=" "):
- with io.open(scp_path, 'r', encoding='utf-8') as f:
+def load_scp_as_dict(scp_path, value_type="str", kv_sep=" "):
+ with io.open(scp_path, "r", encoding="utf-8") as f:
ret_dict = OrderedDict()
for one_line in f.readlines():
one_line = one_line.strip()
pos = one_line.find(kv_sep)
- key, value = one_line[:pos], one_line[pos + 1:]
- if value_type == 'list':
- value = value.split(' ')
+ key, value = one_line[:pos], one_line[pos + 1 :]
+ if value_type == "list":
+ value = value.split(" ")
ret_dict[key] = value
return ret_dict
-def load_scp_as_list(scp_path, value_type='str', kv_sep=" "):
- with io.open(scp_path, 'r', encoding='utf8') as f:
+def load_scp_as_list(scp_path, value_type="str", kv_sep=" "):
+ with io.open(scp_path, "r", encoding="utf8") as f:
ret_dict = []
for one_line in f.readlines():
one_line = one_line.strip()
pos = one_line.find(kv_sep)
- key, value = one_line[:pos], one_line[pos + 1:]
- if value_type == 'list':
- value = value.split(' ')
+ key, value = one_line[:pos], one_line[pos + 1 :]
+ if value_type == "list":
+ value = value.split(" ")
ret_dict.append((key, value))
return ret_dict
+
def deep_update(original, update):
for key, value in update.items():
if isinstance(value, dict) and key in original:
+ if len(value) == 0:
+ original[key] = value
deep_update(original[key], value)
else:
original[key] = value
-
-
+
+
def prepare_model_dir(**kwargs):
-
os.makedirs(kwargs.get("output_dir", "./"), exist_ok=True)
-
+
yaml_file = os.path.join(kwargs.get("output_dir", "./"), "config.yaml")
OmegaConf.save(config=kwargs, f=yaml_file)
print(kwargs)
--
Gitblit v1.9.1