From b254fe1358b13ff2e7c0bcc4d4eaee14f5ecb05b Mon Sep 17 00:00:00 2001 From: "Matthew D. Scholefield" Date: Mon, 26 Feb 2018 21:19:30 -0600 Subject: [PATCH] Rename precise-stream to precise-engine It makes way more sense --- precise.stream.spec => precise.engine.spec | 6 +++--- precise/scripts/{stream.py => engine.py} | 0 publish.sh | 6 +++--- runner/example.py | 4 ++-- runner/precise_runner/runner.py | 4 ++-- setup.py | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) rename precise.stream.spec => precise.engine.spec (87%) rename precise/scripts/{stream.py => engine.py} (100%) diff --git a/precise.stream.spec b/precise.engine.spec similarity index 87% rename from precise.stream.spec rename to precise.engine.spec index 0716d6b..d73a557 100644 --- a/precise.stream.spec +++ b/precise.engine.spec @@ -1,7 +1,7 @@ # -*- mode: python -*- block_cipher = None -a = Analysis(['precise/scripts/stream.py'], +a = Analysis(['precise/scripts/engine.py'], pathex=['.'], binaries=[], datas=[], @@ -19,7 +19,7 @@ pyz = PYZ(a.pure, a.zipped_data, exe = EXE(pyz, a.scripts, exclude_binaries=True, - name='precise-stream', + name='precise-engine', debug=False, strip=True, upx=True, @@ -31,4 +31,4 @@ coll = COLLECT(exe, a.datas, strip=True, upx=True, - name='precise-stream') + name='precise-engine') diff --git a/precise/scripts/stream.py b/precise/scripts/engine.py similarity index 100% rename from precise/scripts/stream.py rename to precise/scripts/engine.py diff --git a/publish.sh b/publish.sh index eb52cf1..72e6601 100755 --- a/publish.sh +++ b/publish.sh @@ -71,11 +71,11 @@ arch="$(find_arch)" .venv/bin/pip3 install pyinstaller rm -rf dist/ echo "Building executable..." -.venv/bin/pyinstaller -y precise.stream.spec +.venv/bin/pyinstaller -y precise.engine.spec -out_file=dist/precise-stream.tar.gz +out_file=dist/precise-engine.tar.gz cd dist -tar -czvf "precise-stream.tar.gz" precise-stream +tar -czvf "precise-engine.tar.gz" precise-engine cd - echo $version > latest diff --git a/runner/example.py b/runner/example.py index 690c3e5..ebe9d8b 100755 --- a/runner/example.py +++ b/runner/example.py @@ -7,7 +7,7 @@ from threading import Event def main(): - parser = ArgumentParser('Implementation demo of precise-stream') + parser = ArgumentParser('Implementation demo of precise-engine') parser.add_argument('model') args = parser.parse_args() @@ -17,7 +17,7 @@ def main(): def on_activation(): Popen(['aplay', '-q', 'data/activate.wav']) - engine = PreciseEngine('./precise/stream.py', args.model) + engine = PreciseEngine('./precise/engine.py', args.model) PreciseRunner(engine, on_prediction=on_prediction, on_activation=on_activation, trigger_level=0).start() Event().wait() # Wait forever diff --git a/runner/precise_runner/runner.py b/runner/precise_runner/runner.py index c5a79cd..22dda13 100644 --- a/runner/precise_runner/runner.py +++ b/runner/precise_runner/runner.py @@ -25,7 +25,7 @@ class PreciseEngine(Engine): Args: exe_file (Union[str, list]): Either filename or list of arguments - (ie. ['python', 'precise_stream.py']) + (ie. ['python', 'precise/scripts/engine.py']) model_file (str): Location to .pb model file to use (with .pb.params) chunk_size (int): Number of samples per prediction. Higher numbers decrease CPU usage but increase latency @@ -64,7 +64,7 @@ class PreciseRunner: >>> def on_act(): ... print('Activation!') ... - >>> p = PreciseRunner(PreciseEngine('./precise-stream'), on_activation=on_act) + >>> p = PreciseRunner(PreciseEngine('./precise-engine'), on_activation=on_act) >>> p.start() >>> from time import sleep; sleep(10) >>> p.stop() diff --git a/setup.py b/setup.py index 1d2d6d7..c369195 100755 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ setup( 'precise-eval=precise.scripts.eval:main', 'precise-record=precise.scripts.record:main', 'precise-record-pocketsphinx=precise.pocketsphinx.scripts.record:main', - 'precise-stream=precise.scripts.stream:main', + 'precise-engine=precise.scripts.engine:main', 'precise-test=precise.scripts.test:main', 'precise-test-pocketsphinx=precise.pocketsphinx.scripts.test:main', 'precise-train=precise.scripts.train:main',