EngineX-Iluvatar/enginex-mr_series-sherpa-onnx
Archived
16
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Fix CI errors introduced by supporting loading keywords from buffers (#1366)

Browse Source
This commit is contained in:
Fangjun Kuang
2024-09-20 19:04:21 +08:00
committed by GitHub
parent 06b61ccad8
commit d8809b520e
8 changed files with 55 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
wasm/kws/sherpa-onnx-kws.js
View File

@@ -172,10 +172,18 @@ function initKwsConfig(config, Module) {
};
}
if (!('keywordsBuf' in config)) {
config.keywordsBuf = '';
}
if (!('keywordsBufSize' in config)) {
config.keywordsBufSize = 0;
}
let featConfig = initFeatureExtractorConfig(config.featConfig, Module);
let modelConfig = initModelConfig(config.modelConfig, Module);
let numBytes = featConfig.len + modelConfig.len + 4 * 5;
let numBytes = featConfig.len + modelConfig.len + 4 * 7;
let ptr = Module._malloc(numBytes);
let offset = 0;
@@ -198,11 +206,22 @@ function initKwsConfig(config, Module) {
offset += 4;
let keywordsLen = Module.lengthBytesUTF8(config.keywords) + 1;
let keywordsBuffer = Module._malloc(keywordsLen);
let keywordsBufLen = Module.lengthBytesUTF8(config.keywordsBuf) + 1;
let keywordsBuffer = Module._malloc(keywordsLen + keywordsBufLen);
Module.stringToUTF8(config.keywords, keywordsBuffer, keywordsLen);
Module.stringToUTF8(
config.keywordsBuf, keywordsBuffer + keywordsLen, keywordsBufLen);
Module.setValue(ptr + offset, keywordsBuffer, 'i8*');
offset += 4;
Module.setValue(ptr + offset, keywordsBuffer + keywordsLen, 'i8*');
offset += 4;
Module.setValue(ptr + offset, config.keywordsBufLen, 'i32');
offset += 4;
return {
ptr: ptr, len: numBytes, featConfig: featConfig, modelConfig: modelConfig,
keywordsBuffer: keywordsBuffer

2
wasm/kws/sherpa-onnx-wasm-main-kws.cc
View File

@@ -24,7 +24,7 @@ static_assert(sizeof(SherpaOnnxOnlineModelConfig) ==
static_assert(sizeof(SherpaOnnxFeatureConfig) == 2 * 4, "");
static_assert(sizeof(SherpaOnnxKeywordSpotterConfig) ==
sizeof(SherpaOnnxFeatureConfig) +
sizeof(SherpaOnnxOnlineModelConfig) + 5 * 4,
sizeof(SherpaOnnxOnlineModelConfig) + 7 * 4,
"");
void CopyHeap(const char *src, int32_t num_bytes, char *dst) {