From be3d7fc02c7cf010ff94f1300fea009875594530 Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Wed, 20 Oct 2021 10:54:54 -0400 Subject: [PATCH] Add build_packages to Docker build Former-commit-id: b941b39599ce4fb4f08d4ab31cf8238bc1e76cf8 --- .gitignore | 1 + Dockerfile | 7 + README.md | 3 +- configure | 14 +- scripts/build-docker.sh | 305 ++---------------- .../cmu_indic_ben_rm.flitevox.REMOVED.git-id | 1 - .../cmu_indic_guj_ad.flitevox.REMOVED.git-id | 1 - .../cmu_indic_guj_dp.flitevox.REMOVED.git-id | 1 - .../cmu_indic_guj_kt.flitevox.REMOVED.git-id | 1 - .../cmu_indic_hin_ab.flitevox.REMOVED.git-id | 1 - .../cmu_indic_kan_plv.flitevox.REMOVED.git-id | 1 - .../cmu_indic_mar_aup.flitevox.REMOVED.git-id | 1 - .../cmu_indic_mar_slp.flitevox.REMOVED.git-id | 1 - .../cmu_indic_pan_amp.flitevox.REMOVED.git-id | 1 - .../cmu_indic_tam_sdr.flitevox.REMOVED.git-id | 1 - .../cmu_indic_tel_kpn.flitevox.REMOVED.git-id | 1 - .../cmu_indic_tel_sk.flitevox.REMOVED.git-id | 1 - .../cmu_indic_tel_ss.flitevox.REMOVED.git-id | 1 - .../flite/cmu_us_aew.flitevox.REMOVED.git-id | 1 - .../flite/cmu_us_ahw.flitevox.REMOVED.git-id | 1 - .../flite/cmu_us_aup.flitevox.REMOVED.git-id | 1 - .../flite/cmu_us_awb.flitevox.REMOVED.git-id | 1 - .../flite/cmu_us_axb.flitevox.REMOVED.git-id | 1 - .../flite/cmu_us_bdl.flitevox.REMOVED.git-id | 1 - .../flite/cmu_us_clb.flitevox.REMOVED.git-id | 1 - .../flite/cmu_us_eey.flitevox.REMOVED.git-id | 1 - .../flite/cmu_us_fem.flitevox.REMOVED.git-id | 1 - .../flite/cmu_us_gka.flitevox.REMOVED.git-id | 1 - .../flite/cmu_us_jmk.flitevox.REMOVED.git-id | 1 - .../flite/cmu_us_ksp.flitevox.REMOVED.git-id | 1 - .../flite/cmu_us_ljm.flitevox.REMOVED.git-id | 1 - .../flite/cmu_us_lnh.flitevox.REMOVED.git-id | 1 - .../flite/cmu_us_rms.flitevox.REMOVED.git-id | 1 - .../flite/cmu_us_rxr.flitevox.REMOVED.git-id | 1 - .../flite/cmu_us_slp.flitevox.REMOVED.git-id | 1 - .../flite/cmu_us_slt.flitevox.REMOVED.git-id | 1 - .../mycroft_voice_4.0.flitevox.REMOVED.git-id | 1 - .../marytts-lang-de-5.2.jar.REMOVED.git-id | 1 - .../marytts-lang-en-5.2.jar.REMOVED.git-id | 1 - .../groovy-all-2.4.5.jar.REMOVED.git-id | 1 - .../marytts/icu4j-54.1.1.jar.REMOVED.git-id | 1 - 41 files changed, 50 insertions(+), 316 deletions(-) delete mode 100644 voices/flite/cmu_indic_ben_rm.flitevox.REMOVED.git-id delete mode 100644 voices/flite/cmu_indic_guj_ad.flitevox.REMOVED.git-id delete mode 100644 voices/flite/cmu_indic_guj_dp.flitevox.REMOVED.git-id delete mode 100644 voices/flite/cmu_indic_guj_kt.flitevox.REMOVED.git-id delete mode 100644 voices/flite/cmu_indic_hin_ab.flitevox.REMOVED.git-id delete mode 100644 voices/flite/cmu_indic_kan_plv.flitevox.REMOVED.git-id delete mode 100644 voices/flite/cmu_indic_mar_aup.flitevox.REMOVED.git-id delete mode 100644 voices/flite/cmu_indic_mar_slp.flitevox.REMOVED.git-id delete mode 100644 voices/flite/cmu_indic_pan_amp.flitevox.REMOVED.git-id delete mode 100644 voices/flite/cmu_indic_tam_sdr.flitevox.REMOVED.git-id delete mode 100644 voices/flite/cmu_indic_tel_kpn.flitevox.REMOVED.git-id delete mode 100644 voices/flite/cmu_indic_tel_sk.flitevox.REMOVED.git-id delete mode 100644 voices/flite/cmu_indic_tel_ss.flitevox.REMOVED.git-id delete mode 100644 voices/flite/cmu_us_aew.flitevox.REMOVED.git-id delete mode 100644 voices/flite/cmu_us_ahw.flitevox.REMOVED.git-id delete mode 100644 voices/flite/cmu_us_aup.flitevox.REMOVED.git-id delete mode 100644 voices/flite/cmu_us_awb.flitevox.REMOVED.git-id delete mode 100644 voices/flite/cmu_us_axb.flitevox.REMOVED.git-id delete mode 100644 voices/flite/cmu_us_bdl.flitevox.REMOVED.git-id delete mode 100644 voices/flite/cmu_us_clb.flitevox.REMOVED.git-id delete mode 100644 voices/flite/cmu_us_eey.flitevox.REMOVED.git-id delete mode 100644 voices/flite/cmu_us_fem.flitevox.REMOVED.git-id delete mode 100644 voices/flite/cmu_us_gka.flitevox.REMOVED.git-id delete mode 100644 voices/flite/cmu_us_jmk.flitevox.REMOVED.git-id delete mode 100644 voices/flite/cmu_us_ksp.flitevox.REMOVED.git-id delete mode 100644 voices/flite/cmu_us_ljm.flitevox.REMOVED.git-id delete mode 100644 voices/flite/cmu_us_lnh.flitevox.REMOVED.git-id delete mode 100644 voices/flite/cmu_us_rms.flitevox.REMOVED.git-id delete mode 100644 voices/flite/cmu_us_rxr.flitevox.REMOVED.git-id delete mode 100644 voices/flite/cmu_us_slp.flitevox.REMOVED.git-id delete mode 100644 voices/flite/cmu_us_slt.flitevox.REMOVED.git-id delete mode 100644 voices/flite/mycroft_voice_4.0.flitevox.REMOVED.git-id delete mode 100644 voices/marytts/lib/marytts-lang-de-5.2.jar.REMOVED.git-id delete mode 100644 voices/marytts/lib/marytts-lang-en-5.2.jar.REMOVED.git-id delete mode 100644 voices/marytts/lib/marytts/groovy-all-2.4.5.jar.REMOVED.git-id delete mode 100644 voices/marytts/lib/marytts/icu4j-54.1.1.jar.REMOVED.git-id diff --git a/.gitignore b/.gitignore index 1afe800..2cc8370 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ __pycache__/ .dockerargs python_packages packages +build_packages diff --git a/Dockerfile b/Dockerfile index a5b802f..ee2d759 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,6 +18,13 @@ RUN --mount=type=cache,id=apt-build,target=/var/cache/apt \ apt-get install --yes --no-install-recommends \ build-essential python3 python3-venv python3-dev +# Install extra Debian build packages added from ./configure +COPY build_packages /build_packages +RUN --mount=type=cache,id=apt-build,target=/var/cache/apt \ + if [ -s /build_packages ]; then \ + cat /build_packages | xargs apt-get install --yes --no-install-recommends; \ + fi + RUN mkdir -p /home/opentts/app WORKDIR /home/opentts/app diff --git a/README.md b/README.md index def6ab0..5890caf 100644 --- a/README.md +++ b/README.md @@ -268,7 +268,8 @@ Under the hood, this does two things: You can manually run the `configure` script -- see `./configure --help` for more options. This script generates the following files (used by the build process): -* packages - Debian packages installed with `apt-get` +* build_packages - Debian packages installed with `apt-get` during the build only +* packages - Debian packages installed with `apt-get` for runtime * python_packages - Python packages installed with `pip` * .dockerignore - Files that docker will ignore during building ("!" inverts) * .dockerargs - Command-line arguments passed to `docker buildx build` diff --git a/configure b/configure index d5dfebb..17a4399 100755 --- a/configure +++ b/configure @@ -80,7 +80,10 @@ GLOW_SPEAK_PYTHON=('espeak-phonemizer~=1.0.0' 'onnxruntime>=1.6.0,<2.0' 'phoneme GLOW_SPEAK_VOCODERS=('voices/glow-speak/hifi-gan_*') COQUI_TTS_PYTHON=('anyascii' 'coqpit' 'fsspec>=2021.04.0' 'librosa==0.8.0' 'numpy>=1.19.5' 'pysbd' 'scipy>=0.19.0' 'torch>=1.7,<1.9') -# Extgra Debian packages installed with apt-get into the Docker image. +# Extra Debian packages installed with apt-get before building Python virtual environment. +build_packages=() + +# Extra Debian packages installed with apt-get into the Docker image. packages=() if [[ -z "${no_espeak}" ]]; then packages+=('espeak-ng' 'espeak-ng-data') @@ -312,7 +315,8 @@ for language in "${languages[@]}"; do elif [[ "${language}" == 'ja' ]]; then # Japanese if [[ -z "${no_coqui}" ]]; then - packages+=('libmecab-dev') + build_packages+=('libmecab-dev') + packages+=('libmecab2') keep_paths+=('voices/coqui-tts/ja_*') python_packages+=(${COQUI_TTS_PYTHON[@]} 'mecab-python3==1.0.3' 'unidic-lite==1.0.8') fi @@ -469,11 +473,17 @@ trap cleanup EXIT; # Generate files touch \ + "${temp_dir}/build_packages" \ "${temp_dir}/packages" \ "${temp_dir}/python_packages" \ "${temp_dir}/.dockerignore" \ "${temp_dir}/.dockerargs" +for build_package in "${build_packages[@]}"; do + echo "${build_package}" >> "${temp_dir}/build_packages" +done +cat "${temp_dir}/build_packages" | sort | uniq > "${this_dir}/build_packages" + for package in "${packages[@]}"; do echo "${package}" >> "${temp_dir}/packages" done diff --git a/scripts/build-docker.sh b/scripts/build-docker.sh index baa0140..9e8891e 100755 --- a/scripts/build-docker.sh +++ b/scripts/build-docker.sh @@ -7,296 +7,47 @@ src_dir="$(realpath "${this_dir}/..")" version="$(cat "${src_dir}/VERSION")" -# ----------------------------------------------------------------------------- - -: "${PLATFORMS=linux/amd64,linux/arm/v7,linux/arm64}" -: "${DOCKER_REGISTRY=docker.io}" - -if [[ -n "${DOCKER_REGISTRY}" ]] && [[ "${DOCKER_REGISTRY}" != */ ]]; then - # Add final slash - DOCKER_REGISTRY="${DOCKER_REGISTRY}/" -fi - -: "${OPENTTS_LANG=en}" -# ar (Arabic) -# bn (Bengali) -# ca (Catalan) -# cs (Czech) -# de (German) -# en (English) -# es (Spanish) -# fi (Finnish) -# fr (French) -# gu (Gujarati) -# hi (Hindi) -# it (Italian) -# kn (Kannada) -# mr (Marathi) -# nl (Dutch) -# pa (Punjabi) -# ru (Russian) -# sv (Swedish) -# sw (Swahili) -# ta (Tamil) -# te (Telugu) -# tr (Turkish) - -echo "Language: ${OPENTTS_LANG}" - -# ----------------------------------------------------------------------------- - -DOCKERFILE="${src_dir}/Dockerfile" - -# Write .dockerignore file -DOCKERIGNORE="${src_dir}/.dockerignore" -cp -f "${src_dir}/.dockerignore.in" "${DOCKERIGNORE}" - -# Determine voice paths to keep in Docker image -MARYTTS_JARS=('voices/marytts/lib') -LARYNX_VOCODERS=('voices/larynx/hifi_gan' 'voices/larynx/waveglow') - -keep_paths=() -tags=("--tag" "${DOCKER_REGISTRY}synesthesiam/opentts:${OPENTTS_LANG}") -tags+=("--tag" "${DOCKER_REGISTRY}synesthesiam/opentts:${OPENTTS_LANG}-${version}") - -# Extra package variables -# INSTALL_FESTIVAL -# INSTALL_JAVA -# INSTALL_LARYNX - -if [[ "${OPENTTS_LANG}" == 'ar' ]]; then - # Arabic - export LANGUAGE_AR='1' - export INSTALL_FESTIVAL='1' - keep_paths+=('voices/festival/ar') -elif [[ "${OPENTTS_LANG}" == 'bn' ]]; then - # Bengali - export LANGUAGE_BN='1' - keep_paths+=('voices/flite/cmu_indic_ben_rm.flitevox') -elif [[ "${OPENTTS_LANG}" == 'ca' ]]; then - # Catalan - export LANGUAGE_CA='1' - export INSTALL_FESTIVAL='1' - # Packages: festvox-ca-ona-hts - : -elif [[ "${OPENTTS_LANG}" == 'cs' ]]; then - # Czech - export LANGUAGE_CS='1' - export INSTALL_FESTIVAL='1' - # Packages: festvox-czech-dita festvox-czech-krb festvox-czech-machac festvox-czech-ph - : -elif [[ "${OPENTTS_LANG}" == 'de' ]]; then - # German - export LANGUAGE_DE='1' - export INSTALL_FESTIVAL='1' - export INSTALL_JAVA='1' - export INSTALL_LARYNX='1' - keep_paths+=('voices/marytts/de' ${MARYTTS_JARS}) - keep_paths+=('gruut/de-de' 'voices/larynx/de-de' ${LARYNX_VOCODERS[@]}) -elif [[ "${OPENTTS_LANG}" == 'en' ]]; then - # English - export LANGUAGE_EN='1' - export INSTALL_FESTIVAL='1' - export INSTALL_JAVA='1' - export INSTALL_LARYNX='1' - # Packages: festvox-don festvox-en1 festvox-kallpc16k festvox-kdlpc16k festvox-rablpc16k festvox-us1 festvox-us2 festvox-us3 festvox-us-slt-hts - keep_paths+=('voices/marytts/en-GB' 'voices/marytts/en-US' ${MARYTTS_JARS}) - keep_paths+=('voices/larynx/en-us' ${LARYNX_VOCODERS[@]}) - - # Use latest tag for English - tags+=("--tag" "${DOCKER_REGISTRY}synesthesiam/opentts:latest") - tags+=("--tag" "${DOCKER_REGISTRY}synesthesiam/opentts:${version}") -elif [[ "${OPENTTS_LANG}" == 'es' ]]; then - # Spanish - export LANGUAGE_ES='1' - export INSTALL_FESTIVAL='1' - export INSTALL_LARYNX='1' - # Packages: festvox-ellpc11k - keep_paths+=('gruut/es-es' 'voices/larynx/es-es' ${LARYNX_VOCODERS[@]}) -elif [[ "${OPENTTS_LANG}" == 'fi' ]]; then - # Finish - export LANGUAGE_FI='1' - export INSTALL_FESTIVAL='1' - # Packages: festvox-suopuhe-lj festvox-suopuhe-mv - : -elif [[ "${OPENTTS_LANG}" == 'fr' ]]; then - # French - export LANGUAGE_FR='1' - export INSTALL_JAVA='1' - export INSTALL_LARYNX='1' - keep_paths+=('voices/marytts/fr' ${MARYTTS_JARS}) - keep_paths+=('gruut/fr-fr' 'voices/larynx/fr-fr' ${LARYNX_VOCODERS[@]}) -elif [[ "${OPENTTS_LANG}" == 'gu' ]]; then - # Gujarati - export LANGUAGE_GU='1' - keep_paths+=('voices/flite/cmu_indic_guj_ad.flitevox' 'voices/flite/cmu_indic_guj_dp.flitevox' 'voices/flite/cmu_indic_guj_kt.flitevox') -elif [[ "${OPENTTS_LANG}" == 'hi' ]]; then - # Hindi - export LANGUAGE_HI='1' - export INSTALL_FESTIVAL='1' - # Packages: festvox-hi-nsk - keep_paths+=('voices/flite/cmu_indic_hin_ab.flitevox') -elif [[ "${OPENTTS_LANG}" == 'it' ]]; then - # Italian - export LANGUAGE_IT='1' - export INSTALL_FESTIVAL='1' - export INSTALL_JAVA='1' - export INSTALL_LARYNX='1' - # Packages: festvox-italp16k festvox-itapc16k - keep_paths+=('voices/marytts/it' ${MARYTTS_JARS}) - keep_paths+=('gruut/it-it' 'voices/larynx/it-it' ${LARYNX_VOCODERS[@]}) -elif [[ "${OPENTTS_LANG}" == 'kn' ]]; then - # Kannada - export LANGUAGE_BN='1' - keep_paths+=('voices/flite/cmu_indic_kan_plv.flitevox') -elif [[ "${OPENTTS_LANG}" == 'mr' ]]; then - # Marathi - export LANGUAGE_MR='1' - export INSTALL_FESTIVAL='1' - # Packages: festvox-mr-nsk - keep_paths+=('voices/flite/cmu_indic_mar_aup.flitevox' 'voices/flite/cmu_indic_mar_slp.flitevox') -elif [[ "${OPENTTS_LANG}" == 'nl' ]]; then - # Dutch - export LANGUAGE_NL='1' - export INSTALL_LARYNX='1' - keep_paths+=('gruut/nl' 'voices/larynx/nl' ${LARYNX_VOCODERS[@]}) -elif [[ "${OPENTTS_LANG}" == 'pa' ]]; then - # Punjabi - export LANGUAGE_PA='1' - keep_paths+=('voices/flite/cmu_indic_pan_amp.flitevox') -elif [[ "${OPENTTS_LANG}" == 'ru' ]]; then - # Russian - export LANGUAGE_RU='1' - export INSTALL_FESTIVAL='1' - export INSTALL_JAVA='1' - export INSTALL_LARYNX='1' - # Packages: festvox-ru - keep_paths+=('voices/marytts/ru' ${MARYTTS_JARS}) - keep_paths+=('gruut/ru-ru' 'voices/larynx/ru-ru' ${LARYNX_VOCODERS[@]}) -elif [[ "${OPENTTS_LANG}" == 'sv' ]]; then - # Swedish - export LANGUAGE_SV='1' - export INSTALL_JAVA='1' - export INSTALL_LARYNX='1' - keep_paths+=('voices/marytts/sv' ${MARYTTS_JARS}) - keep_paths+=('gruut/sv-se' 'voices/larynx/sv-se' ${LARYNX_VOCODERS[@]}) -elif [[ "${OPENTTS_LANG}" == 'ta' ]]; then - # Tamil - export LANGUAGE_TA='1' - keep_paths+=('voices/flite/cmu_indic_tam_sdr.flitevox') -elif [[ "${OPENTTS_LANG}" == 'te' ]]; then - # Telugu - export LANGUAGE_TE='1' - export INSTALL_FESTIVAL='1' - export INSTALL_JAVA='1' - # Packages: festvox-te-nsk - keep_paths+=('voices/marytts/te' ${MARYTTS_JARS}) - keep_paths+=('voices/flite/cmu_indic_tel_kpn.flitevox' 'voices/flite/cmu_indic_tel_sk.flitevox' 'voices/flite/cmu_indic_tel_ss.flitevox') -elif [[ "${OPENTTS_LANG}" == 'tr' ]]; then - # Turkish - export LANGUAGE_TR='1' - export INSTALL_JAVA='1' - keep_paths+=('voices/marytts/tr' ${MARYTTS_JARS}) +languages=() +if [[ -n "$1" ]]; then + # Specific languages + while [[ -n "$1" ]]; do + languages+=("$1") + shift 1 + done else - echo "Unknown language: ${OPENTTS_LANG}" >&2 - exit 1 + # All languages + languages+=('ar' 'bn' 'ca' 'cs' 'de' 'el' 'en' 'es' 'fi' 'fr' 'gu' 'hi' 'hu' 'it' 'ja' 'kn' 'ko' 'mr' 'nl' 'pa' 'ru' 'sv' 'sw' 'ta' 'te' 'tr' 'zh') fi -for keep_path in "${keep_paths[@]}"; do - echo "!${keep_path}" >> "${DOCKERIGNORE}" -done # ----------------------------------------------------------------------------- -if [[ -n "${PROXY}" ]]; then - if [[ -z "${PROXY_HOST}" ]]; then - export PROXY_HOST="$(hostname -I | awk '{print $1}')" - fi - - : "${APT_PROXY_HOST=${PROXY_HOST}}" - : "${APT_PROXY_PORT=3142}" - : "${PYPI_PROXY_HOST=${PROXY_HOST}}" - : "${PYPI_PROXY_PORT=4000}" - - if [[ -z "NO_APT_PROXY" ]]; then - export APT_PROXY='1' - export APT_PROXY_HOST - export APT_PROXY_PORT - echo "APT proxy: ${APT_PROXY_HOST}:${APT_PROXY_PORT}" - fi +: "${DOCKER_PLATFORMS=--platform linux/amd64,linux/arm/v7,linux/arm64}" +: "${DOCKER_PUSH=--push}" +: "${DOCKER_REGISTRY=docker.io}" - if [[ -z "NO_PYPI_PROXY" ]]; then - export PYPI_PROXY='1' - export PYPI_PROXY_HOST - export PYPI_PROXY_PORT - echo "PyPI proxy: ${PYPI_PROXY_HOST}:${PYPI_PROXY_PORT}" - fi +if [[ -n "${DOCKER_REGISTRY}" ]] && [[ "${DOCKER_REGISTRY}" != */ ]]; then + # Add final slash + DOCKER_REGISTRY="${DOCKER_REGISTRY}/" fi -# Use temporary Dockerfile -temp_dockerfile="$(mktemp -p "${src_dir}")" -function cleanup { - rm -f "${temp_dockerfile}" -} - -trap cleanup EXIT +for language in ${languages[@]}; +do + echo "Language: ${language}" -# Run through pre-processor to replace variables -"${src_dir}/docker/preprocess.sh" < "${DOCKERFILE}" > "${temp_dockerfile}" -DOCKERFILE="${temp_dockerfile}" + tags=("--tag" "${DOCKER_REGISTRY}synesthesiam/opentts:${language}") + tags+=("--tag" "${DOCKER_REGISTRY}synesthesiam/opentts:${language}-${version}") -# ----------------------------------------------------------------------------- - -if [[ -n "${NOBUILDX}" ]]; then - # Don't use docker buildx (single platform) - - if [[ -z "${TARGETARCH}" ]]; then - # Guess architecture - cpu_arch="$(uname -m)" - case "${cpu_arch}" in - armv7l) - export TARGETARCH=arm - export TARGETVARIANT=v7 - ;; - - aarch64|arm64v8) - export TARGETARCH=arm64 - export TARGETVARIANT='' - ;; - - *) - # Assume x86_64 - export TARGETARCH=amd64 - export TARGETVARIANT='' - ;; - esac - - echo "Guessed architecture: ${TARGETARCH}${TARGETVARIANT}" + if [[ "${language}" == 'en' ]]; then + tags+=("--tag" "${DOCKER_REGISTRY}synesthesiam/opentts:latest") fi - docker build \ - "${src_dir}" \ - -f "${DOCKERFILE}" \ - --build-arg "TARGETARCH=${TARGETARCH}" \ - --build-arg "TARGETVARIANT=${TARGETVARIANT}" \ - --build-arg "OPENTTS_LANG=${OPENTTS_LANG}" \ - "${tags[@]}" \ - "$@" -else - args=() + bash "${src_dir}/configure" --language "${language}" - if [[ -n "${DOCKER_REGISTRY}" ]]; then - args+=('--push') - fi - args+=("$@") + xargs < .dockerargs \ + docker buildx build "${src_dir}" \ + ${tags[@]} ${DOCKER_PLATFORMS} ${DOCKER_PUSH} +done - # Use docker buildx (multi-platform) - docker buildx build \ - "${src_dir}" \ - -f "${DOCKERFILE}" \ - "--platform=${PLATFORMS}" \ - --build-arg "OPENTTS_LANG=${OPENTTS_LANG}" \ - "${tags[@]}" \ - "${args[@]}" -fi +echo 'Done' diff --git a/voices/flite/cmu_indic_ben_rm.flitevox.REMOVED.git-id b/voices/flite/cmu_indic_ben_rm.flitevox.REMOVED.git-id deleted file mode 100644 index b3ad620..0000000 --- a/voices/flite/cmu_indic_ben_rm.flitevox.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -ff8ccb8c27da48dd8ae7bafc5c8e37ee61e542bc \ No newline at end of file diff --git a/voices/flite/cmu_indic_guj_ad.flitevox.REMOVED.git-id b/voices/flite/cmu_indic_guj_ad.flitevox.REMOVED.git-id deleted file mode 100644 index 6f237a0..0000000 --- a/voices/flite/cmu_indic_guj_ad.flitevox.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -b95704ccf26f978fb45421d20e35f7772092f09b \ No newline at end of file diff --git a/voices/flite/cmu_indic_guj_dp.flitevox.REMOVED.git-id b/voices/flite/cmu_indic_guj_dp.flitevox.REMOVED.git-id deleted file mode 100644 index ec9b2f3..0000000 --- a/voices/flite/cmu_indic_guj_dp.flitevox.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -df1963d69e8d76b94211475a4a0bd89bec73c055 \ No newline at end of file diff --git a/voices/flite/cmu_indic_guj_kt.flitevox.REMOVED.git-id b/voices/flite/cmu_indic_guj_kt.flitevox.REMOVED.git-id deleted file mode 100644 index 4561360..0000000 --- a/voices/flite/cmu_indic_guj_kt.flitevox.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -a895301bc90cf175806ac4e983afc39e19c5aa72 \ No newline at end of file diff --git a/voices/flite/cmu_indic_hin_ab.flitevox.REMOVED.git-id b/voices/flite/cmu_indic_hin_ab.flitevox.REMOVED.git-id deleted file mode 100644 index cfa67aa..0000000 --- a/voices/flite/cmu_indic_hin_ab.flitevox.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -4963a08c77502c5ae5cb6e4b3a04ba98c449d00f \ No newline at end of file diff --git a/voices/flite/cmu_indic_kan_plv.flitevox.REMOVED.git-id b/voices/flite/cmu_indic_kan_plv.flitevox.REMOVED.git-id deleted file mode 100644 index a6d203e..0000000 --- a/voices/flite/cmu_indic_kan_plv.flitevox.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -bec5ce02437928b4f438c3dd0e26368edbccf6e6 \ No newline at end of file diff --git a/voices/flite/cmu_indic_mar_aup.flitevox.REMOVED.git-id b/voices/flite/cmu_indic_mar_aup.flitevox.REMOVED.git-id deleted file mode 100644 index e9e1c67..0000000 --- a/voices/flite/cmu_indic_mar_aup.flitevox.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -48602a71f19f68b0973c40dd5c69a910cdbb95f1 \ No newline at end of file diff --git a/voices/flite/cmu_indic_mar_slp.flitevox.REMOVED.git-id b/voices/flite/cmu_indic_mar_slp.flitevox.REMOVED.git-id deleted file mode 100644 index 5408da3..0000000 --- a/voices/flite/cmu_indic_mar_slp.flitevox.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -2cc1e36d9cba4dc92769b1e902f90f9810765c72 \ No newline at end of file diff --git a/voices/flite/cmu_indic_pan_amp.flitevox.REMOVED.git-id b/voices/flite/cmu_indic_pan_amp.flitevox.REMOVED.git-id deleted file mode 100644 index 78ee7e8..0000000 --- a/voices/flite/cmu_indic_pan_amp.flitevox.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -95fe6ea17a09fae608ad0f54a9ada040de03b55f \ No newline at end of file diff --git a/voices/flite/cmu_indic_tam_sdr.flitevox.REMOVED.git-id b/voices/flite/cmu_indic_tam_sdr.flitevox.REMOVED.git-id deleted file mode 100644 index 68635dc..0000000 --- a/voices/flite/cmu_indic_tam_sdr.flitevox.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -d8c1b1330bbbf6efb4f817daedaa5d4445929248 \ No newline at end of file diff --git a/voices/flite/cmu_indic_tel_kpn.flitevox.REMOVED.git-id b/voices/flite/cmu_indic_tel_kpn.flitevox.REMOVED.git-id deleted file mode 100644 index 802397b..0000000 --- a/voices/flite/cmu_indic_tel_kpn.flitevox.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -6b1bf924ec2cfc0321b8604beda8d8b0509623ef \ No newline at end of file diff --git a/voices/flite/cmu_indic_tel_sk.flitevox.REMOVED.git-id b/voices/flite/cmu_indic_tel_sk.flitevox.REMOVED.git-id deleted file mode 100644 index 0d4a6fb..0000000 --- a/voices/flite/cmu_indic_tel_sk.flitevox.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -dd8ed9d1e385eb7518e9086e85d613202a6c5b79 \ No newline at end of file diff --git a/voices/flite/cmu_indic_tel_ss.flitevox.REMOVED.git-id b/voices/flite/cmu_indic_tel_ss.flitevox.REMOVED.git-id deleted file mode 100644 index 58a311a..0000000 --- a/voices/flite/cmu_indic_tel_ss.flitevox.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -4b9de9fb5f98aaf89e7806649ae1eeb5f2292e73 \ No newline at end of file diff --git a/voices/flite/cmu_us_aew.flitevox.REMOVED.git-id b/voices/flite/cmu_us_aew.flitevox.REMOVED.git-id deleted file mode 100644 index 7710617..0000000 --- a/voices/flite/cmu_us_aew.flitevox.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -8728d9511c5feeb154588841345ff018c97aab6a \ No newline at end of file diff --git a/voices/flite/cmu_us_ahw.flitevox.REMOVED.git-id b/voices/flite/cmu_us_ahw.flitevox.REMOVED.git-id deleted file mode 100644 index 8e497c5..0000000 --- a/voices/flite/cmu_us_ahw.flitevox.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -37e0432bddb7f561b5b34cde8d2b699ec7dfacd8 \ No newline at end of file diff --git a/voices/flite/cmu_us_aup.flitevox.REMOVED.git-id b/voices/flite/cmu_us_aup.flitevox.REMOVED.git-id deleted file mode 100644 index dbfa13c..0000000 --- a/voices/flite/cmu_us_aup.flitevox.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -fda2957d9d5c4fc7ccd514e0b3037825ed752769 \ No newline at end of file diff --git a/voices/flite/cmu_us_awb.flitevox.REMOVED.git-id b/voices/flite/cmu_us_awb.flitevox.REMOVED.git-id deleted file mode 100644 index 6228adc..0000000 --- a/voices/flite/cmu_us_awb.flitevox.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -69509e244b421707be57829f2d8f13a5ec2c6da7 \ No newline at end of file diff --git a/voices/flite/cmu_us_axb.flitevox.REMOVED.git-id b/voices/flite/cmu_us_axb.flitevox.REMOVED.git-id deleted file mode 100644 index 6c6ac0b..0000000 --- a/voices/flite/cmu_us_axb.flitevox.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -65e23766ce201f6595fda85d489d306842235491 \ No newline at end of file diff --git a/voices/flite/cmu_us_bdl.flitevox.REMOVED.git-id b/voices/flite/cmu_us_bdl.flitevox.REMOVED.git-id deleted file mode 100644 index 169e20f..0000000 --- a/voices/flite/cmu_us_bdl.flitevox.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -534496c6e80b0e7e8080a68c9d7e1e14fe04e382 \ No newline at end of file diff --git a/voices/flite/cmu_us_clb.flitevox.REMOVED.git-id b/voices/flite/cmu_us_clb.flitevox.REMOVED.git-id deleted file mode 100644 index 7917358..0000000 --- a/voices/flite/cmu_us_clb.flitevox.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -7f2ec854449bf3f806c0f847a02dc0ba9a16b1d7 \ No newline at end of file diff --git a/voices/flite/cmu_us_eey.flitevox.REMOVED.git-id b/voices/flite/cmu_us_eey.flitevox.REMOVED.git-id deleted file mode 100644 index 61de170..0000000 --- a/voices/flite/cmu_us_eey.flitevox.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -10fe9c1497af871d4b119e5aa325ca77d55d94ac \ No newline at end of file diff --git a/voices/flite/cmu_us_fem.flitevox.REMOVED.git-id b/voices/flite/cmu_us_fem.flitevox.REMOVED.git-id deleted file mode 100644 index a1b63b2..0000000 --- a/voices/flite/cmu_us_fem.flitevox.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -9d40419fb64db30ab739aa444d50edc72403e928 \ No newline at end of file diff --git a/voices/flite/cmu_us_gka.flitevox.REMOVED.git-id b/voices/flite/cmu_us_gka.flitevox.REMOVED.git-id deleted file mode 100644 index d95a01a..0000000 --- a/voices/flite/cmu_us_gka.flitevox.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -a675a67bb5e6c456d90e36cdd4fddfd03f0cbd57 \ No newline at end of file diff --git a/voices/flite/cmu_us_jmk.flitevox.REMOVED.git-id b/voices/flite/cmu_us_jmk.flitevox.REMOVED.git-id deleted file mode 100644 index 6c4f1db..0000000 --- a/voices/flite/cmu_us_jmk.flitevox.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -f9366d4469b36e2233df45b69085ee1d5108f295 \ No newline at end of file diff --git a/voices/flite/cmu_us_ksp.flitevox.REMOVED.git-id b/voices/flite/cmu_us_ksp.flitevox.REMOVED.git-id deleted file mode 100644 index 30dd5b5..0000000 --- a/voices/flite/cmu_us_ksp.flitevox.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -9a4d5a10dedf41e99d3e04bd70d0af69366f81d1 \ No newline at end of file diff --git a/voices/flite/cmu_us_ljm.flitevox.REMOVED.git-id b/voices/flite/cmu_us_ljm.flitevox.REMOVED.git-id deleted file mode 100644 index 4ca5c1c..0000000 --- a/voices/flite/cmu_us_ljm.flitevox.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -1b9711680d3ea28dd461bb2f0c9bc6a6e4ab340d \ No newline at end of file diff --git a/voices/flite/cmu_us_lnh.flitevox.REMOVED.git-id b/voices/flite/cmu_us_lnh.flitevox.REMOVED.git-id deleted file mode 100644 index 5353946..0000000 --- a/voices/flite/cmu_us_lnh.flitevox.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -1289ff6de1887948262cb7a678904a1e603f8071 \ No newline at end of file diff --git a/voices/flite/cmu_us_rms.flitevox.REMOVED.git-id b/voices/flite/cmu_us_rms.flitevox.REMOVED.git-id deleted file mode 100644 index be1ab66..0000000 --- a/voices/flite/cmu_us_rms.flitevox.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -2ea2c1b720395e4dbdf6057a0f9a890285cfc8e5 \ No newline at end of file diff --git a/voices/flite/cmu_us_rxr.flitevox.REMOVED.git-id b/voices/flite/cmu_us_rxr.flitevox.REMOVED.git-id deleted file mode 100644 index f087746..0000000 --- a/voices/flite/cmu_us_rxr.flitevox.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -b5f39442a942d4018d4bb1d3d6fc3739c06cdeea \ No newline at end of file diff --git a/voices/flite/cmu_us_slp.flitevox.REMOVED.git-id b/voices/flite/cmu_us_slp.flitevox.REMOVED.git-id deleted file mode 100644 index 7db22d4..0000000 --- a/voices/flite/cmu_us_slp.flitevox.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -d7d976748db07cc2411fbf46725b62fb6002b94e \ No newline at end of file diff --git a/voices/flite/cmu_us_slt.flitevox.REMOVED.git-id b/voices/flite/cmu_us_slt.flitevox.REMOVED.git-id deleted file mode 100644 index 0404de3..0000000 --- a/voices/flite/cmu_us_slt.flitevox.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -2d42e3b28258aa07f006536116976124e02cc6c7 \ No newline at end of file diff --git a/voices/flite/mycroft_voice_4.0.flitevox.REMOVED.git-id b/voices/flite/mycroft_voice_4.0.flitevox.REMOVED.git-id deleted file mode 100644 index 3f98968..0000000 --- a/voices/flite/mycroft_voice_4.0.flitevox.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -2b591528d27f2e05b071889287625949651b5667 \ No newline at end of file diff --git a/voices/marytts/lib/marytts-lang-de-5.2.jar.REMOVED.git-id b/voices/marytts/lib/marytts-lang-de-5.2.jar.REMOVED.git-id deleted file mode 100644 index 9415548..0000000 --- a/voices/marytts/lib/marytts-lang-de-5.2.jar.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -1090b7b94cc1023db9ba880c98a678e1e9ab1628 \ No newline at end of file diff --git a/voices/marytts/lib/marytts-lang-en-5.2.jar.REMOVED.git-id b/voices/marytts/lib/marytts-lang-en-5.2.jar.REMOVED.git-id deleted file mode 100644 index 2d6061d..0000000 --- a/voices/marytts/lib/marytts-lang-en-5.2.jar.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -60bb9aa824d1395bb08a0a39be0d144994eaf9d1 \ No newline at end of file diff --git a/voices/marytts/lib/marytts/groovy-all-2.4.5.jar.REMOVED.git-id b/voices/marytts/lib/marytts/groovy-all-2.4.5.jar.REMOVED.git-id deleted file mode 100644 index 260a962..0000000 --- a/voices/marytts/lib/marytts/groovy-all-2.4.5.jar.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -07835093c08aac724997fb9e005511db75d81117 \ No newline at end of file diff --git a/voices/marytts/lib/marytts/icu4j-54.1.1.jar.REMOVED.git-id b/voices/marytts/lib/marytts/icu4j-54.1.1.jar.REMOVED.git-id deleted file mode 100644 index a747cc6..0000000 --- a/voices/marytts/lib/marytts/icu4j-54.1.1.jar.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -ded7cebf8d1a3d9589f7a3efb6a74f485cb0c715 \ No newline at end of file