From 5530e47dcbb13f1d5642477834c8105c26957f25 Mon Sep 17 00:00:00 2001 From: Eduard Trulls Date: Mon, 30 Apr 2018 14:34:23 +0200 Subject: [PATCH] Get rid of subtractive norm. --- modules/lift_desc.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/lift_desc.py b/modules/lift_desc.py index 38242ef..8e765cf 100644 --- a/modules/lift_desc.py +++ b/modules/lift_desc.py @@ -63,8 +63,8 @@ def process(inputs, bypass, name, skip, config, is_training): image_summary_nhwc(name + "-input", inputs) # Import the lift_desc_sub_kernel.h5 to get the kernel file - script_dir = os.path.dirname(os.path.realpath(__file__)) - sub_kernel = loadh5(script_dir + "/lift_desc_sub_kernel.h5")["kernel"] + # script_dir = os.path.dirname(os.path.realpath(__file__)) + # sub_kernel = loadh5(script_dir + "/lift_desc_sub_kernel.h5")["kernel"] # activation if config.desc_activ == "tanh": @@ -100,8 +100,8 @@ def pool(cur_in, desc_pool, ksize): cur_in = batch_norm(cur_in, training=is_training) cur_in = activ(cur_in) cur_in = pool(cur_in, config.desc_pool, 2) - if config.use_subtractive_norm: - cur_in = norm_spatial_subtractive(cur_in, sub_kernel) + # if config.use_subtractive_norm: + # cur_in = norm_spatial_subtractive(cur_in, sub_kernel) with tf.variable_scope("conv-act-pool-norm-2"): cur_in = conv_2d(cur_in, 6, 64, 1, "VALID") @@ -109,8 +109,8 @@ def pool(cur_in, desc_pool, ksize): cur_in = batch_norm(cur_in, training=is_training) cur_in = activ(cur_in) cur_in = pool(cur_in, config.desc_pool, 3) - if config.use_subtractive_norm: - cur_in = norm_spatial_subtractive(cur_in, sub_kernel) + # if config.use_subtractive_norm: + # cur_in = norm_spatial_subtractive(cur_in, sub_kernel) with tf.variable_scope("conv-act-pool-3"): cur_in = conv_2d(cur_in, 5, 128, 1, "VALID")