m5/StackFlow
0
0
Fork 0
mirror of https://github.com/m5stack/StackFlow.git synced 2026-05-20 11:32:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

[update] StackFlow bin add version id

Browse Source
This commit is contained in:
dianjixz
2025-04-18 15:30:36 +08:00
parent d8b0652560
commit 1dd2b14790
18 changed files with 67 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/llm_framework/main/SConstruct
+1 -1
View File
@@ -26,7 +26,7 @@ STATIC_FILES += [AFile('../static_lib/sherpa/ncnn/libsherpa-ncnn-core.so'),
AFile('../static_lib/sherpa/ncnn/libkaldi-native-fbank-core.so'),
]
env['COMPONENTS'].append({'target':'static_file',
env['COMPONENTS'].append({'target':'static_file-1.0',
'SRCS':SRCS,
'INCLUDE':INCLUDE,
'PRIVATE_INCLUDE':PRIVATE_INCLUDE,
projects/llm_framework/main_asr/SConstruct
+1 -1
View File
@@ -26,7 +26,7 @@ REQUIREMENTS += ['ncnn', 'sherpa-ncnn-core']
STATIC_FILES += Glob('mode_*.json')
env['COMPONENTS'].append({'target':'llm_asr',
env['COMPONENTS'].append({'target':'llm_asr-1.5',
'SRCS':SRCS,
'INCLUDE':INCLUDE,
'PRIVATE_INCLUDE':PRIVATE_INCLUDE,
projects/llm_framework/main_audio/SConstruct
+1 -1
View File
@@ -29,7 +29,7 @@ REQUIREMENTS += ['tinyalsa', 'opus', 'samplerate', 'fdk-aac']
STATIC_FILES += [AFile('audio.json')]
STATIC_FILES += Glob('mode_*.json')
env['COMPONENTS'].append({'target':'llm_audio',
env['COMPONENTS'].append({'target':'llm_audio-1.5',
'SRCS':SRCS,
'INCLUDE':INCLUDE,
'PRIVATE_INCLUDE':PRIVATE_INCLUDE,
projects/llm_framework/main_camera/SConstruct
+1 -1
View File
@@ -68,7 +68,7 @@ STATIC_LIB += static_file * 4
STATIC_FILES += [AFile('camera.json')]
STATIC_FILES += Glob('mode_*.json')
env['COMPONENTS'].append({'target':'llm_camera',
env['COMPONENTS'].append({'target':'llm_camera-1.7',
'SRCS':SRCS,
'INCLUDE':INCLUDE,
'PRIVATE_INCLUDE':PRIVATE_INCLUDE,
projects/llm_framework/main_depth_anything/SConstruct
+1 -1
View File
@@ -30,7 +30,7 @@ STATIC_LIB += static_file * 2
STATIC_FILES += Glob('mode_*.json')
env['COMPONENTS'].append({'target':'llm_depth_anything',
env['COMPONENTS'].append({'target':'llm_depth_anything-1.5',
'SRCS':SRCS,
'INCLUDE':INCLUDE,
'PRIVATE_INCLUDE':PRIVATE_INCLUDE,
projects/llm_framework/main_kws/SConstruct
+1 -1
View File
@@ -55,7 +55,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',
env['COMPONENTS'].append({'target':'llm_kws-1.6',
'SRCS':SRCS,
'INCLUDE':INCLUDE,
'PRIVATE_INCLUDE':PRIVATE_INCLUDE,
projects/llm_framework/main_llm/SConstruct
+1 -1
View File
@@ -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',
env['COMPONENTS'].append({'target':'llm_llm-1.7',
'SRCS':SRCS,
'INCLUDE':INCLUDE,
'PRIVATE_INCLUDE':PRIVATE_INCLUDE,
projects/llm_framework/main_melotts/SConstruct
+1 -1
View File
@@ -31,7 +31,7 @@ LDFLAGS += ['-l:libcargs.a', '-l:libonnxruntime.a']
STATIC_FILES += Glob('mode_*.json')
env['COMPONENTS'].append({'target':'llm_melotts',
env['COMPONENTS'].append({'target':'llm_melotts-1.6',
'SRCS':SRCS,
'INCLUDE':INCLUDE,
'PRIVATE_INCLUDE':PRIVATE_INCLUDE,
projects/llm_framework/main_openai_api/SConstruct
+1 -1
View File
@@ -52,7 +52,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_openai_api',
env['COMPONENTS'].append({'target':'llm_openai_api-1.6',
'SRCS':SRCS,
'INCLUDE':INCLUDE,
'PRIVATE_INCLUDE':PRIVATE_INCLUDE,
projects/llm_framework/main_skel/SConstruct
+1 -1
View File
@@ -31,7 +31,7 @@ STATIC_LIB += static_file * 2
STATIC_FILES += Glob('mode_*.json')
env['COMPONENTS'].append({'target':'llm_skel',
env['COMPONENTS'].append({'target':'llm_skel-0.1',
'SRCS':SRCS,
'INCLUDE':INCLUDE,
'PRIVATE_INCLUDE':PRIVATE_INCLUDE,
projects/llm_framework/main_sys/SConstruct
+1 -1
View File
@@ -37,7 +37,7 @@ LDFLAGS+=['-Wl,-rpath=/opt/m5stack/lib', '-Wl,-rpath=/usr/local/m5stack/lib', '-
STATIC_FILES += [AFile('sys_config.json')]
REQUIREMENTS += ['simdjson_component']
env['COMPONENTS'].append({'target':'llm_sys',
env['COMPONENTS'].append({'target':'llm_sys-1.5',
'SRCS':SRCS,
'INCLUDE':INCLUDE,
'PRIVATE_INCLUDE':PRIVATE_INCLUDE,
projects/llm_framework/main_sys/src/event_loop.cpp
+22 -2
View File
@@ -38,7 +38,7 @@
#include "remote_action.h"
#include <simdjson.h>
#include "hv/ifconfig.h"
#include <glob.h>
#include "StackFlowUtil.h"
void usr_print_error(const std::string &request_id, const std::string &work_id, const std::string &error_msg,
@@ -707,7 +707,26 @@ int sys_reset(int com_id, const nlohmann::json &json_obj)
int sys_version(int com_id, const nlohmann::json &json_obj)
{
usr_out(json_obj["request_id"], json_obj["work_id"], std::string("v1.5"), com_id);
usr_out(json_obj["request_id"], json_obj["work_id"], std::string("v1.6"), com_id);
int out = 0;
return out;
}
int sys_version2(int com_id, const nlohmann::json &json_obj)
{
nlohmann::json data_body = nlohmann::json::array();
glob_t glob_result;
int ret = glob("/opt/m5stack/bin/llm_*-*", GLOB_TILDE, NULL, &glob_result); // 匹配所有.txt文件
if (ret == 0) {
for (size_t i = 0; i < glob_result.gl_pathc; i++) {
const char *separator = strrchr(glob_result.gl_pathv[i], '/');
const char *filename = (separator != NULL) ? separator + 1 : glob_result.gl_pathv[i];
data_body.push_back(std::string(filename));
}
}
globfree(&glob_result);
usr_out(json_obj["request_id"], json_obj["work_id"], data_body, com_id);
int out = 0;
return out;
}
@@ -739,6 +758,7 @@ void server_work()
key_sql["sys.rmmode"] = sys_rmmode;
key_sql["sys.unit_call"] = sys_unit_call;
key_sql["sys.cmminfo"] = sys_cmminfo;
key_sql["sys.version2"] = sys_version2;
}
void server_stop_work()
projects/llm_framework/main_tts/SConstruct
+1 -1
View File
@@ -27,7 +27,7 @@ INCLUDE += [ADir('src/runner/eigen-3.4.0'), ADir('src/runner/src/tn/header'), AD
STATIC_FILES += Glob('mode_*.json')
env['COMPONENTS'].append({'target':'llm_tts',
env['COMPONENTS'].append({'target':'llm_tts-1.5',
'SRCS':SRCS,
'INCLUDE':INCLUDE,
'PRIVATE_INCLUDE':PRIVATE_INCLUDE,
projects/llm_framework/main_vad/SConstruct
+1 -1
View File
@@ -28,7 +28,7 @@ LDFLAGS += ['-l:libsherpa-onnx-core.a',
STATIC_FILES += Glob('mode_*.json')
env['COMPONENTS'].append({'target':'llm_vad',
env['COMPONENTS'].append({'target':'llm_vad-1.5',
'SRCS':SRCS,
'INCLUDE':INCLUDE,
'PRIVATE_INCLUDE':PRIVATE_INCLUDE,
projects/llm_framework/main_vlm/SConstruct
+1 -1
View File
@@ -73,7 +73,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',
env['COMPONENTS'].append({'target':'llm_vlm-1.6',
'SRCS':SRCS,
'INCLUDE':INCLUDE,
'PRIVATE_INCLUDE':PRIVATE_INCLUDE,
projects/llm_framework/main_whisper/SConstruct
+1 -1
View File
@@ -33,7 +33,7 @@ LDFLAGS += ['-l:libopencc.a', '-l:libmarisa.a']
STATIC_FILES += Glob('mode_*.json')
env['COMPONENTS'].append({'target':'llm_whisper',
env['COMPONENTS'].append({'target':'llm_whisper-1.6',
'SRCS':SRCS,
'INCLUDE':INCLUDE,
'PRIVATE_INCLUDE':PRIVATE_INCLUDE,
projects/llm_framework/main_yolo/SConstruct
+1 -1
View File
@@ -39,7 +39,7 @@ STATIC_FILES += Glob('mode_*.json')
# AFile('../static_lib/libbz2.so.1.0')]
# DEFINITIONS += ["-DENABLE_BACKWARD"]
env['COMPONENTS'].append({'target':'llm_yolo',
env['COMPONENTS'].append({'target':'llm_yolo-1.7',
'SRCS':SRCS,
'INCLUDE':INCLUDE,
'PRIVATE_INCLUDE':PRIVATE_INCLUDE,
projects/llm_framework/tools/llm_pack.py
+29 -53
View File
@@ -9,6 +9,7 @@ import shutil
import concurrent.futures
import json
import glob
from datetime import datetime
'''
{package_name}_{version}-{revision}_{architecture}.deb
lib-llm_1.0-m5stack1_arm64.deb
@@ -96,6 +97,7 @@ def create_lib_deb(package_name, version, src_folder, revision = 'm5stack1'):
f.write(f'Section: llm-module\n')
f.write(f'Priority: optional\n')
f.write(f'Homepage: https://www.m5stack.com\n')
f.write(f'Packaged-Date: {datetime.now().strftime("%Y-%m-%d %H:%M:%S")}\n')
f.write(f'Description: llm-module\n')
f.write(f' bsp.\n')
with open(os.path.join(deb_folder, 'DEBIAN/postinst'),'w') as f:
@@ -148,7 +150,7 @@ def create_lib_deb(package_name, version, src_folder, revision = 'm5stack1'):
shutil.rmtree(deb_folder)
return package_name + " creat success!"
def create_data_deb(package_name, version, src_folder, revision = 'm5stack1'):
def create_data_deb(package_name, version, src_folder, revision = 'm5stack1', depends = 'lib-llm (>= 1.6)'):
deb_file = f"{package_name}_{version}-{revision}_arm64.deb"
deb_folder = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'debian-{}'.format(package_name))
if os.path.exists(deb_folder):
@@ -201,12 +203,13 @@ def create_data_deb(package_name, version, src_folder, revision = 'm5stack1'):
f.write(f'Original-Maintainer: m5stack <m5stack@m5stack.com>\n')
f.write(f'Section: llm-module\n')
f.write(f'Priority: optional\n')
f.write(f'Depends: lib-llm (>= 1.6)\n')
f.write(f'Depends: {depends}\n')
f.write(f'Homepage: https://www.m5stack.com\n')
if deb_file.startswith('llm-model-'):
deb_name = deb_file[:deb_file.find('_')]
old_deb_name = deb_name.replace('model-','').lower()
f.write(f'Conflicts: {old_deb_name}\n')
f.write(f'Conflicts: {old_deb_name}\n')
f.write(f'Packaged-Date: {datetime.now().strftime("%Y-%m-%d %H:%M:%S")}\n')
f.write(f'Description: llm-module\n')
f.write(f' bsp.\n')
with open(os.path.join(deb_folder, 'DEBIAN/postinst'),'w') as f:
@@ -222,7 +225,17 @@ def create_data_deb(package_name, version, src_folder, revision = 'm5stack1'):
shutil.rmtree(deb_folder)
return package_name + " creat success!"
def create_bin_deb(package_name, version, src_folder, revision = 'm5stack1'):
def create_bin_deb(package_name, version, src_folder, revision = 'm5stack1', depends = 'lib-llm (>= 1.7)'):
bin_files = glob.glob(os.path.join(src_folder, package_name.replace("-", "_") + "-*"))
version_info = 0.0
print(os.path.join(src_folder, package_name + "-*"))
if bin_files:
for bin_file in bin_files:
version_info = float(bin_file.split('-')[-1])
if float(bin_file.split('-')[-1]) > version_info:
version_info = float(bin_file.split('-')[-1])
version = str(version_info)
deb_file = f"{package_name}_{version}-{revision}_arm64.deb"
deb_folder = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'debian-{}'.format(package_name))
# os.makedirs(deb_folder, exist_ok=True)
@@ -250,7 +263,11 @@ def create_bin_deb(package_name, version, src_folder, revision = 'm5stack1'):
vlm_dir = os.path.join(src_folder, 'vlm')
if os.path.exists(vlm_dir):
shutil.copytree(vlm_dir, os.path.join(deb_folder, 'opt/m5stack/lib/vlm'))
shutil.copy2(os.path.join(src_folder, package_name.replace("-", "_")), os.path.join(deb_folder, 'opt/m5stack/bin', package_name.replace("-", "_")))
bin_file_name = package_name.replace("-", "_")
if version_info != 0.0:
bin_file_name = package_name.replace("-", "_") + f'-{version}'
shutil.copy2(os.path.join(src_folder, bin_file_name), os.path.join(deb_folder, 'opt/m5stack/bin', bin_file_name))
ext_scripts_files = glob.glob(os.path.join(src_folder, package_name + "_*"))
if ext_scripts_files:
os.makedirs(os.path.join(deb_folder, 'opt/m5stack/scripts'), exist_ok = True)
@@ -266,8 +283,9 @@ def create_bin_deb(package_name, version, src_folder, revision = 'm5stack1'):
f.write(f'Section: llm-module\n')
f.write(f'Priority: optional\n')
# f.write(f'Depends: lib-llm\n')
f.write(f'Depends: lib-llm (>= 1.7)\n')
f.write(f'Depends: {depends}\n')
f.write(f'Homepage: https://www.m5stack.com\n')
f.write(f'Packaged-Date: {datetime.now().strftime("%Y-%m-%d %H:%M:%S")}\n')
f.write(f'Description: llm-module\n')
f.write(f' bsp.\n')
with open(os.path.join(deb_folder, 'DEBIAN/postinst'),'w') as f:
@@ -289,7 +307,7 @@ def create_bin_deb(package_name, version, src_folder, revision = 'm5stack1'):
f.write(f'Requires=llm-sys.service\n')
f.write(f'\n')
f.write(f'[Service]\n')
f.write(f'ExecStart=/opt/m5stack/bin/{package_name.replace("-", "_")}\n')
f.write(f'ExecStart=/opt/m5stack/bin/{bin_file_name}\n')
f.write(f'WorkingDirectory=/opt/m5stack\n')
f.write(f'Restart=always\n')
f.write(f'RestartSec=1\n')
@@ -333,64 +351,22 @@ if __name__ == "__main__":
else:
cpu_count = cpu_count - 2
# cpu_count = 50
#################################################注意################################################
#################################################注意################################################
#################################################注意################################################
#################################################注意################################################
# 添加新模型版本号从 0.1 版本号开始累加
# 当单元和前单元不兼容时提升大版本号
# 当模型和前模型不兼容时提升大版本号
# 加速单元和模型单元的大版本号保持一致，以有的更新暂不改变，从2025年 04月 03日开始
# Start adding new model version numbers from the 0.1 version number.
# Increment the major version number when units and previous units are incompatible
# Increment the major version number when models and previous models are incompatible
# Keep the major version numbers of acceleration units and model units consistent, with some updates not changing them, starting from April 3, 2025.
#################################################注意################################################
#################################################注意################################################
#################################################注意################################################
#################################################注意################################################
#################################################注意################################################
# 添加新模型版本号从 0.1 版本号开始累加
# 当单元和前单元不兼容时提升大版本号
# 当模型和前模型不兼容时提升大版本号
# 加速单元和模型单元的大版本号保持一致，以有的更新暂不改变，从2025年 04月 03日开始
# Start adding new model version numbers from the 0.1 version number.
# Increment the major version number when units and previous units are incompatible
# Increment the major version number when models and previous models are incompatible
# Keep the major version numbers of acceleration units and model units consistent, with some updates not changing them, starting from April 3, 2025.
#################################################注意################################################
#################################################注意################################################
#################################################注意################################################
#################################################注意################################################
# 添加新模型版本号从 0.1 版本号开始累加
# 当单元和前单元不兼容时提升大版本号
# 当模型和前模型不兼容时提升大版本号
# 加速单元和模型单元的大版本号保持一致，以有的更新暂不改变，从2025年 04月 03日开始
# Start adding new model version numbers from the 0.1 version number.
# Increment the major version number when units and previous units are incompatible
# Increment the major version number when models and previous models are incompatible
# Keep the major version numbers of acceleration units and model units consistent, with some updates not changing them, starting from April 3, 2025.
#################################################注意################################################
#################################################注意################################################
#################################################注意################################################
#################################################注意################################################
#################################################注意################################################
Tasks = {
'lib-llm':[create_lib_deb,'lib-llm', 1.7, src_folder, revision],
'lib-llm':[create_lib_deb,'lib-llm', '1.7', src_folder, revision],
'llm-sys':[create_bin_deb,'llm-sys', version, src_folder, revision],
'llm-audio':[create_bin_deb,'llm-audio', version, src_folder, revision],
'llm-kws':[create_bin_deb,'llm-kws', '1.6', src_folder, revision],
'llm-asr':[create_bin_deb,'llm-asr', version, src_folder, revision],
'llm-llm':[create_bin_deb,'llm-llm', '1.7', src_folder, revision],
'llm-tts':[create_bin_deb,'llm-tts', version, src_folder, revision],
'llm-melotts':[create_bin_deb,'llm-melotts', version, src_folder, revision],
'llm-camera':[create_bin_deb,'llm-camera', '1.6', src_folder, revision],
'llm-melotts':[create_bin_deb,'llm-melotts', '1.6', src_folder, revision],
'llm-camera':[create_bin_deb,'llm-camera', '1.7', src_folder, revision, 'lib-llm'],
'llm-vlm':[create_bin_deb,'llm-vlm', '1.6', src_folder, revision],
'llm-yolo':[create_bin_deb,'llm-yolo', '1.6', src_folder, revision],
'llm-skel':[create_bin_deb,'llm-skel', version, src_folder, revision],
'llm-depth-anything':[create_bin_deb,'llm-depth-anything', version, src_folder, revision],
'llm-vad':[create_bin_deb,'llm-vad', version, src_folder, revision],
'llm-whisper':[create_bin_deb,'llm-whisper', version, src_folder, revision],
'llm-whisper':[create_bin_deb,'llm-whisper', '1.6', src_folder, revision],
'llm-openai-api':[create_bin_deb,'llm-openai-api', '1.6', src_folder, revision],
'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],