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 pull request #63

Open
wants to merge 31 commits into
base: version_that_worked_to_make_paper_figures
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
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
c5b5059
Merge pull request #61 from spacetx/mnist
dalessioluca Nov 17, 2020
33983c7
WDL_params, ML_params
Nov 17, 2020
52935b2
json
Nov 17, 2020
7dfc81a
mains
Nov 17, 2020
0467c3f
larger_ref
Nov 17, 2020
e5f7035
remove regularization plotting
Nov 17, 2020
c51a9d5
add overlap_threshold in tiling function
Nov 17, 2020
23803bb
ready to run on merfish
invalid-email-address Nov 17, 2020
6fb1f36
modified submit_neptune_ml.sh read command line argument and use shift 2
Nov 18, 2020
7161183
cosmetic changes
Nov 18, 2020
d786e4c
new geco. lambda_rec multiplies everythin
Nov 19, 2020
f65b31a
new geco. lambda_rec multiplies everythin
Nov 19, 2020
e422c9e
new json
Nov 19, 2020
328437f
made all decoders more deep
Nov 19, 2020
55e18af
cleaned encoder and decoders and made them deeper
Nov 19, 2020
006516a
cleaned up
Nov 19, 2020
7681e16
added overlap penalty back
Nov 19, 2020
34b7e9f
save data
Nov 19, 2020
7b63d42
save data
Nov 19, 2020
2c17c35
save json
Nov 19, 2020
4be86e0
save notebook
Nov 19, 2020
617a2b0
geco mse should not multiply sparsity
Nov 19, 2020
43e22c3
moved overlap computation in the inference
Nov 19, 2020
8bd8caa
moved back to GECO I used to produce the paper results
Nov 19, 2020
d505861
fixed typo in spelling strength
Nov 19, 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/MNIST_generated_images.pdf
Binary file not shown.
Binary file added dataset_multiMNIST/MNIST_generated_images.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/MNIST_test_images.pdf
Binary file not shown.
Binary file added dataset_multiMNIST/MNIST_test_images.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.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