From d19f9ab05c189ce0cdc9271669d61b5f0e5db0fb Mon Sep 17 00:00:00 2001 From: David Doan Date: Wed, 4 May 2022 00:09:32 -0400 Subject: added a dataset, tried testing (unsuccessfully) --- .DS_Store | Bin 0 -> 6148 bytes __pycache__/hyperparameters.cpython-38.pyc | Bin 0 -> 440 bytes __pycache__/losses.cpython-38.pyc | Bin 0 -> 3369 bytes __pycache__/preprocess.cpython-38.pyc | Bin 0 -> 5048 bytes losses.py | 12 ++++++------ main.py | 12 ++++++------ 6 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 .DS_Store create mode 100644 __pycache__/hyperparameters.cpython-38.pyc create mode 100644 __pycache__/losses.cpython-38.pyc create mode 100644 __pycache__/preprocess.cpython-38.pyc diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 00000000..bba36123 Binary files /dev/null and b/.DS_Store differ diff --git a/__pycache__/hyperparameters.cpython-38.pyc b/__pycache__/hyperparameters.cpython-38.pyc new file mode 100644 index 00000000..637c2796 Binary files /dev/null and b/__pycache__/hyperparameters.cpython-38.pyc differ diff --git a/__pycache__/losses.cpython-38.pyc b/__pycache__/losses.cpython-38.pyc new file mode 100644 index 00000000..398e9cb3 Binary files /dev/null and b/__pycache__/losses.cpython-38.pyc differ diff --git a/__pycache__/preprocess.cpython-38.pyc b/__pycache__/preprocess.cpython-38.pyc new file mode 100644 index 00000000..e2f42bca Binary files /dev/null and b/__pycache__/preprocess.cpython-38.pyc differ diff --git a/losses.py b/losses.py index 93449962..6ebba671 100644 --- a/losses.py +++ b/losses.py @@ -63,13 +63,13 @@ class YourModel(tf.keras.Model): # Dense(15, activation='softmax') ] - self.vgg16 = tf.keras.Sequential(self.vgg16, name="vgg_base") - self.head = tf.keras.Sequential(self.head, name="vgg_head") + # self.vgg16 = tf.keras.Sequential(self.vgg16, name="vgg_base") + # self.head = tf.keras.Sequential(self.head, name="vgg_head") - self.indexed_layers = [layer for layer in self.vgg16 if layer.name.contains("conv1")] - self.desired = [layer.name for layer in self.vgg16 if layer.name.contains("conv1")] + self.indexed_layers = [layer for layer in self.vgg16 if layer.name == "conv1"] + self.desired = [layer.name for layer in self.vgg16 if layer.name == "conv1"] - def forward_pass(self, x): + def call(self, x): layers = [] for layer in self.vgg16.layers: # pass the x through @@ -83,7 +83,7 @@ class YourModel(tf.keras.Model): return x, np.array(layers) - def loss_function(self, p, a, x): + def loss_fn(self, p, a, x): _, photo_layers = self.forward_pass(p) _, art_layers = self.forward_pass(a) _, input_layers = self.forward_pass(x) diff --git a/main.py b/main.py index ca87788d..837dea81 100644 --- a/main.py +++ b/main.py @@ -6,11 +6,11 @@ from datetime import datetime import tensorflow as tf import hyperparameters as hp -from models import YourModel, VGGModel +from losses import YourModel from preprocess import Datasets from skimage.transform import resize -from tensorboard_utils import \ - ImageLabelingLogger, ConfusionMatrixLogger, CustomModelSaver +# from tensorboard_utils import \ +# ImageLabelingLogger, ConfusionMatrixLogger, CustomModelSaver from skimage.io import imread from lime import lime_image @@ -128,9 +128,9 @@ def train(model, datasets, checkpoint_path, logs_path, init_epoch): tf.keras.callbacks.TensorBoard( log_dir=logs_path, update_freq='batch', - profile_batch=0), - ImageLabelingLogger(logs_path, datasets), - CustomModelSaver(checkpoint_path, ARGS.task, hp.max_num_weights) + profile_batch=0) + # ImageLabelingLogger(logs_path, datasets), + # CustomModelSaver(checkpoint_path, ARGS.task, hp.max_num_weights) ] # Include confusion logger in callbacks if flag set -- cgit v1.2.3-70-g09d2