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

Refactoring auto_merge #3435

Merged
merged 31 commits into from
Oct 31, 2024
Merged

Conversation

yger
Copy link
Collaborator

@yger yger commented Sep 24, 2024

This PR is made because of @samuelgarcia request. It will ease the design of recursive auto_merging functions, requiered by SC2 and better methods of automated merging. The idea is that one can provide preset (as before), and params are exposed as dictionary in auto_merges. The old behavior get_potential_auto_merges() is kept, but under the hood, we are now calling the new fonction. The fonction is based as much as possible on extensions.

@alejoe91 alejoe91 added the curation Related to curation module label Sep 25, 2024
Copy link
Member

@alejoe91 alejoe91 left a comment

Choose a reason for hiding this comment

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

Thanks @yger for the refactoring!

I have a few comments

src/spikeinterface/curation/auto_merge.py Outdated Show resolved Hide resolved
src/spikeinterface/curation/auto_merge.py Outdated Show resolved Hide resolved
src/spikeinterface/curation/auto_merge.py Outdated Show resolved Hide resolved
src/spikeinterface/curation/auto_merge.py Outdated Show resolved Hide resolved
src/spikeinterface/curation/auto_merge.py Outdated Show resolved Hide resolved
src/spikeinterface/curation/auto_merge.py Show resolved Hide resolved
src/spikeinterface/curation/auto_merge.py Show resolved Hide resolved
@yger
Copy link
Collaborator Author

yger commented Oct 30, 2024

Forget what I said @samuelgarcia , I found the bug in the other PR, this one is working fine and good to merge on my side

@samuelgarcia
Copy link
Member

@alejoe91 this is OK for me.

@alejoe91 alejoe91 merged commit 5bdcfce into SpikeInterface:main Oct 31, 2024
15 checks passed
@yger yger deleted the auto_merge_refactoring branch October 31, 2024 09:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
curation Related to curation module
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants