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

Fix random_walker regression #4771

Merged
merged 7 commits into from
Jun 11, 2020

Conversation

rfezzani
Copy link
Member

@rfezzani rfezzani commented Jun 4, 2020

Description

Fix #4770.

Regression was introduced in 8f76f0f.

This PR

  • fixes random_walker segmentation when labels contains isolated area
  • adds test_isolated_area

Checklist

For reviewers

  • Check that the PR title is short, concise, and will make sense 1 year
    later.
  • Check that new functions are imported in corresponding __init__.py.
  • Check that new features, API changes, and deprecations are mentioned in
    doc/release/release_dev.rst.

@rfezzani rfezzani added the 🩹 type: Bug fix Fixes unexpected or incorrect behavior label Jun 4, 2020
Copy link
Member

@sciunto sciunto left a comment

Choose a reason for hiding this comment

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

Looks perfect! thanks @rfezzani

Might be worth backporting it.

@sciunto
Copy link
Member

sciunto commented Jun 11, 2020

@scikit-image/core We need a second review on this bugfix (easy to read).

@stefanv
Copy link
Member

stefanv commented Jun 11, 2020

If the test failures are unrelated, go ahead and merge.

@sciunto
Copy link
Member

sciunto commented Jun 11, 2020

They are. i'm merging. Thanks @stefanv

@sciunto sciunto merged commit 6ea4052 into scikit-image:master Jun 11, 2020
@sciunto
Copy link
Member

sciunto commented Jun 11, 2020

@meeseeksdev backport to v0.17.x

@lumberbot-app
Copy link

lumberbot-app bot commented Jun 11, 2020

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
$ git checkout v0.17.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 6ea4052408e5dc969d612a0d26255e65d2efd104
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #4771: Fix random_walker regression'
  1. Push to a named branch :
git push YOURFORK v0.17.x:auto-backport-of-pr-4771-on-v0.17.x
  1. Create a PR against branch v0.17.x, I would have named this PR:

"Backport PR #4771 on branch v0.17.x"

And apply the correct labels and milestones.

Congratulation you did some good work ! Hopefully your backport PR will be tested by the continuous integration and merged soon!

If these instruction are inaccurate, feel free to suggest an improvement.

@lumberbot-app lumberbot-app bot added the Still Needs Manual Backport MrMeeseeks-managed label label Jun 11, 2020
@sciunto sciunto mentioned this pull request Jun 11, 2020
@rfezzani
Copy link
Member Author

🎉 Thank you @sciunto ;)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🩹 type: Bug fix Fixes unexpected or incorrect behavior Still Needs Manual Backport MrMeeseeks-managed label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

segmentation.random_walker error, masking problem
3 participants