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

Add more debug info, untested

Browse Source
This commit is contained in:
msqr1
2024-03-16 23:23:05 -07:00
parent 9c261cb5eb
commit ecab9aa5d5
9 changed files with 5899 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/genericModel.cc
View File

@@ -5,30 +5,31 @@ void genericModel::load() {
thrd.addTask([this](){
if(normalMdl) mdl = vosk_model_new(storepath.c_str());
else vosk_spk_model_new(storepath.c_str());
if(normalMdl && std::get<0>(mdl) == nullptr || std::get<1>(mdl) == nullptr) fireEv(index, "Unable to load model for recognition");
else fireEv(index, nullptr);
emscripten_console_log("Loading finished!");
if(normalMdl ? std::get<0>(mdl) == nullptr : std::get<1>(mdl) == nullptr) fireEv(index, "Unable to load model for recognition");
else fireEv(index, "0");
});
}
bool genericModel::checkFiles() {
if(normalMdl) {
return fs::exists(storepath + "/am/final.mdl", tank) &&
fs::exists(storepath + "/conf/mfcc.conf", tank) &&
fs::exists(storepath + "/conf/model.conf", tank) &&
fs::exists(storepath + "/graph/phones/word_boundary.int", tank) &&
fs::exists(storepath + "/graph/Gr.fst", tank) &&
fs::exists(storepath + "/graph/HCLr.fst", tank) &&
fs::exists(storepath + "/graph/disambig_tid.int", tank) &&
fs::exists(storepath + "/ivector/final.dubm", tank) &&
fs::exists(storepath + "/ivector/final.ie", tank) &&
fs::exists(storepath + "/ivector/final.mat", tank) &&
fs::exists(storepath + "/ivector/global_cmvn.stats", tank) &&
fs::exists(storepath + "/ivector/online_cmvn.conf", tank) &&
fs::exists(storepath + "/ivector/splice.conf", tank);
return fs::exists(storepath + "/am/final.mdl") &&
fs::exists(storepath + "/conf/mfcc.conf") &&
fs::exists(storepath + "/conf/model.conf") &&
fs::exists(storepath + "/graph/phones/word_boundary.int") &&
fs::exists(storepath + "/graph/Gr.fst") &&
fs::exists(storepath + "/graph/HCLr.fst") &&
fs::exists(storepath + "/graph/disambig_tid.int") &&
fs::exists(storepath + "/ivector/final.dubm") &&
fs::exists(storepath + "/ivector/final.ie") &&
fs::exists(storepath + "/ivector/final.mat") &&
fs::exists(storepath + "/ivector/global_cmvn.stats") &&
fs::exists(storepath + "/ivector/online_cmvn.conf") &&
fs::exists(storepath + "/ivector/splice.conf");
}
return fs::exists(storepath + "/mfcc.conf", tank) &&
fs::exists(storepath + "/final.ext.raw", tank) &&
fs::exists(storepath + "/mean.vec", tank) &&
fs::exists(storepath + "/transform.mat", tank);
return fs::exists(storepath + "/mfcc.conf") &&
fs::exists(storepath + "/final.ext.raw") &&
fs::exists(storepath + "/mean.vec") &&
fs::exists(storepath + "/transform.mat");
}
genericModel::~genericModel() {
archive_entry_free(entry);
@@ -53,8 +54,8 @@ void genericModel::check() {
fireEv(index, "OPFS initialization failed");
return;
}
if(!checkFiles() && !fs::exists(storepath + "/id", tank)) {
emscripten_console_log("Model is not available, fetching...");
if(!checkFiles() && !fs::exists(storepath + "/id")) {
emscripten_console_log("Model is not available or incorrect file, fetching...");
fireEv(index, "1");
return;
}
@@ -80,8 +81,8 @@ void genericModel::afterFetch() {
thrd.addTask([this](){
emscripten_console_log("Trying to extract...");
if(!extract()) {
fs::remove(storepath + ".tar",tank);
fs::remove_all(storepath, tank);
fs::remove(storepath + ".tar");
fs::remove_all(storepath);
emscripten_console_log("Unable to extract model");
fireEv(index, "Unable to extract model");
return;
@@ -97,16 +98,16 @@ void genericModel::afterFetch() {
if(idFd == -1) {
emscripten_console_log("Unable to create ID file");
fireEv(index, "Unable to create ID file");
fs::remove(storepath + ".tar",tank);
fs::remove_all(storepath, tank);
fs::remove(storepath + ".tar");
fs::remove_all(storepath);
return;
}
emscripten_console_log("Writing ID...");
if(write(idFd,id.data(), id.size()) == -1) {
emscripten_console_log("Unable to write new ID");
fireEv(index, "Unable to write new ID");
fs::remove(storepath + ".tar",tank);
fs::remove_all(storepath, tank);
fs::remove(storepath + ".tar");
fs::remove_all(storepath);
close(idFd);
return;
};
@@ -148,8 +149,8 @@ bool genericModel::extract() {
return false;
}
}
fs::remove(storepath + "/README",tank);
fs::remove(storepath + ".tar" ,tank);
fs::remove(storepath + "/README");
fs::remove(storepath + ".tar" );
archive_read_free(src);
return true;
}

2
src/genericModel.h
View File

@@ -14,7 +14,7 @@ namespace fs = std::filesystem;
struct genericModel {
bool normalMdl;
bool recognizerUsedThrd;
bool recognizerUsedThrd{};
int index;
std::string storepath;
std::string id;

6
src/global.cc
View File

@@ -1,7 +1,6 @@
#include "global.h"
pthread_t dstThrd{pthread_self()};
std::error_code tank{};
bool OPFSOk{};
bool OPFSTried{};
ProxyingQueue glbQ{};
@@ -19,9 +18,10 @@ void fireEv(int index, const char* content, const char* type) {
reusableThrd::reusableThrd() {
std::thread thrd{[this](){
while(!done.test(std::memory_order_relaxed)) {
blocker.wait(done.test(std::memory_order_relaxed) || queue.empty(), std::memory_order_relaxed);
blocker.wait(queue.empty() || done.test(std::memory_order_relaxed), std::memory_order_relaxed);
blocker.clear(std::memory_order_relaxed);
while(!queue.empty()) {
emscripten_console_log("==========Executing task===========");
queue.front()();
queue.pop();
}
@@ -31,6 +31,8 @@ reusableThrd::reusableThrd() {
}
void reusableThrd::addTask(std::function<void()>&& task) {
queue.emplace(task);
// The following line will make -O3 magically work. Yes, I know, it is a god dang PRINT STATEMENT.
//emscripten_console_log("");
blocker.test_and_set(std::memory_order_relaxed);
blocker.notify_one();
}

14
src/recognizer.cc
View File

@@ -1,14 +1,17 @@
#include "recognizer.h"
recognizer::recognizer(genericModel* model, float sampleRate, int index) : index(index) {
emscripten_console_log("Recognizer constructor called...");
rec = vosk_recognizer_new(std::get<0>(model->mdl),sampleRate);
finishConstruction(model, nullptr);
}
recognizer::recognizer(genericModel* model, genericModel* spkMdl, float sampleRate, int index) {
recognizer::recognizer(genericModel* model, genericModel* spkMdl, float sampleRate, int index) : index(index) {
emscripten_console_log("Recognizer constructor called...");
rec = vosk_recognizer_new_spk(std::get<0>(model->mdl), sampleRate, std::get<1>(spkMdl->mdl));
finishConstruction(model, spkMdl);
}
recognizer::recognizer(genericModel* model, const std::string& grm, float sampleRate, int index, int dummy) {
recognizer::recognizer(genericModel* model, const std::string& grm, float sampleRate, int index, int dummy) : index(index) {
emscripten_console_log("Recognizer constructor called...");
rec = vosk_recognizer_new_grm(std::get<0>(model->mdl), sampleRate, grm.c_str());
finishConstruction(model, nullptr);
}
@@ -20,12 +23,13 @@ recognizer::~recognizer() {
vosk_recognizer_free(rec);
free(dataPtr);
}
void recognizer::finishConstruction(genericModel* model, genericModel* spkModel) {
void recognizer:: finishConstruction(genericModel* model, genericModel* spkModel) {
if(rec == nullptr) {
fireEv(index, "Unable to initialize recognizer");
return;
}
auto main {[this](){
emscripten_console_log("Recognizer loaded!");
fireEv(index, "0");
while(!done.test(std::memory_order_relaxed)) {
controller.wait(!done.test(std::memory_order_relaxed), std::memory_order_relaxed);
@@ -43,12 +47,16 @@ void recognizer::finishConstruction(genericModel* model, genericModel* spkModel)
if(!model->recognizerUsedThrd) {
model->recognizerUsedThrd = true;
model->thrd.addTask(main);
emscripten_console_log("Adding task to model thread...");
return;
}
if(spkModel != nullptr && !spkModel->recognizerUsedThrd) {
spkModel->recognizerUsedThrd = true;
spkModel->thrd.addTask(main);
emscripten_console_log("Adding task to speaker model thread...");
return;
}
emscripten_console_log("New recognizer thread");
std::thread t{main};
t.detach();
}