Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrades to TF 2.2. Compat with TFLite. #141

Open
wants to merge 21 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
e748075
Removes pocketsphinx
andreselizondo-adestech Mar 19, 2020
3df8f7a
Convert all to tf2 using tf_upgrade_v2.
andreselizondo-adestech Mar 25, 2020
317a091
Upgrade TF to 2.1, Keras to 2.3.1 and remove pocketsphinx.
andreselizondo-adestech Mar 25, 2020
920641a
Adjusts training parameters for 20 units in GRU. Adds early stop, red…
andreselizondo-adestech Mar 25, 2020
285499e
Adds TFLiteRunner with enough compatility for inference.
andreselizondo-adestech Mar 30, 2020
eeaebf4
Bugfix: Increments counter for each prediction.
andreselizondo-adestech Apr 2, 2020
8f32394
Adjusts KerasRunner for compat with tf2.
andreselizondo-adestech Apr 2, 2020
15a5bf4
Sets TF version to 2.2.0rc2. Update when 2.2.0 is released.
andreselizondo-adestech Apr 2, 2020
51fc562
Adapts convert script for tf2 and tflite.
andreselizondo-adestech Apr 2, 2020
7d1ad8d
Changes precise-convert default output file extension to tflite.
andreselizondo-adestech Apr 20, 2020
1c3fe87
General cleanup for merge.
andreselizondo-adestech Apr 20, 2020
26e6d25
Restore pocketsphinx files.
andreselizondo-adestech Apr 21, 2020
149a649
Adds quick fix to allow save as h5.
andreselizondo-adestech Apr 21, 2020
2b1bb37
Bugfix: Imports rename from os.
andreselizondo-adestech Apr 21, 2020
e2a3c2d
Fixes saving model to .h5 in train_generated.py
andreselizondo-adestech Apr 29, 2020
3baf5da
Allows for generator training.
andreselizondo-adestech Jul 8, 2020
9e7d884
Swap out keras for tf.keras
MatthewScholefield Jul 17, 2020
06ed742
Merge pull request #1 from MatthewScholefield/tf2
andreselizondo-adestech Aug 19, 2020
04502b2
Merge branch 'dev' into incremental_training
andreselizondo-adestech Aug 19, 2020
1979f14
Merge pull request #2 from andreselizondo-adestech/incremental_training
andreselizondo-adestech Aug 19, 2020
0e0ac5b
Restores pocketsphinx.
andreselizondo-adestech Aug 19, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,7 @@
],
packages=[
'precise',
'precise.scripts',
'precise.pocketsphinx',
'precise.pocketsphinx.scripts'
'precise.scripts'
],
entry_points={
'console_scripts': [
Expand All @@ -71,10 +69,10 @@
},
install_requires=[
'numpy',
'tensorflow>=1.13,<1.14', # Must be on piwheels
'tensorflow-gpu>=2', # Must be on piwheels
'sonopy',
'pyaudio',
'keras<=2.1.5',
'keras>2.1.5',
andreselizondo-adestech marked this conversation as resolved.
Show resolved Hide resolved
'h5py',
'wavio',
'typing',
Expand Down
2 changes: 1 addition & 1 deletion setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ fi

pip install -e runner/
pip install -e .
pip install pocketsphinx # Optional, for comparison
#pip install pocketsphinx # Optional, for comparison
andreselizondo-adestech marked this conversation as resolved.
Show resolved Hide resolved