From 840b5ea07cd6871ae0dd041da2aab906d5fff334 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 18 Feb 2020 18:39:45 +0100 Subject: simple sum --- cli/app/search/search_dense.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cli/app/search/search_dense.py b/cli/app/search/search_dense.py index f52954c..f0e0a68 100644 --- a/cli/app/search/search_dense.py +++ b/cli/app/search/search_dense.py @@ -302,7 +302,7 @@ def find_dense_embedding_for_images(params, opt_tag="inverse_" + timestamp(), op # img_rec_err = params.lambda_mse * img_mse_err + params.lambda_feat * img_feat_err inv_loss = (params.lambda_mse * mse_loss + params.lambda_feat * feat_loss) - inv_loss_quad = (params.lambda_mse * mse_loss_quad + params.lambda_feat * feat_loss_quad) + # inv_loss_quad = (params.lambda_mse * mse_loss_quad + params.lambda_feat * feat_loss_quad) # inv_loss_quint = params.lambda_mse * mse_loss_quint + params.lambda_feat * feat_loss_quint # -------------------------- @@ -328,9 +328,9 @@ def find_dense_embedding_for_images(params, opt_tag="inverse_" + timestamp(), op inv_train_op = optimizer.minimize(inv_loss, var_list=trained_params, global_step=inv_step) reinit_optimizer = tf.variables_initializer(optimizer.variables()) - optimizer_quad = tf.train.AdamOptimizer(learning_rate=lrate, beta1=0.9, beta2=0.999) - inv_train_op_quad = optimizer_quad.minimize(inv_loss_quad, var_list=trained_params, global_step=inv_step) - reinit_optimizer_quad = tf.variables_initializer(optimizer_quad.variables()) + # optimizer_quad = tf.train.AdamOptimizer(learning_rate=lrate, beta1=0.9, beta2=0.999) + # inv_train_op_quad = optimizer_quad.minimize(inv_loss_quad, var_list=trained_params, global_step=inv_step) + # reinit_optimizer_quad = tf.variables_initializer(optimizer_quad.variables()) # optimizer_quint = tf.train.AdamOptimizer(learning_rate=lrate, beta1=0.9, beta2=0.999) # inv_train_op_quint = optimizer_quint.minimize(inv_loss_quint, var_list=trained_params, global_step=inv_step) -- cgit v1.2.3-70-g09d2