experiments/STT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More rebranding

Browse Source
This commit is contained in:
Kelly Davis 2021-03-05 16:46:18 +01:00
parent 915886b3b7
commit 99fc28a6c7
60 changed files with 128 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ISSUE_TEMPLATE.md
View File

@ -1,4 +1,4 @@
For support and discussions, please use our [Discourse forums](https://discourse.mozilla.org/c/deep-speech).
For support and discussions, please use [GitHub Discussions](https://github.com/coqui-ai/STT/discussions).
If you've found a bug, or have a feature request, then please create an issue with the following information:

2
doc/Decoder.rst
View File

@ -22,7 +22,7 @@ The use of an external scorer is fully optional. When an external scorer is not
Currently, the 🐸STT external scorer is implemented with `KenLM <https://kheafield.com/code/kenlm/>`_, plus some tooling to package the necessary files and metadata into a single ``.scorer`` package. The tooling lives in ``data/lm/``. The scripts included in ``data/lm/`` can be used and modified to build your own language model based on your particular use case or language. See :ref:`scorer-scripts` for more details on how to reproduce our scorer file as well as create your own.
The scripts are geared towards replicating the language model files we release as part of `STT model releases <https://github.com/mozilla/🐸STT/releases/latest>`_, but modifying them to use different datasets or language model construction parameters should be simple.
The scripts are geared towards replicating the language model files we release as part of `STT model releases <https://github.com/coqui-ai/STT/releases/latest>`_, but modifying them to use different datasets or language model construction parameters should be simple.
Decoding modes

6
evaluate_tflite.py
View File

@ -19,11 +19,11 @@ from six.moves import zip, range
r'''
This module should be self-contained:
- build libdeepspeech.so with TFLite:
- bazel build [...] --define=runtime=tflite [...] //native_client:libdeepspeech.so
- build libstt.so with TFLite:
- bazel build [...] --define=runtime=tflite [...] //native_client:libstt.so
- make -C native_client/python/ TFDIR=... bindings
- setup a virtualenv
- pip install native_client/python/dist/deepspeech*.whl
- pip install native_client/python/dist/*.whl
- pip install -r requirements_eval_tflite.txt
Then run with a TFLite model, a scorer and a CSV test file

2
native_client/Android.mk
View File

@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := deepspeech-prebuilt
LOCAL_SRC_FILES := $(TFDIR)/bazel-bin/native_client/libdeepspeech.so
LOCAL_SRC_FILES := $(TFDIR)/bazel-bin/native_client/libstt.so
include $(PREBUILT_SHARED_LIBRARY)
include $(CLEAR_VARS)

2
native_client/CODINGSTYLE.md
View File

@ -25,4 +25,4 @@ File naming
Doubts
======
If in doubt, please ask on our Matrix chat channel: https://chat.mozilla.org/#/room/#machinelearning:mozilla.org
If in doubt, please ask on our Matrix chat channel: https://matrix.to/#/#stt:matrix.org?via=matrix.org

2
native_client/Makefile
View File

@ -32,7 +32,7 @@ debug: $(STT_BIN)
install: $(STT_BIN)
install -d ${PREFIX}/lib
install -m 0644 ${TFDIR}/bazel-bin/native_client/libdeepspeech.so ${PREFIX}/lib/
install -m 0644 ${TFDIR}/bazel-bin/native_client/libstt.so ${PREFIX}/lib/
install -d ${PREFIX}/include
install -m 0644 coqui-stt.h ${PREFIX}/include
install -d ${PREFIX}/bin

6
native_client/definitions.mk
View File

@ -20,7 +20,7 @@ endif
STT_BIN := stt$(PLATFORM_EXE_SUFFIX)
CFLAGS_DEEPSPEECH := -std=c++11 -o $(STT_BIN)
LINK_DEEPSPEECH := -ldeepspeech
LINK_DEEPSPEECH := -lstt
LINK_PATH_DEEPSPEECH := -L${TFDIR}/bazel-bin/native_client
ifeq ($(TARGET),host)
@ -61,7 +61,7 @@ TOOL_CC := cl.exe
TOOL_CXX := cl.exe
TOOL_LD := link.exe
TOOL_LIBEXE := lib.exe
LINK_DEEPSPEECH := $(TFDIR)\bazel-bin\native_client\libdeepspeech.so.if.lib
LINK_DEEPSPEECH := $(TFDIR)\bazel-bin\native_client\libstt.so.if.lib
LINK_PATH_DEEPSPEECH :=
CFLAGS_DEEPSPEECH := -nologo -Fe$(STT_BIN)
SOX_CFLAGS :=
@ -182,7 +182,7 @@ define copy_missing_libs
new_missing="$$( (for f in $$(otool -L $$lib 2>/dev/null | tail -n +2 | awk '{ print $$1 }' | grep -v '$$lib'); do ls -hal $$f; done;) 2>&1 | grep 'No such' | cut -d':' -f2 | xargs basename -a)"; \
missing_libs="$$missing_libs $$new_missing"; \
elif [ "$(OS)" = "${TC_MSYS_VERSION}" ]; then \
missing_libs="libdeepspeech.so"; \
missing_libs="libstt.so"; \
else \
missing_libs="$$missing_libs $$($(LDD) $$lib | grep 'not found' | awk '{ print $$1 }')"; \
fi; \

52
native_client/dotnet/DeepSpeechClient/NativeImp.cs
View File

@ -6,107 +6,107 @@ using System.Runtime.InteropServices;
namespace DeepSpeechClient
{
/// <summary>
/// Wrapper for the native implementation of "libdeepspeech.so"
/// Wrapper for the native implementation of "libstt.so"
/// </summary>
internal static class NativeImp
{
#region Native Implementation
[DllImport("libdeepspeech.so", CallingConvention = CallingConvention.Cdecl,
[DllImport("libstt.so", CallingConvention = CallingConvention.Cdecl,
CharSet = CharSet.Ansi, SetLastError = true)]
internal static extern IntPtr DS_Version();
[DllImport("libdeepspeech.so", CallingConvention = CallingConvention.Cdecl)]
[DllImport("libstt.so", CallingConvention = CallingConvention.Cdecl)]
internal unsafe static extern ErrorCodes DS_CreateModel(string aModelPath,
ref IntPtr** pint);
[DllImport("libdeepspeech.so", CallingConvention = CallingConvention.Cdecl)]
[DllImport("libstt.so", CallingConvention = CallingConvention.Cdecl)]
internal unsafe static extern IntPtr DS_ErrorCodeToErrorMessage(int aErrorCode);
[DllImport("libdeepspeech.so", CallingConvention = CallingConvention.Cdecl)]
[DllImport("libstt.so", CallingConvention = CallingConvention.Cdecl)]
internal unsafe static extern uint DS_GetModelBeamWidth(IntPtr** aCtx);
[DllImport("libdeepspeech.so", CallingConvention = CallingConvention.Cdecl)]
[DllImport("libstt.so", CallingConvention = CallingConvention.Cdecl)]
internal unsafe static extern ErrorCodes DS_SetModelBeamWidth(IntPtr** aCtx,
uint aBeamWidth);
[DllImport("libdeepspeech.so", CallingConvention = CallingConvention.Cdecl)]
[DllImport("libstt.so", CallingConvention = CallingConvention.Cdecl)]
internal unsafe static extern ErrorCodes DS_CreateModel(string aModelPath,
uint aBeamWidth,
ref IntPtr** pint);
[DllImport("libdeepspeech.so", CallingConvention = CallingConvention.Cdecl)]
[DllImport("libstt.so", CallingConvention = CallingConvention.Cdecl)]
internal unsafe static extern int DS_GetModelSampleRate(IntPtr** aCtx);
[DllImport("libdeepspeech.so", CallingConvention = CallingConvention.Cdecl)]
[DllImport("libstt.so", CallingConvention = CallingConvention.Cdecl)]
internal static unsafe extern ErrorCodes DS_EnableExternalScorer(IntPtr** aCtx,
string aScorerPath);
[DllImport("libdeepspeech.so", CallingConvention = CallingConvention.Cdecl)]
[DllImport("libstt.so", CallingConvention = CallingConvention.Cdecl)]
internal static unsafe extern ErrorCodes DS_AddHotWord(IntPtr** aCtx,
string aWord,
float aBoost);
[DllImport("libdeepspeech.so", CallingConvention = CallingConvention.Cdecl)]
[DllImport("libstt.so", CallingConvention = CallingConvention.Cdecl)]
internal static unsafe extern ErrorCodes DS_EraseHotWord(IntPtr** aCtx,
string aWord);
[DllImport("libdeepspeech.so", CallingConvention = CallingConvention.Cdecl)]
[DllImport("libstt.so", CallingConvention = CallingConvention.Cdecl)]
internal static unsafe extern ErrorCodes DS_ClearHotWords(IntPtr** aCtx);
[DllImport("libdeepspeech.so", CallingConvention = CallingConvention.Cdecl)]
[DllImport("libstt.so", CallingConvention = CallingConvention.Cdecl)]
internal static unsafe extern ErrorCodes DS_DisableExternalScorer(IntPtr** aCtx);
[DllImport("libdeepspeech.so", CallingConvention = CallingConvention.Cdecl)]
[DllImport("libstt.so", CallingConvention = CallingConvention.Cdecl)]
internal static unsafe extern ErrorCodes DS_SetScorerAlphaBeta(IntPtr** aCtx,
float aAlpha,
float aBeta);
[DllImport("libdeepspeech.so", CallingConvention = CallingConvention.Cdecl,
[DllImport("libstt.so", CallingConvention = CallingConvention.Cdecl,
CharSet = CharSet.Ansi, SetLastError = true)]
internal static unsafe extern IntPtr DS_SpeechToText(IntPtr** aCtx,
short[] aBuffer,
uint aBufferSize);
[DllImport("libdeepspeech.so", CallingConvention = CallingConvention.Cdecl, SetLastError = true)]
[DllImport("libstt.so", CallingConvention = CallingConvention.Cdecl, SetLastError = true)]
internal static unsafe extern IntPtr DS_SpeechToTextWithMetadata(IntPtr** aCtx,
short[] aBuffer,
uint aBufferSize,
uint aNumResults);
[DllImport("libdeepspeech.so", CallingConvention = CallingConvention.Cdecl)]
[DllImport("libstt.so", CallingConvention = CallingConvention.Cdecl)]
internal static unsafe extern void DS_FreeModel(IntPtr** aCtx);
[DllImport("libdeepspeech.so", CallingConvention = CallingConvention.Cdecl)]
[DllImport("libstt.so", CallingConvention = CallingConvention.Cdecl)]
internal static unsafe extern ErrorCodes DS_CreateStream(IntPtr** aCtx,
ref IntPtr** retval);
[DllImport("libdeepspeech.so", CallingConvention = CallingConvention.Cdecl)]
[DllImport("libstt.so", CallingConvention = CallingConvention.Cdecl)]
internal static unsafe extern void DS_FreeStream(IntPtr** aSctx);
[DllImport("libdeepspeech.so", CallingConvention = CallingConvention.Cdecl)]
[DllImport("libstt.so", CallingConvention = CallingConvention.Cdecl)]
internal static unsafe extern void DS_FreeMetadata(IntPtr metadata);
[DllImport("libdeepspeech.so", CallingConvention = CallingConvention.Cdecl)]
[DllImport("libstt.so", CallingConvention = CallingConvention.Cdecl)]
internal static unsafe extern void DS_FreeString(IntPtr str);
[DllImport("libdeepspeech.so", CallingConvention = CallingConvention.Cdecl,
[DllImport("libstt.so", CallingConvention = CallingConvention.Cdecl,
CharSet = CharSet.Ansi, SetLastError = true)]
internal static unsafe extern void DS_FeedAudioContent(IntPtr** aSctx,
short[] aBuffer,
uint aBufferSize);
[DllImport("libdeepspeech.so", CallingConvention = CallingConvention.Cdecl)]
[DllImport("libstt.so", CallingConvention = CallingConvention.Cdecl)]
internal static unsafe extern IntPtr DS_IntermediateDecode(IntPtr** aSctx);
[DllImport("libdeepspeech.so", CallingConvention = CallingConvention.Cdecl)]
[DllImport("libstt.so", CallingConvention = CallingConvention.Cdecl)]
internal static unsafe extern IntPtr DS_IntermediateDecodeWithMetadata(IntPtr** aSctx,
uint aNumResults);
[DllImport("libdeepspeech.so", CallingConvention = CallingConvention.Cdecl,
[DllImport("libstt.so", CallingConvention = CallingConvention.Cdecl,
CharSet = CharSet.Ansi, SetLastError = true)]
internal static unsafe extern IntPtr DS_FinishStream(IntPtr** aSctx);
[DllImport("libdeepspeech.so", CallingConvention = CallingConvention.Cdecl)]
[DllImport("libstt.so", CallingConvention = CallingConvention.Cdecl)]
internal static unsafe extern IntPtr DS_FinishStreamWithMetadata(IntPtr** aSctx,
uint aNumResults);
#endregion

12
native_client/dotnet/nupkg/deepspeech.nuspec.in → native_client/dotnet/nupkg/stt.nuspec.in
View File

@ -3,14 +3,14 @@
<metadata>
<id>$NUPKG_ID</id>
<version>$NUPKG_VERSION</version>
<title>DeepSpeech</title>
<authors>DeepSpeech authors</authors>
<owners>DeepSpeech authors</owners>
<title>Coqui STT</title>
<authors>Coqui GmbH</authors>
<owners>Coqui GmbH</owners>
<license type="expression">MPL-2.0</license>
<projectUrl>http://github.com/mozilla/DeepSpeech</projectUrl>
<projectUrl>http://github.com/coqui-ai/STT</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>A library for running inference with a DeepSpeech model</description>
<copyright>Copyright (c) 2019-2020 Mozilla Corporation, 2020 DeepSpeech authors</copyright>
<description>A library for doing speech recognition using a Coqui STT model</description>
<copyright>Copyright (c) 2019-2020 Mozilla Corporation, (c) 2020 DeepSpeech authors, (c) 2021 Coqui GmbH</copyright>
<tags>native speech speech_recognition</tags>
</metadata>
<files>

14
native_client/java/Makefile
View File

@ -2,7 +2,7 @@
include ../definitions.mk
ARCHS := $(shell grep 'ABI_FILTERS' libdeepspeech/gradle.properties | cut -d'=' -f2 | sed -e 's/;/ /g')
ARCHS := $(shell grep 'ABI_FILTERS' libstt/gradle.properties | cut -d'=' -f2 | sed -e 's/;/ /g')
GRADLE ?= ./gradlew
all: apk
@ -14,13 +14,13 @@ apk-clean:
$(GRADLE) clean
libs-clean:
rm -fr libdeepspeech/libs/*/libdeepspeech.so
rm -fr libstt/libs/*/libstt.so
libdeepspeech/libs/%/libdeepspeech.so:
-mkdir libdeepspeech/libs/$*/
cp ${TFDIR}/bazel-out/$*-*/bin/native_client/libdeepspeech.so libdeepspeech/libs/$*/
libstt/libs/%/libstt.so:
-mkdir libstt/libs/$*/
cp ${TFDIR}/bazel-out/$*-*/bin/native_client/libstt.so libstt/libs/$*/
apk: apk-clean bindings $(patsubst %,libdeepspeech/libs/%/libdeepspeech.so,$(ARCHS))
apk: apk-clean bindings $(patsubst %,libstt/libs/%/libstt.so,$(ARCHS))
$(GRADLE) build
maven-bundle: apk
@ -28,4 +28,4 @@ maven-bundle: apk
$(GRADLE) zipMavenArtifacts
bindings: clean ds-swig
$(DS_SWIG_ENV) swig -c++ -java -package org.deepspeech.libdeepspeech -outdir libdeepspeech/src/main/java/org/deepspeech/libdeepspeech/ -o jni/deepspeech_wrap.cpp jni/deepspeech.i
$(DS_SWIG_ENV) swig -c++ -java -package ai.coqui.libstt -outdir libstt/src/main/java/ai/coqui/libstt/ -o jni/deepspeech_wrap.cpp jni/deepspeech.i

4
native_client/java/app/build.gradle
View File

@ -4,7 +4,7 @@ android {
compileSdkVersion 27
defaultConfig {
applicationId "org.deepspeech"
applicationId "ai.coqui.sttexampleapp"
minSdkVersion 21
targetSdkVersion 27
versionName androidGitVersion.name()
@ -28,7 +28,7 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(':libdeepspeech')
implementation project(':libstt')
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
testImplementation 'junit:junit:4.12'

4
native_client/java/app/src/androidTest/java/org/deepspeech/ExampleInstrumentedTest.java → native_client/java/app/src/androidTest/java/ai/coqui/sttexampleapp/ExampleInstrumentedTest.java
View File

@ -1,4 +1,4 @@
package org.deepspeech;
package ai.coqui.sttexampleapp
import android.content.Context;
import android.support.test.InstrumentationRegistry;
@ -21,6 +21,6 @@ public class ExampleInstrumentedTest {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getTargetContext();
assertEquals("org.deepspeech", appContext.getPackageName());
assertEquals("ai.coqui.sttexampleapp", appContext.getPackageName());
}
}

2
native_client/java/app/src/main/AndroidManifest.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.deepspeech">
package="ai.coqui.sttexampleapp">
<application
android:allowBackup="true"

4
native_client/java/app/src/main/java/org/deepspeech/DeepSpeechActivity.java → native_client/java/app/src/main/java/ai/coqui/sttexampleapp/DeepSpeechActivity.java
View File

@ -1,4 +1,4 @@
package org.deepspeech;
package ai.coqui.sttexampleapp;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
@ -16,7 +16,7 @@ import java.io.IOException;
import java.nio.ByteOrder;
import java.nio.ByteBuffer;
import org.deepspeech.libdeepspeech.DeepSpeechModel;
import ai.coqui.libstt.DeepSpeechModel;
public class DeepSpeechActivity extends AppCompatActivity {

2
native_client/java/libdeepspeech/src/test/java/org/deepspeech/libdeepspeech/ExampleUnitTest.java → native_client/java/app/src/test/java/ai/coqui/sttexampleapp/ExampleUnitTest.java
View File

@ -1,4 +1,4 @@
package org.deepspeech.libdeepspeech;
package ai.coqui.sttexampleapp
import org.junit.Test;

0
native_client/java/libdeepspeech/.gitignore → native_client/java/libstt/.gitignore vendored
View File

0
native_client/java/libdeepspeech/CMakeLists.txt → native_client/java/libstt/CMakeLists.txt
View File

24
native_client/java/libdeepspeech/build.gradle → native_client/java/libstt/build.gradle
View File

@ -46,7 +46,7 @@ android {
// Avoid scanning libdeepspeech_doc
sourceSets {
main.java.srcDirs = [ 'src/main/java/org/deepspeech/libdeepspeech/' ]
main.java.srcDirs = [ 'src/main/java/ai/coqui/libstt/' ]
}
}
@ -76,14 +76,14 @@ uploadArchives {
repositories {
mavenDeployer {
pom.packaging = 'aar'
pom.name = 'libdeepspeech'
pom.groupId = 'org.deepspeech'
pom.artifactId = 'libdeepspeech'
pom.name = 'libstt'
pom.groupId = 'ai.coqui'
pom.artifactId = 'libstt'
pom.version = dsVersionString + (project.hasProperty('snapshot') ? '-SNAPSHOT' : '')
pom.project {
description 'Speech recognition library'
url 'https://github.com/mozilla/DeepSpeech'
description 'A library for doing speech recognition using a Coqui STT model'
url 'https://github.com/coqui-ai/STT'
licenses {
license {
@ -95,16 +95,16 @@ uploadArchives {
developers {
developer {
id 'deepspeech'
name 'DeepSpeech authors'
email 'deepspeechs@lists.mozilla.org'
id 'coqui'
name 'Coqui GmbH'
email 'maven@coqui.ai'
}
}
scm {
connection 'https://github.com/mozilla/DeepSpeech.git'
developerConnection 'https://github.com/mozilla/DeepSpeech.git'
url 'https://github.com/mozilla/DeepSpeech'
connection 'https://github.com/coqui-ai/STT.git'
developerConnection 'https://github.com/coqui-ai/STT.git'
url 'https://github.com/coqui-ai/STT'
}
}

0
native_client/java/libdeepspeech/gradle.properties → native_client/java/libstt/gradle.properties
View File

0
native_client/java/libdeepspeech/libs/.gitignore → native_client/java/libstt/libs/.gitignore vendored
View File

0
native_client/java/libdeepspeech/proguard-rules.pro → native_client/java/libstt/proguard-rules.pro vendored
View File

8
native_client/java/libdeepspeech/src/androidTest/java/org/deepspeech/libdeepspeech/test/BasicTest.java → native_client/java/libstt/src/androidTest/java/ai/coqui/libstt/test/BasicTest.java
View File

@ -1,4 +1,4 @@
package org.deepspeech.libdeepspeech.test;
package ai.coqui.libstt.test;
import android.content.Context;
import android.support.test.InstrumentationRegistry;
@ -11,8 +11,8 @@ import org.junit.runners.MethodSorters;
import static org.junit.Assert.*;
import org.deepspeech.libdeepspeech.DeepSpeechModel;
import org.deepspeech.libdeepspeech.CandidateTranscript;
import ai.coqui.libstt.DeepSpeechModel;
import ai.coqui.libstt.CandidateTranscript;
import java.io.RandomAccessFile;
import java.io.FileNotFoundException;
@ -54,7 +54,7 @@ public class BasicTest {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getTargetContext();
assertEquals("org.deepspeech.libdeepspeech.test", appContext.getPackageName());
assertEquals("ai.coqui.libstt.test", appContext.getPackageName());
}
@Test

2
native_client/java/libdeepspeech/src/main/AndroidManifest.xml → native_client/java/libstt/src/main/AndroidManifest.xml
View File

@ -1,2 +1,2 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.deepspeech.libdeepspeech" />
package="ai.coqui.libstt" />

2
native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech/DeepSpeechModel.java → native_client/java/libstt/src/main/java/ai/coqui/libstt/DeepSpeechModel.java
View File

@ -1,4 +1,4 @@
package org.deepspeech.libdeepspeech;
package ai.coqui.libstt;
/**
* @brief Exposes a DeepSpeech model in Java

2
native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech/DeepSpeechStreamingState.java → native_client/java/libstt/src/main/java/ai/coqui/libstt/DeepSpeechStreamingState.java
View File

@ -1,4 +1,4 @@
package org.deepspeech.libdeepspeech;
package ai.coqui.libstt;
public final class DeepSpeechStreamingState {
private SWIGTYPE_p_StreamingState _sp;

2
native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech_doc/CandidateTranscript.java → native_client/java/libstt/src/main/java/ai/coqui/libstt_doc/CandidateTranscript.java
View File

@ -6,7 +6,7 @@
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
package org.deepspeech.libdeepspeech;
package ai.coqui.libstt;
/**
* A single transcript computed by the model, including a confidence<br>

2
native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech_doc/DeepSpeech_Error_Codes.java → native_client/java/libstt/src/main/java/ai/coqui/libstt_doc/DeepSpeech_Error_Codes.java
View File

@ -6,7 +6,7 @@
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
package org.deepspeech.libdeepspeech;
package ai.coqui.libstt;
public enum DeepSpeech_Error_Codes {
ERR_OK(0x0000),

2
native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech_doc/Metadata.java → native_client/java/libstt/src/main/java/ai/coqui/libstt_doc/Metadata.java
View File

@ -6,7 +6,7 @@
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
package org.deepspeech.libdeepspeech;
package ai.coqui.libstt;
/**
* An array of CandidateTranscript objects computed by the model.

2
native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech_doc/README.rst → native_client/java/libstt/src/main/java/ai/coqui/libstt_doc/README.rst
View File

@ -8,4 +8,4 @@ To update, please install SWIG (4.0 at least) and then run from native_client/ja
.. code-block::
swig -c++ -java -doxygen -package org.deepspeech.libdeepspeech -outdir libdeepspeech/src/main/java/org/deepspeech/libdeepspeech_doc -o jni/deepspeech_wrap.cpp jni/deepspeech.i
swig -c++ -java -doxygen -package ai.coqui.libstt -outdir libstt/src/main/java/ai/coqui/libstt_doc -o jni/deepspeech_wrap.cpp jni/deepspeech.i

2
native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech_doc/TokenMetadata.java → native_client/java/libstt/src/main/java/ai/coqui/libstt_doc/TokenMetadata.java
View File

@ -6,7 +6,7 @@
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
package org.deepspeech.libdeepspeech;
package ai.coqui.libstt;
/**
* Stores text of an individual token, along with its timing information

0
native_client/java/libdeepspeech/src/main/res/values/strings.xml → native_client/java/libstt/src/main/res/values/strings.xml
View File

2
native_client/java/app/src/test/java/org/deepspeech/ExampleUnitTest.java → native_client/java/libstt/src/test/java/ai/coqui/libstt/ExampleUnitTest.java
View File

@ -1,4 +1,4 @@
package org.deepspeech;
package ai.coqui.libstt;
import org.junit.Test;

2
native_client/javascript/package.json.in
View File

@ -1,7 +1,7 @@
{
"name" : "$(PROJECT_NAME)",
"version" : "$(PROJECT_VERSION)",
"description" : "Coqui STT NodeJS bindings",
"description" : "A library for doing speech recognition using a Coqui STT model",
"main" : "./index.js",
"types": "./index.d.ts",
"bin": {

2
native_client/python/setup.py
View File

@ -67,7 +67,7 @@ def main():
swig_opts=['-c++', '-keyword'])
setup(name=project_name,
description='A library for running inference on a Coqui STT model',
description='A library for doing speech recognition using a Coqui STT model',
long_description=read('README.rst'),
long_description_content_type='text/x-rst; charset=UTF-8',
author='Coqui GmbH',

2
native_client/swift/deepspeech_ios.xcodeproj/project.pbxproj
View File

@ -166,7 +166,7 @@
attributes = {
LastSwiftUpdateCheck = 1150;
LastUpgradeCheck = 1150;
ORGANIZATIONNAME = Mozilla;
ORGANIZATIONNAME = "Coqui GmbH";
TargetAttributes = {
505B136024960D550007DADA = {
CreatedOnToolsVersion = 11.5;

4
native_client/swift/deepspeech_ios/DeepSpeech.swift
View File

@ -3,8 +3,8 @@
// deepspeech_ios
//
// Created by Reuben Morais on 14.06.20.
// Copyright © 2020 Mozilla. All rights reserved.
//
// Copyright © 2020 Mozilla
// Copyright © 2021 Coqui GmbH
import deepspeech_ios.libdeepspeech_Private

4
native_client/swift/deepspeech_ios/deepspeech_ios.h
View File

@ -3,8 +3,8 @@
// deepspeech_ios
//
// Created by Reuben Morais on 14.06.20.
// Copyright © 2020 Mozilla. All rights reserved.
//
// Copyright © 2020 Mozilla
// Copyright © 2021 Coqui GmbH
#import <Foundation/Foundation.h>

2
native_client/swift/deepspeech_ios_test.xcodeproj/project.pbxproj
View File

@ -236,7 +236,7 @@
attributes = {
LastSwiftUpdateCheck = 1150;
LastUpgradeCheck = 1150;
ORGANIZATIONNAME = Mozilla;
ORGANIZATIONNAME = "Coqui GmbH";
TargetAttributes = {
50F787EE2497683900D52237 = {
CreatedOnToolsVersion = 11.5;

4
native_client/swift/deepspeech_ios_test/AppDelegate.swift
View File

@ -3,8 +3,8 @@
// deepspeech_ios_test
//
// Created by Reuben Morais on 15.06.20.
// Copyright © 2020 Mozilla. All rights reserved.
//
// Copyright © 2020 Mozilla
// Copyright © 2021 Coqui GmbH
import UIKit

5
native_client/swift/deepspeech_ios_test/AudioContext.swift
View File

@ -3,8 +3,9 @@
// deepspeech_ios_test
//
// Created by Erik Ziegler on 27.07.20.
// Copyright © 2020 Mozilla. All rights reserved.
//
// Copyright © 2020 Mozilla
// Copyright © 2020 Erik Ziegler
// Copyright © 2020 Coqui GmbH
import Foundation
import AVFoundation

3
native_client/swift/deepspeech_ios_test/SceneDelegate.swift
View File

@ -3,7 +3,8 @@
// deepspeech_ios_test
//
// Created by Reuben Morais on 15.06.20.
// Copyright © 2020 Mozilla. All rights reserved.
// Copyright © 2020 Mozilla
// Copyright © 2021 Coqui GmbH
//
import UIKit

3
native_client/swift/deepspeech_ios_testTests/deepspeech_ios_testTests.swift
View File

@ -3,7 +3,8 @@
// deepspeech_ios_testTests
//
// Created by Reuben Morais on 15.06.20.
// Copyright © 2020 Mozilla. All rights reserved.
// Copyright © 2020 Mozilla
// Copyright © 2021 Coqui GmbH
//
import XCTest

2
taskcluster/README.rst
View File

@ -2,6 +2,6 @@
Taskcluster
===========
This directory contains files associated with Taskcluster -- a task execution framework for Mozilla's Continuous Integration system.
This directory contains files associated with Taskcluster -- a task execution framework developed by Mozilla for use in Continuous Integration systems.
Please consult the `existing Taskcluster documentation <https://docs.taskcluster.net/docs>`_.

2
taskcluster/android-build-dbg.sh
View File

@ -9,7 +9,7 @@ source $(dirname "$0")/tc-tests-utils.sh
source $(dirname "$0")/tf_tc-vars.sh
BAZEL_TARGETS="
//native_client:libdeepspeech.so
//native_client:libstt.so
"
if [ "${arm_flavor}" = "armeabi-v7a" ]; then

2
taskcluster/android-build.sh
View File

@ -9,7 +9,7 @@ source $(dirname "$0")/tc-tests-utils.sh
source $(dirname "$0")/tf_tc-vars.sh
BAZEL_TARGETS="
//native_client:libdeepspeech.so
//native_client:libstt.so
//native_client:generate_scorer_package
"

2
taskcluster/arm64-build-dbg.sh
View File

@ -7,7 +7,7 @@ source $(dirname "$0")/tc-tests-utils.sh
source $(dirname "$0")/tf_tc-vars.sh
BAZEL_TARGETS="
//native_client:libdeepspeech.so
//native_client:libstt.so
"
BAZEL_BUILD_FLAGS="${BAZEL_ARM64_FLAGS} ${BAZEL_EXTRA_FLAGS}"

2
taskcluster/arm64-build.sh
View File

@ -7,7 +7,7 @@ source $(dirname "$0")/tc-tests-utils.sh
source $(dirname "$0")/tf_tc-vars.sh
BAZEL_TARGETS="
//native_client:libdeepspeech.so
//native_client:libstt.so
//native_client:generate_scorer_package
"

2
taskcluster/cuda-build-dbg.sh
View File

@ -7,7 +7,7 @@ source $(dirname "$0")/tc-tests-utils.sh
source $(dirname "$0")/tf_tc-vars.sh
BAZEL_TARGETS="
//native_client:libdeepspeech.so
//native_client:libstt.so
"
BAZEL_ENV_FLAGS="TF_NEED_CUDA=1 ${TF_CUDA_FLAGS}"

2
taskcluster/cuda-build.sh
View File

@ -7,7 +7,7 @@ source $(dirname "$0")/tc-tests-utils.sh
source $(dirname "$0")/tf_tc-vars.sh
BAZEL_TARGETS="
//native_client:libdeepspeech.so
//native_client:libstt.so
//native_client:generate_scorer_package
"

2
taskcluster/examples-base.tyml
View File

@ -21,7 +21,7 @@ then:
DEEPSPEECH_MODEL: "https://github.com/reuben/DeepSpeech/releases/download/v0.8.0/models_0.8.tar.gz"
DEEPSPEECH_AUDIO: "https://github.com/mozilla/DeepSpeech/releases/download/v0.4.1/audio-0.4.1.tar.gz"
PIP_DEFAULT_TIMEOUT: "60"
EXAMPLES_CLONE_URL: "https://github.com/mozilla/DeepSpeech-examples"
EXAMPLES_CLONE_URL: "https://github.com/coqui-ai/STT-examples"
EXAMPLES_CHECKOUT_TARGET: "master"
command:

2
taskcluster/host-build-dbg.sh
View File

@ -9,7 +9,7 @@ source $(dirname "$0")/tc-tests-utils.sh
source $(dirname "$0")/tf_tc-vars.sh
BAZEL_TARGETS="
//native_client:libdeepspeech.so
//native_client:libstt.so
"
if [ "${runtime}" = "tflite" ]; then

2
taskcluster/host-build.sh
View File

@ -9,7 +9,7 @@ source $(dirname "$0")/tc-tests-utils.sh
source $(dirname "$0")/tf_tc-vars.sh
BAZEL_TARGETS="
//native_client:libdeepspeech.so
//native_client:libstt.so
//native_client:generate_scorer_package
"

2
taskcluster/rpi3-build-dbg.sh
View File

@ -7,7 +7,7 @@ source $(dirname "$0")/tc-tests-utils.sh
source $(dirname "$0")/tf_tc-vars.sh
BAZEL_TARGETS="
//native_client:libdeepspeech.so
//native_client:libstt.so
"
BAZEL_BUILD_FLAGS="${BAZEL_ARM_FLAGS} ${BAZEL_EXTRA_FLAGS}"

2
taskcluster/rpi3-build.sh
View File

@ -7,7 +7,7 @@ source $(dirname "$0")/tc-tests-utils.sh
source $(dirname "$0")/tf_tc-vars.sh
BAZEL_TARGETS="
//native_client:libdeepspeech.so
//native_client:libstt.so
//native_client:generate_scorer_package
"

2
taskcluster/tc-all-utils.sh
View File

@ -156,7 +156,7 @@ verify_bazel_rebuild()
cp ${DS_ROOT_TASK}/DeepSpeech/ds/tensorflow/bazel*.log ${TASKCLUSTER_ARTIFACTS}/
spurious_rebuilds=$(grep 'Executing action' "${bazel_explain_file}" | grep 'Compiling' | grep -v -E 'no entry in the cache|[for host]|unconditional execution is requested|Executing genrule //native_client:workspace_status|Compiling native_client/workspace_status.cc|Linking native_client/libdeepspeech.so' | wc -l)
spurious_rebuilds=$(grep 'Executing action' "${bazel_explain_file}" | grep 'Compiling' | grep -v -E 'no entry in the cache|[for host]|unconditional execution is requested|Executing genrule //native_client:workspace_status|Compiling native_client/workspace_status.cc|Linking native_client/libstt.so' | wc -l)
if [ "${spurious_rebuilds}" -ne 0 ]; then
echo "Bazel rebuilds some file it should not, please check."

2
taskcluster/tc-android-utils.sh
View File

@ -39,7 +39,7 @@ do_deepspeech_java_apk_build()
mkdir native_client/java/libdeepspeech/libs/${nc_dir}
curl -L https://community-tc.services.mozilla.com/api/queue/v1/task/${dep}/artifacts/public/native_client.tar.xz | tar -C native_client/java/libdeepspeech/libs/${nc_dir}/ -Jxvf - libdeepspeech.so
curl -L https://community-tc.services.mozilla.com/api/queue/v1/task/${dep}/artifacts/public/native_client.tar.xz | tar -C native_client/java/libdeepspeech/libs/${nc_dir}/ -Jxvf - libstt.so
fi;
done;

12
taskcluster/tc-build-utils.sh
View File

@ -17,9 +17,9 @@ do_deepspeech_python_build()
SETUP_FLAGS=""
if [ "${package_option}" = "--cuda" ]; then
SETUP_FLAGS="--project_name deepspeech-gpu"
SETUP_FLAGS="--project_name stt-gpu"
elif [ "${package_option}" = "--tflite" ]; then
SETUP_FLAGS="--project_name deepspeech-tflite"
SETUP_FLAGS="--project_name stt-tflite"
fi
for pyver_conf in ${SUPPORTED_PYTHON_VERSIONS}; do
@ -139,7 +139,7 @@ do_deepspeech_nodejs_build()
done;
if [ "${rename_to_gpu}" = "--cuda" ]; then
make -C native_client/javascript clean npm-pack PROJECT_NAME=deepspeech-gpu
make -C native_client/javascript clean npm-pack PROJECT_NAME=stt-gpu
else
make -C native_client/javascript clean npm-pack
fi
@ -312,7 +312,7 @@ do_nuget_build()
cd ${DS_DSDIR}/native_client/dotnet
cp ${DS_TFDIR}/bazel-bin/native_client/libdeepspeech.so nupkg/build
cp ${DS_TFDIR}/bazel-bin/native_client/libstt.so nupkg/build
# We copy the generated clients for .NET into the Nuget framework dirs
@ -332,9 +332,9 @@ do_nuget_build()
sed \
-e "s/\$NUPKG_ID/${PROJECT_NAME}/" \
-e "s/\$NUPKG_VERSION/${PROJECT_VERSION}/" \
nupkg/deepspeech.nuspec.in > nupkg/deepspeech.nuspec && cat nupkg/deepspeech.nuspec
nupkg/stt.nuspec.in > nupkg/stt.nuspec && cat nupkg/stt.nuspec
nuget pack nupkg/deepspeech.nuspec
nuget pack nupkg/stt.nuspec
}
do_deepspeech_ios_framework_build()

2
taskcluster/tc-dotnet-utils.sh
View File

@ -36,7 +36,7 @@ install_nuget()
nuget install NAudio -Version 1.10.0
cp NAudio*/lib/net35/NAudio.dll ${TASKCLUSTER_TMP_DIR}/ds/
cp ${PROJECT_NAME}.${DS_VERSION}/build/libdeepspeech.so ${TASKCLUSTER_TMP_DIR}/ds/
cp ${PROJECT_NAME}.${DS_VERSION}/build/libstt.so ${TASKCLUSTER_TMP_DIR}/ds/
cp ${PROJECT_NAME}.${DS_VERSION}/lib/net46/DeepSpeechClient.dll ${TASKCLUSTER_TMP_DIR}/ds/
ls -hal ${TASKCLUSTER_TMP_DIR}/ds/

10
taskcluster/win-build.sh
View File

@ -9,20 +9,20 @@ source $(dirname "$0")/tc-tests-utils.sh
source $(dirname "$0")/tf_tc-vars.sh
BAZEL_TARGETS="
//native_client:libdeepspeech.so
//native_client:libstt.so
//native_client:generate_scorer_package
"
if [ "${package_option}" = "--cuda" ]; then
BAZEL_ENV_FLAGS="TF_NEED_CUDA=1 ${TF_CUDA_FLAGS}"
BAZEL_BUILD_FLAGS="${BAZEL_CUDA_FLAGS} ${BAZEL_EXTRA_FLAGS} ${BAZEL_OPT_FLAGS}"
PROJECT_NAME="DeepSpeech-GPU"
PROJECT_NAME="STT-GPU"
elif [ "${package_option}" = "--tflite" ]; then
PROJECT_NAME="DeepSpeech-TFLite"
PROJECT_NAME="STT-TFLite"
BAZEL_BUILD_FLAGS="--define=runtime=tflite ${BAZEL_OPT_FLAGS} ${BAZEL_EXTRA_FLAGS}"
BAZEL_ENV_FLAGS="TF_NEED_CUDA=0"
else
PROJECT_NAME="DeepSpeech"
PROJECT_NAME="STT"
BAZEL_BUILD_FLAGS="${BAZEL_OPT_FLAGS} ${BAZEL_EXTRA_FLAGS}"
BAZEL_ENV_FLAGS="TF_NEED_CUDA=0"
fi
@ -32,7 +32,7 @@ SYSTEM_TARGET=host-win
do_bazel_build
if [ "${package_option}" = "--cuda" ]; then
cp ${DS_ROOT_TASK}/DeepSpeech/ds/tensorflow/bazel-bin/native_client/liblibdeepspeech.so.ifso ${DS_ROOT_TASK}/DeepSpeech/ds/tensorflow/bazel-bin/native_client/libdeepspeech.so.if.lib
cp ${DS_ROOT_TASK}/DeepSpeech/ds/tensorflow/bazel-bin/native_client/liblibstt.so.ifso ${DS_ROOT_TASK}/DeepSpeech/ds/tensorflow/bazel-bin/native_client/libstt.so.if.lib
fi
export PATH=$PATH:$(cygpath ${ChocolateyInstall})/bin:'/c/Program Files/nodejs/'

2
taskcluster/win-opt-base.tyml
View File

@ -29,7 +29,7 @@ payload:
TC_MSYS_VERSION: 'MSYS_NT-6.3-9600'
MSYS: 'winsymlinks:nativestrict'
GIT_LFS_SKIP_SMUDGE: '1'
EXAMPLES_CLONE_URL: "https://github.com/mozilla/DeepSpeech-examples"
EXAMPLES_CLONE_URL: "https://github.com/coqui-ai/STT-examples"
EXAMPLES_CHECKOUT_TARGET: "master"
command: