Skip to content

Commit 476b3ad

Browse files
committed
[update] del tokenizer && remove deb name
1 parent 4b7ba5e commit 476b3ad

5 files changed

Lines changed: 31 additions & 221 deletions

File tree

projects/llm_framework/main_tokenizer/Kconfig

Whitespace-only changes.

projects/llm_framework/main_tokenizer/SConstruct

Lines changed: 0 additions & 34 deletions
This file was deleted.

projects/llm_framework/main_tokenizer/_tokenizer.py

Lines changed: 0 additions & 130 deletions
This file was deleted.

projects/llm_framework/main_tokenizer/src/main.cpp

Lines changed: 0 additions & 26 deletions
This file was deleted.

projects/llm_framework/tools/llm_pack.py

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ def create_data_deb(package_name, version, src_folder, revision = 'm5stack1'):
143143
shutil.rmtree(deb_folder)
144144
os.makedirs(deb_folder, exist_ok = True)
145145

146-
zip_file = f"m5stack_{package_name}_{version}_data.tar.gz"
147-
down_url = f"https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/linux/llm/m5stack_{package_name}_{version}_data.tar.gz"
146+
zip_file = f"m5stack_{package_name[0:4]+package_name[10:]}_{version}_data.tar.gz"
147+
down_url = f"https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/linux/llm/m5stack_{package_name[0:4]+package_name[10:]}_{version}_data.tar.gz"
148148
zip_file_extrpath = f"m5stack_{package_name}_{version}_data"
149149
if not os.path.exists(zip_file_extrpath):
150150
# Downloading via HTTP (more common)
@@ -164,9 +164,9 @@ def create_data_deb(package_name, version, src_folder, revision = 'm5stack1'):
164164
RED = "\033[31m"
165165
RESET = "\033[0m"
166166
os.makedirs(os.path.join(deb_folder, 'opt/m5stack/data/models'), exist_ok = True)
167-
mode_config_file = os.path.join(src_folder,'mode_{}.json'.format(package_name[4:]))
167+
mode_config_file = os.path.join(src_folder,'mode_{}.json'.format(package_name[10:]))
168168
if os.path.exists(mode_config_file):
169-
shutil.copy2(mode_config_file, os.path.join(deb_folder, 'opt/m5stack/data/models', 'mode_{}.json'.format(package_name[4:])))
169+
shutil.copy2(mode_config_file, os.path.join(deb_folder, 'opt/m5stack/data/models', 'mode_{}.json'.format(package_name[10:])))
170170
try:
171171
with open(mode_config_file, 'r', encoding='utf-8') as file:
172172
data = json.load(file)
@@ -279,7 +279,7 @@ def create_bin_deb(package_name, version, src_folder, revision = 'm5stack1'):
279279
os.system('rm ./*.deb m5stack_* -rf')
280280
exit(0)
281281

282-
version = '1.4'
282+
version = '1.5'
283283
data_version = '0.2'
284284
src_folder = '../dist'
285285
revision = 'm5stack1'
@@ -294,7 +294,7 @@ def create_bin_deb(package_name, version, src_folder, revision = 'm5stack1'):
294294
cpu_count = 2
295295
else:
296296
cpu_count = cpu_count - 2
297-
# cpu_count = 10
297+
# cpu_count = 50
298298
with concurrent.futures.ThreadPoolExecutor(max_workers=cpu_count) as executor:
299299
futures = []
300300
if (create_lib):
@@ -315,32 +315,32 @@ def create_bin_deb(package_name, version, src_folder, revision = 'm5stack1'):
315315
futures.append(executor.submit(create_bin_deb,'llm-vad', version, src_folder, revision))
316316
futures.append(executor.submit(create_bin_deb,'llm-whisper', version, src_folder, revision))
317317
if (create_data):
318-
futures.append(executor.submit(create_data_deb,'llm-audio-en-us', data_version, src_folder, revision))
319-
futures.append(executor.submit(create_data_deb,'llm-audio-zh-cn', data_version, src_folder, revision))
320-
futures.append(executor.submit(create_data_deb,'llm-sherpa-ncnn-streaming-zipformer-20M-2023-02-17', data_version, src_folder, revision))
321-
futures.append(executor.submit(create_data_deb,'llm-sherpa-ncnn-streaming-zipformer-zh-14M-2023-02-23', data_version, src_folder, revision))
322-
futures.append(executor.submit(create_data_deb,'llm-sherpa-onnx-kws-zipformer-gigaspeech-3.3M-2024-01-01', '0.3', src_folder, revision))
323-
futures.append(executor.submit(create_data_deb,'llm-sherpa-onnx-kws-zipformer-wenetspeech-3.3M-2024-01-01', '0.3', src_folder, revision))
324-
futures.append(executor.submit(create_data_deb,'llm-single-speaker-english-fast', data_version, src_folder, revision))
325-
futures.append(executor.submit(create_data_deb,'llm-single-speaker-fast', data_version, src_folder, revision))
326-
futures.append(executor.submit(create_data_deb,'llm-melotts-zh-cn', '0.4', src_folder, revision))
327-
futures.append(executor.submit(create_data_deb,'llm-yolo11n', data_version, src_folder, revision))
328-
futures.append(executor.submit(create_data_deb,'llm-yolo11n-pose', '0.3', src_folder, revision))
329-
futures.append(executor.submit(create_data_deb,'llm-yolo11n-hand-pose', '0.3', src_folder, revision))
330-
futures.append(executor.submit(create_data_deb,'llm-yolo11n-seg', data_version, src_folder, revision))
331-
futures.append(executor.submit(create_data_deb,'llm-depth-anything-ax630c', '0.3', src_folder, revision))
332-
futures.append(executor.submit(create_data_deb,'llm-whisper-tiny', '0.3', src_folder, revision))
333-
futures.append(executor.submit(create_data_deb,'llm-silero-vad', '0.3', src_folder, revision))
318+
futures.append(executor.submit(create_data_deb,'llm-model-audio-en-us', data_version, src_folder, revision))
319+
futures.append(executor.submit(create_data_deb,'llm-model-audio-zh-cn', data_version, src_folder, revision))
320+
futures.append(executor.submit(create_data_deb,'llm-model-sherpa-ncnn-streaming-zipformer-20M-2023-02-17', data_version, src_folder, revision))
321+
futures.append(executor.submit(create_data_deb,'llm-model-sherpa-ncnn-streaming-zipformer-zh-14M-2023-02-23', data_version, src_folder, revision))
322+
futures.append(executor.submit(create_data_deb,'llm-model-sherpa-onnx-kws-zipformer-gigaspeech-3.3M-2024-01-01', '0.3', src_folder, revision))
323+
futures.append(executor.submit(create_data_deb,'llm-model-sherpa-onnx-kws-zipformer-wenetspeech-3.3M-2024-01-01', '0.3', src_folder, revision))
324+
futures.append(executor.submit(create_data_deb,'llm-model-single-speaker-english-fast', data_version, src_folder, revision))
325+
futures.append(executor.submit(create_data_deb,'llm-model-single-speaker-fast', data_version, src_folder, revision))
326+
futures.append(executor.submit(create_data_deb,'llm-model-melotts-zh-cn', '0.4', src_folder, revision))
327+
futures.append(executor.submit(create_data_deb,'llm-model-yolo11n', data_version, src_folder, revision))
328+
futures.append(executor.submit(create_data_deb,'llm-model-yolo11n-pose', '0.3', src_folder, revision))
329+
futures.append(executor.submit(create_data_deb,'llm-model-yolo11n-hand-pose', '0.3', src_folder, revision))
330+
futures.append(executor.submit(create_data_deb,'llm-model-yolo11n-seg', data_version, src_folder, revision))
331+
futures.append(executor.submit(create_data_deb,'llm-model-depth-anything-ax630c', '0.3', src_folder, revision))
332+
futures.append(executor.submit(create_data_deb,'llm-model-whisper-tiny', '0.3', src_folder, revision))
333+
futures.append(executor.submit(create_data_deb,'llm-model-silero-vad', '0.3', src_folder, revision))
334334
if (create_llm_data):
335-
# futures.append(executor.submit(create_data_deb,'llm-qwen2-0.5B-prefill-20e', data_version, src_folder, revision))
336-
# futures.append(executor.submit(create_data_deb,'llm-qwen2-1.5B-prefill-20e', data_version, src_folder, revision))
337-
futures.append(executor.submit(create_data_deb,'llm-qwen2.5-0.5B-prefill-20e', data_version, src_folder, revision))
338-
futures.append(executor.submit(create_data_deb,'llm-qwen2.5-1.5B-ax630c', '0.3', src_folder, revision))
339-
futures.append(executor.submit(create_data_deb,'llm-qwen2.5-coder-0.5B-ax630c', data_version, src_folder, revision))
340-
futures.append(executor.submit(create_data_deb,'llm-llama3.2-1B-prefill-ax630c', data_version, src_folder, revision))
341-
futures.append(executor.submit(create_data_deb,'llm-openbuddy-llama3.2-1B-ax630c', data_version, src_folder, revision))
342-
futures.append(executor.submit(create_data_deb,'llm-internvl2.5-1B-ax630c', '0.4', src_folder, revision))
343-
futures.append(executor.submit(create_data_deb,'llm-deepseek-r1-1.5B-ax630c', '0.3', src_folder, revision))
335+
# futures.append(executor.submit(create_data_deb,'llm-model-qwen2-0.5B-prefill-20e', data_version, src_folder, revision))
336+
# futures.append(executor.submit(create_data_deb,'llm-model-qwen2-1.5B-prefill-20e', data_version, src_folder, revision))
337+
futures.append(executor.submit(create_data_deb,'llm-model-qwen2.5-0.5B-prefill-20e', data_version, src_folder, revision))
338+
futures.append(executor.submit(create_data_deb,'llm-model-qwen2.5-1.5B-ax630c', '0.3', src_folder, revision))
339+
futures.append(executor.submit(create_data_deb,'llm-model-qwen2.5-coder-0.5B-ax630c', data_version, src_folder, revision))
340+
futures.append(executor.submit(create_data_deb,'llm-model-llama3.2-1B-prefill-ax630c', data_version, src_folder, revision))
341+
futures.append(executor.submit(create_data_deb,'llm-model-openbuddy-llama3.2-1B-ax630c', data_version, src_folder, revision))
342+
futures.append(executor.submit(create_data_deb,'llm-model-internvl2.5-1B-ax630c', '0.4', src_folder, revision))
343+
futures.append(executor.submit(create_data_deb,'llm-model-deepseek-r1-1.5B-ax630c', '0.3', src_folder, revision))
344344
for future in concurrent.futures.as_completed(futures):
345345
result = future.result()
346346
print(result)

0 commit comments

Comments
 (0)