From fbd26a02d5259e7fbef89a33962f2649653c9df2 Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Wed, 30 Mar 2022 18:14:18 -0400 Subject: [PATCH] Don't use --onefile in PyInstaller, it's too slow on the Pi --- Dockerfile.binary | 2 -- Makefile | 4 ++-- mimic3-tts/mimic3_tts/__main__.py | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Dockerfile.binary b/Dockerfile.binary index 5914cb8..c99f09d 100644 --- a/Dockerfile.binary +++ b/Dockerfile.binary @@ -52,7 +52,6 @@ RUN --mount=type=cache,id=pip-venv,target=/root/.cache/pip \ # Create binary for command-line interface RUN .venv/bin/pyinstaller \ - --onefile \ --noconfirm \ --name mimic3 \ --hidden-import 'pycrfsuite._dumpparser' \ @@ -81,7 +80,6 @@ RUN .venv/bin/pyinstaller \ # Create binary for web server RUN .venv/bin/pyinstaller \ - --onefile \ --noconfirm \ --name mimic3-server \ --hidden-import 'pycrfsuite._dumpparser' \ diff --git a/Makefile b/Makefile index bc92473..ccc9741 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ .PHONY: dist install docker binaries SHELL := bash -DOCKER_PLATFORM := linux/amd64 +DOCKER_PLATFORM ?= linux/amd64 dist: cd opentts-abc && python3 setup.py sdist @@ -34,4 +34,4 @@ docker: docker buildx build . -f Dockerfile --platform $(DOCKER_PLATFORM) --tag mycroftai/mimic3 --load binaries: - docker buildx build . -f Dockerfile.binary $(DOCKER_PLATFORM) --output type=local,dest=dist/$(DOCKER_PLATFORM) + docker buildx build . -f Dockerfile.binary --platform $(DOCKER_PLATFORM) --output type=local,dest=dist/$(DOCKER_PLATFORM) diff --git a/mimic3-tts/mimic3_tts/__main__.py b/mimic3-tts/mimic3_tts/__main__.py index 100beff..e06b61d 100644 --- a/mimic3-tts/mimic3_tts/__main__.py +++ b/mimic3-tts/mimic3_tts/__main__.py @@ -373,7 +373,6 @@ def process_lines(state: CommandLineInterfaceState): state.result_queue.put(None) if state.result_thread is not None: - print("Waiting for audio to finish...", file=sys.stderr) state.result_thread.join() # -------------------------------------------------------------------------