From d80ac2fd2df4e7fb8a28acfa512bb11472b5cc99 Mon Sep 17 00:00:00 2001
From: liugz18 <57401541+liugz18@users.noreply.github.com>
Date: 星期四, 18 七月 2024 21:34:55 +0800
Subject: [PATCH] Rename 'res' in line 514 to avoid with naming conflict with line 365
---
funasr/register.py | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/funasr/register.py b/funasr/register.py
index 15363c0..384bc58 100644
--- a/funasr/register.py
+++ b/funasr/register.py
@@ -1,6 +1,7 @@
import logging
import inspect
from dataclasses import dataclass
+import re
@dataclass
@@ -15,6 +16,7 @@
predictor_classes = {}
stride_conv_classes = {}
tokenizer_classes = {}
+ dataloader_classes = {}
batch_sampler_classes = {}
dataset_classes = {}
index_ds_classes = {}
@@ -23,53 +25,63 @@
print("\ntables: \n")
fields = vars(self)
for classes_key, classes_dict in fields.items():
-
+
flag = True
if key is not None:
flag = key in classes_key
if classes_key.endswith("_meta") and flag:
print(f"----------- ** {classes_key.replace('_meta', '')} ** --------------")
- headers = ["class name", "register name", "class location"]
+ headers = ["register name", "class name", "class location"]
metas = []
for register_key, meta in classes_dict.items():
metas.append(meta)
metas.sort(key=lambda x: x[0])
data = [headers] + metas
col_widths = [max(len(str(item)) for item in col) for col in zip(*data)]
-
- for row in data:
- print("| " + " | ".join(str(item).ljust(width) for item, width in zip(row, col_widths)) + " |")
- print("\n")
+ for row in data:
+ print(
+ "| "
+ + " | ".join(str(item).ljust(width) for item, width in zip(row, col_widths))
+ + " |"
+ )
+ print("\n")
def register(self, register_tables_key: str, key=None):
def decorator(target_class):
-
+
if not hasattr(self, register_tables_key):
setattr(self, register_tables_key, {})
logging.info("new registry table has been added: {}".format(register_tables_key))
-
+
registry = getattr(self, register_tables_key)
registry_key = key if key is not None else target_class.__name__
- registry_key = registry_key.lower()
- # import pdb; pdb.set_trace()
- assert not registry_key in registry, "(key: {} / class: {}) has been registered already锛宨n {}".format(
- registry_key, target_class, register_tables_key)
-
+
+ # assert not registry_key in registry, "(key: {} / class: {}) has been registered already锛宨n {}".format(
+ # registry_key, target_class, register_tables_key)
+
registry[registry_key] = target_class
-
+
# meta锛� headers = ["class name", "register name", "class location"]
register_tables_key_meta = register_tables_key + "_meta"
if not hasattr(self, register_tables_key_meta):
setattr(self, register_tables_key_meta, {})
registry_meta = getattr(self, register_tables_key_meta)
+ # doc = target_class.__doc__
class_file = inspect.getfile(target_class)
class_line = inspect.getsourcelines(target_class)[1]
- meata_data = [f"{target_class.__name__}", f"{registry_key}", f"{class_file}:{class_line}"]
+ pattern = r"^.+/funasr/"
+ class_file = re.sub(pattern, "funasr/", class_file)
+ # meata_data = [f"{target_class.__name__}", f"{class_file}:{class_line}"]
+ meata_data = [
+ f"{registry_key}",
+ f"{target_class.__name__}",
+ f"{class_file}:{class_line}",
+ ]
registry_meta[registry_key] = meata_data
# print(f"Registering class: {class_file}:{class_line} - {target_class.__name__} as {registry_key}")
return target_class
-
+
return decorator
@@ -77,4 +89,3 @@
import funasr
-
--
Gitblit v1.9.1