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

Add SpotNet v1.1 #706

Merged
merged 2 commits into from
Jun 25, 2024
Merged

Add SpotNet v1.1 #706

merged 2 commits into from
Jun 25, 2024

Conversation

elaubsch
Copy link
Member

This PR adds SpotNet version 1.1, which adds Airlocalize to the set of spot detection methods used to create consensus annotations.

Copy link
Contributor

@rossbar rossbar left a comment

Choose a reason for hiding this comment

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

I took the liberty of updating the version in the gallery example as well, but otherwise LGTM! All the failing CI was unrelated to this PR and has now been fixed. I tested locally and everything worked as expected.

I'll go ahead and approve - feel free to merge whenever you're ready @elaubsch !

@msschwartz21
Copy link
Contributor

@rossbar I was getting ready to open a PR with a tracking related change and found this old PR which I was going to merge in first. Of course now the actions are failing... Would you mind taking a look?

@rossbar rossbar force-pushed the mly/spotnet_v1_1 branch from e082bef to 37cd962 Compare June 25, 2024 10:40
@rossbar
Copy link
Contributor

rossbar commented Jun 25, 2024

Would you mind taking a look?

No problem - the root causes were twofold:

  1. Dependency sync issues with the docs deps (specifically nbsphinx) - this will only get worse as we're pinned further and further from "current" (i.e. Python 3.12)
  2. Updates to ruff, specifically the addition of checks to always use f-strings. I've ignored these checks for now1 which should generally be unobjectionable, though if anyone feels strongly about how string formatting is done by all means feel free to modify!
>>> layer_names = ['conv_pw_{}_relu'.format(i for i in block_ids)]  # Doesn't evaluate expression
['conv_pw_<generator object <genexpr> at 0x7c532706f680>_relu']
>>> layer_names = ['conv_pw_%s_relu' % i for i in block_ids]
['conv_pw_0_relu', 'conv_pw_1_relu', 'conv_pw_2_relu']

Footnotes

  1. this actually led down an interesting rabbit hole with behavior I was unaware of. It seems like there's a difference in whether generator expressions are evaluated with % formatting vs. f-/.format(!). See codeblock above :)

@rossbar
Copy link
Contributor

rossbar commented Jun 25, 2024

I rebased on master to pull in the changes from #719 and all is green, so I'll go ahead and get this in as well. Thanks for looking at it @msschwartz21 !

@rossbar rossbar merged commit 2ef52e0 into master Jun 25, 2024
31 checks passed
@rossbar rossbar deleted the mly/spotnet_v1_1 branch June 25, 2024 11:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
datasets Related to data in deepcell.datasets
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants