Commit 4b02b283 authored by Andrey Filippov's avatar Andrey Filippov

more versions, adding more images in the results plot

parent 466ed6b1
...@@ -1755,7 +1755,7 @@ if __name__ == "__main__": ...@@ -1755,7 +1755,7 @@ if __name__ == "__main__":
test_corrs = [] test_corrs = []
#1527257933_150165-ML_DATA-32B-O-FZ0.05-MAIN-RND2.00000.tiff #1527257933_150165-ML_DATA-32B-O-FZ0.05-MAIN-RND2.00000.tiff
#/home/eyesis/x3d_data/data_sets/test_mlr32_18a/1527257933_150165/v04/mlr32_18c/1527257933_150165-ML_DATA-32B-O-FZ0.05-MAIN.tiff #/home/eyesis/x3d_data/data_sets/test_mlr32_18a/1527257933_150165/v04/mlr32_18c/1527257933_150165-ML_DATA-32B-O-FZ0.05-MAIN.tiff
'''
test_sets = [ test_sets = [
"/data_ssd/lwir_sets/lwir_test2/1562390202_933097/v01/ml32", # andrey /empty "/data_ssd/lwir_sets/lwir_test2/1562390202_933097/v01/ml32", # andrey /empty
"/data_ssd/lwir_sets/lwir_test2/1562390225_269784/v01/ml32", # andrey /empty "/data_ssd/lwir_sets/lwir_test2/1562390225_269784/v01/ml32", # andrey /empty
...@@ -1777,7 +1777,18 @@ if __name__ == "__main__": ...@@ -1777,7 +1777,18 @@ if __name__ == "__main__":
"/data_ssd/lwir_sets/lwir_test3/1562390409_661607/v01/ml32", # lena, 2 far moving cars "/data_ssd/lwir_sets/lwir_test3/1562390409_661607/v01/ml32", # lena, 2 far moving cars
"/data_ssd/lwir_sets/lwir_test3/1562390435_873048/v01/ml32", # 2 parked cars, lena "/data_ssd/lwir_sets/lwir_test3/1562390435_873048/v01/ml32", # 2 parked cars, lena
"/data_ssd/lwir_sets/lwir_test3/1562390456_842237/v01/ml32", # near trees "/data_ssd/lwir_sets/lwir_test3/1562390456_842237/v01/ml32", # near trees
"/data_ssd/lwir_sets/lwir_test3/1562390460_261151/v01/ml32"] # near trees, olga "/data_ssd/lwir_sets/lwir_test3/1562390460_261151/v01/ml32", # near trees, olga
]
'''
test_sets = [
"/data_ssd/lwir_sets/lwir_test6/1562390317_693673/v01/ml32", # andrey + olga
"/data_ssd/lwir_sets/lwir_test6/1562390318_833313/v01/ml32", # andrey + olga
"/data_ssd/lwir_sets/lwir_test6/1562390326_354823/v01/ml32", # andrey + olga
"/data_ssd/lwir_sets/lwir_test6/1562390331_483132/v01/ml32", # andrey + olga
"/data_ssd/lwir_sets/lwir_test6/1562390333_192523/v01/ml32", # lena
]
#Parameters to generate neighbors data. Set radius to 0 to generate single-tile #Parameters to generate neighbors data. Set radius to 0 to generate single-tile
TEST_SAME_LENGTH_AS_TRAIN = False # True # make test to have same number of entries as train ones TEST_SAME_LENGTH_AS_TRAIN = False # True # make test to have same number of entries as train ones
......
...@@ -1657,14 +1657,15 @@ if __name__ == "__main__": ...@@ -1657,14 +1657,15 @@ if __name__ == "__main__":
test_corrs = [] test_corrs = []
test_sets = [ test_sets = [
"/data_ssd/lwir_sets/lwir_test2/1562390202_933097/v01/ml32", # andrey /empty "/data_ssd/lwir_sets/lwir_test2/1562390202_933097/v01/ml32b", # andrey /empty
"/data_ssd/lwir_sets/lwir_test2/1562390225_269784/v01/ml32", # andrey /empty "/data_ssd/lwir_sets/lwir_test2/1562390225_269784/v01/ml32b", # andrey /empty
"/data_ssd/lwir_sets/lwir_test2/1562390225_839538/v01/ml32", # andrey /empty "/data_ssd/lwir_sets/lwir_test2/1562390225_839538/v01/ml32b", # andrey /empty
"/data_ssd/lwir_sets/lwir_test2/1562390243_047919/v01/ml32", # 2 trees "/data_ssd/lwir_sets/lwir_test2/1562390243_047919/v01/ml32b", # 2 trees
"/data_ssd/lwir_sets/lwir_test2/1562390251_025390/v01/ml32", # empty space
"/data_ssd/lwir_sets/lwir_test2/1562390257_977146/v01/ml32", # first 3 "/data_ssd/lwir_sets/lwir_test6/1562390251_025390/v01/ml32b", # empty space
"/data_ssd/lwir_sets/lwir_test2/1562390260_370347/v01/ml32", # all 3 "/data_ssd/lwir_sets/lwir_test6/1562390257_977146/v01/ml32b", # first 3
"/data_ssd/lwir_sets/lwir_test2/1562390260_940102/v01/ml32", # all 3 "/data_ssd/lwir_sets/lwir_test6/1562390260_370347/v01/ml32b", # all 3
"/data_ssd/lwir_sets/lwir_test2/1562390260_940102/v01/ml32b", # all 3
"/data_ssd/lwir_sets/lwir_test6/1562390317_693673/v01/ml32", # andrey + olga "/data_ssd/lwir_sets/lwir_test6/1562390317_693673/v01/ml32", # andrey + olga
"/data_ssd/lwir_sets/lwir_test6/1562390318_833313/v01/ml32", # andrey + olga "/data_ssd/lwir_sets/lwir_test6/1562390318_833313/v01/ml32", # andrey + olga
...@@ -1672,12 +1673,12 @@ if __name__ == "__main__": ...@@ -1672,12 +1673,12 @@ if __name__ == "__main__":
"/data_ssd/lwir_sets/lwir_test6/1562390331_483132/v01/ml32", # andrey + olga "/data_ssd/lwir_sets/lwir_test6/1562390331_483132/v01/ml32", # andrey + olga
"/data_ssd/lwir_sets/lwir_test6/1562390333_192523/v01/ml32", # lena "/data_ssd/lwir_sets/lwir_test6/1562390333_192523/v01/ml32", # lena
"/data_ssd/lwir_sets/lwir_test3/1562390402_254007/v01/ml32", # near moving car "/data_ssd/lwir_sets/lwir_test6/1562390402_254007/v01/ml32b", # near moving car
"/data_ssd/lwir_sets/lwir_test3/1562390407_382326/v01/ml32", # near moving car "/data_ssd/lwir_sets/lwir_test6/1562390407_382326/v01/ml32b", # near moving car
"/data_ssd/lwir_sets/lwir_test3/1562390409_661607/v01/ml32", # lena, 2 far moving cars "/data_ssd/lwir_sets/lwir_test6/1562390409_661607/v01/ml32b", # lena, 2 far moving cars
"/data_ssd/lwir_sets/lwir_test3/1562390435_873048/v01/ml32", # 2 parked cars, lena "/data_ssd/lwir_sets/lwir_test6/1562390435_873048/v01/ml32b", # 2 parked cars, lena
"/data_ssd/lwir_sets/lwir_test3/1562390456_842237/v01/ml32", # near trees "/data_ssd/lwir_sets/lwir_test6/1562390456_842237/v01/ml32b", # near trees
"/data_ssd/lwir_sets/lwir_test3/1562390460_261151/v01/ml32"] # near trees, olga "/data_ssd/lwir_sets/lwir_test6/1562390460_261151/v01/ml32b"] # near trees, olga
#Parameters to generate neighbors data. Set radius to 0 to generate single-tile #Parameters to generate neighbors data. Set radius to 0 to generate single-tile
TEST_SAME_LENGTH_AS_TRAIN = False # True # make test to have same number of entries as train ones TEST_SAME_LENGTH_AS_TRAIN = False # True # make test to have same number of entries as train ones
......
...@@ -3,7 +3,7 @@ __copyright__ = "Copyright 2018-2019, Elphel, Inc." ...@@ -3,7 +3,7 @@ __copyright__ = "Copyright 2018-2019, Elphel, Inc."
__license__ = "GPL-3.0+" __license__ = "GPL-3.0+"
__email__ = "andrey@elphel.com" __email__ = "andrey@elphel.com"
#python3 nn_ds_neibs31.py /data_ssd/lwir_sets/conf/qcstereo_lwir05.xml /data_ssd/lwir_sets/ #python3 nn_ds_neibs31.py /data_ssd/lwir_sets/conf/qcstereo_lwir21.xml /data_ssd/lwir_sets/
#tensorboard --logdir="nn_ds_neibs30_graph13-9RNSWLAM0.5SLAM0.1SCLP0.2_nG_nI_HF_CP0.3_S0.03" --port=7001 #tensorboard --logdir="nn_ds_neibs30_graph13-9RNSWLAM0.5SLAM0.1SCLP0.2_nG_nI_HF_CP0.3_S0.03" --port=7001
import os import os
......
This diff is collapsed.
This diff is collapsed.
...@@ -110,21 +110,21 @@ def network_sub(input_tensor, ...@@ -110,21 +110,21 @@ def network_sub(input_tensor,
fc_sym.append(slim.fully_connected(inp8[j], num_sym8, activation_fn=lrelu, scope= scp, reuse = reuse_this)) fc_sym.append(slim.fully_connected(inp8[j], num_sym8, activation_fn=lrelu, scope= scp, reuse = reuse_this))
if not reuse_this: if not reuse_this:
with tf.compat.v1.variable_scope(scp,reuse=True) : # tf.AUTO_REUSE): with tf.compat.v1.variable_scope(scp,reuse=True) : # tf.AUTO_REUSE):
inp_weights.append(tf.get_variable('weights')) # ,shape=[inp.shape[1],num_outs])) inp_weights.append(tf.compat.v1.get_variable('weights')) # ,shape=[inp.shape[1],num_outs]))
if num_non_sum > 0: if num_non_sum > 0:
reuse_this = reuse reuse_this = reuse
scp = 'g_fc_sub'+str(i)+"r" scp = 'g_fc_sub'+str(i)+"r"
fc_sym.append(slim.fully_connected(inp, num_non_sum, activation_fn=lrelu, scope=scp, reuse = reuse_this)) fc_sym.append(slim.fully_connected(inp, num_non_sum, activation_fn=lrelu, scope=scp, reuse = reuse_this))
if not reuse_this: if not reuse_this:
with tf.compat.v1.variable_scope(scp,reuse=True) : # tf.AUTO_REUSE): with tf.compat.v1.variable_scope(scp,reuse=True) : # tf.AUTO_REUSE):
inp_weights.append(tf.get_variable('weights')) # ,shape=[inp.shape[1],num_outs])) inp_weights.append(tf.compat.v1.get_variable('weights')) # ,shape=[inp.shape[1],num_outs]))
fc.append(tf.concat(fc_sym, 1, name='sym_input_layer')) fc.append(tf.concat(fc_sym, 1, name='sym_input_layer'))
else: else:
scp = 'g_fc_sub'+str(i) scp = 'g_fc_sub'+str(i)
fc.append(slim.fully_connected(inp, num_outs, activation_fn=lrelu, scope= scp, reuse = reuse)) fc.append(slim.fully_connected(inp, num_outs, activation_fn=lrelu, scope= scp, reuse = reuse))
if not reuse: if not reuse:
with tf.compat.v1.variable_scope(scp, reuse=True) : # tf.AUTO_REUSE): with tf.compat.v1.variable_scope(scp, reuse=True) : # tf.AUTO_REUSE):
inp_weights.append(tf.get_variable('weights')) # ,shape=[inp.shape[1],num_outs])) inp_weights.append(tf.compat.v1.get_variable('weights')) # ,shape=[inp.shape[1],num_outs]))
return fc[-1], inp_weights return fc[-1], inp_weights
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment