Merge pull request #468 from neurodata/hhelm10-patch-1

Temporarily change keras import to be more stable with tensorflow version

Author: PSSF23

proglearn/network.py

@@ -9,8 +9,8 @@
 from .voters import KNNClassificationVoter
 from .deciders import SimpleArgmaxAverage
 
-from keras.optimizers import Adam
-from keras.callbacks import EarlyStopping
+from tensorflow.keras.optimizers import Adam
+from tensorflow.keras.callbacks import EarlyStopping
 
 from sklearn.utils.validation import check_X_y, check_array
 

proglearn/tests/test_network.py

@@ -3,7 +3,7 @@
 import numpy as np
 import random
 
-import keras
+from tensorflow import keras
 
 from proglearn.network import LifelongClassificationNetwork
 from proglearn.transformers import NeuralClassificationTransformer

proglearn/transformers.py

@@ -2,7 +2,7 @@
 Main Author: Will LeVine
 Corresponding Email: levinewill@icloud.com
 """
-import keras
+from tensorflow import keras
 import numpy as np
 from sklearn.tree import DecisionTreeClassifier
 from sklearn.utils.validation import check_array, check_is_fitted, check_X_y