From 6f84bd1996d08aa9770b785851b607bcb79e464d Mon Sep 17 00:00:00 2001 From: Alexandre Lissy Date: Mon, 10 Aug 2020 16:42:54 +0200 Subject: [PATCH] Rename deepspeech_training package --- DeepSpeech.py | 2 +- GRAPH_VERSION | 2 +- VERSION | 2 +- bin/compare_samples.py | 4 ++-- bin/data_set_tool.py | 8 ++++---- bin/import_aidatatang.py | 2 +- bin/import_aishell.py | 2 +- bin/import_cv.py | 6 +++--- bin/import_cv2.py | 4 ++-- bin/import_fisher.py | 2 +- bin/import_freestmandarin.py | 2 +- bin/import_gram_vaani.py | 2 +- bin/import_ldc93s1.py | 2 +- bin/import_librivox.py | 2 +- bin/import_lingua_libre.py | 4 ++-- bin/import_m-ailabs.py | 4 ++-- bin/import_magicdata.py | 2 +- bin/import_primewords.py | 2 +- bin/import_slr57.py | 4 ++-- bin/import_swb.py | 2 +- bin/import_swc.py | 4 ++-- bin/import_ted.py | 4 ++-- bin/import_ts.py | 4 ++-- bin/import_tuda.py | 4 ++-- bin/import_vctk.py | 4 ++-- bin/import_voxforge.py | 2 +- bin/play.py | 6 +++--- data/README.rst | 2 +- doc/Flags.rst | 2 +- doc/examples | 2 +- evaluate.py | 2 +- evaluate_tflite.py | 4 ++-- lm_optimizer.py | 12 ++++++------ native_client/bazel_workspace_status_cmd.sh | 4 ++-- native_client/ctcdecode/setup.py | 2 +- native_client/javascript/Makefile | 2 +- native_client/python/setup.py | 2 +- setup.py | 4 ++-- stats.py | 2 +- taskcluster/tc-all-vars.sh | 2 +- tests/test_importers.py | 2 +- tests/test_value_range.py | 2 +- .../GRAPH_VERSION | 0 .../VERSION | 0 .../__init__.py | 0 .../evaluate.py | 0 .../train.py | 0 .../util/__init__.py | 0 .../util/audio.py | 0 .../util/augmentations.py | 0 .../util/check_characters.py | 0 .../util/checkpoints.py | 0 .../util/config.py | 0 .../util/downloader.py | 0 .../util/evaluate_tools.py | 0 .../util/feeding.py | 0 .../util/flags.py | 0 .../util/gpu.py | 0 .../util/helpers.py | 0 .../util/importers.py | 0 .../util/logging.py | 0 .../util/sample_collections.py | 0 .../util/stm.py | 0 .../util/taskcluster.py | 0 .../util/text.py | 0 transcribe.py | 14 +++++++------- util/taskcluster.py | 2 +- 67 files changed, 75 insertions(+), 75 deletions(-) rename training/{deepspeech_training => mozilla_voice_stt_training}/GRAPH_VERSION (100%) rename training/{deepspeech_training => mozilla_voice_stt_training}/VERSION (100%) rename training/{deepspeech_training => mozilla_voice_stt_training}/__init__.py (100%) rename training/{deepspeech_training => mozilla_voice_stt_training}/evaluate.py (100%) rename training/{deepspeech_training => mozilla_voice_stt_training}/train.py (100%) rename training/{deepspeech_training => mozilla_voice_stt_training}/util/__init__.py (100%) rename training/{deepspeech_training => mozilla_voice_stt_training}/util/audio.py (100%) rename training/{deepspeech_training => mozilla_voice_stt_training}/util/augmentations.py (100%) rename training/{deepspeech_training => mozilla_voice_stt_training}/util/check_characters.py (100%) rename training/{deepspeech_training => mozilla_voice_stt_training}/util/checkpoints.py (100%) rename training/{deepspeech_training => mozilla_voice_stt_training}/util/config.py (100%) rename training/{deepspeech_training => mozilla_voice_stt_training}/util/downloader.py (100%) rename training/{deepspeech_training => mozilla_voice_stt_training}/util/evaluate_tools.py (100%) rename training/{deepspeech_training => mozilla_voice_stt_training}/util/feeding.py (100%) rename training/{deepspeech_training => mozilla_voice_stt_training}/util/flags.py (100%) rename training/{deepspeech_training => mozilla_voice_stt_training}/util/gpu.py (100%) rename training/{deepspeech_training => mozilla_voice_stt_training}/util/helpers.py (100%) rename training/{deepspeech_training => mozilla_voice_stt_training}/util/importers.py (100%) rename training/{deepspeech_training => mozilla_voice_stt_training}/util/logging.py (100%) rename training/{deepspeech_training => mozilla_voice_stt_training}/util/sample_collections.py (100%) rename training/{deepspeech_training => mozilla_voice_stt_training}/util/stm.py (100%) rename training/{deepspeech_training => mozilla_voice_stt_training}/util/taskcluster.py (100%) rename training/{deepspeech_training => mozilla_voice_stt_training}/util/text.py (100%) diff --git a/DeepSpeech.py b/DeepSpeech.py index 0fa4ae8a..39740870 100755 --- a/DeepSpeech.py +++ b/DeepSpeech.py @@ -4,7 +4,7 @@ from __future__ import absolute_import, division, print_function if __name__ == '__main__': try: - from deepspeech_training import train as ds_train + from mozilla_voice_stt_training import train as ds_train except ImportError: print('Training package is not installed. See training documentation.') raise diff --git a/GRAPH_VERSION b/GRAPH_VERSION index b9a65815..20665e89 120000 --- a/GRAPH_VERSION +++ b/GRAPH_VERSION @@ -1 +1 @@ -training/deepspeech_training/GRAPH_VERSION \ No newline at end of file +training/mozilla_voice_stt_training/GRAPH_VERSION \ No newline at end of file diff --git a/VERSION b/VERSION index 8a3ed242..941b2c33 120000 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -training/deepspeech_training/VERSION \ No newline at end of file +training/mozilla_voice_stt_training/VERSION \ No newline at end of file diff --git a/bin/compare_samples.py b/bin/compare_samples.py index 94108a7a..934a26f6 100755 --- a/bin/compare_samples.py +++ b/bin/compare_samples.py @@ -5,8 +5,8 @@ Tool for comparing two wav samples import sys import argparse -from deepspeech_training.util.audio import AUDIO_TYPE_NP, mean_dbfs -from deepspeech_training.util.sample_collections import load_sample +from mozilla_voice_stt_training.util.audio import AUDIO_TYPE_NP, mean_dbfs +from mozilla_voice_stt_training.util.sample_collections import load_sample def fail(message): diff --git a/bin/data_set_tool.py b/bin/data_set_tool.py index 589b4585..7b7322c3 100755 --- a/bin/data_set_tool.py +++ b/bin/data_set_tool.py @@ -8,19 +8,19 @@ import argparse import progressbar from pathlib import Path -from deepspeech_training.util.audio import ( +from mozilla_voice_stt_training.util.audio import ( AUDIO_TYPE_PCM, AUDIO_TYPE_OPUS, AUDIO_TYPE_WAV, change_audio_types, ) -from deepspeech_training.util.downloader import SIMPLE_BAR -from deepspeech_training.util.sample_collections import ( +from mozilla_voice_stt_training.util.downloader import SIMPLE_BAR +from mozilla_voice_stt_training.util.sample_collections import ( CSVWriter, DirectSDBWriter, samples_from_sources, ) -from deepspeech_training.util.augmentations import ( +from mozilla_voice_stt_training.util.augmentations import ( parse_augmentations, apply_sample_augmentations, SampleAugmentation diff --git a/bin/import_aidatatang.py b/bin/import_aidatatang.py index c53eba09..34769482 100755 --- a/bin/import_aidatatang.py +++ b/bin/import_aidatatang.py @@ -5,7 +5,7 @@ import tarfile import pandas -from deepspeech_training.util.importers import get_importers_parser +from mozilla_voice_stt_training.util.importers import get_importers_parser COLUMN_NAMES = ["wav_filename", "wav_filesize", "transcript"] diff --git a/bin/import_aishell.py b/bin/import_aishell.py index 341d0d88..4972afb8 100755 --- a/bin/import_aishell.py +++ b/bin/import_aishell.py @@ -5,7 +5,7 @@ import tarfile import pandas -from deepspeech_training.util.importers import get_importers_parser +from mozilla_voice_stt_training.util.importers import get_importers_parser COLUMNNAMES = ["wav_filename", "wav_filesize", "transcript"] diff --git a/bin/import_cv.py b/bin/import_cv.py index e7dab564..4af9d9bd 100755 --- a/bin/import_cv.py +++ b/bin/import_cv.py @@ -9,13 +9,13 @@ from multiprocessing import Pool import progressbar import sox -from deepspeech_training.util.downloader import SIMPLE_BAR, maybe_download -from deepspeech_training.util.importers import ( +from mozilla_voice_stt_training.util.downloader import SIMPLE_BAR, maybe_download +from mozilla_voice_stt_training.util.importers import ( get_counter, get_imported_samples, print_import_report, ) -from deepspeech_training.util.importers import validate_label_eng as validate_label +from mozilla_voice_stt_training.util.importers import validate_label_eng as validate_label FIELDNAMES = ["wav_filename", "wav_filesize", "transcript"] SAMPLE_RATE = 16000 diff --git a/bin/import_cv2.py b/bin/import_cv2.py index d6c8c192..5aedfc78 100755 --- a/bin/import_cv2.py +++ b/bin/import_cv2.py @@ -15,8 +15,8 @@ from multiprocessing import Pool import progressbar import sox -from deepspeech_training.util.downloader import SIMPLE_BAR -from deepspeech_training.util.importers import ( +from mozilla_voice_stt_training.util.downloader import SIMPLE_BAR +from mozilla_voice_stt_training.util.importers import ( get_counter, get_imported_samples, get_importers_parser, diff --git a/bin/import_fisher.py b/bin/import_fisher.py index 0634c860..89b72c75 100755 --- a/bin/import_fisher.py +++ b/bin/import_fisher.py @@ -10,7 +10,7 @@ import librosa import pandas import soundfile # <= Has an external dependency on libsndfile -from deepspeech_training.util.importers import validate_label_eng as validate_label +from mozilla_voice_stt_training.util.importers import validate_label_eng as validate_label # Prerequisite: Having the sph2pipe tool in your PATH: # https://www.ldc.upenn.edu/language-resources/tools/sphere-conversion-tools diff --git a/bin/import_freestmandarin.py b/bin/import_freestmandarin.py index 55ce9128..10cf2e5c 100755 --- a/bin/import_freestmandarin.py +++ b/bin/import_freestmandarin.py @@ -6,7 +6,7 @@ import tarfile import numpy as np import pandas -from deepspeech_training.util.importers import get_importers_parser +from mozilla_voice_stt_training.util.importers import get_importers_parser COLUMN_NAMES = ["wav_filename", "wav_filesize", "transcript"] diff --git a/bin/import_gram_vaani.py b/bin/import_gram_vaani.py index 71fcee08..4e91a67a 100755 --- a/bin/import_gram_vaani.py +++ b/bin/import_gram_vaani.py @@ -12,7 +12,7 @@ import pandas as pd from sox import Transformer import swifter -from deepspeech_training.util.importers import get_importers_parser, get_validate_label +from mozilla_voice_stt_training.util.importers import get_importers_parser, get_validate_label __version__ = "0.1.0" _logger = logging.getLogger(__name__) diff --git a/bin/import_ldc93s1.py b/bin/import_ldc93s1.py index 86a00d74..1bac085f 100755 --- a/bin/import_ldc93s1.py +++ b/bin/import_ldc93s1.py @@ -4,7 +4,7 @@ import sys import pandas -from deepspeech_training.util.downloader import maybe_download +from mozilla_voice_stt_training.util.downloader import maybe_download def _download_and_preprocess_data(data_dir): diff --git a/bin/import_librivox.py b/bin/import_librivox.py index 32c1d20a..0f77a7ab 100755 --- a/bin/import_librivox.py +++ b/bin/import_librivox.py @@ -12,7 +12,7 @@ import progressbar from sox import Transformer from tensorflow.python.platform import gfile -from deepspeech_training.util.downloader import maybe_download +from mozilla_voice_stt_training.util.downloader import maybe_download SAMPLE_RATE = 16000 diff --git a/bin/import_lingua_libre.py b/bin/import_lingua_libre.py index 956d7a0b..30a1ea84 100755 --- a/bin/import_lingua_libre.py +++ b/bin/import_lingua_libre.py @@ -12,8 +12,8 @@ from multiprocessing import Pool import progressbar import sox -from deepspeech_training.util.downloader import SIMPLE_BAR, maybe_download -from deepspeech_training.util.importers import ( +from mozilla_voice_stt_training.util.downloader import SIMPLE_BAR, maybe_download +from mozilla_voice_stt_training.util.importers import ( get_counter, get_imported_samples, get_importers_parser, diff --git a/bin/import_m-ailabs.py b/bin/import_m-ailabs.py index bbaa744b..c8ece728 100755 --- a/bin/import_m-ailabs.py +++ b/bin/import_m-ailabs.py @@ -10,8 +10,8 @@ from multiprocessing import Pool import progressbar -from deepspeech_training.util.downloader import SIMPLE_BAR, maybe_download -from deepspeech_training.util.importers import ( +from mozilla_voice_stt_training.util.downloader import SIMPLE_BAR, maybe_download +from mozilla_voice_stt_training.util.importers import ( get_counter, get_imported_samples, get_importers_parser, diff --git a/bin/import_magicdata.py b/bin/import_magicdata.py index c8502784..b7205c1f 100755 --- a/bin/import_magicdata.py +++ b/bin/import_magicdata.py @@ -6,7 +6,7 @@ import wave import pandas -from deepspeech_training.util.importers import get_importers_parser +from mozilla_voice_stt_training.util.importers import get_importers_parser COLUMN_NAMES = ["wav_filename", "wav_filesize", "transcript"] diff --git a/bin/import_primewords.py b/bin/import_primewords.py index 08f3302a..bedc3a85 100755 --- a/bin/import_primewords.py +++ b/bin/import_primewords.py @@ -7,7 +7,7 @@ import tarfile import numpy as np import pandas -from deepspeech_training.util.importers import get_importers_parser +from mozilla_voice_stt_training.util.importers import get_importers_parser COLUMN_NAMES = ["wav_filename", "wav_filesize", "transcript"] diff --git a/bin/import_slr57.py b/bin/import_slr57.py index 57588696..b6107c71 100755 --- a/bin/import_slr57.py +++ b/bin/import_slr57.py @@ -9,8 +9,8 @@ from multiprocessing import Pool import progressbar -from deepspeech_training.util.downloader import SIMPLE_BAR, maybe_download -from deepspeech_training.util.importers import ( +from mozilla_voice_stt_training.util.downloader import SIMPLE_BAR, maybe_download +from mozilla_voice_stt_training.util.importers import ( get_counter, get_imported_samples, get_importers_parser, diff --git a/bin/import_swb.py b/bin/import_swb.py index 11e43f31..e8497114 100755 --- a/bin/import_swb.py +++ b/bin/import_swb.py @@ -16,7 +16,7 @@ import pandas import requests import soundfile # <= Has an external dependency on libsndfile -from deepspeech_training.util.importers import validate_label_eng as validate_label +from mozilla_voice_stt_training.util.importers import validate_label_eng as validate_label # ARCHIVE_NAME refers to ISIP alignments from 01/29/03 ARCHIVE_NAME = "switchboard_word_alignments.tar.gz" diff --git a/bin/import_swc.py b/bin/import_swc.py index 3775de05..c5211dcb 100755 --- a/bin/import_swc.py +++ b/bin/import_swc.py @@ -22,8 +22,8 @@ from multiprocessing.pool import ThreadPool import progressbar import sox -from deepspeech_training.util.downloader import SIMPLE_BAR, maybe_download -from deepspeech_training.util.importers import validate_label_eng as validate_label +from mozilla_voice_stt_training.util.downloader import SIMPLE_BAR, maybe_download +from mozilla_voice_stt_training.util.importers import validate_label_eng as validate_label from ds_ctcdecoder import Alphabet SWC_URL = "https://www2.informatik.uni-hamburg.de/nats/pub/SWC/SWC_{language}.tar" diff --git a/bin/import_ted.py b/bin/import_ted.py index bad1452f..0e185ac6 100755 --- a/bin/import_ted.py +++ b/bin/import_ted.py @@ -10,8 +10,8 @@ import pandas from sox import Transformer from tensorflow.python.platform import gfile -from deepspeech_training.util.downloader import maybe_download -from deepspeech_training.util.stm import parse_stm_file +from mozilla_voice_stt_training.util.downloader import maybe_download +from mozilla_voice_stt_training.util.stm import parse_stm_file def _download_and_preprocess_data(data_dir): diff --git a/bin/import_ts.py b/bin/import_ts.py index e0130130..373e86c7 100755 --- a/bin/import_ts.py +++ b/bin/import_ts.py @@ -10,8 +10,8 @@ import progressbar import sox import unidecode -from deepspeech_training.util.downloader import SIMPLE_BAR, maybe_download -from deepspeech_training.util.importers import ( +from mozilla_voice_stt_training.util.downloader import SIMPLE_BAR, maybe_download +from mozilla_voice_stt_training.util.importers import ( get_counter, get_imported_samples, get_importers_parser, diff --git a/bin/import_tuda.py b/bin/import_tuda.py index da0cb42b..697405b4 100755 --- a/bin/import_tuda.py +++ b/bin/import_tuda.py @@ -14,8 +14,8 @@ from collections import Counter import progressbar -from deepspeech_training.util.downloader import SIMPLE_BAR, maybe_download -from deepspeech_training.util.importers import validate_label_eng as validate_label +from mozilla_voice_stt_training.util.downloader import SIMPLE_BAR, maybe_download +from mozilla_voice_stt_training.util.importers import validate_label_eng as validate_label from ds_ctcdecoder import Alphabet TUDA_VERSION = "v2" diff --git a/bin/import_vctk.py b/bin/import_vctk.py index f9c86799..6d673020 100755 --- a/bin/import_vctk.py +++ b/bin/import_vctk.py @@ -11,8 +11,8 @@ from zipfile import ZipFile import librosa import progressbar -from deepspeech_training.util.downloader import SIMPLE_BAR, maybe_download -from deepspeech_training.util.importers import ( +from mozilla_voice_stt_training.util.downloader import SIMPLE_BAR, maybe_download +from mozilla_voice_stt_training.util.importers import ( get_counter, get_imported_samples, print_import_report, diff --git a/bin/import_voxforge.py b/bin/import_voxforge.py index 16195a8e..92dadc82 100755 --- a/bin/import_voxforge.py +++ b/bin/import_voxforge.py @@ -13,7 +13,7 @@ from os import makedirs, path import pandas from bs4 import BeautifulSoup from tensorflow.python.platform import gfile -from deepspeech_training.util.downloader import maybe_download +from mozilla_voice_stt_training.util.downloader import maybe_download """The number of jobs to run in parallel""" NUM_PARALLEL = 8 diff --git a/bin/play.py b/bin/play.py index 1e8c59ca..bffc581e 100755 --- a/bin/play.py +++ b/bin/play.py @@ -9,9 +9,9 @@ import sys import random import argparse -from deepspeech_training.util.audio import LOADABLE_AUDIO_EXTENSIONS, AUDIO_TYPE_PCM, AUDIO_TYPE_WAV -from deepspeech_training.util.sample_collections import SampleList, LabeledSample, samples_from_source -from deepspeech_training.util.augmentations import parse_augmentations, apply_sample_augmentations, SampleAugmentation +from mozilla_voice_stt_training.util.audio import LOADABLE_AUDIO_EXTENSIONS, AUDIO_TYPE_PCM, AUDIO_TYPE_WAV +from mozilla_voice_stt_training.util.sample_collections import SampleList, LabeledSample, samples_from_source +from mozilla_voice_stt_training.util.augmentations import parse_augmentations, apply_sample_augmentations, SampleAugmentation def get_samples_in_play_order(): diff --git a/data/README.rst b/data/README.rst index f731a31c..4a98ac93 100644 --- a/data/README.rst +++ b/data/README.rst @@ -3,7 +3,7 @@ Language-Specific Data This directory contains language-specific data files. Most importantly, you will find here: -1. A list of unique characters for the target language (e.g. English) in ``data/alphabet.txt``. After installing the training code, you can check ``python -m deepspeech_training.util.check_characters --help`` for a tool that creates an alphabet file from a list of training CSV files. +1. A list of unique characters for the target language (e.g. English) in ``data/alphabet.txt``. After installing the training code, you can check ``python -m mozilla_voice_stt_training.util.check_characters --help`` for a tool that creates an alphabet file from a list of training CSV files. 2. A script used to generate a binary n-gram language model: ``data/lm/generate_lm.py``. diff --git a/doc/Flags.rst b/doc/Flags.rst index 66b26f0c..05c9ce4d 100644 --- a/doc/Flags.rst +++ b/doc/Flags.rst @@ -8,7 +8,7 @@ Below you can find the definition of all command-line flags supported by the tra Flags ----- -.. literalinclude:: ../training/deepspeech_training/util/flags.py +.. literalinclude:: ../training/mozilla_voice_stt_training/util/flags.py :language: python :linenos: :lineno-match: diff --git a/doc/examples b/doc/examples index 6f5f501f..93914db8 160000 --- a/doc/examples +++ b/doc/examples @@ -1 +1 @@ -Subproject commit 6f5f501fa62743f1b78fe162eb1a579a450bd38f +Subproject commit 93914db805408b4a130e4489cb5d4ff88cd95159 diff --git a/evaluate.py b/evaluate.py index dc502542..f8ff3815 100644 --- a/evaluate.py +++ b/evaluate.py @@ -4,7 +4,7 @@ from __future__ import absolute_import, division, print_function if __name__ == '__main__': try: - from deepspeech_training import evaluate as ds_evaluate + from mozilla_voice_stt_training import evaluate as ds_evaluate except ImportError: print('Training package is not installed. See training documentation.') raise diff --git a/evaluate_tflite.py b/evaluate_tflite.py index 829a7d18..09e24568 100644 --- a/evaluate_tflite.py +++ b/evaluate_tflite.py @@ -11,8 +11,8 @@ import os import sys from mozilla_voice_stt import Model -from deepspeech_training.util.evaluate_tools import calculate_and_print_report -from deepspeech_training.util.flags import create_flags +from mozilla_voice_stt_training.util.evaluate_tools import calculate_and_print_report +from mozilla_voice_stt_training.util.flags import create_flags from functools import partial from multiprocessing import JoinableQueue, Process, cpu_count, Manager from six.moves import zip, range diff --git a/lm_optimizer.py b/lm_optimizer.py index 25d8a05e..d398663d 100644 --- a/lm_optimizer.py +++ b/lm_optimizer.py @@ -7,12 +7,12 @@ import optuna import sys import tensorflow.compat.v1 as tfv1 -from deepspeech_training.evaluate import evaluate -from deepspeech_training.train import create_model -from deepspeech_training.util.config import Config, initialize_globals -from deepspeech_training.util.flags import create_flags, FLAGS -from deepspeech_training.util.logging import log_error -from deepspeech_training.util.evaluate_tools import wer_cer_batch +from mozilla_voice_stt_training.evaluate import evaluate +from mozilla_voice_stt_training.train import create_model +from mozilla_voice_stt_training.util.config import Config, initialize_globals +from mozilla_voice_stt_training.util.flags import create_flags, FLAGS +from mozilla_voice_stt_training.util.logging import log_error +from mozilla_voice_stt_training.util.evaluate_tools import wer_cer_batch from ds_ctcdecoder import Scorer diff --git a/native_client/bazel_workspace_status_cmd.sh b/native_client/bazel_workspace_status_cmd.sh index a1a5a2a0..e9820a4d 100755 --- a/native_client/bazel_workspace_status_cmd.sh +++ b/native_client/bazel_workspace_status_cmd.sh @@ -22,8 +22,8 @@ echo "STABLE_TF_GIT_VERSION ${tf_git_rev}" pushd $(dirname "$0") ds_git_rev=$(git describe --long --tags) echo "STABLE_DS_GIT_VERSION ${ds_git_rev}" -ds_version=$(cat ../training/deepspeech_training/VERSION) +ds_version=$(cat ../training/mozilla_voice_stt_training/VERSION) echo "STABLE_DS_VERSION ${ds_version}" -ds_graph_version=$(cat ../training/deepspeech_training/GRAPH_VERSION) +ds_graph_version=$(cat ../training/mozilla_voice_stt_training/GRAPH_VERSION) echo "STABLE_DS_GRAPH_VERSION ${ds_graph_version}" popd diff --git a/native_client/ctcdecode/setup.py b/native_client/ctcdecode/setup.py index 82e702a8..9b26828d 100644 --- a/native_client/ctcdecode/setup.py +++ b/native_client/ctcdecode/setup.py @@ -51,7 +51,7 @@ def maybe_rebuild(srcs, out_name, build_dir): num_parallel=known_args.num_processes, debug=debug) -project_version = read('../../training/deepspeech_training/VERSION').strip() +project_version = read('../../training/mozilla_voice_stt_training/VERSION').strip() build_dir = 'temp_build/temp_build' diff --git a/native_client/javascript/Makefile b/native_client/javascript/Makefile index ba2da06a..3855d5b6 100644 --- a/native_client/javascript/Makefile +++ b/native_client/javascript/Makefile @@ -3,7 +3,7 @@ NODE_ABI_TARGET ?= NODE_BUILD_VERBOSE ?= --verbose NPM_TOOL ?= npm PROJECT_NAME ?= @mozilla-voice/stt -PROJECT_VERSION ?= $(shell cat ../../training/deepspeech_training/VERSION | tr -d '\n') +PROJECT_VERSION ?= $(shell cat ../../training/mozilla_voice_stt_training/VERSION | tr -d '\n') NPM_ROOT ?= $(shell npm root) NODE_MODULES_BIN ?= $(NPM_ROOT)/.bin/ diff --git a/native_client/python/setup.py b/native_client/python/setup.py index cdc1217c..e0f0ca13 100755 --- a/native_client/python/setup.py +++ b/native_client/python/setup.py @@ -31,7 +31,7 @@ def main(): sys.argv.remove('--project_name') sys.argv.pop(project_name_idx) - with open('../../training/deepspeech_training/VERSION', 'r') as ver: + with open('../../training/mozilla_voice_stt_training/VERSION', 'r') as ver: project_version = ver.read().strip() class BuildExtFirst(build): diff --git a/setup.py b/setup.py index 91a9af5b..0551c751 100644 --- a/setup.py +++ b/setup.py @@ -96,7 +96,7 @@ def main(): install_requires = install_requires + tensorflow_pypi_dep setup( - name='deepspeech_training', + name='mozilla_voice_stt_training', version=version, description='Training code for mozilla DeepSpeech', url='https://github.com/mozilla/DeepSpeech', @@ -119,7 +119,7 @@ def main(): # If there are data files included in your packages that need to be # installed, specify them here. package_data={ - 'deepspeech_training': [ + 'mozilla_voice_stt_training': [ 'VERSION', 'GRAPH_VERSION', ], diff --git a/stats.py b/stats.py index 569f2743..b78e8fdb 100644 --- a/stats.py +++ b/stats.py @@ -3,7 +3,7 @@ import argparse import functools import pandas -from deepspeech_training.util.helpers import secs_to_hours +from mozilla_voice_stt_training.util.helpers import secs_to_hours from pathlib import Path diff --git a/taskcluster/tc-all-vars.sh b/taskcluster/tc-all-vars.sh index f2281faf..ba01d486 100755 --- a/taskcluster/tc-all-vars.sh +++ b/taskcluster/tc-all-vars.sh @@ -53,7 +53,7 @@ export DS_TFDIR=${DS_ROOT_TASK}/DeepSpeech/ds/tensorflow export DS_DSDIR=${DS_ROOT_TASK}/DeepSpeech/ds export DS_EXAMPLEDIR=${DS_ROOT_TASK}/DeepSpeech/examples -export DS_VERSION="$(cat ${DS_DSDIR}/training/deepspeech_training/VERSION)" +export DS_VERSION="$(cat ${DS_DSDIR}/training/mozilla_voice_stt_training/VERSION)" export GRADLE_USER_HOME=${DS_ROOT_TASK}/gradle-cache export ANDROID_SDK_HOME=${DS_ROOT_TASK}/DeepSpeech/Android/SDK/ diff --git a/tests/test_importers.py b/tests/test_importers.py index 8f52a21c..d26ce8d1 100644 --- a/tests/test_importers.py +++ b/tests/test_importers.py @@ -1,7 +1,7 @@ import unittest from argparse import Namespace -from deepspeech_training.util.importers import validate_label_eng, get_validate_label +from mozilla_voice_stt_training.util.importers import validate_label_eng, get_validate_label from pathlib import Path def from_here(path): diff --git a/tests/test_value_range.py b/tests/test_value_range.py index c08dcbd5..dbe8c15c 100644 --- a/tests/test_value_range.py +++ b/tests/test_value_range.py @@ -2,7 +2,7 @@ import unittest import numpy as np import tensorflow as tf -from deepspeech_training.util.helpers import ValueRange, get_value_range, pick_value_from_range, tf_pick_value_from_range +from mozilla_voice_stt_training.util.helpers import ValueRange, get_value_range, pick_value_from_range, tf_pick_value_from_range class TestValueRange(unittest.TestCase): diff --git a/training/deepspeech_training/GRAPH_VERSION b/training/mozilla_voice_stt_training/GRAPH_VERSION similarity index 100% rename from training/deepspeech_training/GRAPH_VERSION rename to training/mozilla_voice_stt_training/GRAPH_VERSION diff --git a/training/deepspeech_training/VERSION b/training/mozilla_voice_stt_training/VERSION similarity index 100% rename from training/deepspeech_training/VERSION rename to training/mozilla_voice_stt_training/VERSION diff --git a/training/deepspeech_training/__init__.py b/training/mozilla_voice_stt_training/__init__.py similarity index 100% rename from training/deepspeech_training/__init__.py rename to training/mozilla_voice_stt_training/__init__.py diff --git a/training/deepspeech_training/evaluate.py b/training/mozilla_voice_stt_training/evaluate.py similarity index 100% rename from training/deepspeech_training/evaluate.py rename to training/mozilla_voice_stt_training/evaluate.py diff --git a/training/deepspeech_training/train.py b/training/mozilla_voice_stt_training/train.py similarity index 100% rename from training/deepspeech_training/train.py rename to training/mozilla_voice_stt_training/train.py diff --git a/training/deepspeech_training/util/__init__.py b/training/mozilla_voice_stt_training/util/__init__.py similarity index 100% rename from training/deepspeech_training/util/__init__.py rename to training/mozilla_voice_stt_training/util/__init__.py diff --git a/training/deepspeech_training/util/audio.py b/training/mozilla_voice_stt_training/util/audio.py similarity index 100% rename from training/deepspeech_training/util/audio.py rename to training/mozilla_voice_stt_training/util/audio.py diff --git a/training/deepspeech_training/util/augmentations.py b/training/mozilla_voice_stt_training/util/augmentations.py similarity index 100% rename from training/deepspeech_training/util/augmentations.py rename to training/mozilla_voice_stt_training/util/augmentations.py diff --git a/training/deepspeech_training/util/check_characters.py b/training/mozilla_voice_stt_training/util/check_characters.py similarity index 100% rename from training/deepspeech_training/util/check_characters.py rename to training/mozilla_voice_stt_training/util/check_characters.py diff --git a/training/deepspeech_training/util/checkpoints.py b/training/mozilla_voice_stt_training/util/checkpoints.py similarity index 100% rename from training/deepspeech_training/util/checkpoints.py rename to training/mozilla_voice_stt_training/util/checkpoints.py diff --git a/training/deepspeech_training/util/config.py b/training/mozilla_voice_stt_training/util/config.py similarity index 100% rename from training/deepspeech_training/util/config.py rename to training/mozilla_voice_stt_training/util/config.py diff --git a/training/deepspeech_training/util/downloader.py b/training/mozilla_voice_stt_training/util/downloader.py similarity index 100% rename from training/deepspeech_training/util/downloader.py rename to training/mozilla_voice_stt_training/util/downloader.py diff --git a/training/deepspeech_training/util/evaluate_tools.py b/training/mozilla_voice_stt_training/util/evaluate_tools.py similarity index 100% rename from training/deepspeech_training/util/evaluate_tools.py rename to training/mozilla_voice_stt_training/util/evaluate_tools.py diff --git a/training/deepspeech_training/util/feeding.py b/training/mozilla_voice_stt_training/util/feeding.py similarity index 100% rename from training/deepspeech_training/util/feeding.py rename to training/mozilla_voice_stt_training/util/feeding.py diff --git a/training/deepspeech_training/util/flags.py b/training/mozilla_voice_stt_training/util/flags.py similarity index 100% rename from training/deepspeech_training/util/flags.py rename to training/mozilla_voice_stt_training/util/flags.py diff --git a/training/deepspeech_training/util/gpu.py b/training/mozilla_voice_stt_training/util/gpu.py similarity index 100% rename from training/deepspeech_training/util/gpu.py rename to training/mozilla_voice_stt_training/util/gpu.py diff --git a/training/deepspeech_training/util/helpers.py b/training/mozilla_voice_stt_training/util/helpers.py similarity index 100% rename from training/deepspeech_training/util/helpers.py rename to training/mozilla_voice_stt_training/util/helpers.py diff --git a/training/deepspeech_training/util/importers.py b/training/mozilla_voice_stt_training/util/importers.py similarity index 100% rename from training/deepspeech_training/util/importers.py rename to training/mozilla_voice_stt_training/util/importers.py diff --git a/training/deepspeech_training/util/logging.py b/training/mozilla_voice_stt_training/util/logging.py similarity index 100% rename from training/deepspeech_training/util/logging.py rename to training/mozilla_voice_stt_training/util/logging.py diff --git a/training/deepspeech_training/util/sample_collections.py b/training/mozilla_voice_stt_training/util/sample_collections.py similarity index 100% rename from training/deepspeech_training/util/sample_collections.py rename to training/mozilla_voice_stt_training/util/sample_collections.py diff --git a/training/deepspeech_training/util/stm.py b/training/mozilla_voice_stt_training/util/stm.py similarity index 100% rename from training/deepspeech_training/util/stm.py rename to training/mozilla_voice_stt_training/util/stm.py diff --git a/training/deepspeech_training/util/taskcluster.py b/training/mozilla_voice_stt_training/util/taskcluster.py similarity index 100% rename from training/deepspeech_training/util/taskcluster.py rename to training/mozilla_voice_stt_training/util/taskcluster.py diff --git a/training/deepspeech_training/util/text.py b/training/mozilla_voice_stt_training/util/text.py similarity index 100% rename from training/deepspeech_training/util/text.py rename to training/mozilla_voice_stt_training/util/text.py diff --git a/transcribe.py b/transcribe.py index 665921a2..151a8abd 100755 --- a/transcribe.py +++ b/transcribe.py @@ -13,11 +13,11 @@ import logging logging.getLogger('sox').setLevel(logging.ERROR) import glob -from deepspeech_training.util.audio import AudioFile -from deepspeech_training.util.config import Config, initialize_globals -from deepspeech_training.util.feeding import split_audio_file -from deepspeech_training.util.flags import create_flags, FLAGS -from deepspeech_training.util.logging import log_error, log_info, log_progress, create_progressbar +from mozilla_voice_stt_training.util.audio import AudioFile +from mozilla_voice_stt_training.util.config import Config, initialize_globals +from mozilla_voice_stt_training.util.feeding import split_audio_file +from mozilla_voice_stt_training.util.flags import create_flags, FLAGS +from mozilla_voice_stt_training.util.logging import log_error, log_info, log_progress, create_progressbar from ds_ctcdecoder import ctc_beam_search_decoder_batch, Scorer from multiprocessing import Process, cpu_count @@ -28,8 +28,8 @@ def fail(message, code=1): def transcribe_file(audio_path, tlog_path): - from deepspeech_training.train import create_model # pylint: disable=cyclic-import,import-outside-toplevel - from deepspeech_training.util.checkpoints import load_graph_for_evaluation + from mozilla_voice_stt_training.train import create_model # pylint: disable=cyclic-import,import-outside-toplevel + from mozilla_voice_stt_training.util.checkpoints import load_graph_for_evaluation initialize_globals() scorer = Scorer(FLAGS.lm_alpha, FLAGS.lm_beta, FLAGS.scorer_path, Config.alphabet) try: diff --git a/util/taskcluster.py b/util/taskcluster.py index 9ef72f41..031b3450 100644 --- a/util/taskcluster.py +++ b/util/taskcluster.py @@ -4,7 +4,7 @@ from __future__ import absolute_import, division, print_function if __name__ == '__main__': try: - from deepspeech_training.util import taskcluster as dsu_taskcluster + from mozilla_voice_stt_training.util import taskcluster as dsu_taskcluster except ImportError: print('Training package is not installed. See training documentation.') raise