From 3ab3d87a19aee4e661a0288e314ba90dd8d71c11 Mon Sep 17 00:00:00 2001 From: LittleMouse Date: Fri, 26 Dec 2025 10:29:20 +0800 Subject: [PATCH] [update] update package version --- .../llm_cosyvoice2.md | 2 +- projects/llm_framework/main_asr/SConstruct | 2 +- projects/llm_framework/main_audio/SConstruct | 2 +- .../llm_framework/main_cosy_voice/SConstruct | 4 +-- .../src/runner/Tokenizer/Tokenizer.cpp | 4 +-- projects/llm_framework/main_kws/SConstruct | 2 +- projects/llm_framework/main_llm/SConstruct | 2 +- .../src/runner/Tokenizer/Tokenizer.cpp | 4 +-- .../llm_framework/main_melotts/SConstruct | 2 +- .../models/mode_melotts-en-au-ax650.json | 2 +- .../models/mode_melotts-en-br-ax650.json | 2 +- .../models/mode_melotts-en-default-ax650.json | 2 +- .../models/mode_melotts-en-india-ax650.json | 2 +- .../models/mode_melotts-en-us-ax650.json | 2 +- .../models/mode_melotts-es-es-ax650.json | 2 +- .../models/mode_melotts-ja-jp-ax650.json | 2 +- .../models/mode_melotts-zh-cn-ax650.json | 2 +- projects/llm_framework/main_vlm/SConstruct | 2 +- .../src/runner/Tokenizer/Tokenizer.cpp | 6 ++-- projects/llm_framework/tools/llm_pack.py | 32 +++++++++---------- 20 files changed, 40 insertions(+), 40 deletions(-) diff --git a/doc/projects_llm_framework_doc/llm_cosyvoice2.md b/doc/projects_llm_framework_doc/llm_cosyvoice2.md index 7f3a7ab..19a001f 100644 --- a/doc/projects_llm_framework_doc/llm_cosyvoice2.md +++ b/doc/projects_llm_framework_doc/llm_cosyvoice2.md @@ -31,7 +31,7 @@ cosy_voice - object：传输的数据类型为 `cosy_voice.setup`。 - model：使用的模型为 `CosyVoice2-0.5B-ax650` 模型。 - prompt_files：要克隆的音频信息文件。 -- response_format：返回结果为 `sys.pcm`, 系统音频数据，并直接发送到 llm-audio 模块进行播放。返回结果为 `file`, 生成的音频写 wav 文件，可用 `prompt_data` 指定路径或文件名。 +- response_format：返回结果为 `sys.pcm`, 系统音频数据，并直接发送到 llm-audio 模块进行播放。返回结果为 `file`, 生成的音频写 wav 文件，可用 `prompt_dir` 指定路径或文件名。 - input：输入的为 `tts.utf-8`,代表的是从用户输入。 - enoutput：是否起用用户结果输出。 diff --git a/projects/llm_framework/main_asr/SConstruct b/projects/llm_framework/main_asr/SConstruct index 217bbc5..1098aab 100644 --- a/projects/llm_framework/main_asr/SConstruct +++ b/projects/llm_framework/main_asr/SConstruct @@ -40,7 +40,7 @@ LDFLAGS += [ STATIC_FILES += Glob('mode_*.json') -env['COMPONENTS'].append({'target':'llm_asr-1.7', +env['COMPONENTS'].append({'target':'llm_asr-1.8', 'SRCS':SRCS, 'INCLUDE':INCLUDE, 'PRIVATE_INCLUDE':PRIVATE_INCLUDE, diff --git a/projects/llm_framework/main_audio/SConstruct b/projects/llm_framework/main_audio/SConstruct index 2afd08d..3e1c8d6 100644 --- a/projects/llm_framework/main_audio/SConstruct +++ b/projects/llm_framework/main_audio/SConstruct @@ -32,7 +32,7 @@ if 'CONFIG_AX_620E_MSP_ENABLED' in os.environ: STATIC_FILES += [AFile('audio.json'), AFile('audio_kit.json'), AFile('audio_pyramid.json')] STATIC_FILES += Glob('mode_*.json') -env['COMPONENTS'].append({'target':'llm_audio-1.7', +env['COMPONENTS'].append({'target':'llm_audio-1.8', 'SRCS':SRCS, 'INCLUDE':INCLUDE, 'PRIVATE_INCLUDE':PRIVATE_INCLUDE, diff --git a/projects/llm_framework/main_cosy_voice/SConstruct b/projects/llm_framework/main_cosy_voice/SConstruct index 499edf7..3e5fa77 100644 --- a/projects/llm_framework/main_cosy_voice/SConstruct +++ b/projects/llm_framework/main_cosy_voice/SConstruct @@ -17,7 +17,7 @@ LDFLAGS = [] LINK_SEARCH_PATH = [] STATIC_FILES = [] -python_venv = check_wget_down("https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/linux/llm/m5stack_llm-cosy-voice-python-venv_v1.7.tar.gz", 'm5stack_llm-cosy-voice-python-venv_v1.7.tar.gz') +python_venv = check_wget_down("https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/linux/llm/m5stack_llm-cosy-voice-python-venv_v1.8.tar.gz", 'm5stack_llm-cosy-voice-python-venv_v1.8.tar.gz') # REQUIREMENTS += ['Backward_cpp'] # DYNAMIC_LIB += [ AFile('../static_lib/libdw.so.1'), @@ -68,7 +68,7 @@ ignore['ignore'] = list(set(ignore['ignore'])) with open('../dist/fileignore', 'w') as f: json.dump(ignore, f, indent=4) -env['COMPONENTS'].append({'target':'llm_cosy_voice-1.9', +env['COMPONENTS'].append({'target':'llm_cosy_voice-1.10', 'SRCS':SRCS, 'INCLUDE':INCLUDE, 'PRIVATE_INCLUDE':PRIVATE_INCLUDE, diff --git a/projects/llm_framework/main_cosy_voice/src/runner/Tokenizer/Tokenizer.cpp b/projects/llm_framework/main_cosy_voice/src/runner/Tokenizer/Tokenizer.cpp index 0829ffa..cfea0d8 100644 --- a/projects/llm_framework/main_cosy_voice/src/runner/Tokenizer/Tokenizer.cpp +++ b/projects/llm_framework/main_cosy_voice/src/runner/Tokenizer/Tokenizer.cpp @@ -349,7 +349,7 @@ public: bool Init(std::string model_path = "http://localhost:8080", bool b_bos = true, bool b_eos = false) override { base_url = model_path; - if (!test_connect_http(base_url, 20)) { + if (!test_connect_http(base_url, 300)) { ALOGE("connect %s failed", base_url.c_str()); return false; } else { @@ -395,7 +395,7 @@ public: bool Init(std::string model_path = "http://localhost:8080") override { base_url = model_path; - if (!test_connect_http(base_url, 20)) { + if (!test_connect_http(base_url, 300)) { ALOGE("connect %s failed", base_url.c_str()); return false; } else { diff --git a/projects/llm_framework/main_kws/SConstruct b/projects/llm_framework/main_kws/SConstruct index fc02a37..3ad5f92 100644 --- a/projects/llm_framework/main_kws/SConstruct +++ b/projects/llm_framework/main_kws/SConstruct @@ -60,7 +60,7 @@ ignore['ignore'] = list(set(ignore['ignore'])) with open('../dist/fileignore', 'w') as f: json.dump(ignore, f, indent=4) -env['COMPONENTS'].append({'target':'llm_kws-1.9', +env['COMPONENTS'].append({'target':'llm_kws-1.10', 'SRCS':SRCS, 'INCLUDE':INCLUDE, 'PRIVATE_INCLUDE':PRIVATE_INCLUDE, diff --git a/projects/llm_framework/main_llm/SConstruct b/projects/llm_framework/main_llm/SConstruct index d77a4fb..305f425 100644 --- a/projects/llm_framework/main_llm/SConstruct +++ b/projects/llm_framework/main_llm/SConstruct @@ -66,7 +66,7 @@ ignore['ignore'] = list(set(ignore['ignore'])) with open('../dist/fileignore', 'w') as f: json.dump(ignore, f, indent=4) -env['COMPONENTS'].append({'target':'llm_llm-1.11', +env['COMPONENTS'].append({'target':'llm_llm-1.12', 'SRCS':SRCS, 'INCLUDE':INCLUDE, 'PRIVATE_INCLUDE':PRIVATE_INCLUDE, diff --git a/projects/llm_framework/main_llm/src/runner/Tokenizer/Tokenizer.cpp b/projects/llm_framework/main_llm/src/runner/Tokenizer/Tokenizer.cpp index 0829ffa..cfea0d8 100644 --- a/projects/llm_framework/main_llm/src/runner/Tokenizer/Tokenizer.cpp +++ b/projects/llm_framework/main_llm/src/runner/Tokenizer/Tokenizer.cpp @@ -349,7 +349,7 @@ public: bool Init(std::string model_path = "http://localhost:8080", bool b_bos = true, bool b_eos = false) override { base_url = model_path; - if (!test_connect_http(base_url, 20)) { + if (!test_connect_http(base_url, 300)) { ALOGE("connect %s failed", base_url.c_str()); return false; } else { @@ -395,7 +395,7 @@ public: bool Init(std::string model_path = "http://localhost:8080") override { base_url = model_path; - if (!test_connect_http(base_url, 20)) { + if (!test_connect_http(base_url, 300)) { ALOGE("connect %s failed", base_url.c_str()); return false; } else { diff --git a/projects/llm_framework/main_melotts/SConstruct b/projects/llm_framework/main_melotts/SConstruct index 5466d8e..e0dea06 100644 --- a/projects/llm_framework/main_melotts/SConstruct +++ b/projects/llm_framework/main_melotts/SConstruct @@ -32,7 +32,7 @@ REQUIREMENTS += ['onnxruntime'] STATIC_FILES += Glob('models/mode_*.json') -env['COMPONENTS'].append({'target':'llm_melotts-1.9', +env['COMPONENTS'].append({'target':'llm_melotts-1.10', 'SRCS':SRCS, 'INCLUDE':INCLUDE, 'PRIVATE_INCLUDE':PRIVATE_INCLUDE, diff --git a/projects/llm_framework/main_melotts/models/mode_melotts-en-au-ax650.json b/projects/llm_framework/main_melotts/models/mode_melotts-en-au-ax650.json index 8b94e7e..539a8ef 100644 --- a/projects/llm_framework/main_melotts/models/mode_melotts-en-au-ax650.json +++ b/projects/llm_framework/main_melotts/models/mode_melotts-en-au-ax650.json @@ -25,7 +25,7 @@ "verbalizer": "en_tn_verbalizer.fst", "spacker_speed": 1.2, "mode_rate": 44100, - "audio_rate": 16000, + "audio_rate": 48000, "awake_delay": 1000 } } \ No newline at end of file diff --git a/projects/llm_framework/main_melotts/models/mode_melotts-en-br-ax650.json b/projects/llm_framework/main_melotts/models/mode_melotts-en-br-ax650.json index ef43e58..40bf41d 100644 --- a/projects/llm_framework/main_melotts/models/mode_melotts-en-br-ax650.json +++ b/projects/llm_framework/main_melotts/models/mode_melotts-en-br-ax650.json @@ -25,7 +25,7 @@ "verbalizer": "en_tn_verbalizer.fst", "spacker_speed": 1.2, "mode_rate": 44100, - "audio_rate": 16000, + "audio_rate": 48000, "awake_delay": 1000 } } \ No newline at end of file diff --git a/projects/llm_framework/main_melotts/models/mode_melotts-en-default-ax650.json b/projects/llm_framework/main_melotts/models/mode_melotts-en-default-ax650.json index 3e19b40..04af8b0 100644 --- a/projects/llm_framework/main_melotts/models/mode_melotts-en-default-ax650.json +++ b/projects/llm_framework/main_melotts/models/mode_melotts-en-default-ax650.json @@ -25,7 +25,7 @@ "verbalizer": "en_tn_verbalizer.fst", "spacker_speed": 1.2, "mode_rate": 44100, - "audio_rate": 16000, + "audio_rate": 48000, "awake_delay": 1000 } } \ No newline at end of file diff --git a/projects/llm_framework/main_melotts/models/mode_melotts-en-india-ax650.json b/projects/llm_framework/main_melotts/models/mode_melotts-en-india-ax650.json index ee0cab6..1eab34c 100644 --- a/projects/llm_framework/main_melotts/models/mode_melotts-en-india-ax650.json +++ b/projects/llm_framework/main_melotts/models/mode_melotts-en-india-ax650.json @@ -25,7 +25,7 @@ "verbalizer": "en_tn_verbalizer.fst", "spacker_speed": 1.2, "mode_rate": 44100, - "audio_rate": 16000, + "audio_rate": 48000, "awake_delay": 1000 } } \ No newline at end of file diff --git a/projects/llm_framework/main_melotts/models/mode_melotts-en-us-ax650.json b/projects/llm_framework/main_melotts/models/mode_melotts-en-us-ax650.json index 6ca7181..8490b24 100644 --- a/projects/llm_framework/main_melotts/models/mode_melotts-en-us-ax650.json +++ b/projects/llm_framework/main_melotts/models/mode_melotts-en-us-ax650.json @@ -25,7 +25,7 @@ "verbalizer": "en_tn_verbalizer.fst", "spacker_speed": 1.2, "mode_rate": 44100, - "audio_rate": 16000, + "audio_rate": 48000, "awake_delay": 1000 } } \ No newline at end of file diff --git a/projects/llm_framework/main_melotts/models/mode_melotts-es-es-ax650.json b/projects/llm_framework/main_melotts/models/mode_melotts-es-es-ax650.json index 7012574..04c0cb0 100644 --- a/projects/llm_framework/main_melotts/models/mode_melotts-es-es-ax650.json +++ b/projects/llm_framework/main_melotts/models/mode_melotts-es-es-ax650.json @@ -23,7 +23,7 @@ "lexicon": "lexicon-es.txt", "spacker_speed": 1.2, "mode_rate": 44100, - "audio_rate": 16000, + "audio_rate": 48000, "awake_delay": 1000 } } \ No newline at end of file diff --git a/projects/llm_framework/main_melotts/models/mode_melotts-ja-jp-ax650.json b/projects/llm_framework/main_melotts/models/mode_melotts-ja-jp-ax650.json index 49f26aa..58cd3a8 100644 --- a/projects/llm_framework/main_melotts/models/mode_melotts-ja-jp-ax650.json +++ b/projects/llm_framework/main_melotts/models/mode_melotts-ja-jp-ax650.json @@ -25,7 +25,7 @@ "verbalizer": "ja_tn_verbalizer.fst", "spacker_speed": 1.1, "mode_rate": 44100, - "audio_rate": 16000, + "audio_rate": 48000, "awake_delay": 1000 } } \ No newline at end of file diff --git a/projects/llm_framework/main_melotts/models/mode_melotts-zh-cn-ax650.json b/projects/llm_framework/main_melotts/models/mode_melotts-zh-cn-ax650.json index 4106097..cfe7e6f 100644 --- a/projects/llm_framework/main_melotts/models/mode_melotts-zh-cn-ax650.json +++ b/projects/llm_framework/main_melotts/models/mode_melotts-zh-cn-ax650.json @@ -25,7 +25,7 @@ "verbalizer": "zh_tn_verbalizer.fst", "spacker_speed": 1.1, "mode_rate": 44100, - "audio_rate": 16000, + "audio_rate": 48000, "awake_delay": 1000 } } \ No newline at end of file diff --git a/projects/llm_framework/main_vlm/SConstruct b/projects/llm_framework/main_vlm/SConstruct index 2d05a3b..2e78455 100644 --- a/projects/llm_framework/main_vlm/SConstruct +++ b/projects/llm_framework/main_vlm/SConstruct @@ -76,7 +76,7 @@ ignore['ignore'] = list(set(ignore['ignore'])) with open('../dist/fileignore', 'w') as f: json.dump(ignore, f, indent=4) -env['COMPONENTS'].append({'target':'llm_vlm-1.10', +env['COMPONENTS'].append({'target':'llm_vlm-1.11', 'SRCS':SRCS, 'INCLUDE':INCLUDE, 'PRIVATE_INCLUDE':PRIVATE_INCLUDE, diff --git a/projects/llm_framework/main_vlm/src/runner/Tokenizer/Tokenizer.cpp b/projects/llm_framework/main_vlm/src/runner/Tokenizer/Tokenizer.cpp index 8877a2b..5d1caf7 100644 --- a/projects/llm_framework/main_vlm/src/runner/Tokenizer/Tokenizer.cpp +++ b/projects/llm_framework/main_vlm/src/runner/Tokenizer/Tokenizer.cpp @@ -25,7 +25,7 @@ public: bool Init(std::string model_path) override { base_url = model_path; - if (!test_connect_http(base_url, 20)) { + if (!test_connect_http(base_url, 300)) { ALOGE("connect %s failed", base_url.c_str()); return false; } else { @@ -153,7 +153,7 @@ public: bool Init(std::string model_path = "http://localhost:8080", bool b_bos = true, bool b_eos = false) override { base_url = model_path; - if (!test_connect_http(base_url, 30)) { + if (!test_connect_http(base_url, 300)) { ALOGE("connect %s failed", base_url.c_str()); return false; } else { @@ -200,7 +200,7 @@ public: bool Init_new(std::string model_path, bool b_bos, bool b_eos) override { base_url = model_path; - if (!test_connect_http(base_url, 30)) { + if (!test_connect_http(base_url, 300)) { ALOGE("connect %s failed", base_url.c_str()); return false; } else { diff --git a/projects/llm_framework/tools/llm_pack.py b/projects/llm_framework/tools/llm_pack.py index 36a7f74..f2b58d8 100755 --- a/projects/llm_framework/tools/llm_pack.py +++ b/projects/llm_framework/tools/llm_pack.py @@ -372,23 +372,23 @@ if __name__ == "__main__": # cpu_count = 50 Tasks = { # Unit - 'lib-llm':[create_lib_deb,'lib-llm', '1.8', src_folder, revision], + 'lib-llm':[create_lib_deb,'lib-llm', '1.9', src_folder, revision], 'llm-sys':[create_bin_deb,'llm-sys', '1.6', src_folder, revision], - 'llm-audio':[create_bin_deb,'llm-audio', '1.7', src_folder, revision], - 'llm-kws':[create_bin_deb,'llm-kws', '1.9', src_folder, revision], - 'llm-asr':[create_bin_deb,'llm-asr', '1.7', src_folder, revision], - 'llm-llm':[create_bin_deb,'llm-llm', '1.11', src_folder, revision], + 'llm-audio':[create_bin_deb,'llm-audio', '1.8', src_folder, revision], + 'llm-kws':[create_bin_deb,'llm-kws', '1.10', src_folder, revision], + 'llm-asr':[create_bin_deb,'llm-asr', '1.8', src_folder, revision], + 'llm-llm':[create_bin_deb,'llm-llm', '1.12', src_folder, revision], 'llm-tts':[create_bin_deb,'llm-tts', '1.6', src_folder, revision], - 'llm-melotts':[create_bin_deb,'llm-melotts', '1.9', src_folder, revision], + 'llm-melotts':[create_bin_deb,'llm-melotts', '1.10', src_folder, revision], 'llm-camera':[create_bin_deb,'llm-camera', '1.9', src_folder, revision, 'lib-llm'], - 'llm-vlm':[create_bin_deb,'llm-vlm', '1.10', src_folder, revision], + 'llm-vlm':[create_bin_deb,'llm-vlm', '1.11', src_folder, revision], 'llm-yolo':[create_bin_deb,'llm-yolo', '1.9', src_folder, revision], 'llm-skel':[create_bin_deb,'llm-skel', version, src_folder, revision], 'llm-depth-anything':[create_bin_deb,'llm-depth-anything', '1.7', src_folder, revision], 'llm-vad':[create_bin_deb,'llm-vad', '1.8', src_folder, revision], 'llm-whisper':[create_bin_deb,'llm-whisper', '1.8', src_folder, revision], 'llm-openai-api':[create_bin_deb,'llm-openai-api', '1.9', src_folder, revision], - 'llm-cosy-voice':[create_bin_deb,'llm-cosy-voice', '1.9', src_folder, revision], + 'llm-cosy-voice':[create_bin_deb,'llm-cosy-voice', '1.10', src_folder, revision], # keyword spotting Audio file 'llm-model-audio-en-us':[create_data_deb,'llm-model-audio-en-us', data_version, src_folder, revision], 'llm-model-audio-zh-cn':[create_data_deb,'llm-model-audio-zh-cn', data_version, src_folder, revision], @@ -425,14 +425,14 @@ if __name__ == "__main__": 'llm-model-melotts-ja-jp':[create_data_deb,'llm-model-melotts-ja-jp', '0.6', src_folder, revision], 'llm-model-melotts-es-es':[create_data_deb,'llm-model-melotts-es-es', '0.5', src_folder, revision], ## AX650 - 'llm-model-melotts-zh-cn-ax650':[create_data_deb,'llm-model-melotts-zh-cn-ax650', '0.6', src_folder, revision], - 'llm-model-melotts-en-au-ax650':[create_data_deb,'llm-model-melotts-en-au-ax650', '0.6', src_folder, revision], - 'llm-model-melotts-en-br-ax650':[create_data_deb,'llm-model-melotts-en-br-ax650', '0.6', src_folder, revision], - 'llm-model-melotts-en-default-ax650':[create_data_deb,'llm-model-melotts-en-default-ax650', '0.6', src_folder, revision], - 'llm-model-melotts-en-india-ax650':[create_data_deb,'llm-model-melotts-en-india-ax650', '0.6', src_folder, revision], - 'llm-model-melotts-en-us-ax650':[create_data_deb,'llm-model-melotts-en-us-ax650', '0.6', src_folder, revision], - 'llm-model-melotts-ja-jp-ax650':[create_data_deb,'llm-model-melotts-ja-jp-ax650', '0.6', src_folder, revision], - 'llm-model-melotts-es-es-ax650':[create_data_deb,'llm-model-melotts-es-es-ax650', '0.5', src_folder, revision], + 'llm-model-melotts-zh-cn-ax650':[create_data_deb,'llm-model-melotts-zh-cn-ax650', '0.7', src_folder, revision], + 'llm-model-melotts-en-au-ax650':[create_data_deb,'llm-model-melotts-en-au-ax650', '0.7', src_folder, revision], + 'llm-model-melotts-en-br-ax650':[create_data_deb,'llm-model-melotts-en-br-ax650', '0.7', src_folder, revision], + 'llm-model-melotts-en-default-ax650':[create_data_deb,'llm-model-melotts-en-default-ax650', '0.7', src_folder, revision], + 'llm-model-melotts-en-india-ax650':[create_data_deb,'llm-model-melotts-en-india-ax650', '0.7', src_folder, revision], + 'llm-model-melotts-en-us-ax650':[create_data_deb,'llm-model-melotts-en-us-ax650', '0.7', src_folder, revision], + 'llm-model-melotts-ja-jp-ax650':[create_data_deb,'llm-model-melotts-ja-jp-ax650', '0.7', src_folder, revision], + 'llm-model-melotts-es-es-ax650':[create_data_deb,'llm-model-melotts-es-es-ax650', '0.6', src_folder, revision], # CosyVoice2 model ## AX650 'llm-model-CosyVoice2-0.5B-ax650':[create_data_deb,'llm-model-CosyVoice2-0.5B-ax650', '0.6', src_folder, revision],