diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 5c684dc8..05d38b64 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -145,7 +145,7 @@ jobs: bindings - uses: actions/upload-artifact@v2 with: - name: "ds_ctcdecoder-Linux-test.whl" + name: "coqui_stt_ctcdecoder-Linux-test.whl" path: ${{ github.workspace }}/native_client/ctcdecode/dist/*.whl - run: | make -C native_client/ctcdecode clean-keep-third-party @@ -166,14 +166,14 @@ jobs: python-version: 3.6 - uses: actions/download-artifact@v2 with: - name: "ds_ctcdecoder-Linux-test.whl" + name: "coqui_stt_ctcdecoder-Linux-test.whl" - run: | python --version pip --version - run: | pip install --upgrade pip==19.3.1 setuptools==45.0.0 wheel==0.33.6 - run: | - pip install ds_ctcdecoder-*-cp36-cp36m-*_x86_64.whl + pip install coqui_stt_ctcdecoder-*-cp36-cp36m-*_x86_64.whl DS_NODECODER=y pip install --upgrade . - run: | bits="" @@ -685,7 +685,7 @@ jobs: bindings - uses: actions/upload-artifact@v2 with: - name: "ds_ctcdecoder-macOS-test.whl" + name: "coqui_stt_ctcdecoder-macOS-test.whl" path: ${{ github.workspace }}/native_client/ctcdecode/dist/*.whl - run: | make -C native_client/ctcdecode clean-keep-third-party @@ -706,14 +706,14 @@ jobs: python-version: 3.6 - uses: actions/download-artifact@v2 with: - name: "ds_ctcdecoder-macOS-test.whl" + name: "coqui_stt_ctcdecoder-macOS-test.whl" - run: | python --version pip --version - run: | pip install --upgrade pip==19.3.1 setuptools==45.0.0 wheel==0.33.6 - run: | - pip install ds_ctcdecoder-*-cp36-cp36m-*_x86_64.whl + pip install coqui_stt_ctcdecoder-*-cp36-cp36m-*_x86_64.whl DS_NODECODER=y pip install --upgrade . - run: | bits="" @@ -1190,7 +1190,7 @@ jobs: bindings - uses: actions/upload-artifact@v2 with: - name: "ds_ctcdecoder-windows-test.whl" + name: "coqui_stt_ctcdecoder-windows-test.whl" path: ${{ github.workspace }}/native_client/ctcdecode/dist/*.whl - run: | make -C native_client/ctcdecode clean-keep-third-party diff --git a/bin/import_ccpmf.py b/bin/import_ccpmf.py index 0d670a43..80c68d33 100755 --- a/bin/import_ccpmf.py +++ b/bin/import_ccpmf.py @@ -39,7 +39,7 @@ from coqui_stt_training.util.importers import ( get_validate_label, print_import_report, ) -from ds_ctcdecoder import Alphabet +from coqui_stt_ctcdecoder import Alphabet FIELDNAMES = ["wav_filename", "wav_filesize", "transcript"] SAMPLE_RATE = 16000 diff --git a/bin/import_cv2.py b/bin/import_cv2.py index fcc3635a..af702385 100755 --- a/bin/import_cv2.py +++ b/bin/import_cv2.py @@ -23,7 +23,7 @@ from coqui_stt_training.util.importers import ( get_validate_label, print_import_report, ) -from ds_ctcdecoder import Alphabet +from coqui_stt_ctcdecoder import Alphabet FIELDNAMES = ["wav_filename", "wav_filesize", "transcript"] SAMPLE_RATE = 16000 diff --git a/bin/import_lingua_libre.py b/bin/import_lingua_libre.py index 1c8f31ae..743e404d 100755 --- a/bin/import_lingua_libre.py +++ b/bin/import_lingua_libre.py @@ -20,7 +20,7 @@ from coqui_stt_training.util.importers import ( get_validate_label, print_import_report, ) -from ds_ctcdecoder import Alphabet +from coqui_stt_ctcdecoder import Alphabet FIELDNAMES = ["wav_filename", "wav_filesize", "transcript"] SAMPLE_RATE = 16000 diff --git a/bin/import_m-ailabs.py b/bin/import_m-ailabs.py index 0e655612..68417500 100755 --- a/bin/import_m-ailabs.py +++ b/bin/import_m-ailabs.py @@ -18,7 +18,7 @@ from coqui_stt_training.util.importers import ( get_validate_label, print_import_report, ) -from ds_ctcdecoder import Alphabet +from coqui_stt_ctcdecoder import Alphabet FIELDNAMES = ["wav_filename", "wav_filesize", "transcript"] SAMPLE_RATE = 16000 diff --git a/bin/import_slr57.py b/bin/import_slr57.py index 94869c21..ba42881e 100755 --- a/bin/import_slr57.py +++ b/bin/import_slr57.py @@ -17,7 +17,7 @@ from coqui_stt_training.util.importers import ( get_validate_label, print_import_report, ) -from ds_ctcdecoder import Alphabet +from coqui_stt_ctcdecoder import Alphabet FIELDNAMES = ["wav_filename", "wav_filesize", "transcript"] SAMPLE_RATE = 16000 diff --git a/bin/import_swc.py b/bin/import_swc.py index d660b300..59bc3084 100755 --- a/bin/import_swc.py +++ b/bin/import_swc.py @@ -24,7 +24,7 @@ import sox from coqui_stt_training.util.downloader import SIMPLE_BAR, maybe_download from coqui_stt_training.util.importers import validate_label_eng as validate_label -from ds_ctcdecoder import Alphabet +from coqui_stt_ctcdecoder import Alphabet SWC_URL = "https://www2.informatik.uni-hamburg.de/nats/pub/SWC/SWC_{language}.tar" SWC_ARCHIVE = "SWC_{language}.tar" diff --git a/bin/import_tuda.py b/bin/import_tuda.py index 16f4dcc8..99ffd9f5 100755 --- a/bin/import_tuda.py +++ b/bin/import_tuda.py @@ -16,7 +16,7 @@ import progressbar from coqui_stt_training.util.downloader import SIMPLE_BAR, maybe_download from coqui_stt_training.util.importers import validate_label_eng as validate_label -from ds_ctcdecoder import Alphabet +from coqui_stt_ctcdecoder import Alphabet TUDA_VERSION = "v2" TUDA_PACKAGE = "german-speechdata-package-{}".format(TUDA_VERSION) diff --git a/doc/BUILDING.rst b/doc/BUILDING.rst index 08b4b0ff..54444c35 100644 --- a/doc/BUILDING.rst +++ b/doc/BUILDING.rst @@ -146,7 +146,7 @@ This will create the package ``stt-VERSION.tgz`` in ``native_client/javascript`` Install the CTC decoder package ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -To build the ``ds_ctcdecoder`` package, you'll need the general requirements listed above (in particular SWIG). The command below builds the bindings using eight (8) processes for compilation. Adjust the parameter accordingly for more or less parallelism. +To build the ``coqui_stt_ctcdecoder`` package, you'll need the general requirements listed above (in particular SWIG). The command below builds the bindings using eight (8) processes for compilation. Adjust the parameter accordingly for more or less parallelism. .. code-block:: diff --git a/lm_optimizer.py b/lm_optimizer.py index 74a02dc7..15fff5ed 100644 --- a/lm_optimizer.py +++ b/lm_optimizer.py @@ -13,7 +13,7 @@ from coqui_stt_training.util.config import Config, initialize_globals from coqui_stt_training.util.flags import create_flags, FLAGS from coqui_stt_training.util.logging import log_error from coqui_stt_training.util.evaluate_tools import wer_cer_batch -from ds_ctcdecoder import Scorer +from coqui_stt_ctcdecoder import Scorer def character_based(): diff --git a/native_client/ctcdecode/Makefile b/native_client/ctcdecode/Makefile index dcaaae7f..8c4c5f52 100644 --- a/native_client/ctcdecode/Makefile +++ b/native_client/ctcdecode/Makefile @@ -11,7 +11,7 @@ LDFLAGS_NEEDED += $(RASPBIAN)/lib/aarch64-linux-gnu/libm.so.6 endif ifeq ($(OS),Darwin) -GENERATE_DEBUG_SYMS := dsymutil temp_build/temp_build/ds_ctcdecoder/_swigwrapper.*.so +GENERATE_DEBUG_SYMS := dsymutil temp_build/temp_build/coqui_stt_ctcdecoder/_swigwrapper.*.so else GENERATE_DEBUG_SYMS := endif @@ -29,7 +29,7 @@ THIRD_PARTY := third_party.$(ARCHIVE_EXT) all: bindings clean-keep-third-party: - rm -rf dist temp_build ds_ctcdecoder.egg-info + rm -rf dist temp_build coqui_stt_ctcdecoder.egg-info rm -f swigwrapper_wrap.cpp swigwrapper.py $(FIRST_PARTY) clean: clean-keep-third-party diff --git a/native_client/ctcdecode/setup.py b/native_client/ctcdecode/setup.py index e18578af..3f0c778d 100644 --- a/native_client/ctcdecode/setup.py +++ b/native_client/ctcdecode/setup.py @@ -68,7 +68,7 @@ maybe_rebuild(KENLM_FILES, third_party_build, build_dir) maybe_rebuild(CTC_DECODER_FILES, ctc_decoder_build, build_dir) decoder_module = Extension( - name='ds_ctcdecoder._swigwrapper', + name='coqui_stt_ctcdecoder._swigwrapper', sources=['swigwrapper.i'], swig_opts=['-c++', '-extranative'], language='c++', @@ -84,12 +84,12 @@ class BuildExtFirst(build): ('build_scripts', build.has_scripts)] setup( - name='ds_ctcdecoder', + name='coqui_stt_ctcdecoder', version=project_version, description="""DS CTC decoder""", cmdclass = {'build': BuildExtFirst}, ext_modules=[decoder_module], - package_dir = {'ds_ctcdecoder': '.'}, - py_modules=['ds_ctcdecoder', 'ds_ctcdecoder.swigwrapper'], + package_dir = {'coqui_stt_ctcdecoder': '.'}, + py_modules=['coqui_stt_ctcdecoder', 'coqui_stt_ctcdecoder.swigwrapper'], install_requires = ['numpy%s' % numpy_min_ver], ) diff --git a/setup.py b/setup.py index 07861b50..565a657f 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ def main(): ] decoder_pypi_dep = [ - 'ds_ctcdecoder == {}'.format(version) + 'coqui_stt_ctcdecoder == {}'.format(version) ] tensorflow_pypi_dep = [ diff --git a/tests/test_text.py b/tests/test_text.py index 5bdda19e..ae6a18e0 100644 --- a/tests/test_text.py +++ b/tests/test_text.py @@ -1,7 +1,7 @@ import unittest import os -from ds_ctcdecoder import Alphabet +from coqui_stt_ctcdecoder import Alphabet class TestAlphabetParsing(unittest.TestCase): diff --git a/training/coqui_stt_training/VERSION b/training/coqui_stt_training/VERSION index 29d972a2..ca5d557f 100644 --- a/training/coqui_stt_training/VERSION +++ b/training/coqui_stt_training/VERSION @@ -1 +1 @@ -0.10.0-alpha.4 +0.10.0-alpha.5 diff --git a/training/coqui_stt_training/evaluate.py b/training/coqui_stt_training/evaluate.py index 0647705f..5298f3af 100755 --- a/training/coqui_stt_training/evaluate.py +++ b/training/coqui_stt_training/evaluate.py @@ -12,7 +12,7 @@ import progressbar import tensorflow as tf import tensorflow.compat.v1 as tfv1 -from ds_ctcdecoder import ctc_beam_search_decoder_batch, Scorer +from coqui_stt_ctcdecoder import ctc_beam_search_decoder_batch, Scorer from six.moves import zip from .util.augmentations import NormalizeSampleRate from .util.config import Config, initialize_globals diff --git a/training/coqui_stt_training/train.py b/training/coqui_stt_training/train.py index def90001..77d32487 100644 --- a/training/coqui_stt_training/train.py +++ b/training/coqui_stt_training/train.py @@ -25,7 +25,7 @@ tfv1.logging.set_verbosity({ }.get(DESIRED_LOG_LEVEL)) from datetime import datetime -from ds_ctcdecoder import ctc_beam_search_decoder, Scorer +from coqui_stt_ctcdecoder import ctc_beam_search_decoder, Scorer from .evaluate import evaluate from six.moves import zip, range from .util.augmentations import NormalizeSampleRate diff --git a/training/coqui_stt_training/util/config.py b/training/coqui_stt_training/util/config.py index 6339ab25..f3b25bb3 100755 --- a/training/coqui_stt_training/util/config.py +++ b/training/coqui_stt_training/util/config.py @@ -6,7 +6,7 @@ import tensorflow.compat.v1 as tfv1 from attrdict import AttrDict from xdg import BaseDirectory as xdg -from ds_ctcdecoder import Alphabet, UTF8Alphabet +from coqui_stt_ctcdecoder import Alphabet, UTF8Alphabet from .flags import FLAGS from .gpu import get_available_gpus diff --git a/training/coqui_stt_training/util/helpers.py b/training/coqui_stt_training/util/helpers.py index ab5a7d8a..77372360 100644 --- a/training/coqui_stt_training/util/helpers.py +++ b/training/coqui_stt_training/util/helpers.py @@ -44,11 +44,11 @@ def check_ctcdecoder_version(): try: # pylint: disable=import-outside-toplevel - from ds_ctcdecoder import __version__ as decoder_version + from coqui_stt_ctcdecoder import __version__ as decoder_version except ImportError as e: if e.msg.find('__version__') > 0: print("Coqui STT version ({ds_version}) requires CTC decoder to expose __version__. " - "Please upgrade the ds_ctcdecoder package to version {ds_version}".format(ds_version=ds_version_s)) + "Please upgrade the coqui_stt_ctcdecoder package to version {ds_version}".format(ds_version=ds_version_s)) sys.exit(1) raise e diff --git a/transcribe.py b/transcribe.py index 1695d7b6..c6d79dab 100755 --- a/transcribe.py +++ b/transcribe.py @@ -18,7 +18,7 @@ from coqui_stt_training.util.config import Config, initialize_globals from coqui_stt_training.util.feeding import split_audio_file from coqui_stt_training.util.flags import create_flags, FLAGS from coqui_stt_training.util.logging import log_error, log_info, log_progress, create_progressbar -from ds_ctcdecoder import ctc_beam_search_decoder_batch, Scorer +from coqui_stt_ctcdecoder import ctc_beam_search_decoder_batch, Scorer from multiprocessing import Process, cpu_count