From 57adefcc10de41e9ebaaf9fe2cfd676a119551f2 Mon Sep 17 00:00:00 2001 From: Kelly Davis Date: Sun, 7 Mar 2021 14:41:43 +0100 Subject: [PATCH] More rebranding, submodules, some internal names --- .gitmodules | 4 ++-- CONTRIBUTING.rst | 5 ----- doc/doxygen-dotnet.conf | 2 +- ds_lib.supp | 2 +- native_client/Makefile | 2 +- native_client/definitions.mk | 16 ++++++++-------- 6 files changed, 13 insertions(+), 18 deletions(-) diff --git a/.gitmodules b/.gitmodules index 3ec0cd1b..fdbe1f3c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,10 +1,10 @@ [submodule "doc/examples"] path = doc/examples - url = https://github.com/mozilla/DeepSpeech-examples.git + url = https://github.com/coqui-ai/STT-examples.git branch = master [submodule "tensorflow"] path = tensorflow - url = https://github.com/mozilla/tensorflow.git + url = https://github.com/coqui-ai/tensorflow.git [submodule "kenlm"] path = kenlm url = https://github.com/kpu/kenlm diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 1d65f660..3e8b7ebf 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -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. -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 ^^^^^^^^^^^^^^ diff --git a/doc/doxygen-dotnet.conf b/doc/doxygen-dotnet.conf index 74c2c5bb..04047fc0 100644 --- a/doc/doxygen-dotnet.conf +++ b/doc/doxygen-dotnet.conf @@ -790,7 +790,7 @@ WARN_LOGFILE = # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING # 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 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses diff --git a/ds_lib.supp b/ds_lib.supp index 98f40177..9fae3aef 100644 --- a/ds_lib.supp +++ b/ds_lib.supp @@ -1,5 +1,5 @@ { - deepspeech_tflite_error_reporter + stt_tflite_error_reporter Memcheck:Leak match-leak-kinds: reachable fun:_Znwm diff --git a/native_client/Makefile b/native_client/Makefile index 9fbc99a1..540eb49d 100644 --- a/native_client/Makefile +++ b/native_client/Makefile @@ -19,7 +19,7 @@ clean: rm -f stt $(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) install_name_tool -change bazel-out/local-opt/bin/native_client/libstt.so @rpath/libstt.so stt endif diff --git a/native_client/definitions.mk b/native_client/definitions.mk index b6ca13e4..d5aa2fea 100644 --- a/native_client/definitions.mk +++ b/native_client/definitions.mk @@ -19,9 +19,9 @@ PLATFORM_EXE_SUFFIX := .exe endif STT_BIN := stt$(PLATFORM_EXE_SUFFIX) -CFLAGS_DEEPSPEECH := -std=c++11 -o $(STT_BIN) -LINK_DEEPSPEECH := -lstt -LINK_PATH_DEEPSPEECH := -L${TFDIR}/bazel-bin/native_client +CFLAGS_STT := -std=c++11 -o $(STT_BIN) +LINK_STT := -lstt +LINK_PATH_STT := -L${TFDIR}/bazel-bin/native_client ifeq ($(TARGET),host) TOOLCHAIN := @@ -61,9 +61,9 @@ TOOL_CC := cl.exe TOOL_CXX := cl.exe TOOL_LD := link.exe TOOL_LIBEXE := lib.exe -LINK_DEEPSPEECH := $(TFDIR)\bazel-bin\native_client\libstt.so.if.lib -LINK_PATH_DEEPSPEECH := -CFLAGS_DEEPSPEECH := -nologo -Fe$(STT_BIN) +LINK_STT := $(TFDIR)\bazel-bin\native_client\libstt.so.if.lib +LINK_PATH_STT := +CFLAGS_STT := -nologo -Fe$(STT_BIN) SOX_CFLAGS := SOX_LDFLAGS := PYTHON_PACKAGES := numpy${NUMPY_BUILD_VERSION} @@ -141,8 +141,8 @@ endif CFLAGS += $(EXTRA_CFLAGS) CXXFLAGS += $(EXTRA_CXXFLAGS) -LIBS := $(LINK_DEEPSPEECH) $(EXTRA_LIBS) -LDFLAGS_DIRS := $(LINK_PATH_DEEPSPEECH) $(EXTRA_LDFLAGS) +LIBS := $(LINK_STT) $(EXTRA_LIBS) +LDFLAGS_DIRS := $(LINK_PATH_STT) $(EXTRA_LDFLAGS) LDFLAGS += $(LDFLAGS_NEEDED) $(LDFLAGS_RPATH) $(LDFLAGS_DIRS) $(LIBS) AS := $(TOOLCHAIN)$(TOOL_AS)