From 6e69d784e4814c3dbe35e8f70c6cf4b920c8b20b Mon Sep 17 00:00:00 2001
From: 天地 <tiandiweizun@gmail.com>
Date: 星期三, 19 三月 2025 23:10:13 +0800
Subject: [PATCH] 1. bug fix:list(mean)和list(var),由于mean和var是numpy,导致写入到文件的格式错误,参考上面的话,大概率是list(mean.tolist()),其实外层list没有必要 (#2437)

---
 setup.py |   38 ++++++++++++++++++++++----------------
 1 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/setup.py b/setup.py
index 9a69fcd..21c51ce 100644
--- a/setup.py
+++ b/setup.py
@@ -18,9 +18,9 @@
         "kaldiio>=2.17.0",
         "torch_complex",
         # "nltk>=3.4.5",
-        "sentencepiece", # train
+        "sentencepiece",  # train
         "jieba",
-        "rotary_embedding_torch",
+        # "rotary_embedding_torch",
         # "ffmpeg-python",
         # "pypinyin>=0.44.0",
         # "espnet_tts_frontend",
@@ -39,7 +39,9 @@
         "jaconv",
         "hydra-core>=1.3.2",
         "tensorboardX",
-        "rotary_embedding_torch",
+        # "rotary_embedding_torch",
+        "requests",
+        "modelscope",
     ],
     # train: The modules invoked when training only.
     "train": [
@@ -52,7 +54,7 @@
         "torch_optimizer",
         "fairscale",
         "transformers",
-        "openai-whisper"
+        "openai-whisper",
     ],
     "setup": [
         "numpy",
@@ -80,9 +82,9 @@
         "recommonmark>=0.4.0",
         "nbsphinx>=0.4.2",
         "sphinx-markdown-tables>=0.0.12",
-        "configargparse>=1.2.1"
+        "configargparse>=1.2.1",
     ],
-    "llm":[
+    "llm": [
         "transformers>=4.32.0",
         "accelerate",
         "tiktoken",
@@ -101,9 +103,7 @@
 install_requires = requirements["install"]
 setup_requires = requirements["setup"]
 tests_require = requirements["test"]
-extras_require = {
-    k: v for k, v in requirements.items() if k not in ["install", "setup"]
-}
+extras_require = {k: v for k, v in requirements.items() if k not in ["install", "setup"]}
 
 dirname = os.path.dirname(__file__)
 version_file = os.path.join(dirname, "funasr", "version.txt")
@@ -138,11 +138,17 @@
         "License :: OSI Approved :: Apache Software License",
         "Topic :: Software Development :: Libraries :: Python Modules",
     ],
-    entry_points={"console_scripts": [
-        "funasr = funasr.bin.inference:main_hydra",
-        "funasr-train = funasr.bin.train:main_hydra",
-        "funasr-export = funasr.bin.export:main_hydra",
-        "scp2jsonl = funasr.datasets.audio_datasets.scp2jsonl:main_hydra",
-        "jsonl2scp = funasr.datasets.audio_datasets.jsonl2scp:main_hydra",
-    ]},
+    entry_points={
+        "console_scripts": [
+            "funasr = funasr.bin.inference:main_hydra",
+            "funasr-train = funasr.bin.train:main_hydra",
+            "funasr-export = funasr.bin.export:main_hydra",
+            "scp2jsonl = funasr.datasets.audio_datasets.scp2jsonl:main_hydra",
+            "jsonl2scp = funasr.datasets.audio_datasets.jsonl2scp:main_hydra",
+            "sensevoice2jsonl = funasr.datasets.audio_datasets.sensevoice2jsonl:main_hydra",
+            "funasr-scp2jsonl = funasr.datasets.audio_datasets.scp2jsonl:main_hydra",
+            "funasr-jsonl2scp = funasr.datasets.audio_datasets.jsonl2scp:main_hydra",
+            "funasr-sensevoice2jsonl = funasr.datasets.audio_datasets.sensevoice2jsonl:main_hydra",
+        ]
+    },
 )

--
Gitblit v1.9.1