mirror of
https://github.com/rhasspy/rhasspy.git
synced 2022-02-12 01:59:45 +03:00
Add Larynx to configure scripts
This commit is contained in:
Michael Hansen
34
Makefile.in
34
Makefile.in
@@ -104,6 +104,9 @@ SNOWBOY_FILE = $(DOWNLOAD_DIR)/snowboy-1.3.0.tar.gz
|
||||
ENABLE_SNIPS = @ENABLE_SNIPS@
|
||||
SNIPS_LANG_DIR = $(srcdir)/rhasspy-snips-nlu/etc/languages
|
||||
|
||||
ENABLE_LARYNX = @ENABLE_LARYNX@
|
||||
TORCH_WHEEL = $(DOWNLOAD_DIR)/torch-1.6.0-cp37-cp37m-$(DOCKER_ARCH).whl
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
VENV_DIR = $(DESTDIR)$(prefix)
|
||||
@@ -135,7 +138,7 @@ ifeq ($(VIRTUALENV),yes)
|
||||
"$(VENV_PYTHON)" -m pip install $(PIP_INSTALL_ARGS) cython
|
||||
endif # VIRTUALENV == yes
|
||||
|
||||
.PHONY: install-opengrm install-phonetisaurus install-precise install-pocketsphinx install-kaldi install-julius install-snowboy install-deepspeech install-kenlm
|
||||
.PHONY: install-opengrm install-phonetisaurus install-precise install-pocketsphinx install-kaldi install-julius install-snowboy install-deepspeech install-kenlm install-nanotts install-larynx
|
||||
install-dependencies: install-opengrm \
|
||||
install-phonetisaurus \
|
||||
install-precise \
|
||||
@@ -145,9 +148,10 @@ install-dependencies: install-opengrm \
|
||||
install-snowboy \
|
||||
install-deepspeech \
|
||||
install-kenlm \
|
||||
install-nanotts
|
||||
install-nanotts \
|
||||
install-larynx
|
||||
|
||||
install-rhasspy:
|
||||
install-rhasspy: install-larynx
|
||||
ifeq ($(ENABLE_SNIPS),yes)
|
||||
"$(INSTALL_PYTHON)" -m pip install $(PIP_INSTALL_ARGS) setuptools_rust
|
||||
endif # ENABLE_SNIPS
|
||||
@@ -161,6 +165,10 @@ ifeq ($(ENABLE_SNIPS),yes)
|
||||
done
|
||||
endif # ENABLE_SNIPS
|
||||
|
||||
ifeq ($(ENABLE_LARYNX),yes)
|
||||
"$(INSTALL_PYTHON)" -m pip install $(PIP_INSTALL_ARGS) "$(TORCH_WHEEL)"
|
||||
endif # ENABLE_LARYNX
|
||||
|
||||
chmod +x "${srcdir}/rhasspy.sh"
|
||||
ifneq ($(IN_PLACE),yes)
|
||||
install -D "${srcdir}/rhasspy.sh" "$(DESTDIR)$(prefix)/bin/rhasspy"
|
||||
@@ -438,6 +446,26 @@ endif # ENABLE_NANOTTS
|
||||
$(NANOTTS_SRC_FILE):
|
||||
$(DO_DOWNLOAD) "$(NANOTTS_SRC_FILE)" 'https://github.com/synesthesiam/prebuilt-apps/raw/master/download/nanotts-20200520.tar.gz'
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# Larynx: text to speech
|
||||
# https://github.com/rhasspy/larynx
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
.PHONY: larynx
|
||||
ifeq ($(ENABLE_LARYNX),yes)
|
||||
larynx: $(NANOTTS_PRE_FILE)
|
||||
|
||||
install-larynx: $(TORCH_WHEEL)
|
||||
"$(srcdir)/scripts/install/install-nanotts.sh" "$(NANOTTS_PRE_FILE)" "$(DESTDIR)$(prefix)"
|
||||
|
||||
$(TORCH_WHEEL):
|
||||
$(DO_DOWNLOAD) "$(TORCH_WHEEL)" "https://github.com/synesthesiam/prebuilt-apps/releases/download/v1.0/torch-1.6.0-cp37-cp37m-$(DOCKER_ARCH).whl"
|
||||
else # ENABLE_LARYNX
|
||||
larynx:
|
||||
|
||||
install-larynx:
|
||||
endif # ENABLE_LARYNX
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
uninstall:
|
||||
|
||||
51
configure
vendored
51
configure
vendored
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.69 for rhasspy 2.5.2.
|
||||
# Generated by GNU Autoconf 2.69 for rhasspy 2.5.7.
|
||||
#
|
||||
# Report bugs to <mike@rhasspy.org>.
|
||||
#
|
||||
@@ -580,8 +580,8 @@ MAKEFLAGS=
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='rhasspy'
|
||||
PACKAGE_TARNAME='rhasspy'
|
||||
PACKAGE_VERSION='2.5.2'
|
||||
PACKAGE_STRING='rhasspy 2.5.2'
|
||||
PACKAGE_VERSION='2.5.7'
|
||||
PACKAGE_STRING='rhasspy 2.5.7'
|
||||
PACKAGE_BUGREPORT='mike@rhasspy.org'
|
||||
PACKAGE_URL=''
|
||||
|
||||
@@ -625,6 +625,7 @@ ac_includes_default="\
|
||||
ac_subst_vars='LTLIBOBJS
|
||||
LIBOBJS
|
||||
IN_PLACE
|
||||
ENABLE_LARYNX
|
||||
ENABLE_WAVENET
|
||||
NANOTTS_FROM
|
||||
ENABLE_NANOTTS
|
||||
@@ -749,6 +750,7 @@ enable_fuzzywuzzy
|
||||
enable_snips
|
||||
enable_nanotts
|
||||
enable_wavenet
|
||||
enable_larynx
|
||||
enable_dependency_check
|
||||
'
|
||||
ac_precious_vars='build_alias
|
||||
@@ -1318,7 +1320,7 @@ if test "$ac_init_help" = "long"; then
|
||||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures rhasspy 2.5.2 to adapt to many kinds of systems.
|
||||
\`configure' configures rhasspy 2.5.7 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@@ -1384,7 +1386,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of rhasspy 2.5.2:";;
|
||||
short | recursive ) echo "Configuration of rhasspy 2.5.7:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@@ -1425,6 +1427,7 @@ Optional Features:
|
||||
system
|
||||
--disable-wavenet disable installation of Google Wavenet text to
|
||||
speech system
|
||||
--disable-larynx disable installation of Larynx text to speech system
|
||||
--disable-dependency-check
|
||||
disable checking for external dependencies
|
||||
|
||||
@@ -1518,7 +1521,7 @@ fi
|
||||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
rhasspy configure 2.5.2
|
||||
rhasspy configure 2.5.7
|
||||
generated by GNU Autoconf 2.69
|
||||
|
||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||
@@ -1900,7 +1903,7 @@ cat >config.log <<_ACEOF
|
||||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by rhasspy $as_me 2.5.2, which was
|
||||
It was created by rhasspy $as_me 2.5.7, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@@ -3788,6 +3791,8 @@ nanotts_from=prebuilt
|
||||
|
||||
is_wavenet_enabled=yes
|
||||
|
||||
is_larynx_enabled=UNKNOWN
|
||||
|
||||
case $host_cpu in #(
|
||||
armv6l) :
|
||||
|
||||
@@ -3818,6 +3823,8 @@ case $host_cpu in #(
|
||||
is_kenlm_enabled=yes
|
||||
|
||||
is_nanotts_enabled=yes
|
||||
|
||||
is_larynx_enabled=no
|
||||
;; #(
|
||||
armv7l) :
|
||||
|
||||
@@ -3847,6 +3854,8 @@ case $host_cpu in #(
|
||||
is_kenlm_enabled=yes
|
||||
|
||||
is_nanotts_enabled=yes
|
||||
|
||||
is_larynx_enabled=yes
|
||||
;; #(
|
||||
aarch64) :
|
||||
|
||||
@@ -3876,6 +3885,8 @@ case $host_cpu in #(
|
||||
is_kenlm_enabled=yes
|
||||
|
||||
is_nanotts_enabled=yes
|
||||
|
||||
is_larynx_enabled=yes
|
||||
;; #(
|
||||
x86_64) :
|
||||
|
||||
@@ -3905,6 +3916,8 @@ case $host_cpu in #(
|
||||
is_kenlm_enabled=yes
|
||||
|
||||
is_nanotts_enabled=yes
|
||||
|
||||
is_larynx_enabled=yes
|
||||
;; #(
|
||||
*) :
|
||||
;;
|
||||
@@ -4050,6 +4063,12 @@ if test "${enable_wavenet+set}" = set; then :
|
||||
fi
|
||||
|
||||
|
||||
# Check whether --enable-larynx was given.
|
||||
if test "${enable_larynx+set}" = set; then :
|
||||
enableval=$enable_larynx;
|
||||
fi
|
||||
|
||||
|
||||
|
||||
wake_system=NONE
|
||||
|
||||
@@ -4319,6 +4338,16 @@ case $enable_wavenet in #(
|
||||
;;
|
||||
esac
|
||||
|
||||
case $enable_larynx in #(
|
||||
yes) :
|
||||
is_larynx_enabled=yes ;; #(
|
||||
no) :
|
||||
is_larynx_enabled=no ;; #(
|
||||
*) :
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
case $enable_precompiled_binaries in #(
|
||||
no) :
|
||||
|
||||
@@ -5084,6 +5113,7 @@ text to speech:"
|
||||
|
||||
$as_echo " nanoTTS: ${is_nanotts_enabled} (${nanotts_from})"
|
||||
$as_echo " Wavenet: ${is_wavenet_enabled}"
|
||||
$as_echo " Larynx: ${is_larynx_enabled}"
|
||||
|
||||
$as_echo "
|
||||
training:"
|
||||
@@ -5183,6 +5213,9 @@ NANOTTS_FROM=$nanotts_from
|
||||
ENABLE_WAVENET=$is_wavenet_enabled
|
||||
|
||||
|
||||
ENABLE_LARYNX=$is_larynx_enabled
|
||||
|
||||
|
||||
IN_PLACE=$is_in_place
|
||||
|
||||
|
||||
@@ -5728,7 +5761,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by rhasspy $as_me 2.5.2, which was
|
||||
This file was extended by rhasspy $as_me 2.5.7, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@@ -5781,7 +5814,7 @@ _ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||
ac_cs_version="\\
|
||||
rhasspy config.status 2.5.2
|
||||
rhasspy config.status 2.5.7
|
||||
configured by $0, generated by GNU Autoconf 2.69,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
||||
24
configure.ac
24
configure.ac
@@ -1,4 +1,4 @@
|
||||
AC_INIT([rhasspy], [2.5.2], [mike@rhasspy.org])
|
||||
AC_INIT([rhasspy], [2.5.7], [mike@rhasspy.org])
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
PC_INIT([3.7.0])
|
||||
|
||||
@@ -101,6 +101,8 @@ nanotts_from=prebuilt
|
||||
|
||||
is_wavenet_enabled=yes
|
||||
|
||||
is_larynx_enabled=UNKNOWN
|
||||
|
||||
dnl Set architectures based on host CPU
|
||||
AS_CASE([$host_cpu],
|
||||
[armv6l],[
|
||||
@@ -132,6 +134,8 @@ AS_CASE([$host_cpu],
|
||||
is_kenlm_enabled=yes
|
||||
|
||||
is_nanotts_enabled=yes
|
||||
|
||||
is_larynx_enabled=no
|
||||
],
|
||||
[armv7l],[
|
||||
dnl ARM 32-bit v7 (Pi 2/3/4)
|
||||
@@ -161,6 +165,8 @@ AS_CASE([$host_cpu],
|
||||
is_kenlm_enabled=yes
|
||||
|
||||
is_nanotts_enabled=yes
|
||||
|
||||
is_larynx_enabled=yes
|
||||
],
|
||||
[aarch64],[
|
||||
dnl ARM 64-bit (Pi 3/4)
|
||||
@@ -190,6 +196,8 @@ AS_CASE([$host_cpu],
|
||||
is_kenlm_enabled=yes
|
||||
|
||||
is_nanotts_enabled=yes
|
||||
|
||||
is_larynx_enabled=yes
|
||||
],
|
||||
[x86_64],[
|
||||
dnl x86_64 compatible
|
||||
@@ -219,6 +227,8 @@ AS_CASE([$host_cpu],
|
||||
is_kenlm_enabled=yes
|
||||
|
||||
is_nanotts_enabled=yes
|
||||
|
||||
is_larynx_enabled=yes
|
||||
])
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
@@ -355,6 +365,10 @@ AC_ARG_ENABLE([wavenet],
|
||||
AS_HELP_STRING([--disable-wavenet],
|
||||
[disable installation of Google Wavenet text to speech system]))
|
||||
|
||||
AC_ARG_ENABLE([larynx],
|
||||
AS_HELP_STRING([--disable-larynx],
|
||||
[disable installation of Larynx text to speech system]))
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl Resolve Settings
|
||||
dnl ---------------------------------------------------------------------------
|
||||
@@ -538,6 +552,11 @@ AS_CASE([$enable_wavenet],
|
||||
[yes],[is_wavenet_enabled=yes],
|
||||
[no],[is_wavenet_enabled=no])
|
||||
|
||||
AS_CASE([$enable_larynx],
|
||||
[yes],[is_larynx_enabled=yes],
|
||||
[no],[is_larynx_enabled=no])
|
||||
|
||||
|
||||
dnl Determine prebuilt/source
|
||||
AS_CASE([$enable_precompiled_binaries],
|
||||
[no],[
|
||||
@@ -696,6 +715,7 @@ text to speech:"])
|
||||
|
||||
AS_ECHO([" nanoTTS: ${is_nanotts_enabled} (${nanotts_from})"])
|
||||
AS_ECHO([" Wavenet: ${is_wavenet_enabled}"])
|
||||
AS_ECHO([" Larynx: ${is_larynx_enabled}"])
|
||||
|
||||
AS_ECHO(["
|
||||
training:"])
|
||||
@@ -762,6 +782,8 @@ AC_SUBST([NANOTTS_FROM], [$nanotts_from])
|
||||
|
||||
AC_SUBST([ENABLE_WAVENET], [$is_wavenet_enabled])
|
||||
|
||||
AC_SUBST([ENABLE_LARYNX], [$is_larynx_enabled])
|
||||
|
||||
AC_SUBST([IN_PLACE], [$is_in_place])
|
||||
|
||||
AC_OUTPUT
|
||||
|
||||
Reference in New Issue
Block a user