Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fake comparison to see what I changed between MNIS-115 and MNIS-64 #60

Open
wants to merge 25 commits into
base: compare_nv_12
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
008104b
run with noisy_sampling=False at test time
Nov 10, 2020
bea62eb
switch nms off after a certain number of epoch
Nov 11, 2020
f3cf0b0
nms is always on, but threshold value at train and test time are diff…
Nov 11, 2020
68d8671
made MNIST dataset with GRID
Nov 11, 2020
6bde2d5
dataset created double tensor instead of float
Nov 11, 2020
22ee2d1
draw the background when I do generation
Nov 11, 2020
fdd91cf
print every 10 epoch
Nov 11, 2020
34e7e01
added print statements
Nov 12, 2020
d5a6e28
debugging
Nov 12, 2020
b29ab03
removed print statement. Empty solution happens if prob_corr_factor <…
Nov 12, 2020
87160b1
added comment and change plotting so that p_map plots 16 inputs image…
Nov 12, 2020
d9d0cd4
visualize reconstruction with and without noisy_sampling
Nov 12, 2020
cf5116e
detached the torch.sign from the g_geco. Added comment
Nov 12, 2020
471fb01
clean up GECO code
Nov 12, 2020
f8935f9
revert back to OLD geco formulation
Nov 12, 2020
1088de8
write N_cell constraint based on c_map_before_nms so that all peaks d…
Nov 12, 2020
aa78469
g_cell knows about c_map_after_nms. and prob_corr_factor is lower so …
Nov 12, 2020
7b4c2c1
reverted back to new geco
Nov 12, 2020
75e27a5
fixed typo detahc -> detach
Nov 12, 2020
8d92836
done postprocessing on multi_MNIST
Nov 13, 2020
8755696
ready to rerun smFISH
Nov 14, 2020
96caf76
modified ML_params.json to match new code
Nov 14, 2020
430ff71
comment plt.axis(off) in show_batch
Nov 14, 2020
cba4ded
larger reference images
Nov 14, 2020
f7b2631
done postprocessing on smFISH
invalid-email-address Nov 14, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
112 changes: 112 additions & 0 deletions dataset_multiMNIST/ML_parameters.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
{

"neptune_project" : "dalessioluca/MNIST",

"simulation" : {
"__comment" : "there are 3 types of runs: scratch, resume, pretrained",
"type" : "scratch",
"MAX_EPOCHS" : 1501,
"TEST_FREQUENCY" : 50,
"CHECKPOINT_FREQUENCY" : 50,
"batch_size" : 128
},

"architecture" : {
"__comment" : "architecture parameters, level_zwhere_output is between 0 and n_max_pool included",
"dim_zinstance" : 20,
"dim_zwhere" : 4,
"dim_zbg" : 20,
"dim_logit" : 1,
"cropped_size" : 28,
"n_max_pool" : 4,
"level_zwhere_and_logit_output" : 2,
"level_background_output" : 4,
"n_ch_output_features" : 32,
"n_ch_after_first_two_conv" : 32,
"concatenate_raw_image_to_fmap" : true
},

"DPP" : {
"__comment" : "parameters for the DPP prior",
"n_kernels" : 1
},

"input_image" : {
"__comment" : "parameters describing the input images",
"n_objects_max" : 10,
"size_object_min" : 15,
"size_object_max" : 50,
"length_scale_similarity" : 10.0,
"size_raw_image" : 80,
"ch_in" : 1
},

"nms" : {
"__comment" : "parameters for the non-max-suppression",
"overlap_threshold_train" : 0.3,
"overlap_threshold_test" : 0.5
},

"GECO_loss" : {
"__comment" : "if active=false use ELBO, else use GECO with Log-Likelihood threshold = n_pixels * n_channel * threshold",
"is_active" : true,

"geco_mse_range" : [0.1, 0.8, 0.9],
"geco_fgfraction_range" : [0.1, 1.0, 10.0],
"geco_ncell_range" : [0.1, 1.0, 10.0],

"target_fgfraction" : [0.05, 0.15],
"target_mse" : [0.25, 0.75],
"target_ncell" : [3.0, 5.0],

"bg_std" : 0.1,
"fg_std" : 0.1
},

"optimizer" : {
"__comment" : "which optimizer to use",
"type" : "adam",
"base_lr" : 0.001,
"betas" : [0.9, 0.999],
"base_lr_similarity" : 0.01,
"betas_similarity" : [0.9, 0.999],
"base_lr_geco" : 0.001,
"betas_geco" : [0.9, 0.999],
"weight_decay" : 0.0,
"eps" : 1E-8,
"scheduler_is_active" : true,
"scheduler_type" : "step_LR",
"scheduler_step_size" : 500,
"scheduler_gamma" : 0.75
},

"shortcut_prob_corr_factor" : {
"__comment" : "parameters for the shortcut for porb_corr_factor",
"values" : [0.4, 0.0],
"times" : [50, 150]
},

"soft_constraint" : {

"__comment": "all the parameters about the soft constraints",

"overlap": {
"__comment": "cost which discourages masks from overlapping",
"strength": 0,
"exponent": 1
},

"mask_volume_absolute" : {
"__comment" : "cost which discourage masks which are too large or too small",
"lower_bound_value": 40,
"lower_bound_width": 5,
"lower_bound_strength": 0,
"lower_bound_exponent": 2,
"upper_bound_value": 300,
"upper_bound_width": 5,
"upper_bound_strength": 0,
"upper_bound_exponent": 2
}
}
}

112 changes: 112 additions & 0 deletions dataset_multiMNIST/ML_parameters_NO_GRID.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
{

"neptune_project" : "dalessioluca/MNIST",

"simulation" : {
"__comment" : "there are 3 types of runs: scratch, resume, pretrained",
"type" : "scratch",
"MAX_EPOCHS" : 501,
"TEST_FREQUENCY" : 50,
"CHECKPOINT_FREQUENCY" : 50,
"batch_size" : 128
},

"architecture" : {
"__comment" : "architecture parameters, level_zwhere_output is between 0 and n_max_pool included",
"dim_zinstance" : 20,
"dim_zwhere" : 4,
"dim_zbg" : 4,
"dim_logit" : 1,
"cropped_size" : 28,
"n_max_pool" : 4,
"level_zwhere_and_logit_output" : 2,
"level_background_output" : 4,
"n_ch_output_features" : 32,
"n_ch_after_first_two_conv" : 32,
"concatenate_raw_image_to_fmap" : true
},

"DPP" : {
"__comment" : "parameters for the DPP prior",
"n_kernels" : 1
},

"input_image" : {
"__comment" : "parameters describing the input images",
"n_objects_max" : 10,
"size_object_min" : 15,
"size_object_max" : 50,
"length_scale_similarity" : 10.0,
"size_raw_image" : 80,
"ch_in" : 1
},

"nms" : {
"__comment" : "parameters for the non-max-suppression",
"overlap_threshold_train" : 0.3,
"overlap_threshold_test" : 0.5
},

"GECO_loss" : {
"__comment" : "if active=false use ELBO, else use GECO with Log-Likelihood threshold = n_pixels * n_channel * threshold",
"is_active" : true,

"geco_mse_range" : [0.1, 0.8, 0.9],
"geco_fgfraction_range" : [0.1, 1.0, 3.0],
"geco_ncell_range" : [0.1, 1.0, 3.0],

"target_fgfraction" : [0.05, 0.25],
"target_mse" : [0.25, 0.75],
"target_ncell" : [1.2, 7.0],

"bg_std" : 0.1,
"fg_std" : 0.1
},

"optimizer" : {
"__comment" : "which optimizer to use",
"type" : "adam",
"base_lr" : 0.001,
"betas" : [0.9, 0.999],
"base_lr_similarity" : 0.01,
"betas_similarity" : [0.9, 0.999],
"base_lr_geco" : 0.001,
"betas_geco" : [0.9, 0.999],
"weight_decay" : 0.0,
"eps" : 1E-8,
"scheduler_is_active" : true,
"scheduler_type" : "step_LR",
"scheduler_step_size" : 500,
"scheduler_gamma" : 0.75
},

"shortcut_prob_corr_factor" : {
"__comment" : "parameters for the shortcut for porb_corr_factor",
"values" : [0.4, 0.0],
"times" : [50, 150]
},

"soft_constraint" : {

"__comment": "all the parameters about the soft constraints",

"overlap": {
"__comment": "cost which discourages masks from overlapping",
"strength": 0,
"exponent": 1
},

"mask_volume_absolute" : {
"__comment" : "cost which discourage masks which are too large or too small",
"lower_bound_value": 40,
"lower_bound_width": 5,
"lower_bound_strength": 0,
"lower_bound_exponent": 2,
"upper_bound_value": 300,
"upper_bound_width": 5,
"upper_bound_strength": 0,
"upper_bound_exponent": 2
}
}
}

112 changes: 112 additions & 0 deletions dataset_multiMNIST/ML_parameters_WITH_GRID.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
{

"neptune_project" : "dalessioluca/MNIST",

"simulation" : {
"__comment" : "there are 3 types of runs: scratch, resume, pretrained",
"type" : "scratch",
"MAX_EPOCHS" : 1501,
"TEST_FREQUENCY" : 50,
"CHECKPOINT_FREQUENCY" : 50,
"batch_size" : 128
},

"architecture" : {
"__comment" : "architecture parameters, level_zwhere_output is between 0 and n_max_pool included",
"dim_zinstance" : 20,
"dim_zwhere" : 4,
"dim_zbg" : 20,
"dim_logit" : 1,
"cropped_size" : 28,
"n_max_pool" : 4,
"level_zwhere_and_logit_output" : 2,
"level_background_output" : 4,
"n_ch_output_features" : 32,
"n_ch_after_first_two_conv" : 32,
"concatenate_raw_image_to_fmap" : true
},

"DPP" : {
"__comment" : "parameters for the DPP prior",
"n_kernels" : 1
},

"input_image" : {
"__comment" : "parameters describing the input images",
"n_objects_max" : 10,
"size_object_min" : 15,
"size_object_max" : 50,
"length_scale_similarity" : 10.0,
"size_raw_image" : 80,
"ch_in" : 1
},

"nms" : {
"__comment" : "parameters for the non-max-suppression",
"overlap_threshold_train" : 0.3,
"overlap_threshold_test" : 0.5
},

"GECO_loss" : {
"__comment" : "if active=false use ELBO, else use GECO with Log-Likelihood threshold = n_pixels * n_channel * threshold",
"is_active" : true,

"geco_mse_range" : [0.1, 0.8, 0.9],
"geco_fgfraction_range" : [0.1, 1.0, 10.0],
"geco_ncell_range" : [0.1, 1.0, 10.0],

"target_fgfraction" : [0.05, 0.15],
"target_mse" : [0.25, 0.75],
"target_ncell" : [3.0, 5.0],

"bg_std" : 0.1,
"fg_std" : 0.1
},

"optimizer" : {
"__comment" : "which optimizer to use",
"type" : "adam",
"base_lr" : 0.001,
"betas" : [0.9, 0.999],
"base_lr_similarity" : 0.01,
"betas_similarity" : [0.9, 0.999],
"base_lr_geco" : 0.001,
"betas_geco" : [0.9, 0.999],
"weight_decay" : 0.0,
"eps" : 1E-8,
"scheduler_is_active" : true,
"scheduler_type" : "step_LR",
"scheduler_step_size" : 500,
"scheduler_gamma" : 0.75
},

"shortcut_prob_corr_factor" : {
"__comment" : "parameters for the shortcut for porb_corr_factor",
"values" : [0.4, 0.0],
"times" : [50, 150]
},

"soft_constraint" : {

"__comment": "all the parameters about the soft constraints",

"overlap": {
"__comment": "cost which discourages masks from overlapping",
"strength": 0,
"exponent": 1
},

"mask_volume_absolute" : {
"__comment" : "cost which discourage masks which are too large or too small",
"lower_bound_value": 40,
"lower_bound_width": 5,
"lower_bound_strength": 0,
"lower_bound_exponent": 2,
"upper_bound_value": 300,
"upper_bound_width": 5,
"upper_bound_strength": 0,
"upper_bound_exponent": 2
}
}
}

Binary file added dataset_multiMNIST/accuracy.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dataset_multiMNIST/accuracy_traces.zip
Binary file not shown.
Loading