diff --git a/src/addCOI.js b/addCOI.js similarity index 100% rename from src/addCOI.js rename to addCOI.js diff --git a/devel/test.sh b/devel/test.sh index e5fa041..c9984fd 100755 --- a/devel/test.sh +++ b/devel/test.sh @@ -29,8 +29,8 @@ if [ $EMSDK = ../emsdk ]; then echo "EMSDK is current directory, installing emsdk and Emscripten..." && git clone --depth=1 https://github.com/emscripten-core/emsdk.git && cd emsdk && - ./emsdk install 3.1.53 && - ./emsdk activate 3.1.53 + ./emsdk install 3.1.54 && + ./emsdk activate 3.1.54 fi . $EMSDK/emsdk_env.sh && @@ -38,13 +38,7 @@ export PATH=:$PATH:$EMSDK/upstream/bin && cd $SRC && if [ $RELEASE = 0 ]; then - em++ -O0 global.cc genericModel.cc model.cc spkModel.cc recognizer.cc bindings.cc -sWASMFS -sWASM_BIGINT -sSINGLE_FILE -sMODULARIZE -sTRUSTED_TYPES -sASSERTIONS=2 -sEMBIND_STD_STRING_IS_UTF8 -sPTHREAD_POOL_DELAY_LOAD -sTEXTDECODER=2 -sPTHREAD_POOL_SIZE_STRICT=2 -sINITIAL_MEMORY=$MAX_MEMORY -sPTHREAD_POOL_SIZE=$MAX_THREADS -sPOLYFILL=0 -sSUPPORT_LONGJMP=0 -sEXPORTED_FUNCTIONS=_malloc -sEXPORT_NAME=loadBR -sMALLOC=emmalloc -sEXPORTED_RUNTIME_METHODS=UTF8ToString,stringToUTF8OnStack -sENVIRONMENT=web,worker -I. -I$LIBARCHIVE/include -I$VOSK/src -L$LIBARCHIVE/lib -larchive -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 -lopfs.js -lembind -pthread -flto --no-entry --pre-js pre.js -o ../devel/BrowserRecognizer.js && - cd ../devel && - rm -f BrowserRecognizer.worker.js && - sed -i "s/locateFile('BrowserRecognizer.worker.js')/pthreadUrl/g" BrowserRecognizer.js + em++ -O0 global.cc genericModel.cc model.cc spkModel.cc recognizer.cc bindings.cc -sWASMFS -sWASM_BIGINT -sSINGLE_FILE -sMODULARIZE -sASSERTIONS=2 -sEMBIND_STD_STRING_IS_UTF8 -sPTHREAD_POOL_DELAY_LOAD -sTEXTDECODER=2 -sPTHREAD_POOL_SIZE_STRICT=2 -sINITIAL_MEMORY=$MAX_MEMORY -sPTHREAD_POOL_SIZE=$MAX_THREADS -sPOLYFILL=0 -sSUPPORT_LONGJMP=0 -sEXPORTED_FUNCTIONS=_malloc -sEXPORT_NAME=loadBR -sMALLOC=emmalloc -sEXPORTED_RUNTIME_METHODS=UTF8ToString,stringToUTF8OnStack -sENVIRONMENT=web,worker -I. -I$LIBARCHIVE/include -I$VOSK/src -L$LIBARCHIVE/lib -larchive -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 -lopfs.js -lembind -pthread -flto -msimd128 --no-entry --emit-symbol-map --pre-js pre.js -o ../devel/BrowserRecognizer.js && else - em++ -O3 global.cc genericModel.cc model.cc spkModel.cc recognizer.cc bindings.cc -sWASMFS -sWASM_BIGINT -sSINGLE_FILE -sMODULARIZE -sTRUSTED_TYPES -sEMBIND_STD_STRING_IS_UTF8 -sPTHREAD_POOL_DELAY_LOAD -sTEXTDECODER=2 -sPTHREAD_POOL_SIZE_STRICT=2 -sINITIAL_MEMORY=$MAX_MEMORY -sPTHREAD_POOL_SIZE=$MAX_THREADS -sPOLYFILL=0 -sSUPPORT_LONGJMP=0 -sEXPORTED_FUNCTIONS=_malloc -sEXPORT_NAME=loadBR -sMALLOC=emmalloc -sEXPORTED_RUNTIME_METHODS=UTF8ToString,stringToUTF8OnStack -sENVIRONMENT=web,worker -I. -I$LIBARCHIVE/include -I$VOSK/src -L$LIBARCHIVE/lib -larchive -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 -lopfs.js -lembind -pthread -flto --no-entry --pre-js pre.js -o ../BrowserRecognizer.js && - cd .. && - rm -f BrowserRecognizer.worker.js && - sed -i 's/locateFile("BrowserRecognizer.worker.js")/pthreadUrl/g' BrowserRecognizer.js -fi \ No newline at end of file + em++ -O3 global.cc genericModel.cc model.cc spkModel.cc recognizer.cc bindings.cc -sWASMFS -sWASM_BIGINT -sSINGLE_FILE -sMODULARIZE -sEMBIND_STD_STRING_IS_UTF8 -sPTHREAD_POOL_DELAY_LOAD -sTEXTDECODER=2 -sPTHREAD_POOL_SIZE_STRICT=2 -sINITIAL_MEMORY=$MAX_MEMORY -sPTHREAD_POOL_SIZE=$MAX_THREADS -sPOLYFILL=0 -sSUPPORT_LONGJMP=0 -sEXPORTED_FUNCTIONS=_malloc -sEXPORT_NAME=loadBR -sMALLOC=emmalloc -sEXPORTED_RUNTIME_METHODS=UTF8ToString,stringToUTF8OnStack -sENVIRONMENT=web,worker -I. -I$LIBARCHIVE/include -I$VOSK/src -L$LIBARCHIVE/lib -larchive -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 -lopfs.js -lembind -pthread -flto -msimd128 --no-entry --pre-js pre.js -o ../devel/BrowserRecognizer.js && +fi diff --git a/src/Makefile b/src/Makefile index f854c26..1c68c32 100644 --- a/src/Makefile +++ b/src/Makefile @@ -20,7 +20,7 @@ CLAPACK_WASM:=$(realpath clapack-wasm) BrowserRecognizer.js: | vosk libarchive cd $(SRC) && \ - em++ -O3 global.cc genericModel.cc model.cc spkModel.cc recognizer.cc bindings.cc -sWASMFS -sWASM_BIGINT -sSINGLE_FILE -sMODULARIZE -sTRUSTED_TYPES -sEMBIND_STD_STRING_IS_UTF8 -sPTHREAD_POOL_DELAY_LOAD -sTEXTDECODER=2 -sPTHREAD_POOL_SIZE_STRICT=2 -sINITIAL_MEMORY=$(MAX_MEMORY) -sPTHREAD_POOL_SIZE=$(MAX_THREADS) -sPOLYFILL=0 -sSUPPORT_LONGJMP=0 -sEXPORTED_FUNCTIONS=_malloc,_main -sEXPORT_NAME=loadBR -sMALLOC=emmalloc -sEXPORTED_RUNTIME_METHODS=UTF8ToString,stringToUTF8OnStack -sENVIRONMENT=web,worker -I. -I$(LIBARCHIVE)/include -I$(VOSK)/src -L$(LIBARCHIVE)/lib -larchive -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 -lopfs.js -lembind -pthread -flto --pre-js pre.js -o ../BrowserRecognizer.js && \ + em++ -O3 global.cc genericModel.cc model.cc spkModel.cc recognizer.cc bindings.cc -sWASMFS -sWASM_BIGINT -sSINGLE_FILE -sMODULARIZE -sEMBIND_STD_STRING_IS_UTF8 -sPTHREAD_POOL_DELAY_LOAD -sTEXTDECODER=2 -sPTHREAD_POOL_SIZE_STRICT=2 -sINITIAL_MEMORY=$(MAX_MEMORY) -sPTHREAD_POOL_SIZE=$(MAX_THREADS) -sPOLYFILL=0 -sSUPPORT_LONGJMP=0 -sEXPORTED_FUNCTIONS=_malloc,_main -sEXPORT_NAME=loadBR -sMALLOC=emmalloc -sEXPORTED_RUNTIME_METHODS=UTF8ToString,stringToUTF8OnStack -sENVIRONMENT=web,worker -I. -I$(LIBARCHIVE)/include -I$(VOSK)/src -L$(LIBARCHIVE)/lib -larchive -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 -lopfs.js -lembind -pthread -flto -msimd128 --no-entry --pre-js pre.js -o ../BrowserRecognizer.js && \ cd .. && \ rm -f BrowserRecognizer.worker.js && \ sed -i 's/locateFile("BrowserRecognizer.worker.js")/pthreadUrl/g' BrowserRecognizer.js && \ @@ -43,8 +43,8 @@ prepare: echo "Installing emsdk + Emscripten..."; \ git clone --depth=1 https://github.com/emscripten-core/emsdk.git && \ cd emsdk && \ - ./emsdk install 3.1.53 && \ - ./emsdk activate 3.1.53; \ + ./emsdk install 3.1.54 && \ + ./emsdk activate 3.1.54; \ . $(EMSDK)/emsdk_env.sh && \ export PATH=:$$PATH:$(EMSDK)/upstream/bin diff --git a/src/pre.js b/src/pre.js index 1fea77d..049e291 100644 --- a/src/pre.js +++ b/src/pre.js @@ -8,6 +8,10 @@ Module.cleanUp = () => { objs.forEach(obj => obj.delete()) Module.revokeURLs() } +Module.locateFile = (path, scriptDir) => { + if(path === "BrowserRecognizer.worker.js") return pthreadUrl + return scriptDir+path +} class genericModel extends EventTarget { constructor() { super() @@ -144,176 +148,8 @@ let processorUrl = URL.createObjectURL(new Blob(['(', }) }).toString() , ')()'], {type : "text/javascript"})) - -// Taken from the worker.js file let pthreadUrl = URL.createObjectURL(new Blob(['(', (() => { - /** - * @license - * Copyright 2015 The Emscripten Authors - * SPDX-License-Identifier: MIT - */ - - // Pthread Web Worker startup routine: - // This is the entry point file that is loaded first by each Web Worker - // that executes pthreads on the Emscripten application. - 'use strict'; - - var Module = {}; - - // Thread-local guard variable for one-time init of the JS state - var initializedJS = false; - - function assert(condition, text) { - if (!condition) abort('Assertion failed: ' + text); - } - function threadPrintErr() { - var text = Array.prototype.slice.call(arguments).join(' '); - console.error(text); - } - function threadAlert() { - var text = Array.prototype.slice.call(arguments).join(' '); - postMessage({cmd: 'alert', text, threadId: Module['_pthread_self']()}); - } - // We don't need out() for now, but may need to add it if we want to use it - // here. Or, if this code all moves into the main JS, that problem will go - // away. (For now, adding it here increases code size for no benefit.) - var out = () => { throw 'out() is not defined in worker.js.'; } - var err = threadPrintErr; - self.alert = threadAlert; - var dbg = threadPrintErr; - - Module['instantiateWasm'] = (info, receiveInstance) => { - // Instantiate from the module posted from the main thread. - // We can just use sync instantiation in the worker. - var module = Module['wasmModule']; - // We don't need the module anymore; new threads will be spawned from the main thread. - Module['wasmModule'] = null; - var instance = new WebAssembly.Instance(module, info); - // TODO: Due to Closure regression https://github.com/google/closure-compiler/issues/3193, - // the above line no longer optimizes out down to the following line. - // When the regression is fixed, we can remove this if/else. - return receiveInstance(instance); - } - - // Turn unhandled rejected promises into errors so that the main thread will be - // notified about them. - self.onunhandledrejection = (e) => { - throw e.reason || e; - }; - - function handleMessage(e) { - try { - if (e.data.cmd === 'load') { // Preload command that is called once per worker to parse and load the Emscripten code. - - // Until we initialize the runtime, queue up any further incoming messages. - let messageQueue = []; - self.onmessage = (e) => messageQueue.push(e); - - // And add a callback for when the runtime is initialized. - self.startWorker = (instance) => { - Module = instance; - // Notify the main thread that this thread has loaded. - postMessage({ 'cmd': 'loaded' }); - // Process any messages that were queued before the thread was ready. - for (let msg of messageQueue) { - handleMessage(msg); - } - // Restore the real message handler. - self.onmessage = handleMessage; - }; - - // Module and memory were sent from main thread - Module['wasmModule'] = e.data.wasmModule; - - // Use `const` here to ensure that the variable is scoped only to - // that iteration, allowing safe reference from a closure. - for (const handler of e.data.handlers) { - Module[handler] = (...args) => { - postMessage({ cmd: 'callHandler', handler, args: args }); - } - } - - Module['wasmMemory'] = e.data.wasmMemory; - - Module['buffer'] = Module['wasmMemory'].buffer; - - Module['workerID'] = e.data.workerID; - - Module['ENVIRONMENT_IS_PTHREAD'] = true; - - if (typeof e.data.urlOrBlob == 'string') { - if (typeof self.trustedTypes != 'undefined' && self.trustedTypes.createPolicy) { - var p = self.trustedTypes.createPolicy('emscripten#workerPolicy3', { createScriptURL: (ignored) => e.data.urlOrBlob }); - importScripts(p.createScriptURL('ignored')); - } else - importScripts(e.data.urlOrBlob); - } else { - var objectUrl = URL.createObjectURL(e.data.urlOrBlob); - if (typeof self.trustedTypes != 'undefined' && self.trustedTypes.createPolicy) { - var p = self.trustedTypes.createPolicy('emscripten#workerPolicy3', { createScriptURL: (ignored) => objectUrl }); - importScripts(p.createScriptURL('ignored')); - } else - importScripts(objectUrl); - URL.revokeObjectURL(objectUrl); - } - loadBR(Module); - } else if (e.data.cmd === 'run') { - // Pass the thread address to wasm to store it for fast access. - Module['__emscripten_thread_init'](e.data.pthread_ptr, /*is_main=*/0, /*is_runtime=*/0, /*can_block=*/1); - - // Await mailbox notifications with `Atomics.waitAsync` so we can start - // using the fast `Atomics.notify` notification path. - Module['__emscripten_thread_mailbox_await'](e.data.pthread_ptr); - - assert(e.data.pthread_ptr); - // Also call inside JS module to set up the stack frame for this pthread in JS module scope - Module['establishStackSpace'](); - Module['PThread'].receiveObjectTransfer(e.data); - Module['PThread'].threadInitTLS(); - - if (!initializedJS) { - // Embind must initialize itself on all threads, as it generates support JS. - // We only do this once per worker since they get reused - Module['__embind_initialize_bindings'](); - initializedJS = true; - } - - try { - Module['invokeEntryPoint'](e.data.start_routine, e.data.arg); - } catch(ex) { - if (ex != 'unwind') { - // The pthread "crashed". Do not call `_emscripten_thread_exit` (which - // would make this thread joinable). Instead, re-throw the exception - // and let the top level handler propagate it back to the main thread. - throw ex; - } - } - } else if (e.data.cmd === 'cancel') { // Main thread is asking for a pthread_cancel() on this thread. - if (Module['_pthread_self']()) { - Module['__emscripten_thread_exit'](-1); - } - } else if (e.data.target === 'setimmediate') { - // no-op - } else if (e.data.cmd === 'checkMailbox') { - if (initializedJS) { - Module['checkMailbox'](); - } - } else if (e.data.cmd) { - // The received message looks like something that should be handled by this message - // handler, (since there is a e.data.cmd field present), but is not one of the - // recognized commands: - err(`worker.js received unknown command ${e.data.cmd}`); - err(e.data); - } - } catch(ex) { - err(`worker.js onmessage() captured an uncaught exception: ${ex}`); - if (ex?.stack) err(ex.stack); - Module['__emscripten_thread_crashed']?.(); - throw ex; - } - }; - - self.onmessage = handleMessage; + // FIXME: Copy content of worker.js with -O0 here }).toString() , ')()'], {type : "text/javascript"})) \ No newline at end of file