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

Two step source separation #67

Merged
merged 56 commits into from
Apr 9, 2020

Conversation

etzinis
Copy link
Contributor

@etzinis etzinis commented Mar 27, 2020

Integrating the two-step source separation in asteroid.

etzinis added 11 commits March 27, 2020 16:45
…rating the two step source separation recipe. Specifically, for the two step process a new method callback is called which has a modular structure and does not intervene with the other callback methods existing.
…opriate format and docs. Moreover we add a simpler block for dilated separable convolutions without skip connections.
…zation for the filterbank and the separator.
…ses for loading the appropriate module parts and encoding directories paths.
Copy link
Collaborator

@mpariente mpariente left a comment

Choose a reason for hiding this comment

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

Thanks a lot for the PR, it will be a great addition to the set of recipes we have !

There are few things to address before merging but it looks great already 🚀

asteroid/data/wham_dataset.py Outdated Show resolved Hide resolved
asteroid/data/wham_dataset.py Outdated Show resolved Hide resolved
asteroid/data/wham_dataset.py Outdated Show resolved Hide resolved
asteroid/engine/system.py Outdated Show resolved Hide resolved
asteroid/engine/system.py Outdated Show resolved Hide resolved
egs/wham/TwoStep/model.py Show resolved Hide resolved
egs/wham/TwoStep/model.py Show resolved Hide resolved
egs/wham/TwoStep/model.py Outdated Show resolved Hide resolved
egs/wham/TwoStep/model.py Outdated Show resolved Hide resolved
egs/wham/TwoStep/train.py Outdated Show resolved Hide resolved
mpariente and others added 18 commits March 28, 2020 13:45
…rating the two step source separation recipe. Specifically, for the two step process a new method callback is called which has a modular structure and does not intervene with the other callback methods existing.
…opriate format and docs. Moreover we add a simpler block for dilated separable convolutions without skip connections.
…zation for the filterbank and the separator.
…ses for loading the appropriate module parts and encoding directories paths.
…opriate format and docs. Moreover we add a simpler block for dilated separable convolutions without skip connections.
etzinis added 26 commits April 7, 2020 21:30
…zation for the filterbank and the separator.
…ses for loading the appropriate module parts and encoding directories paths.
…rating the two step source separation recipe. Specifically, for the two step process a new method callback is called which has a modular structure and does not intervene with the other callback methods existing.
…problem with a background running server job
…ore code as specified. However, in a next PR we can move the two-step tdcn inside the main block codebase as it is almost ready
@@ -52,24 +51,29 @@ def forward(self, *args, **kwargs):
"""
return self.model(*args, **kwargs)

def common_step(self, batch, batch_nb):
def common_step(self, batch, batch_nb, train=True):
Copy link
Collaborator

Choose a reason for hiding this comment

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

I guess you cherry-picked three of my commits to have the new System.
This is bad habit for two reasons

  • The changes will be asociated with this PR (wrong history)
  • If you make a small change on this new version of the file, it is not as obvious to see
    There are two ways to deal with this
  • Rebase master and force-push
  • Merge master into your branch
    Because we squash PRs before merging, I prefer the second method.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh I am sorry man this was a mistake

Copy link
Collaborator

@mpariente mpariente left a comment

Choose a reason for hiding this comment

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

That looks good, thanks ! We'll keep it in the recipe for now and try to merge the architecture definitions to avoid redundancy.
Thanks again !

@mpariente mpariente merged commit 2c16ea4 into asteroid-team:master Apr 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants