Skip to content

Commit 2adbe84

Browse files
author
LittleMouse
committed
[update] update sherpa-onnx libonnxruntime version & update software version
1 parent 5666775 commit 2adbe84

6 files changed

Lines changed: 14 additions & 13 deletions

File tree

projects/llm_framework/main/SConstruct

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ STATIC_FILES += [AFile('../static_lib/sherpa/ncnn/libsherpa-ncnn-core.so'),
2929
AFile('../static_lib/libonnxruntime.so'),
3030
AFile('../static_lib/libonnxruntime.so.1'),
3131
AFile('../static_lib/libonnxruntime.so.1.14.0'),
32+
AFile('../static_lib/libonnxruntime.so.1.23.2'),
3233
AFile('../static_lib/libzmq.so.5'),
3334
AFile('../static_lib/libMNN.so')
3435
]

projects/llm_framework/main_asr/SConstruct

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ INCLUDE += [ADir('../static_lib/include/sherpa/sherpa-ncnn'),
2626
ADir('../static_lib/include/sherpa/sherpa-onnx/onnxruntime-src')]
2727
LINK_SEARCH_PATH += [ADir('../static_lib/sherpa/ncnn')]
2828
LINK_SEARCH_PATH += [ADir('../static_lib/sherpa/onnx')]
29-
REQUIREMENTS += ['ncnn', '', 'onnxruntime']
29+
REQUIREMENTS += ['ncnn']
3030
LDFLAGS += [
31+
'-l:libonnxruntime.so.1.23.2',
3132
'-l:libsherpa-onnx-core.a', '-l:libkaldi-native-fbank-core.a','-l:libkissfft-float.a',
3233
'-l:libkaldi-decoder-core.a', '-l:libssentencepiece_core.a', '-l:libsherpa-onnx-fst.a',
3334
'-l:libsherpa-onnx-kaldifst-core.a', '-l:libsherpa-onnx-fstfar.a',
@@ -38,7 +39,7 @@ LDFLAGS += [
3839

3940
STATIC_FILES += Glob('mode_*.json')
4041

41-
env['COMPONENTS'].append({'target':'llm_asr-1.10',
42+
env['COMPONENTS'].append({'target':'llm_asr-1.11',
4243
'SRCS':SRCS,
4344
'INCLUDE':INCLUDE,
4445
'PRIVATE_INCLUDE':PRIVATE_INCLUDE,

projects/llm_framework/main_kws/SConstruct

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ INCLUDE += [ADir('src/runner'),
3232

3333
LINK_SEARCH_PATH += [ADir('../static_lib/sherpa/onnx')]
3434
REQUIREMENTS += ['ax_engine', 'ax_interpreter', 'ax_sys']
35-
REQUIREMENTS += ['onnxruntime']
3635

37-
LDFLAGS += ['-l:libsherpa-onnx-core.a', '-l:libkaldi-native-fbank-core.a','-l:libkissfft-float.a',
36+
LDFLAGS += ['-l:libonnxruntime.so.1.23.2',
37+
'-l:libsherpa-onnx-core.a', '-l:libkaldi-native-fbank-core.a','-l:libkissfft-float.a',
3838
'-l:libkaldi-decoder-core.a', '-l:libssentencepiece_core.a']
3939

4040

@@ -60,7 +60,7 @@ ignore['ignore'] = list(set(ignore['ignore']))
6060
with open('../dist/fileignore', 'w') as f:
6161
json.dump(ignore, f, indent=4)
6262

63-
env['COMPONENTS'].append({'target':'llm_kws-1.12',
63+
env['COMPONENTS'].append({'target':'llm_kws-1.13',
6464
'SRCS':SRCS,
6565
'INCLUDE':INCLUDE,
6666
'PRIVATE_INCLUDE':PRIVATE_INCLUDE,

projects/llm_framework/main_tts/SConstruct

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,9 @@ INCLUDE += [ADir('src/runner/eigen-3.4.0'),
3131
]
3232

3333
LINK_SEARCH_PATH += [ADir('../static_lib/sherpa/onnx')]
34-
REQUIREMENTS += ['onnxruntime']
3534

3635

37-
LDFLAGS += [
36+
LDFLAGS += ['-l:libonnxruntime.so.1.23.2',
3837
'-l:libsherpa-onnx-core.a',
3938
'-l:libkaldi-native-fbank-core.a',
4039
'-l:libkissfft-float.a',

projects/llm_framework/main_vad/SConstruct

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

2525
LINK_SEARCH_PATH += [ADir('../static_lib/sherpa/onnx')]
2626

27-
LDFLAGS += ['-l:libsherpa-onnx-core.a', '-l:libkaldi-native-fbank-core.a', '-l:libkissfft-float.a']
27+
LDFLAGS += ['-l:libonnxruntime.so.1.23.2',
28+
'-l:libsherpa-onnx-core.a', '-l:libkaldi-native-fbank-core.a', '-l:libkissfft-float.a']
2829

29-
REQUIREMENTS += ['onnxruntime']
3030

3131
STATIC_FILES += Glob('mode_*.json')
3232

33-
env['COMPONENTS'].append({'target':'llm_vad-1.8',
33+
env['COMPONENTS'].append({'target':'llm_vad-1.9',
3434
'SRCS':SRCS,
3535
'INCLUDE':INCLUDE,
3636
'PRIVATE_INCLUDE':PRIVATE_INCLUDE,

projects/llm_framework/tools/llm_pack.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -375,8 +375,8 @@ def create_bin_deb(package_name, version, src_folder, revision = 'm5stack1', dep
375375
'lib-llm':[create_lib_deb,'lib-llm', '1.10', src_folder, revision],
376376
'llm-sys':[create_bin_deb,'llm-sys', '1.6', src_folder, revision, 'lib-llm (>= 1.8)'],
377377
'llm-audio':[create_bin_deb,'llm-audio', '1.9', src_folder, revision],
378-
'llm-kws':[create_bin_deb,'llm-kws', '1.12', src_folder, revision],
379-
'llm-asr':[create_bin_deb,'llm-asr', '1.10', src_folder, revision],
378+
'llm-kws':[create_bin_deb,'llm-kws', '1.13', src_folder, revision],
379+
'llm-asr':[create_bin_deb,'llm-asr', '1.11', src_folder, revision],
380380
'llm-llm':[create_bin_deb,'llm-llm', '1.12', src_folder, revision],
381381
'llm-llm2':[create_bin_deb,'llm-llm2', '1.12', src_folder, revision],
382382
'llm-tts':[create_bin_deb,'llm-tts', '1.7', src_folder, revision],
@@ -386,7 +386,7 @@ def create_bin_deb(package_name, version, src_folder, revision = 'm5stack1', dep
386386
'llm-yolo':[create_bin_deb,'llm-yolo', '1.9', src_folder, revision],
387387
'llm-skel':[create_bin_deb,'llm-skel', version, src_folder, revision],
388388
'llm-depth-anything':[create_bin_deb,'llm-depth-anything', '1.7', src_folder, revision],
389-
'llm-vad':[create_bin_deb,'llm-vad', '1.8', src_folder, revision],
389+
'llm-vad':[create_bin_deb,'llm-vad', '1.9', src_folder, revision],
390390
'llm-whisper':[create_bin_deb,'llm-whisper', '1.8', src_folder, revision],
391391
'llm-openai-api':[create_bin_deb,'llm-openai-api', '1.10', src_folder, revision],
392392
'llm-cosy-voice':[create_bin_deb,'llm-cosy-voice', '1.10', src_folder, revision],

0 commit comments

Comments
 (0)