Skip to content

Commit 00c0533

Browse files
author
LittleMouse
committed
[update] update libonnxruntime.so
1 parent daeaf4b commit 00c0533

File tree

5 files changed

+13
-9
lines changed

5 files changed

+13
-9
lines changed

projects/llm_framework/main/SConstruct

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ STATIC_FILES += [AFile('../static_lib/sherpa/ncnn/libsherpa-ncnn-core.so'),
2626
AFile('../static_lib/sherpa/ncnn/libkaldi-native-fbank-core.so'),
2727
AFile('../static_lib/wetext/libglog.so.0'),
2828
AFile('../static_lib/wetext/libfst.so.16'),
29+
AFile('../static_lib/libonnxruntime.so.1'),
2930
]
3031

3132
env['COMPONENTS'].append({'target':'static_file-1.0',

projects/llm_framework/main_kws/SConstruct

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,12 @@ INCLUDE += [ADir('../include/sherpa'),
2929
]
3030

3131
LINK_SEARCH_PATH += [ADir('../static_lib/sherpa/onnx')]
32-
LDFLAGS += ['-l:libcargs.a', '-l:libonnxruntime.a',
32+
LDFLAGS += ['-l:libcargs.a',
3333
'-l:libsherpa-onnx-core.a', '-l:libkaldi-native-fbank-core.a',
3434
'-l:libkaldi-decoder-core.a', '-l:libssentencepiece_core.a']
3535

36+
REQUIREMENTS += ['onnxruntime']
37+
3638
STATIC_FILES += [os.path.join(python_venv, 'sherpa-onnx')]
3739
STATIC_FILES += Glob('llm-kws_text2token.py')
3840
STATIC_FILES += Glob('mode_*.json')
@@ -55,7 +57,7 @@ ignore['ignore'] = list(set(ignore['ignore']))
5557
with open('../dist/fileignore', 'w') as f:
5658
json.dump(ignore, f, indent=4)
5759

58-
env['COMPONENTS'].append({'target':'llm_kws-1.7',
60+
env['COMPONENTS'].append({'target':'llm_kws-1.8',
5961
'SRCS':SRCS,
6062
'INCLUDE':INCLUDE,
6163
'PRIVATE_INCLUDE':PRIVATE_INCLUDE,

projects/llm_framework/main_melotts/SConstruct

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ REQUIREMENTS += ['samplerate']
2626
INCLUDE += [ADir('../include')]
2727
INCLUDE += [ADir('src/runner'), ADir('../include/onnxruntime/core/session')]
2828
LINK_SEARCH_PATH += [ADir('../static_lib/wetext')]
29-
LINK_SEARCH_PATH += [ADir('../static_lib/sherpa/onnx')]
30-
LDFLAGS += ['-l:libcargs.a', '-l:libonnxruntime.a']
3129
REQUIREMENTS += ['glog', 'fst']
3230

31+
REQUIREMENTS += ['onnxruntime']
32+
3333
STATIC_FILES += Glob('mode_*.json')
3434

3535
env['COMPONENTS'].append({'target':'llm_melotts-1.8',

projects/llm_framework/main_vad/SConstruct

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,13 @@ LINK_SEARCH_PATH += [ADir('../static_lib')]
2323
INCLUDE += [ADir('../include/sherpa')]
2424

2525
LINK_SEARCH_PATH += [ADir('../static_lib/sherpa/onnx')]
26-
LDFLAGS += ['-l:libsherpa-onnx-core.a',
27-
'-l:libonnxruntime.a']
26+
LDFLAGS += ['-l:libsherpa-onnx-core.a']
27+
28+
REQUIREMENTS += ['onnxruntime']
2829

2930
STATIC_FILES += Glob('mode_*.json')
3031

31-
env['COMPONENTS'].append({'target':'llm_vad-1.6',
32+
env['COMPONENTS'].append({'target':'llm_vad-1.7',
3233
'SRCS':SRCS,
3334
'INCLUDE':INCLUDE,
3435
'PRIVATE_INCLUDE':PRIVATE_INCLUDE,

projects/llm_framework/tools/llm_pack.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ def create_bin_deb(package_name, version, src_folder, revision = 'm5stack1', dep
355355
'lib-llm':[create_lib_deb,'lib-llm', '1.8', src_folder, revision],
356356
'llm-sys':[create_bin_deb,'llm-sys', '1.6', src_folder, revision],
357357
'llm-audio':[create_bin_deb,'llm-audio', '1.6', src_folder, revision],
358-
'llm-kws':[create_bin_deb,'llm-kws', '1.7', src_folder, revision],
358+
'llm-kws':[create_bin_deb,'llm-kws', '1.8', src_folder, revision],
359359
'llm-asr':[create_bin_deb,'llm-asr', '1.6', src_folder, revision],
360360
'llm-llm':[create_bin_deb,'llm-llm', '1.8', src_folder, revision],
361361
'llm-tts':[create_bin_deb,'llm-tts', '1.6', src_folder, revision],
@@ -365,7 +365,7 @@ def create_bin_deb(package_name, version, src_folder, revision = 'm5stack1', dep
365365
'llm-yolo':[create_bin_deb,'llm-yolo', '1.8', src_folder, revision],
366366
'llm-skel':[create_bin_deb,'llm-skel', version, src_folder, revision],
367367
'llm-depth-anything':[create_bin_deb,'llm-depth-anything', '1.6', src_folder, revision],
368-
'llm-vad':[create_bin_deb,'llm-vad', '1.6', src_folder, revision],
368+
'llm-vad':[create_bin_deb,'llm-vad', '1.7', src_folder, revision],
369369
'llm-whisper':[create_bin_deb,'llm-whisper', '1.7', src_folder, revision],
370370
'llm-openai-api':[create_bin_deb,'llm-openai-api', '1.7', src_folder, revision],
371371
'llm-model-audio-en-us':[create_data_deb,'llm-model-audio-en-us', data_version, src_folder, revision],

0 commit comments

Comments
 (0)