From 8bc753de7b0a7a202e5f02265bdcaa02fc602be1 Mon Sep 17 00:00:00 2001 From: ShibaNekoL Date: Tue, 25 Feb 2025 23:01:23 -0500 Subject: [PATCH 1/3] Fix optimizer initialization --- prinpy/glob.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/prinpy/glob.py b/prinpy/glob.py index ad7e7cf..e38ecc6 100644 --- a/prinpy/glob.py +++ b/prinpy/glob.py @@ -5,18 +5,14 @@ in space greater than 2-dimensions. ''' -# General libraries import numpy as np - -# 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 +119,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 From b967c32c07b90d06eb4bedbb22d3671adb1476d5 Mon Sep 17 00:00:00 2001 From: Candice Liang <75994334+ShibaNekoL@users.noreply.github.com> Date: Tue, 25 Feb 2025 23:04:42 -0500 Subject: [PATCH 2/3] Update glob.py --- prinpy/glob.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/prinpy/glob.py b/prinpy/glob.py index e38ecc6..f40252b 100644 --- a/prinpy/glob.py +++ b/prinpy/glob.py @@ -13,6 +13,7 @@ from tensorflow.keras.optimizers import Adam import tensorflow.keras.backend as K +# Preprocessing from sklearn.preprocessing import MinMaxScaler, StandardScaler @@ -147,4 +148,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) From d1f342d9385d3f2476510d4e772b52b0a5efd163 Mon Sep 17 00:00:00 2001 From: Candice Liang <75994334+ShibaNekoL@users.noreply.github.com> Date: Tue, 25 Feb 2025 23:06:08 -0500 Subject: [PATCH 3/3] Update glob.py --- prinpy/glob.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/prinpy/glob.py b/prinpy/glob.py index f40252b..64c5726 100644 --- a/prinpy/glob.py +++ b/prinpy/glob.py @@ -5,7 +5,10 @@ in space greater than 2-dimensions. ''' +# General libraries import numpy as np + +# ML libraries import tensorflow as tf from tensorflow import keras from tensorflow.keras.models import Model