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

[WIP] From 4 to 2 domains, and adding masker functionality #50

Merged
merged 6 commits into from
May 28, 2020

Conversation

51N84D
Copy link
Member

@51N84D 51N84D commented May 25, 2020

Instead of four domains {real, sim}_{flooded, nonflooded} we now only have two {real, sim}. I've also added a "Masker" decoder. I've retained the "Water" decoder because we may want to use that for the auxiliary task of water segmentation (which is different from mask generation).

Also, all of the tests should pass but I haven't tried running a real training experiment.

@51N84D 51N84D added the WIP Work In Progress label May 25, 2020
omnigan/data.py Outdated Show resolved Hide resolved
omnigan/data.py Show resolved Hide resolved
omnigan/data.py Show resolved Hide resolved
omnigan/generator.py Show resolved Hide resolved
omnigan/generator.py Outdated Show resolved Hide resolved
omnigan/trainer.py Outdated Show resolved Hide resolved
omnigan/trainer.py Show resolved Hide resolved
omnigan/tutils.py Outdated Show resolved Hide resolved
omnigan/tutils.py Show resolved Hide resolved
@vict0rsch
Copy link
Contributor

good wip :)

updating tests is good writing new one is best :p (not immediately, but before merging)

omnigan/trainer.py Outdated Show resolved Hide resolved
omnigan/trainer.py Outdated Show resolved Hide resolved
omnigan/trainer.py Outdated Show resolved Hide resolved
@vict0rsch vict0rsch marked this pull request as draft May 27, 2020 17:46
@51N84D 51N84D marked this pull request as ready for review May 28, 2020 15:02
@51N84D 51N84D requested a review from vict0rsch May 28, 2020 15:02
@51N84D
Copy link
Member Author

51N84D commented May 28, 2020

Ok, I added back the discriminators. Is it ready to merge into master?

@melisandeteng
Copy link
Contributor

@51N84D I think it's ready enough for Tianyu and I to start working on it!

Copy link
Contributor

@melisandeteng melisandeteng left a comment

Choose a reason for hiding this comment

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

Works fine ! Great work!
(of course the discriminators part should be left out for the moment when trying to run an experiment though)

Copy link
Contributor

@vict0rsch vict0rsch left a comment

Choose a reason for hiding this comment

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

question before we merge: do we consider discriminator(s) for the masked to be part of the advent PR or should that already be a flag here? it would ~ boil down to adding a key in the OmniDiscriminator class and a key like generative:True|False in m

shared/trainer/defaults.yaml Outdated Show resolved Hide resolved
@melisandeteng
Copy link
Contributor

question before we merge: do we consider discriminator(s) for the masked to be part of the advent PR or should that already be a flag here? it would ~ boil down to adding a key in the OmniDiscriminator class and a key like generative:True|False in m

That would be useful! instead of having to comment the discriminators in and out

@51N84D
Copy link
Member Author

51N84D commented May 28, 2020

question before we merge: do we consider discriminator(s) for the masked to be part of the advent PR or should that already be a flag here? it would ~ boil down to adding a key in the OmniDiscriminator class and a key like generative:True|False in m

That would be useful! instead of having to comment the discriminators in and out

Right now the code is setup such that if the "OmniDiscriminator" is empty (as in no parameters) it gets ignored. I think we can wait to add the ADVENT key with the ADVENT PR

@melisandeteng
Copy link
Contributor

question before we merge: do we consider discriminator(s) for the masked to be part of the advent PR or should that already be a flag here? it would ~ boil down to adding a key in the OmniDiscriminator class and a key like generative:True|False in m

That would be useful! instead of having to comment the discriminators in and out

Right now the code is setup such that if the "OmniDiscriminator" is empty (as in no parameters) it gets ignored. I think we can wait to add the ADVENT key with the ADVENT PR

Oh ok I hadn't noticed that. I'm wondering is there a way to ignore default settings then ?

@vict0rsch
Copy link
Contributor

what do you mean ignore default? what problem do you have?

@51N84D
Copy link
Member Author

51N84D commented May 28, 2020

@vict0rsch actually, I may have made the commit that un-comments the discriminator stuff after Méli already cloned the branch...
@melisandeteng can you try pulling those changes and running again? You shouldn't have to comment anything out

@melisandeteng
Copy link
Contributor

@vict0rsch actually, I may have made the commit that un-comments the discriminator stuff after Méli already cloned the branch...
@melisandeteng can you try pulling those changes and running again? You shouldn't have to comment anything out

It works perfectly fine! for some reason when I first had pulled the uncommented version it would output an error message with "Key "a" does not exist" in the tasks so I thought it was fetching the default parameters but somehow I don't have this issue anymore!

@melisandeteng melisandeteng merged commit 7b88449 into master May 28, 2020
@51N84D 51N84D deleted the 2domain_masker branch May 29, 2020 15:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
WIP Work In Progress
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants