patrick/Vosklet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use C++ iostream in untar, enforce naming convention, remodel threading to use join, reduce lambda usage

Browse Source
This commit is contained in:
msqr1
2024-08-20 22:59:13 -07:00
parent 2122902190
commit 53262fe7f3
12 changed files with 125 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
API.md
View File

@@ -7,7 +7,7 @@
## Shared interface ## Shared interface
| Function/Object | Description | | Function/Object | Description |
|---|---| |---|---|
| ```delete()``` | Delete this object, see [why](https://emscripten.org/docs/getting_started/FAQ.html#what-does-exiting-the-runtime-mean-why-don-t-atexit-s-run) this is neccessary. | | ```delete()``` | Delete this object (call C++ destructor), see [why](https://emscripten.org/docs/getting_started/FAQ.html#what-does-exiting-the-runtime-mean-why-don-t-atexit-s-run) this is neccessary. |
## ```Module``` object ## ```Module``` object
| Function/Object | Description | | Function/Object | Description |

2
Examples/Vosklet.js
View File

File diff suppressed because one or more lines are too long

6
README.md
View File

@@ -18,7 +18,7 @@
# Basic usage (microphone recognition in English) # Basic usage (microphone recognition in English)
- Result are logged to the console. - Result are logged to the console.
- Copied from *examples/fromMic.html* - Copied from *examples/fromMic.html*
- **Note: The example folder and this piece of code uses *examples/Vosklet.js* because I can't set the Response headers for my model for browsers to decompress correctly. Instead, I used DecompressionStream to decompress manually, so *examples/Vosklet.js* only works for the examples. In production, please use the top-level Vosklet.js instead.** - **Note: The example folder and this piece of code uses *examples/Vosklet.js* because I can't set the Response headers for my model for browsers to decompress correctly. Instead, I used DecompressionStream to decompress manually, so *examples/Vosklet.js* only works for the examples. In production, use the top-level Vosklet.js instead.**
```html ```html
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
@@ -42,8 +42,8 @@
// Load Vosklet module, model and recognizer // Load Vosklet module, model and recognizer
let module = await loadVosklet() let module = await loadVosklet()
let model2 = await module.createModel("https://ccoreilly.github.io/vosk-browser/models/vosk-model-small-en-us-0.15.tar.gz","model","ID") let model = await module.createModel("https://ccoreilly.github.io/vosk-browser/models/vosk-model-small-en-us-0.15.tar.gz","model","ID")
let recognizer2 = await module.createRecognizer(model, 16000) let recognizer = await module.createRecognizer(model, 16000)
// Listen for result and partial result // Listen for result and partial result
recognizer.addEventListener("result", ev => { recognizer.addEventListener("result", ev => {

2
Vosklet.js
View File

File diff suppressed because one or more lines are too long

18
src/CommonModel.cc
View File

@@ -1,8 +1,10 @@
#include "CommonModel.h" #include "CommonModel.h"
CommonModel::CommonModel(int index, bool normalMdl, std::string storepath, std::string id, int tarStart, int tarSize) : normalMdl{normalMdl}, index{index}, storepath{std::move(storepath)}, id{std::move(id)} { CommonModel::CommonModel(int index, bool normalMdl, std::string storepath, std::string id, int tarStart, int tarSize) :
t = std::thread{extractAndLoad, reinterpret_cast<unsigned char*>(tarStart), tarSize}; normalMdl{normalMdl}, index{index},
} t{&CommonModel::extractAndLoad, this, reinterpret_cast<unsigned char*>(tarStart), tarSize},
storepath{std::move(storepath)},
id{std::move(id)} {}
void CommonModel::extractAndLoad(unsigned char* tar, int tarSize) { void CommonModel::extractAndLoad(unsigned char* tar, int tarSize) {
int res{untar(tar, tarSize, storepath)}; int res{untar(tar, tarSize, storepath)};
free(tar); free(tar);
@@ -28,6 +30,10 @@ void CommonModel::extractAndLoad(unsigned char* tar, int tarSize) {
if(normalMdl ? std::get<VoskModel*>(mdl) != nullptr : std::get<VoskSpkModel*>(mdl) != nullptr) fireEv(index, "0"); if(normalMdl ? std::get<VoskModel*>(mdl) != nullptr : std::get<VoskSpkModel*>(mdl) != nullptr) fireEv(index, "0");
else fireEv(index, "Unable to load model for recognition"); else fireEv(index, "Unable to load model for recognition");
fs::remove_all(storepath); fs::remove_all(storepath);
// Wait for potential recognizer usage
thrdUsed.wait(false, std::memory_order_relaxed);
if(recognizerMain) recognizerMain();
} }
int CommonModel::findWord(std::string word) { int CommonModel::findWord(std::string word) {
return vosk_model_find_word(std::get<VoskModel*>(mdl), word.c_str()); return vosk_model_find_word(std::get<VoskModel*>(mdl), word.c_str());
@@ -35,5 +41,9 @@ int CommonModel::findWord(std::string word) {
CommonModel::~CommonModel() { CommonModel::~CommonModel() {
if(normalMdl) vosk_model_free(std::get<VoskModel*>(mdl)); if(normalMdl) vosk_model_free(std::get<VoskModel*>(mdl));
else vosk_spk_model_free(std::get<VoskSpkModel*>(mdl)); else vosk_spk_model_free(std::get<VoskSpkModel*>(mdl));
if(t.joinable()) t.join(); if(t.joinable()) {
thrdUsed.store(true, std::memory_order_relaxed);
thrdUsed.notify_one();
t.join();
}
} }

4
src/CommonModel.h
View File

@@ -2,13 +2,13 @@
#include "Util.h" #include "Util.h"
#include <vosk_api.h> #include <vosk_api.h>
extern void free(void*); extern void free(void*);
struct CommonModel { struct CommonModel {
bool normalMdl; bool normalMdl;
bool thrdUsed{}; std::atomic_bool thrdUsed{};
int index; int index;
std::thread t; std::thread t;
std::function<void()> recognizerMain;
std::string storepath; std::string storepath;
std::string id; std::string id;
std::variant<VoskModel*, VoskSpkModel*> mdl; std::variant<VoskModel*, VoskSpkModel*> mdl;

112
src/Recognizer.cc
View File

@@ -1,90 +1,100 @@
#include "recognizer.h" #include "Recognizer.h"
recognizer::recognizer(int index, float sampleRate, CommonModel* model) : index{index}, rec{vosk_recognizer_new(std::get<VoskModel*>(model->mdl),sampleRate)}, t{std::move(model->t)} { Recognizer::Recognizer(int index, float sampleRate, CommonModel* model) :
index{index},
t{std::move(model->t)},
rec{vosk_recognizer_new(std::get<VoskModel*>(model->mdl), sampleRate)} {
finishConstruction(model); finishConstruction(model);
} }
recognizer::recognizer(int index, float sampleRate, CommonModel* model, CommonModel* spkModel) : index{index}, rec{vosk_recognizer_new_spk(std::get<VoskModel*>(model->mdl), sampleRate, std::get<VoskSpkModel*>(spkModel->mdl))}, t{std::move(model->t)} { Recognizer::Recognizer(int index, float sampleRate, CommonModel* model, CommonModel* spkModel) :
index{index},
t{std::move(model->t)},
rec{vosk_recognizer_new_spk(std::get<VoskModel*>(model->mdl), sampleRate, std::get<VoskSpkModel*>(spkModel->mdl))} {
finishConstruction(model, spkModel); finishConstruction(model, spkModel);
} }
recognizer::recognizer(int index, float sampleRate, CommonModel* model, const std::string& grm, int) : index{index}, rec{vosk_recognizer_new_grm(std::get<VoskModel*>(model->mdl), sampleRate, grm.c_str())}, t{std::move(model->t)} { Recognizer::Recognizer(int index, float sampleRate, CommonModel* model, const std::string& grm, int) :
index{index},
t{std::move(model->t)},
rec{vosk_recognizer_new_grm(std::get<VoskModel*>(model->mdl), sampleRate, grm.c_str())} {
finishConstruction(model); finishConstruction(model);
} }
recognizer::~recognizer() { Recognizer::~Recognizer() {
done = true;
vosk_recognizer_free(rec); vosk_recognizer_free(rec);
if(t.joinable()) t.join(); if(t.joinable()) {
done = true;
blocker.store(true, std::memory_order_relaxed);
blocker.notify_one();
t.join();
}
} }
void recognizer::finishConstruction(CommonModel* model, CommonModel* spkModel) { void Recognizer::finishConstruction(CommonModel* model, CommonModel* spkModel) {
if(rec == nullptr) { if(rec == nullptr) {
fireEv(index, "Unable to initialize recognizer"); fireEv(index, "Unable to initialize recognizer");
return; return;
} }
auto main {[this](){ if(!model->thrdUsed.load(std::memory_order_relaxed)) {
fireEv(index, "0"); model->recognizerMain = [this]{main();};
audioData* next; model->thrdUsed.store(true, std::memory_order_relaxed);
while(!done) { model->thrdUsed.notify_one();
blocker.wait(done, std::memory_order_relaxed);
blocker = false;
next = &dataQ.front();
while(!dataQ.empty()) {
switch(vosk_recognizer_accept_waveform_f(rec, next->data, next->len)) {
case 0:
fireEv(index, vosk_recognizer_result(rec), "result");
break;
case 1:
fireEv(index, vosk_recognizer_partial_result(rec), "partialResult");
}
free(next->data);
dataQ.pop();
}
}
}};
if(!model->thrdUsed) {
model->thrdUsed = true;
model->func = main;
model->blocker = true;
model->blocker.notify_one();
return; return;
} }
if(spkModel != nullptr && !spkModel->thrdUsed) { if(spkModel != nullptr && !spkModel->thrdUsed.load(std::memory_order_relaxed)) {
spkModel->thrdUsed = true; spkModel->recognizerMain = [this]{main();};
spkModel->func = main; spkModel->thrdUsed.store(true, std::memory_order_relaxed);
spkModel->blocker = true; spkModel->thrdUsed.notify_one();
model->blocker.notify_one();
return; return;
} }
blocker.is_always_lock_free t = std::thread{&Recognizer::main, this};
std::thread{main}.detach();
} }
void recognizer::pushData(int start, int len) { void Recognizer::main() {
fireEv(index, "0");
while(!done) {
blocker.wait(false, std::memory_order_relaxed);
blocker.store(false, std::memory_order_relaxed);
while(!dataQ.empty()) {
AudioData& next = dataQ.front();
// If done we free the rest of the data by skipping this block
switch(vosk_recognizer_accept_waveform_f(rec, next.data, next.len)) {
case 0: [[likely]]
fireEv(index, vosk_recognizer_partial_result(rec), "partialResult");
break;
case 1: [[unlikely]]
fireEv(index, vosk_recognizer_result(rec), "result");
}
free(next.data);
dataQ.pop();
}
}
}
void Recognizer::pushData(int start, int len) {
dataQ.emplace(start, len); dataQ.emplace(start, len);
blocker = true; blocker.store(true, std::memory_order_relaxed);
blocker.notify_one(); blocker.notify_one();
} }
void recognizer::reset() { void Recognizer::reset() {
vosk_recognizer_reset(rec); vosk_recognizer_reset(rec);
} }
void recognizer::setEndpointerMode(VoskEndpointerMode mode) { void Recognizer::setEndpointerMode(VoskEndpointerMode mode) {
vosk_recognizer_set_endpointer_mode(rec, mode); vosk_recognizer_set_endpointer_mode(rec, mode);
} }
void recognizer::setEndpointerDelays(float tStartMax, float tEnd, float tMax) { void Recognizer::setEndpointerDelays(float tStartMax, float tEnd, float tMax) {
vosk_recognizer_set_endpointer_delays(rec, tStartMax, tEnd, tMax); vosk_recognizer_set_endpointer_delays(rec, tStartMax, tEnd, tMax);
} }
void recognizer::setGrm(const std::string& grm) { void Recognizer::setGrm(const std::string& grm) {
vosk_recognizer_set_grm(rec, grm.c_str()); vosk_recognizer_set_grm(rec, grm.c_str());
} }
void recognizer::setSpkModel(CommonModel* spkModel) { void Recognizer::setSpkModel(CommonModel* spkModel) {
vosk_recognizer_set_spk_model(rec, std::get<VoskSpkModel*>(spkModel->mdl)); vosk_recognizer_set_spk_model(rec, std::get<VoskSpkModel*>(spkModel->mdl));
} }
void recognizer::setWords(bool words) { void Recognizer::setWords(bool words) {
vosk_recognizer_set_words(rec, words); vosk_recognizer_set_words(rec, words);
} }
void recognizer::setPartialWords(bool partialWords) { void Recognizer::setPartialWords(bool partialWords) {
vosk_recognizer_set_partial_words(rec, partialWords); vosk_recognizer_set_partial_words(rec, partialWords);
} }
void recognizer::setNLSML(bool nlsml) { void Recognizer::setNLSML(bool nlsml) {
vosk_recognizer_set_nlsml(rec, nlsml); vosk_recognizer_set_nlsml(rec, nlsml);
} }
void recognizer::setMaxAlternatives(int alts) { void Recognizer::setMaxAlternatives(int alts) {
vosk_recognizer_set_max_alternatives(rec, alts); vosk_recognizer_set_max_alternatives(rec, alts);
} }

13
src/Recognizer.h
View File

@@ -5,23 +5,22 @@
#include <emscripten/console.h> #include <emscripten/console.h>
struct audioData { // Prevent naming conflicts with Vosk's Recognizer class
float* data; #define Recognizer Recognizer_
int len;
audioData(int start, int len) : data{reinterpret_cast<float*>(start)}, len{len} {}
};
struct Recognizer { struct Recognizer {
std::atomic_bool done{}; bool done{};
std::atomic_bool blocker{}; std::atomic_bool blocker{};
int index; int index;
std::thread t; std::thread t;
VoskRecognizer* rec; VoskRecognizer* rec;
std::queue<audioData> dataQ; std::queue<AudioData> dataQ;
Recognizer(int index, float sampleRate, CommonModel* model); Recognizer(int index, float sampleRate, CommonModel* model);
Recognizer(int index, float sampleRate, CommonModel* model, CommonModel* spkModel); Recognizer(int index, float sampleRate, CommonModel* model, CommonModel* spkModel);
Recognizer(int index, float sampleRate, CommonModel* model, const std::string& grm, int); Recognizer(int index, float sampleRate, CommonModel* model, const std::string& grm, int);
~Recognizer(); ~Recognizer();
void finishConstruction(CommonModel* model, CommonModel* spkModel = nullptr); void finishConstruction(CommonModel* model, CommonModel* spkModel = nullptr);
void main();
void pushData(int start, int len); void pushData(int start, int len);
void reset(); void reset();
void setEndpointerMode(VoskEndpointerMode mode); void setEndpointerMode(VoskEndpointerMode mode);

41
src/Util.cc
View File

@@ -1,45 +1,46 @@
#include "Util.h" #include "Util.h"
void fireEv(int index, const char* content, const char* type) { void fireEv(int index, const char* content, const char* type) {
MAIN_THREAD_EM_ASM({ MAIN_THREAD_EM_ASM({
objs[$0].dispatchEvent(new CustomEvent($2 === 0 ? "0" : UTF8ToString($2), { "detail" : UTF8ToString($1) })); objs[$0].dispatchEvent(new CustomEvent($2 === 0 ? "0" : UTF8ToString($2), { "detail" : UTF8ToString($1) }));
}, index, content, type); }, index, content, type);
} }
int untar(unsigned char* tar, int tarSize, const std::string& storepath) { int untar(unsigned char* tar, int tarSize, const std::string& storepath) {
if(memcmp(tar + 257, "ustar", 5)) return IncorrectFormat; if(std::memcmp(tar + 257, "ustar", 5)) return IncorrectFormat;
unsigned char* ptr = tar; size_t size{};
size_t size{0}; std::string path;
std::string path{};
path.reserve(100); // Max length path.reserve(100); // Max length
unsigned char* end = tar + tarSize; unsigned char* end = tar + tarSize;
while(ptr <= end) { while(tar <= end) {
if(ptr[156] != '5' && ptr[156] != 0 && if(tar[156] != '5' && tar[156] != 0 &&
ptr[156] != '0') { tar[156] != '0') {
return IncorrectFiletype; return IncorrectFiletype;
} }
path.clear(); path.clear();
path += reinterpret_cast<char*>(ptr + 345); path += reinterpret_cast<char*>(tar + 345);
path += reinterpret_cast<char*>(ptr); path += reinterpret_cast<char*>(tar);
ptr += 124; tar += 124;
for(int i{0}; i < 11; i++) { for(int i{0}; i < 11; i++) {
size *= 8; size *= 8;
size += *ptr - 48; size += *tar - 48;
ptr++; tar++;
} }
ptr += 377; tar += 377;
size_t firstSlash = path.find_first_of("/"); size_t firstSlash = path.find_first_of("/");
if(firstSlash == std::string::npos) { if(firstSlash == std::string::npos) {
if(size != 0) ptr += size + 512 - size % 512; if(size != 0) tar += size + 512 - size % 512;
continue; continue;
} }
path = storepath + path.substr(firstSlash); path = storepath + path.substr(firstSlash);
std::ofstream file;
if(size == 0) fs::create_directory(path); if(size == 0) fs::create_directory(path);
else { else {
int fd {open(path.c_str(), O_CREAT | O_WRONLY | O_TRUNC, 0777)}; file.open(path, std::ios::trunc | std::ios::binary);
if(fd == -1) return FailedOpen; if(!file) return FailedOpen;
int res = write(fd, ptr, size); if(!file.write(reinterpret_cast<char*>(tar), size)) return FailedWrite;
if(res == -1) return FailedWrite; file.close();
if(close(fd) == -1) return FailedClose; if(!file) return FailedClose;
ptr += size + 512 - size % 512; tar += size + 512 - size % 512;
} }
} }
return Successful; return Successful;

9
src/Util.h
View File

@@ -3,13 +3,16 @@
#include <filesystem> #include <filesystem>
#include <functional> #include <functional>
#include <variant> #include <variant>
#include <unistd.h> #include <fstream>
#include <fcntl.h>
#include <emscripten/em_asm.h> #include <emscripten/em_asm.h>
#include <emscripten/console.h> #include <emscripten/console.h>
namespace fs = std::filesystem; namespace fs = std::filesystem;
struct AudioData {
float* data;
int len;
AudioData(int start, int len) : data{reinterpret_cast<float*>(start)}, len{len} {}
};
enum UntarStatus { enum UntarStatus {
Successful, Successful,
IncorrectFormat, IncorrectFormat,

6
src/make
View File

@@ -73,13 +73,13 @@ if [ ! -d $VOSK ]; then
fi fi
cd $SRC && cd $SRC &&
em++ util.cc CommonModel.cc Recognizer.cc Bindings.cc -O3 -sWASMFS -sWASM_BIGINT -sSINGLE_FILE -sMODULARIZE -sEMBIND_STD_STRING_IS_UTF8 -sPTHREAD_POOL_DELAY_LOAD -sALLOW_MEMORY_GROWTH -sTEXTDECODER=2 -sPTHREAD_POOL_SIZE_STRICT=2 -sINITIAL_MEMORY=$INITIAL_MEMORY -sPTHREAD_POOL_SIZE=$MAX_THREADS -sPOLYFILL=0 -sEXIT_RUNTIME=0 -sINVOKE_RUN=0 -sSUPPORT_LONGJMP=0 -sEXPORTED_FUNCTIONS=_malloc -sEXPORT_NAME=loadVosklet -sMALLOC=emmalloc -sEXPORTED_RUNTIME_METHODS=UTF8ToString,stringToUTF8OnStack -sENVIRONMENT=web,worker -I. -I"$VOSK"/src -L$KALDI/src -l:online2/kaldi-online2.a -l:decoder/kaldi-decoder.a -l:ivector/kaldi-ivector.a -l:gmm/kaldi-gmm.a -l:tree/kaldi-tree.a -l:feat/kaldi-feat.a -l:cudamatrix/kaldi-cudamatrix.a -l:lat/kaldi-lat.a -l:lm/kaldi-lm.a -l:rnnlm/kaldi-rnnlm.a -l:hmm/kaldi-hmm.a -l:nnet3/kaldi-nnet3.a -l:transform/kaldi-transform.a -l:matrix/kaldi-matrix.a -l:fstext/kaldi-fstext.a -l:util/kaldi-util.a -l:base/kaldi-base.a -L"$OPENFST"/lib -l:libfst.a -l:libfstngram.a -L"$CLAPACK_WASM" -l:CBLAS/lib/cblas.a -l:CLAPACK-3.2.1/lapack.a -l:CLAPACK-3.2.1/libcblaswr.a -l:f2c_BLAS-3.8.0/blas.a -l:libf2c/libf2c.a -L$VOSK/src -l:vosk.a -lembind -pthread -flto -msimd128 -mreference-types -mnontrapping-fptoint -mextended-const -msign-ext -mmutable-globals --pre-js Wrapper.js -o ../Vosklet.js && em++ Util.cc CommonModel.cc Recognizer.cc Bindings.cc -O3 -sWASMFS -sWASM_BIGINT -sSINGLE_FILE -sMODULARIZE -sEMBIND_STD_STRING_IS_UTF8 -sPTHREAD_POOL_DELAY_LOAD -sALLOW_MEMORY_GROWTH -sTEXTDECODER=2 -sPTHREAD_POOL_SIZE_STRICT=2 -sINITIAL_MEMORY=$INITIAL_MEMORY -sPTHREAD_POOL_SIZE=$MAX_THREADS -sPOLYFILL=0 -sEXIT_RUNTIME=0 -sINVOKE_RUN=0 -sSUPPORT_LONGJMP=0 -sEXPORTED_FUNCTIONS=_malloc -sEXPORT_NAME=loadVosklet -sMALLOC=emmalloc -sEXPORTED_RUNTIME_METHODS=UTF8ToString,stringToUTF8OnStack -sENVIRONMENT=web,worker -I. -I"$VOSK"/src -L$KALDI/src -l:online2/kaldi-online2.a -l:decoder/kaldi-decoder.a -l:ivector/kaldi-ivector.a -l:gmm/kaldi-gmm.a -l:tree/kaldi-tree.a -l:feat/kaldi-feat.a -l:cudamatrix/kaldi-cudamatrix.a -l:lat/kaldi-lat.a -l:lm/kaldi-lm.a -l:rnnlm/kaldi-rnnlm.a -l:hmm/kaldi-hmm.a -l:nnet3/kaldi-nnet3.a -l:transform/kaldi-transform.a -l:matrix/kaldi-matrix.a -l:fstext/kaldi-fstext.a -l:util/kaldi-util.a -l:base/kaldi-base.a -L"$OPENFST"/lib -l:libfst.a -l:libfstngram.a -L"$CLAPACK_WASM" -l:CBLAS/lib/cblas.a -l:CLAPACK-3.2.1/lapack.a -l:CLAPACK-3.2.1/libcblaswr.a -l:f2c_BLAS-3.8.0/blas.a -l:libf2c/libf2c.a -L$VOSK/src -l:vosk.a -lembind -pthread -flto -msimd128 -mreference-types -mnontrapping-fptoint -mextended-const -msign-ext -mmutable-globals --pre-js Wrapper.js -o ../Vosklet.js &&
cd .. && cd .. &&
rm -f Vosklet.worker.js rm -f Vosklet.worker.js
cp Vosklet.js examples/Vosklet.js && cp Vosklet.js Examples/Vosklet.js &&
# Can't serve files from raw.githubusercontent with Content-Encoding: gzip header so the browser won't decompress automatically. Manually decompressing instead. # Can't serve files from raw.githubusercontent with Content-Encoding: gzip header so the browser won't decompress automatically. Manually decompressing instead.
sed -i 's/res.body/new Response(res.body.pipeThrough(new DecompressionStream("gzip"))).body/' examples/Vosklet.js && sed -i 's/res.body/new Response(res.body.pipeThrough(new DecompressionStream("gzip"))).body/' Examples/Vosklet.js &&
rm -rf /tmp/openfst rm -rf /tmp/openfst

10
test
View File

@@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
INITIAL_MEMORY=${INITIAL_MEMORY:-100mb} INITIAL_MEMORY=${INITIAL_MEMORY:-800mb}
MAX_THREADS=${MAX_THREADS:-2} MAX_THREADS=${MAX_THREADS:-2}
EMSDK=${EMSDK:-emsdk} EMSDK=${EMSDK:-emsdk}
JOBS=${JOBS:-$(nproc)} JOBS=${JOBS:-$(nproc)}
@@ -36,14 +36,14 @@ OPENFST=$(realpath openfst)
CLAPACK_WASM=$(realpath clapack-wasm) CLAPACK_WASM=$(realpath clapack-wasm)
cd src && cd src &&
MODE=1 && # 0: Ultra debug info, 1: Optimized release, else custom MODE=0 && # 0: Ultra debug info, 1: Optimized release, else custom
echo "Mode = $MODE" && echo "Mode = $MODE" &&
if [ $MODE = 0 ]; then if [ $MODE = 0 ]; then
em++ util.cc genericModel.cc recognizer.cc bindings.cc -O0 -Wall -Werror -sWASMFS -sWASM_BIGINT -sSINGLE_FILE -sMODULARIZE -sEMBIND_STD_STRING_IS_UTF8 -sPTHREAD_POOL_DELAY_LOAD -sRUNTIME_DEBUG -sALLOW_MEMORY_GROWTH -sSTACK_OVERFLOW_CHECK=2 -sTEXTDECODER=2 -sPTHREAD_POOL_SIZE_STRICT=2 -sASSERTIONS=2 -sINITIAL_MEMORY=$INITIAL_MEMORY -sPTHREAD_POOL_SIZE=$MAX_THREADS -sDISABLE_EXCEPTION_CATCHING=0 -sEXIT_RUNTIME=0 -sINVOKE_RUN=0 -sPOLYFILL=0 -sEXPORTED_FUNCTIONS=_malloc -sEXPORT_NAME=loadVosklet -sMALLOC=emmalloc -sEXPORTED_RUNTIME_METHODS=UTF8ToString,stringToUTF8OnStack -sENVIRONMENT=web,worker -I. -I$VOSK/src -L$KALDI/src -l:online2/kaldi-online2.a -l:decoder/kaldi-decoder.a -l:ivector/kaldi-ivector.a -l:gmm/kaldi-gmm.a -l:tree/kaldi-tree.a -l:feat/kaldi-feat.a -l:cudamatrix/kaldi-cudamatrix.a -l:lat/kaldi-lat.a -l:lm/kaldi-lm.a -l:rnnlm/kaldi-rnnlm.a -l:hmm/kaldi-hmm.a -l:nnet3/kaldi-nnet3.a -l:transform/kaldi-transform.a -l:matrix/kaldi-matrix.a -l:fstext/kaldi-fstext.a -l:util/kaldi-util.a -l:base/kaldi-base.a -L$OPENFST/lib -l:libfst.a -l:libfstngram.a -L$CLAPACK_WASM -l:CBLAS/lib/cblas.a -l:CLAPACK-3.2.1/lapack.a -l:CLAPACK-3.2.1/libcblaswr.a -l:f2c_BLAS-3.8.0/blas.a -l:libf2c/libf2c.a -L$VOSK/src -l:vosk.a -lembind -pthread -flto -fsanitize=undefined -fsanitize=address -fsanitize=leak -msimd128 -mreference-types -mnontrapping-fptoint -mextended-const -msign-ext -mmutable-globals -g3 --pre-js wrapper.js -o ../test.js em++ Util.cc CommonModel.cc Recognizer.cc Bindings.cc -O0 -Wall -Werror -Wno-pthreads-mem-growth -sWASMFS -sWASM_BIGINT -sSINGLE_FILE -sMODULARIZE -sEMBIND_STD_STRING_IS_UTF8 -sPTHREAD_POOL_DELAY_LOAD -sRUNTIME_DEBUG -sALLOW_MEMORY_GROWTH -sSTACK_OVERFLOW_CHECK=2 -sTEXTDECODER=2 -sPTHREAD_POOL_SIZE_STRICT=2 -sASSERTIONS=2 -sINITIAL_MEMORY=$INITIAL_MEMORY -sPTHREAD_POOL_SIZE=$MAX_THREADS -sDISABLE_EXCEPTION_CATCHING=0 -sEXIT_RUNTIME=0 -sINVOKE_RUN=0 -sPOLYFILL=0 -sEXPORTED_FUNCTIONS=_malloc -sEXPORT_NAME=loadVosklet -sMALLOC=emmalloc -sEXPORTED_RUNTIME_METHODS=UTF8ToString,stringToUTF8OnStack -sENVIRONMENT=web,worker -I. -I$VOSK/src -L$KALDI/src -l:online2/kaldi-online2.a -l:decoder/kaldi-decoder.a -l:ivector/kaldi-ivector.a -l:gmm/kaldi-gmm.a -l:tree/kaldi-tree.a -l:feat/kaldi-feat.a -l:cudamatrix/kaldi-cudamatrix.a -l:lat/kaldi-lat.a -l:lm/kaldi-lm.a -l:rnnlm/kaldi-rnnlm.a -l:hmm/kaldi-hmm.a -l:nnet3/kaldi-nnet3.a -l:transform/kaldi-transform.a -l:matrix/kaldi-matrix.a -l:fstext/kaldi-fstext.a -l:util/kaldi-util.a -l:base/kaldi-base.a -L$OPENFST/lib -l:libfst.a -l:libfstngram.a -L$CLAPACK_WASM -l:CBLAS/lib/cblas.a -l:CLAPACK-3.2.1/lapack.a -l:CLAPACK-3.2.1/libcblaswr.a -l:f2c_BLAS-3.8.0/blas.a -l:libf2c/libf2c.a -L$VOSK/src -l:vosk.a -lembind -pthread -flto -fsanitize=undefined -fsanitize=address -fsanitize=leak -msimd128 -mreference-types -mnontrapping-fptoint -mextended-const -msign-ext -mmutable-globals -g3 --pre-js Wrapper.js -o ../test.js
elif [ $MODE = 1 ]; then elif [ $MODE = 1 ]; then
em++ util.cc genericModel.cc recognizer.cc bindings.cc -O3 -sWASMFS -sWASM_BIGINT -sSINGLE_FILE -sMODULARIZE -sEMBIND_STD_STRING_IS_UTF8 -sPTHREAD_POOL_DELAY_LOAD -sTEXTDECODER=2 -sPTHREAD_POOL_SIZE_STRICT=2 -sINITIAL_MEMORY=$INITIAL_MEMORY -sALLOW_MEMORY_GROWTH -sPTHREAD_POOL_SIZE=$MAX_THREADS -sPOLYFILL=0 -sEXIT_RUNTIME=0 -sINVOKE_RUN=0 -sSUPPORT_LONGJMP=0 -sEXPORTED_FUNCTIONS=_malloc -sEXPORT_NAME=loadVosklet -sMALLOC=emmalloc -sEXPORTED_RUNTIME_METHODS=UTF8ToString,stringToUTF8OnStack -sENVIRONMENT=web,worker -I. -I$VOSK/src -L$KALDI/src -l:online2/kaldi-online2.a -l:decoder/kaldi-decoder.a -l:ivector/kaldi-ivector.a -l:gmm/kaldi-gmm.a -l:tree/kaldi-tree.a -l:feat/kaldi-feat.a -l:cudamatrix/kaldi-cudamatrix.a -l:lat/kaldi-lat.a -l:lm/kaldi-lm.a -l:rnnlm/kaldi-rnnlm.a -l:hmm/kaldi-hmm.a -l:nnet3/kaldi-nnet3.a -l:transform/kaldi-transform.a -l:matrix/kaldi-matrix.a -l:fstext/kaldi-fstext.a -l:util/kaldi-util.a -l:base/kaldi-base.a -L$OPENFST/lib -l:libfst.a -l:libfstngram.a -L$CLAPACK_WASM -l:CBLAS/lib/cblas.a -l:CLAPACK-3.2.1/lapack.a -l:CLAPACK-3.2.1/libcblaswr.a -l:f2c_BLAS-3.8.0/blas.a -l:libf2c/libf2c.a -L$VOSK/src -l:vosk.a -lembind -pthread -flto -msimd128 -mreference-types -mnontrapping-fptoint -mextended-const -msign-ext -mmutable-globals --pre-js wrapper.js -o ../test.js em++ Util.cc CommonModel.cc Recognizer.cc Bindings.cc -O3 -sWASMFS -sWASM_BIGINT -sSINGLE_FILE -sMODULARIZE -sEMBIND_STD_STRING_IS_UTF8 -sPTHREAD_POOL_DELAY_LOAD -sTEXTDECODER=2 -sPTHREAD_POOL_SIZE_STRICT=2 -sINITIAL_MEMORY=$INITIAL_MEMORY -sALLOW_MEMORY_GROWTH -sPTHREAD_POOL_SIZE=$MAX_THREADS -sPOLYFILL=0 -sEXIT_RUNTIME=0 -sINVOKE_RUN=0 -sSUPPORT_LONGJMP=0 -sEXPORTED_FUNCTIONS=_malloc -sEXPORT_NAME=loadVosklet -sMALLOC=emmalloc -sEXPORTED_RUNTIME_METHODS=UTF8ToString,stringToUTF8OnStack -sENVIRONMENT=web,worker -I. -I$VOSK/src -L$KALDI/src -l:online2/kaldi-online2.a -l:decoder/kaldi-decoder.a -l:ivector/kaldi-ivector.a -l:gmm/kaldi-gmm.a -l:tree/kaldi-tree.a -l:feat/kaldi-feat.a -l:cudamatrix/kaldi-cudamatrix.a -l:lat/kaldi-lat.a -l:lm/kaldi-lm.a -l:rnnlm/kaldi-rnnlm.a -l:hmm/kaldi-hmm.a -l:nnet3/kaldi-nnet3.a -l:transform/kaldi-transform.a -l:matrix/kaldi-matrix.a -l:fstext/kaldi-fstext.a -l:util/kaldi-util.a -l:base/kaldi-base.a -L$OPENFST/lib -l:libfst.a -l:libfstngram.a -L$CLAPACK_WASM -l:CBLAS/lib/cblas.a -l:CLAPACK-3.2.1/lapack.a -l:CLAPACK-3.2.1/libcblaswr.a -l:f2c_BLAS-3.8.0/blas.a -l:libf2c/libf2c.a -L$VOSK/src -l:vosk.a -lembind -pthread -flto -msimd128 -mreference-types -mnontrapping-fptoint -mextended-const -msign-ext -mmutable-globals --pre-js Wrapper.js -o ../test.js
else else
em++ util.cc genericModel.cc recognizer.cc bindings.cc -O0 -sWASMFS -sWASM_BIGINT -sSINGLE_FILE -sMODULARIZE -sEMBIND_STD_STRING_IS_UTF8 -sPTHREAD_POOL_DELAY_LOAD -sTEXTDECODER=2 -sPTHREAD_POOL_SIZE_STRICT=2 -sINITIAL_MEMORY=$INITIAL_MEMORY -sPTHREAD_POOL_SIZE=$MAX_THREADS -sPOLYFILL=0 -sEXIT_RUNTIME=0 -sINVOKE_RUN=0 -sSUPPORT_LONGJMP=0 -sEXPORTED_FUNCTIONS=_malloc -sEXPORT_NAME=loadVosklet -sMALLOC=emmalloc -sEXPORTED_RUNTIME_METHODS=UTF8ToString,stringToUTF8OnStack -sENVIRONMENT=web,worker -I. -I$VOSK/src -L$KALDI/src -l:online2/kaldi-online2.a -l:decoder/kaldi-decoder.a -l:ivector/kaldi-ivector.a -l:gmm/kaldi-gmm.a -l:tree/kaldi-tree.a -l:feat/kaldi-feat.a -l:cudamatrix/kaldi-cudamatrix.a -l:lat/kaldi-lat.a -l:lm/kaldi-lm.a -l:rnnlm/kaldi-rnnlm.a -l:hmm/kaldi-hmm.a -l:nnet3/kaldi-nnet3.a -l:transform/kaldi-transform.a -l:matrix/kaldi-matrix.a -l:fstext/kaldi-fstext.a -l:util/kaldi-util.a -l:base/kaldi-base.a -L$OPENFST/lib -l:libfst.a -l:libfstngram.a -L$CLAPACK_WASM -l:CBLAS/lib/cblas.a -l:CLAPACK-3.2.1/lapack.a -l:CLAPACK-3.2.1/libcblaswr.a -l:f2c_BLAS-3.8.0/blas.a -l:libf2c/libf2c.a -L$VOSK/src -l:vosk.a -lembind -pthread -flto -msimd128 -mreference-types -mnontrapping-fptoint -mextended-const -msign-ext -mmutable-globals --pre-js wrapper.js -o ../test.js em++ Util.cc CommonModel.cc Recognizer.cc Bindings.cc -O0 -sWASMFS -sWASM_BIGINT -sSINGLE_FILE -sMODULARIZE -sEMBIND_STD_STRING_IS_UTF8 -sPTHREAD_POOL_DELAY_LOAD -sTEXTDECODER=2 -sPTHREAD_POOL_SIZE_STRICT=2 -sINITIAL_MEMORY=$INITIAL_MEMORY -sPTHREAD_POOL_SIZE=$MAX_THREADS -sPOLYFILL=0 -sEXIT_RUNTIME=0 -sINVOKE_RUN=0 -sSUPPORT_LONGJMP=0 -sEXPORTED_FUNCTIONS=_malloc -sEXPORT_NAME=loadVosklet -sMALLOC=emmalloc -sEXPORTED_RUNTIME_METHODS=UTF8ToString,stringToUTF8OnStack -sENVIRONMENT=web,worker -I. -I$VOSK/src -L$KALDI/src -l:online2/kaldi-online2.a -l:decoder/kaldi-decoder.a -l:ivector/kaldi-ivector.a -l:gmm/kaldi-gmm.a -l:tree/kaldi-tree.a -l:feat/kaldi-feat.a -l:cudamatrix/kaldi-cudamatrix.a -l:lat/kaldi-lat.a -l:lm/kaldi-lm.a -l:rnnlm/kaldi-rnnlm.a -l:hmm/kaldi-hmm.a -l:nnet3/kaldi-nnet3.a -l:transform/kaldi-transform.a -l:matrix/kaldi-matrix.a -l:fstext/kaldi-fstext.a -l:util/kaldi-util.a -l:base/kaldi-base.a -L$OPENFST/lib -l:libfst.a -l:libfstngram.a -L$CLAPACK_WASM -l:CBLAS/lib/cblas.a -l:CLAPACK-3.2.1/lapack.a -l:CLAPACK-3.2.1/libcblaswr.a -l:f2c_BLAS-3.8.0/blas.a -l:libf2c/libf2c.a -L$VOSK/src -l:vosk.a -lembind -pthread -flto -msimd128 -mreference-types -mnontrapping-fptoint -mextended-const -msign-ext -mmutable-globals --pre-js Wrapper.js -o ../test.js
fi fi
sed -i 's/res.body/new Response(res.body.pipeThrough(new DecompressionStream("gzip"))).body/' ../test.js sed -i 's/res.body/new Response(res.body.pipeThrough(new DecompressionStream("gzip"))).body/' ../test.js
rm -f ../test.worker.js rm -f ../test.worker.js