diff --git a/prinpy/glob.py b/prinpy/glob.py index ad7e7cf..64c5726 100644 --- a/prinpy/glob.py +++ b/prinpy/glob.py @@ -10,11 +10,11 @@ # ML libraries import tensorflow as tf -import keras -from keras.models import Model -from keras.layers import Dense, Input, LeakyReLU -from keras import optimizers -import keras.backend as k +from tensorflow import keras +from tensorflow.keras.models import Model +from tensorflow.keras.layers import Dense, Input, LeakyReLU +from tensorflow.keras.optimizers import Adam +import tensorflow.keras.backend as K # Preprocessing from sklearn.preprocessing import MinMaxScaler, StandardScaler @@ -123,7 +123,7 @@ def create_model(self, num_dim, nodes, lr): # Connect and compile model: model = Model(inputs = input, outputs = output) - gradient_descent = optimizers.adam(learning_rate=lr) + gradient_descent = Adam(learning_rate=lr) model.compile(loss = orth_dist, optimizer = gradient_descent) return model @@ -151,4 +151,4 @@ def preprocess(self, data): scaled = scale.fit_transform(normed.reshape(-1,1)) data_lists.append(scaled) - return np.concatenate(data_lists, axis = 1) \ No newline at end of file + return np.concatenate(data_lists, axis = 1)