Merge branch 'dev' of https://github.com/mycroftai/mycroft-precise into dev

Author: joshua-montgomery

precise/scripts/train_optimize.py

@@ -14,7 +14,6 @@
 # limitations under the License.
 import numpy
 # Optimizer blackhat
-from bbopt import BlackBoxOptimizer
 from glob import glob
 from os import remove
 from os.path import isfile, splitext, join
@@ -47,6 +46,7 @@ class TrainOptimizeScript(TrainScript):
 
     def __init__(self, args):
         super().__init__(args)
+        from bbopt import BlackBoxOptimizer
         self.bb = BlackBoxOptimizer(file=self.args.trials_name)
         if not self.test:
             data = TrainData.from_both(self.args.tags_file, self.args.tags_folder, self.args.folder)

requirements.txt

@@ -1,15 +1,13 @@
 absl-py==0.7.1
 astor==0.7.1
 attrs==19.1.0
-bbopt==1.1.1
 cycler==0.10.0
 decorator==4.4.0
 fitipy==0.1.2
 future==0.17.1
 gast==0.2.2
 grpcio==1.19.0
 h5py==2.9.0
-hyperopt==0.1.2
 Keras==2.2.4
 Keras-Applications==1.0.7
 Keras-Preprocessing==1.0.9
@@ -18,7 +16,6 @@ Markdown==3.1
 matplotlib==3.0.3
 mock==2.0.0
 -e [email protected]:MycroftAI/mycroft-precise@37ef1ab91eeca81fd889bce2967775b2f6918d97#egg=mycroft_precise
-networkx==1.11
 numpy==1.16.2
 pbr==5.1.3
 pocketsphinx==0.1.15

setup.py

@@ -74,18 +74,15 @@
         'tensorflow>=1.13,<1.14',  # Must be on piwheels
         'sonopy',
         'pyaudio',
-        'keras',
+        'keras<=2.1.5',
         'h5py',
         'wavio',
         'typing',
         'prettyparse>=1.1.0',
         'precise-runner',
         'attrs',
         'fitipy<1.0',
-        # 'bbopt',
         'speechpy-fast',
         'pyache'
-        # 'networkx==1.11',
-        # 'hyperopt==0.1.2'
     ]
 )