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

Use bioimageio.core.build_spec to generate stardist export #171

Merged
merged 41 commits into from
Mar 2, 2022
Merged
Show file tree
Hide file tree
Changes from 38 commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
bcadb48
Use bioimageio.core.build_spec to generate stardist export
constantinpape Nov 3, 2021
77395ff
Add bioimageio.core to requirements
constantinpape Nov 3, 2021
d919e5d
Update bioimageio export
constantinpape Nov 4, 2021
3536ae8
Make bioimageio.core optional dependency
constantinpape Nov 4, 2021
687b373
Fix small errors
constantinpape Nov 4, 2021
3513897
Concatenate output tensor for tf weights
constantinpape Nov 8, 2021
718a7b0
Hard-code correct output name for tf bioimageio export
constantinpape Nov 8, 2021
46a541e
Use tf model for prediction in bioimageio-utils
constantinpape Nov 9, 2021
da8d86f
First working version of bioimageio export
constantinpape Nov 11, 2021
deaeb46
Refactor imports
uschmidt83 Nov 15, 2021
bd581cb
Fix problem with running bioimageio export multiple times
uschmidt83 Nov 15, 2021
1ae3957
Make it work for tensorflow 1 & 2 (hopefully)
uschmidt83 Nov 16, 2021
75e6c46
Update test config (WIP)
uschmidt83 Nov 16, 2021
66ffcdd
Try to fix test config
uschmidt83 Nov 16, 2021
c2fb703
Test 3D model export; tweak code
uschmidt83 Nov 16, 2021
c828fa7
Disable bioimageio tests for tensorflow 2.x
uschmidt83 Nov 16, 2021
22990d1
Github actions syntax error (again...)
uschmidt83 Nov 16, 2021
0178582
Use csbdeep.move_image_axes WIP
constantinpape Nov 22, 2021
06a3d66
Revert "Use csbdeep.move_image_axes WIP"
uschmidt83 Nov 22, 2021
c6da276
Major refactoring
uschmidt83 Nov 22, 2021
d4bab08
Fix output shape spec WIP
constantinpape Nov 23, 2021
4cccfd6
Support inference for bioimage.io models; add example
uschmidt83 Nov 23, 2021
ef3e48f
Add halo WIP
constantinpape Nov 25, 2021
86ac602
Adapt to changes in bioimageio.build_model and some cosmetic changes
constantinpape Jan 12, 2022
04d849f
Add macro for stardist postprocessing in deepIJ to modelzoo export
constantinpape Jan 12, 2022
c3af5c8
Fix issues with postprocessing macro
constantinpape Jan 14, 2022
3cb0143
Rename postprocessing macro and add missing command to it
constantinpape Jan 22, 2022
d7eae81
Fix how the macro file is added to package data
constantinpape Jan 25, 2022
8ed9ae6
Remove ijm file
uschmidt83 Feb 4, 2022
7a2f686
Refactoring and fixes
uschmidt83 Feb 4, 2022
b39fb7d
Export StarDist/Keras weights separately
uschmidt83 Feb 4, 2022
1546daf
Add import_bioimageio function, remove BioimageioModel class
uschmidt83 Feb 5, 2022
6f08a9c
Update halo computation
uschmidt83 Feb 6, 2022
17ffe4f
Replace mutable default value with None
uschmidt83 Feb 7, 2022
c120153
Update notebook
uschmidt83 Feb 7, 2022
58ca216
Only create bioimage.io zip file during export
uschmidt83 Feb 7, 2022
95a1200
Update bioimageio export function to be compatible with new bioimagei…
constantinpape Feb 28, 2022
7d7e4f8
Merge pull request #2 from constantinpape/modelzoo-core-v05
constantinpape Feb 28, 2022
db86a7a
Update tags
uschmidt83 Mar 1, 2022
6ab6d5f
Adjust input_min_shape if necessary
uschmidt83 Mar 1, 2022
797744e
Update tests and tags
uschmidt83 Mar 2, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,10 @@ jobs:
if: startsWith(matrix.os, 'macos') == false
run: pip install ".[test]"

- name: Install bioimage.io dependencies
if: |
matrix.python-version >= 3.7 &&
matrix.tensorflow != 'tensorflow'
run: pip install ".[bioimageio]"

- run: pytest -v --durations=50 -m "not gpu"
6 changes: 6 additions & 0 deletions .github/workflows/tests_cron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,10 @@ jobs:
# pip uninstall -y stardist
# pip install --no-cache-dir --only-binary stardist "stardist>0"

- name: Install bioimage.io dependencies
if: |
matrix.python-version >= 3.7 &&
matrix.tensorflow != 'tensorflow'
run: pip install --no-binary stardist "stardist[bioimageio]"

- run: pytest -v --durations=50 -m "not gpu"
335 changes: 335 additions & 0 deletions examples/other2D/bioimageio.ipynb

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@ def build_extension(self, ext):
setup(
name='stardist',
version=__version__,
description='StarDist',
description='StarDist - Object Detection with Star-convex Shapes',
long_description=long_description,
long_description_content_type='text/markdown',
url='https://github.com/stardist/stardist',
author='Uwe Schmidt, Martin Weigert',
author_email='research@uweschmidt.org, martin.weigert@epfl.ch',
license='BSD 3-Clause License',
license='BSD-3-Clause',
packages=find_packages(),
python_requires='>=3.6',

Expand Down Expand Up @@ -114,6 +114,7 @@ def build_extension(self, ext):
extras_require={
"tf1": ["csbdeep[tf1]>=0.6.3"],
"test": ["pytest"],
"bioimageio": ["bioimageio.core>=0.5.0","importlib-metadata"],
},

)
1 change: 1 addition & 0 deletions stardist/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ def format_warning(message, category, filename, lineno, line=''):
from .plot.render import render_label, render_label_pred
from .rays3d import rays_from_json, Rays_Cartesian, Rays_SubDivide, Rays_Tetra, Rays_Octo, Rays_GoldenSpiral, Rays_Explicit
from .sample_patches import sample_patches
from .bioimageio_utils import export_bioimageio, import_bioimageio