Remove single file deployment for streaming instantiation and smaller size.
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -6,3 +6,4 @@ openfst
|
|||||||
emsdk
|
emsdk
|
||||||
index.html
|
index.html
|
||||||
test.js
|
test.js
|
||||||
|
test.wasm
|
||||||
File diff suppressed because one or more lines are too long
BIN
Examples/Vosklet.wasm
Executable file
BIN
Examples/Vosklet.wasm
Executable file
Binary file not shown.
@@ -1,7 +1,7 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<script src="https://cdn.jsdelivr.net/gh/msqr1/Vosklet@1.1.1/examples/Vosklet.min.js" async defer></script>
|
<script src="https://cdn.jsdelivr.net/gh/msqr1/Vosklet@1.1.1/Examples/Vosklet.min.js" async defer></script>
|
||||||
<script>
|
<script>
|
||||||
async function start() {
|
async function start() {
|
||||||
// Make sure sample rate matches that in the training data
|
// Make sure sample rate matches that in the training data
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<script src="https://cdn.jsdelivr.net/gh/msqr1/Vosklet@1.1.1/examples/Vosklet.min.js" async defer></script>
|
<script src="https://cdn.jsdelivr.net/gh/msqr1/Vosklet@1.1.1/Examples/Vosklet.min.js" async defer></script>
|
||||||
<script>
|
<script>
|
||||||
async function start() {
|
async function start() {
|
||||||
// Make sure sample rate matches that in the training data
|
// Make sure sample rate matches that in the training data
|
||||||
|
|||||||
1
NOTICE
1
NOTICE
@@ -12,4 +12,3 @@ distributed under the License is distributed on an "AS IS" BASIS,
|
|||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
See the License for the specific language governing permissions and
|
See the License for the specific language governing permissions and
|
||||||
limitations under the License.
|
limitations under the License.
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
- Support multiple models
|
- Support multiple models
|
||||||
- Has models' storage path management
|
- Has models' storage path management
|
||||||
- Has models' ID management (for model updates)
|
- Has models' ID management (for model updates)
|
||||||
- Has smaller JS size (>3.1MB vs 1.2MB gzipped)
|
- Has smaller JS size (>3.1MB vs 904KB gzipped)
|
||||||
- Has all related files (pthread worker, audio worklet processor,...) merged
|
- Has all related files (pthread worker, audio worklet processor,...) merged
|
||||||
- Has faster processing time
|
- Has faster processing time
|
||||||
- Has shorter from-scratch build time
|
- Has shorter from-scratch build time
|
||||||
@@ -18,12 +18,12 @@
|
|||||||
# 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, 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>
|
||||||
<head>
|
<head>
|
||||||
<script src="https://cdn.jsdelivr.net/gh/msqr1/Vosklet@1.1.1/examples/Vosklet.min.js" async defer></script>
|
<script src="https://cdn.jsdelivr.net/gh/msqr1/Vosklet@1.1.1/Examples/Vosklet.min.js" async defer></script>
|
||||||
<script>
|
<script>
|
||||||
async function start() {
|
async function start() {
|
||||||
// Make sure sample rate matches that in the training data
|
// Make sure sample rate matches that in the training data
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
BIN
Vosklet.wasm
Executable file
BIN
Vosklet.wasm
Executable file
Binary file not shown.
@@ -2,6 +2,7 @@
|
|||||||
#include "Util.h"
|
#include "Util.h"
|
||||||
|
|
||||||
#include <vosk_api.h>
|
#include <vosk_api.h>
|
||||||
|
|
||||||
struct CommonModel {
|
struct CommonModel {
|
||||||
bool normalMdl;
|
bool normalMdl;
|
||||||
int index;
|
int index;
|
||||||
@@ -13,4 +14,3 @@ struct CommonModel {
|
|||||||
CommonModel(int index, bool normalMdl, std::string storepath, std::string id, int tarStart, int tarSize);
|
CommonModel(int index, bool normalMdl, std::string storepath, std::string id, int tarStart, int tarSize);
|
||||||
~CommonModel();
|
~CommonModel();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ Module.createTransferer = async (ctx, bufferSize) => {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
async function getFileHandle(path, create = false) {
|
getFileHandle = async (path, create = false) => {
|
||||||
let components = path.split("/")
|
let components = path.split("/")
|
||||||
let prevDir = await navigator.storage.getDirectory()
|
let prevDir = await navigator.storage.getDirectory()
|
||||||
for(let component of components.slice(0, -1)) prevDir = await prevDir.getDirectoryHandle(component, { create : create })
|
for(let component of components.slice(0, -1)) prevDir = await prevDir.getDirectoryHandle(component, { create : create })
|
||||||
@@ -105,7 +105,7 @@ class Recognizer extends EventTarget {
|
|||||||
super()
|
super()
|
||||||
objs.push(this)
|
objs.push(this)
|
||||||
return new Proxy(this, {
|
return new Proxy(this, {
|
||||||
get(self, prop, receiver) {
|
get(self, prop, _) {
|
||||||
return self.obj && Object.keys(Object.getPrototypeOf(self.obj)).includes(prop) ? self.obj[prop].bind(self.obj) : self[prop] ? self[prop].bind ? self[prop].bind(self) : self[prop] : undefined
|
return self.obj && Object.keys(Object.getPrototypeOf(self.obj)).includes(prop) ? self.obj[prop].bind(self.obj) : self[prop] ? self[prop].bind ? self[prop].bind(self) : self[prop] : undefined
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
59
src/make
59
src/make
@@ -4,15 +4,15 @@ MAX_THREADS=${MAX_THREADS:-1}
|
|||||||
EMSDK=${EMSDK:-../emsdk}
|
EMSDK=${EMSDK:-../emsdk}
|
||||||
JOBS=${JOBS:-$(nproc)}
|
JOBS=${JOBS:-$(nproc)}
|
||||||
|
|
||||||
if [ $EMSDK != ../emsdk ] && [ ! -d $EMSDK ]; then
|
if [ "$EMSDK" != ../emsdk ] && [ ! -d "$EMSDK" ]; then
|
||||||
echo "Invalid emsdk path"
|
echo "Invalid emsdk path"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
if [ $MAX_THREADS -lt 1 ]; then
|
if [ "$MAX_THREADS" -lt 1 ]; then
|
||||||
echo "MAX_THREADS must be greater than or equal to 1"
|
echo "MAX_THREADS must be greater than or equal to 1"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
if [ $JOBS -lt 1 ]; then
|
if [ "$JOBS" -lt 1 ]; then
|
||||||
echo "JOBS must be greater than or equal to 1"
|
echo "JOBS must be greater than or equal to 1"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
@@ -20,15 +20,15 @@ if ! [[ $INITIAL_MEMORY =~ ^[0-9]+([kmgt]b)?$ ]]; then
|
|||||||
echo "INITIAL_MEMORY valid suffixes are kb, mb, gb, tb, none (bytes)"
|
echo "INITIAL_MEMORY valid suffixes are kb, mb, gb, tb, none (bytes)"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
if [ $EMSDK = ../emsdk ] && [ ! -d $EMSDK ]; then
|
if [ "$EMSDK" = ../emsdk ] && [ ! -d "$EMSDK" ]; then
|
||||||
echo "Installing emsdk + Emscripten..."
|
echo "Installing emsdk + Emscripten..."
|
||||||
git clone --depth=1 https://github.com/emscripten-core/emsdk.git ../emsdk &&
|
git clone --depth=1 https://github.com/emscripten-core/emsdk.git ../emsdk &&
|
||||||
cd ../emsdk &&
|
cd ../emsdk &&
|
||||||
./emsdk install 3.1.65 &&
|
./emsdk install 3.1.65 &&
|
||||||
./emsdk activate 3.1.65
|
./emsdk activate 3.1.65
|
||||||
fi
|
fi
|
||||||
. $(realpath $EMSDK)/emsdk_env.sh &&
|
. $(realpath "$EMSDK")/emsdk_env.sh &&
|
||||||
export PATH=:$PATH:$(realpath $EMSDK)/upstream/bin &&
|
export PATH=:$PATH:$(realpath "$EMSDK")/upstream/bin &&
|
||||||
|
|
||||||
cd .. &&
|
cd .. &&
|
||||||
SRC=$(realpath src)
|
SRC=$(realpath src)
|
||||||
@@ -37,47 +37,48 @@ VOSK=$(realpath vosk)
|
|||||||
OPENFST=$(realpath openfst)
|
OPENFST=$(realpath openfst)
|
||||||
CLAPACK_WASM=$(realpath clapack-wasm)
|
CLAPACK_WASM=$(realpath clapack-wasm)
|
||||||
|
|
||||||
if [ ! -d $OPENFST ]; then
|
if [ ! -d "$OPENFST" ]; then
|
||||||
rm -rf /tmp/openfst &&
|
rm -rf /tmp/openfst &&
|
||||||
git clone --depth=1 https://github.com/alphacep/openfst /tmp/openfst &&
|
git clone --depth=1 https://github.com/alphacep/openfst /tmp/openfst &&
|
||||||
cd /tmp/openfst &&
|
cd /tmp/openfst &&
|
||||||
git apply $SRC/Openfst.patch
|
git apply "$SRC"/Openfst.patch
|
||||||
autoreconf -is &&
|
autoreconf -is &&
|
||||||
CXXFLAGS="-r -O3 -flto -msimd128 -mreference-types -mnontrapping-fptoint -mextended-const -msign-ext -mmutable-globals" LDFLAGS="-O3 -flto" emconfigure ./configure --prefix=$OPENFST --enable-static --disable-shared --enable-lookahead-fsts --enable-ngram-fsts --disable-bin &&
|
CXXFLAGS="-r -O3 -flto -msimd128 -mreference-types -mnontrapping-fptoint -mextended-const -msign-ext -mmutable-globals" LDFLAGS="-O3 -flto" emconfigure ./configure --prefix="$OPENFST" --enable-static --disable-shared --enable-lookahead-fsts --enable-ngram-fsts --disable-bin &&
|
||||||
emmake make -j$JOBS install &&
|
emmake make -j"$JOBS" install &&
|
||||||
echo "PACKAGE_VERSION = 1.8.0" >> $OPENFST/Makefile
|
echo "PACKAGE_VERSION = 1.8.0" >> "$OPENFST"/Makefile
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -d $CLAPACK_WASM ]; then
|
if [ ! -d "$CLAPACK_WASM" ]; then
|
||||||
git clone --depth=1 https://gitlab.inria.fr/multispeech/kaldi.web/clapack-wasm.git $CLAPACK_WASM &&
|
git clone --depth=1 https://gitlab.inria.fr/multispeech/kaldi.web/clapack-wasm.git "$CLAPACK_WASM" &&
|
||||||
cd $CLAPACK_WASM &&
|
cd "$CLAPACK_WASM" &&
|
||||||
git apply $SRC/Clapack-wasm.patch &&
|
git apply "$SRC"/Clapack-wasm.patch &&
|
||||||
bash install_repo.sh emcc
|
bash install_repo.sh emcc
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -d $KALDI ]; then
|
if [ ! -d "$KALDI" ]; then
|
||||||
git clone -b vosk --depth=1 https://github.com/alphacep/kaldi $KALDI &&
|
git clone -b vosk --depth=1 https://github.com/alphacep/kaldi "$KALDI" &&
|
||||||
cd $KALDI/src &&
|
cd "$KALDI"/src &&
|
||||||
git apply $SRC/Kaldi.patch &&
|
git apply "$SRC"/Kaldi.patch &&
|
||||||
CXXFLAGS="-O3 -UHAVE_EXECINFO_H -flto -msimd128 -mreference-types -mnontrapping-fptoint -mextended-const -msign-ext -mmutable-globals -Wno-unused-variable -Wno-unused-but-set-variable -g0" LDFLAGS="-O3 -lembind -flto -g0" emconfigure ./configure --use-cuda=no --with-cudadecoder=no --static --static-math=yes --static-fst=yes --debug-level=0 --fst-root=$OPENFST --clapack-root=$CLAPACK_WASM --host=WASM &&
|
CXXFLAGS="-O3 -UHAVE_EXECINFO_H -flto -msimd128 -mreference-types -mnontrapping-fptoint -mextended-const -msign-ext -mmutable-globals -Wno-unused-variable -Wno-unused-but-set-variable -g0" LDFLAGS="-O3 -lembind -flto -g0" emconfigure ./configure --use-cuda=no --with-cudadecoder=no --static --static-math=yes --static-fst=yes --debug-level=0 --fst-root="$OPENFST" --clapack-root="$CLAPACK_WASM" --host=WASM &&
|
||||||
emmake make -j$JOBS online2 rnnlm
|
emmake make -j"$JOBS" online2 rnnlm
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -d $VOSK ]; then
|
if [ ! -d "$VOSK" ]; then
|
||||||
git clone -b v0.3.50 --depth=1 https://github.com/alphacep/vosk-api $VOSK &&
|
git clone -b v0.3.50 --depth=1 https://github.com/alphacep/vosk-api "$VOSK" &&
|
||||||
cd $VOSK/src &&
|
cd "$VOSK"/src &&
|
||||||
git apply $SRC/Vosk.patch &&
|
git apply "$SRC"/Vosk.patch &&
|
||||||
VOSK_FILES="Recognizer.cc language_model.cc model.cc spk_model.cc vosk_api.cc" &&
|
VOSK_FILES="Recognizer.cc language_model.cc model.cc spk_model.cc vosk_api.cc" &&
|
||||||
em++ -O3 -flto -msimd128 -mreference-types -mnontrapping-fptoint -mextended-const -msign-ext -mmutable-globals -Wno-deprecated -I. -I$KALDI/src -I$OPENFST/include $VOSK_FILES -c &&
|
em++ -O3 -flto -msimd128 -mreference-types -mnontrapping-fptoint -mextended-const -msign-ext -mmutable-globals -Wno-deprecated -I. -I"$KALDI"/src -I"$OPENFST"/include "$VOSK_FILES" -c &&
|
||||||
emar -rcs vosk.a ${VOSK_FILES//.cc/.o}
|
emar -rcs vosk.a "${VOSK_FILES//.cc/.o}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cd $SRC &&
|
cd "$SRC" &&
|
||||||
em++ Util.cc CommonModel.cc Recognizer.cc Bindings.cc -O3 -Wno-pthreads-mem-growth -DEMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=0 -fno-rtti -DMAX_THREADS=$MAX_THREADS -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 -sALLOW_BLOCKING_ON_MAIN_THREAD=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 -Wno-pthreads-mem-growth -DEMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=0 -fno-rtti -DMAX_THREADS="$MAX_THREADS" -sWASMFS -sWASM_BIGINT -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 -sALLOW_BLOCKING_ON_MAIN_THREAD=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 &&
|
||||||
|
cp Vosklet.wasm Example/Vosklet.wasm &&
|
||||||
|
|
||||||
# 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 &&
|
||||||
|
|||||||
20
test
20
test
@@ -4,15 +4,15 @@ MAX_THREADS=${MAX_THREADS:-1}
|
|||||||
EMSDK=${EMSDK:-emsdk}
|
EMSDK=${EMSDK:-emsdk}
|
||||||
JOBS=${JOBS:-$(nproc)}
|
JOBS=${JOBS:-$(nproc)}
|
||||||
|
|
||||||
if [ $EMSDK != emsdk ] && [ ! -d $EMSDK ]; then
|
if [ "$EMSDK" != emsdk ] && [ ! -d "$EMSDK" ]; then
|
||||||
echo "Invalid emsdk path"
|
echo "Invalid emsdk path"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
if [ $MAX_THREADS -lt 1 ]; then
|
if [ "$MAX_THREADS" -lt 1 ]; then
|
||||||
echo "MAX_THREADS must be greater than or equal to 1"
|
echo "MAX_THREADS must be greater than or equal to 1"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
if [ $JOBS -lt 1 ]; then
|
if [ "$JOBS" -lt 1 ]; then
|
||||||
echo "JOBS must be greater than or equal to 1"
|
echo "JOBS must be greater than or equal to 1"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
@@ -20,15 +20,15 @@ if ! [[ $INITIAL_MEMORY =~ ^[0-9]+([kmgt]b)?$ ]]; then
|
|||||||
echo "INITIAL_MEMORY valid suffixes are kb, mb, gb, tb, none (bytes)"
|
echo "INITIAL_MEMORY valid suffixes are kb, mb, gb, tb, none (bytes)"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
if [ $EMSDK = emsdk ] && [ ! -d $EMSDK ]; then
|
if [ "$EMSDK" = emsdk ] && [ ! -d "$EMSDK" ]; then
|
||||||
echo "Installing emsdk + Emscripten..."
|
echo "Installing emsdk + Emscripten..."
|
||||||
git clone --depth=1 https://github.com/emscripten-core/emsdk.git ../emsdk &&
|
git clone --depth=1 https://github.com/emscripten-core/emsdk.git ../emsdk &&
|
||||||
cd ../emsdk &&
|
cd ../emsdk &&
|
||||||
./emsdk install 3.1.65 &&
|
./emsdk install 3.1.65 &&
|
||||||
./emsdk activate 3.1.65
|
./emsdk activate 3.1.65
|
||||||
fi
|
fi
|
||||||
. $(realpath $EMSDK)/emsdk_env.sh &&
|
. $(realpath "$EMSDK")/emsdk_env.sh &&
|
||||||
export PATH=:$PATH:$(realpath $EMSDK)/upstream/bin
|
export PATH=:$PATH:$(realpath "$EMSDK")/upstream/bin
|
||||||
|
|
||||||
KALDI=$(realpath kaldi)
|
KALDI=$(realpath kaldi)
|
||||||
VOSK=$(realpath vosk)
|
VOSK=$(realpath vosk)
|
||||||
@@ -38,10 +38,10 @@ CLAPACK_WASM=$(realpath clapack-wasm)
|
|||||||
cd src &&
|
cd src &&
|
||||||
MODE=1 && # 0: Ultra debug info, 1: Optimized release, else custom
|
MODE=1 && # 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 CommonModel.cc Recognizer.cc Bindings.cc -O0 -Wno-pthreads-mem-growth -DEMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=0 -fno-rtti -DMAX_THREADS=$MAX_THREADS -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 -sALLOW_BLOCKING_ON_MAIN_THREAD=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 -Wno-pthreads-mem-growth -DEMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=0 -fno-rtti -DMAX_THREADS="$MAX_THREADS" -Wall -Werror -Wno-pthreads-mem-growth -sWASMFS -sWASM_BIGINT -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 -sALLOW_BLOCKING_ON_MAIN_THREAD=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 CommonModel.cc Recognizer.cc Bindings.cc -O3 -Wno-pthreads-mem-growth -DEMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=0 -fno-rtti -DMAX_THREADS=$MAX_THREADS -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 -sALLOW_BLOCKING_ON_MAIN_THREAD=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 -Wno-pthreads-mem-growth -DEMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=0 -fno-rtti -DMAX_THREADS="$MAX_THREADS" -sWASMFS -sWASM_BIGINT -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 -sALLOW_BLOCKING_ON_MAIN_THREAD=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
|
||||||
:
|
:
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user