More rebranding, submodules, some internal names

This commit is contained in:
Kelly Davis 2021-03-07 14:41:43 +01:00
parent 6d4d1a7153
commit 57adefcc10
6 changed files with 13 additions and 18 deletions

4
.gitmodules vendored
View File

@ -1,10 +1,10 @@
[submodule "doc/examples"] [submodule "doc/examples"]
path = doc/examples path = doc/examples
url = https://github.com/mozilla/DeepSpeech-examples.git url = https://github.com/coqui-ai/STT-examples.git
branch = master branch = master
[submodule "tensorflow"] [submodule "tensorflow"]
path = tensorflow path = tensorflow
url = https://github.com/mozilla/tensorflow.git url = https://github.com/coqui-ai/tensorflow.git
[submodule "kenlm"] [submodule "kenlm"]
path = kenlm path = kenlm
url = https://github.com/kpu/kenlm url = https://github.com/kpu/kenlm

View File

@ -15,11 +15,6 @@ Bug-fix PR
You've found a bug and you were able to squash it! Great job! Please write a short but clear commit message describing the bug, and how you fixed it. This makes review much easier. Also, please name your branch something related to the bug-fix. You've found a bug and you were able to squash it! Great job! Please write a short but clear commit message describing the bug, and how you fixed it. This makes review much easier. Also, please name your branch something related to the bug-fix.
Documentation PR
^^^^^^^^^^^^^^^^
If you're just making updates or changes to the documentation, there's no need to run all of 🐸STT's tests for Continuous Integration (i.e. Taskcluster tests). In this case, at the end of your short but clear commit message, you should add **X-DeepSpeech: NOBUILD**. This will trigger the CI tests to skip your PR, saving both time and compute.
New Feature PR New Feature PR
^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^

View File

@ -790,7 +790,7 @@ WARN_LOGFILE =
# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
# Note: If this tag is empty the current directory is searched. # Note: If this tag is empty the current directory is searched.
INPUT = native_client/dotnet/DeepSpeechClient/ native_client/dotnet/DeepSpeechClient/Interfaces/ native_client/dotnet/DeepSpeechClient/Enums/ native_client/dotnet/DeepSpeechClient/Models/ INPUT = native_client/dotnet/STTClient/ native_client/dotnet/STTClient/Interfaces/ native_client/dotnet/STTClient/Enums/ native_client/dotnet/STTClient/Models/
# This tag can be used to specify the character encoding of the source files # This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

View File

@ -1,5 +1,5 @@
{ {
deepspeech_tflite_error_reporter stt_tflite_error_reporter
Memcheck:Leak Memcheck:Leak
match-leak-kinds: reachable match-leak-kinds: reachable
fun:_Znwm fun:_Znwm

View File

@ -19,7 +19,7 @@ clean:
rm -f stt rm -f stt
$(STT_BIN): client.cc Makefile $(STT_BIN): client.cc Makefile
$(CXX) $(CFLAGS) $(CFLAGS_DEEPSPEECH) $(SOX_CFLAGS) client.cc $(LDFLAGS) $(SOX_LDFLAGS) $(CXX) $(CFLAGS) $(CFLAGS_STT) $(SOX_CFLAGS) client.cc $(LDFLAGS) $(SOX_LDFLAGS)
ifeq ($(OS),Darwin) ifeq ($(OS),Darwin)
install_name_tool -change bazel-out/local-opt/bin/native_client/libstt.so @rpath/libstt.so stt install_name_tool -change bazel-out/local-opt/bin/native_client/libstt.so @rpath/libstt.so stt
endif endif

View File

@ -19,9 +19,9 @@ PLATFORM_EXE_SUFFIX := .exe
endif endif
STT_BIN := stt$(PLATFORM_EXE_SUFFIX) STT_BIN := stt$(PLATFORM_EXE_SUFFIX)
CFLAGS_DEEPSPEECH := -std=c++11 -o $(STT_BIN) CFLAGS_STT := -std=c++11 -o $(STT_BIN)
LINK_DEEPSPEECH := -lstt LINK_STT := -lstt
LINK_PATH_DEEPSPEECH := -L${TFDIR}/bazel-bin/native_client LINK_PATH_STT := -L${TFDIR}/bazel-bin/native_client
ifeq ($(TARGET),host) ifeq ($(TARGET),host)
TOOLCHAIN := TOOLCHAIN :=
@ -61,9 +61,9 @@ TOOL_CC := cl.exe
TOOL_CXX := cl.exe TOOL_CXX := cl.exe
TOOL_LD := link.exe TOOL_LD := link.exe
TOOL_LIBEXE := lib.exe TOOL_LIBEXE := lib.exe
LINK_DEEPSPEECH := $(TFDIR)\bazel-bin\native_client\libstt.so.if.lib LINK_STT := $(TFDIR)\bazel-bin\native_client\libstt.so.if.lib
LINK_PATH_DEEPSPEECH := LINK_PATH_STT :=
CFLAGS_DEEPSPEECH := -nologo -Fe$(STT_BIN) CFLAGS_STT := -nologo -Fe$(STT_BIN)
SOX_CFLAGS := SOX_CFLAGS :=
SOX_LDFLAGS := SOX_LDFLAGS :=
PYTHON_PACKAGES := numpy${NUMPY_BUILD_VERSION} PYTHON_PACKAGES := numpy${NUMPY_BUILD_VERSION}
@ -141,8 +141,8 @@ endif
CFLAGS += $(EXTRA_CFLAGS) CFLAGS += $(EXTRA_CFLAGS)
CXXFLAGS += $(EXTRA_CXXFLAGS) CXXFLAGS += $(EXTRA_CXXFLAGS)
LIBS := $(LINK_DEEPSPEECH) $(EXTRA_LIBS) LIBS := $(LINK_STT) $(EXTRA_LIBS)
LDFLAGS_DIRS := $(LINK_PATH_DEEPSPEECH) $(EXTRA_LDFLAGS) LDFLAGS_DIRS := $(LINK_PATH_STT) $(EXTRA_LDFLAGS)
LDFLAGS += $(LDFLAGS_NEEDED) $(LDFLAGS_RPATH) $(LDFLAGS_DIRS) $(LIBS) LDFLAGS += $(LDFLAGS_NEEDED) $(LDFLAGS_RPATH) $(LDFLAGS_DIRS) $(LIBS)
AS := $(TOOLCHAIN)$(TOOL_AS) AS := $(TOOLCHAIN)$(TOOL_AS)