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.

Sign up for GitHub

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

Jump to bottom

Ssl one train set #25

Merged
merged 71 commits into from
Oct 5, 2023
Merged

Ssl one train set #25

merged 71 commits into from
Oct 5, 2023

Conversation

lucamarini22
Copy link
Owner

@lucamarini22 lucamarini22 commented Jun 13, 2023 •
edited
Loading

"Main commits" of #22

@lucamarini22
add patches_path and splits_path directly as args path instead of hav…
3710c0c 
…ing just dataset_path
@lucamarini22
update README
c1a50b4
@lucamarini22
add patches_path also to the fully-supervised case
2d6b580
@lucamarini22
add num labeled pixels without nan patches
79b3156
@lucamarini22
consider the right unlabeled pixels when computing the unsupervised loss
ce923cb
@lucamarini22
update gitignore
a2a4b82
@lucamarini22
add link to download MARIDA dataset
19434d3
@lucamarini22
update README
46ef6e2
@lucamarini22
update arguments and add check of log folder
e726236
@lucamarini22
update name of environment
81bdd79
@lucamarini22
add inference
2cf6234
@lucamarini22
remove repeated import
ec167e1
@lucamarini22
update type casting of params
3a40248
@lucamarini22
Merge branch 'ssl-and-fully-sup-same-batches' of https://github.com/l…
01902f3 
…ucamarini22/anomaly-marine-detection into ssl-and-fully-sup-same-batches
@lucamarini22
explicity specify constant val to replace padding val to improve read…
3e5b534 
…ability
@lucamarini22
update parse args
8316de4
@lucamarini22
don't perform backward pass if the loss is not computed on any pixel
c72c555
@lucamarini22
add method to aggregate classes (in segmentation maps) into the 11 cl…
b6660c0 
…asses used in the marida paper
@lucamarini22
add category aggregation enum with 11 classes
4c9c659
@lucamarini22
add option to evaluate with 11 classes aggregation
60ac41b
@lucamarini22
add 11 classes (original from marida paper) option
b3a3cac
@lucamarini22
add 11 classes labels, mapping, and count of labeled pixels
b8e6a4a
@lucamarini22 lucamarini22 added the enhancement New feature or request label Jun 13, 2023
@lucamarini22 lucamarini22 assigned gomezzz and unassigned gomezzz Jun 13, 2023
gomezzz
gomezzz requested changes Jun 16, 2023
View reviewed changes
Copy link
Collaborator

@gomezzz gomezzz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just some minor comments

marineanomalydetection/dataset/get_rois.py Outdated Show resolved Hide resolved
marineanomalydetection/dataset/marineanomalydataset.py Outdated Show resolved Hide resolved
marineanomalydetection/dataset/save_id_patches.py Outdated Show resolved Hide resolved
marineanomalydetection/io/log_functions.py Outdated Show resolved Hide resolved
marineanomalydetection/trainmode.py Outdated Show resolved Hide resolved
train.py Outdated Show resolved Hide resolved
lucamarini22 and others added 25 commits September 25, 2023 12:49
@lucamarini22
set CutOut val = 0.1 instead of 0.0, otherwise it gets ignored during…
40c9b79 
… training as padding pixles
@lucamarini22
update
72135a0
@lucamarini22
add code to visually debug images + re-set CutOut to 0.0. Indeed it …
bd64971 
…works with 0.0 because on the logits of the strongly aug-img I ignore I ignore the padding pixels based on the logits of the weakly aug-img, which has not cutout applied
@lucamarini22
fix grad Lu also for the one training set setting
f5ca2f1
@lucamarini22
add flag "use_ce_in_unsup_component" to use Cross Entropy instead of …
bf0ca27 
…Focal loss in the unsup component of the ssl loss. Update descriptions.
@lucamarini22
add drop_last param in all dataloaders and set it to True
6f708e1
@lucamarini22
add function to visually debug images and predictions, and add possib…
a2b73e8 
…ility of using Cross Entropy in the unsupervised component of the ssl loss
@lucamarini22
update
4518c23
@lucamarini22
add only_supervised flag to train only on the supervised component of…
bf091a6 
… the loss when using semi-supervised learning
@lucamarini22
Merge pull request #29 from lucamarini22/fixes
b7ede57 
Fixes
@lucamarini22
Merge pull request #30 from lucamarini22/grad-Lu-fix
ce39cb8 
Grad lu fix
@lucamarini22
Merge pull request #31 from lucamarini22/softmax-and-augmentations-fixes
e0c6288 
Softmax and augmentations fixes
@lucamarini22
Merge pull request #32 from lucamarini22/small-fixes
27ab78d 
Small fixes
@lucamarini22
Merge pull request #33 from lucamarini22/channel-importance
a766534 
Channel importance
@lucamarini22
Merge pull request #34 from lucamarini22/log_val_miou
0740be2 
Log val miou
@lucamarini22
Merge branch 'ssl-and-fully-sup-same-batches' into original-classes-b…
c24745e 
…aseline
@lucamarini22
Merge pull request #23 from lucamarini22/original-classes-baseline
22be673 
Original classes baseline
@lucamarini22
add split files
45cc123
@lucamarini22
update error message if checkpoint_dir does not exist
9fad1a0
@lucamarini22
create log file
cf6da28
@lucamarini22
update README
e052d52
@lucamarini22
update README
4c96fef
@lucamarini22
add folders where models will be saved
951c303
@lucamarini22
Merge pull request #36 from lucamarini22/fixes
040a2d2 
Fixes
@lucamarini22
Merge pull request #22 from lucamarini22/ssl-and-fully-sup-same-batches
0d7c998 
Implementation of Semi-Supervised Learning with 1 training set instead of 2 different training subsets
@lucamarini22 lucamarini22 mentioned this pull request Oct 5, 2023
Open
@lucamarini22 lucamarini22 changed the base branch from main to l1c-train October 5, 2023 08:38
lucamarini22
lucamarini22 commented Oct 5, 2023
View reviewed changes
Copy link
Owner Author

@lucamarini22 lucamarini22 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

@lucamarini22 lucamarini22 merged commit 7d2f974 into l1c-train Oct 5, 2023
@lucamarini22 lucamarini22 deleted the ssl-one-train-set branch October 5, 2023 08:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gomezzz gomezzz gomezzz requested changes

Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@lucamarini22 @gomezzz