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

WNet merger #55

Closed
wants to merge 254 commits into from
Closed

WNet merger #55

wants to merge 254 commits into from

Conversation

MMathisLab
Copy link
Member

TODO for @C-Achard

C-Achard added 30 commits July 13, 2023 11:34
Fix ONNX reqs
Disable dev scripts coverage
Tests :
    - Base plugin
    - ONNX inference
    - Cropping
Fixes :
    - Fixed review image loading not working
    - Fixed scaling when running inference on a folder and showing originals
Remapping was done in inference always, which was breaking some models outputs. This is now done in the correct place, i.e. the WNet_model file
Fix dtype issue for label layer
Colormap changes
Update name of utils when called by quick menu
C-Achard and others added 25 commits September 21, 2023 14:37
Preventing background to be shown first when using WNet inference, for better UX
* Moved docs to source folder

* Updated to jupyter-books

* Update GH Action to jupyter-book

* Updated guides

* Update reqs for jupyter-books

- Fixed typo

* Fix typo and file duplicate

* Added auto API docs

* Update welcome.rst

* Update interface docstrings

* Update ruff to enforce docstring style

* Updated docstrings in interface/config

* Add additional docstring rule exceptions

* Update utils docstring

* Update plugins.py

* Update dev_scripts

* Updated code_plugin folder docstrings

* Update code_models docstrings

* Update tests docstrings

* Update docstring rules to enforce docs

* Fix warnings when building docs

* Restore docs images

* Remove old API docs

* Added module docstring for all public modules

* Update pyproject.toml

* Update folder desc

* Update inference and training guides

* Update inference_module_guide.rst

* Guides updates

* Change indexing, guides updates

* Fix unindent warning

* Update _toc.yml

* Fixed model list inconsistencies

* Update model list

* Trying to fully use autosummary (see #51)

* Docs update

* Fix missing refactor in CRF

* Update cropping_module_guide.rst

* Updated docs ref for code

* Figs, refs, utils guide update

* Update images to figures where relevant
* Updated refs to source code
* Improved utils guide layout and contents

* Review update + crop/utils

* Review update

* Small inference tweaks for pipeline

* Config changes

* Update worker_inference.py

* Small instance seg refactor

* Added properties for instance seg params

* Utils cleanup

* Small refactor of unclear train/val split terminology

* Fix log parameters incorrectly printing def dir

* Enable sliding window for all instance seg methods

* Update instance_segmentation.py

Refactor sliding window to not shadow builtin "function"

* Fixed mistake in auto-check for WNet results

* Fix for restarting train worker after force stop

* Docs & images update

* mv welcome image

* Improved inference docs

* Update inference_module_guide.rst

* Attempt to fix M1 yaml

* Config docstring update

* Welcome page update

* Docs update

* Add WandB for supervised models

* Added auto contrast reset in cropping

* Added checks for instance labels in training

* Check for custom weights before locking window inference

* Improve review plots makers

* Documentation update (Timokleia) (#53)

* Update cropping_module_guide.rst

changes in the cropping module guide

* Update cropping_module_guide.rst

add ``

* Update inference_module_guide.rst

additions to inference module

* Update metrics_module_guide.rst

adjusting the metrics module

* Update review_module_guide.rst

review module updates

* Update training_module_guide.rst

changes in the training module

* Update training_wnet.rst

additions in the wnet module

* Update utils_module_guide.rst

utilities updates

* review parameters image

* Update cropping_module_guide.rst

emoji

* Update metrics_module_guide.rst

emoji

* Update training_module_guide.rst

emoji

* Update utils_module_guide.rst

emoji

* Update cropping_module_guide.rst

mild style changes

* Update review_module_guide.rst

adjusting image code

* Update welcome.rst

changes to welcome

* Add files via upload

* Review and training tweaks

- Fixed a few links, indents, typos
- Replaced some emojis and added new ones for other pages

* Welcome and inference tweaks

- Fixed minor formatting, tables, broken links issues, etc

* RM unused model wrappers attributes

* Inference edits

* Update WNet and inference

* Images update

* Update plots_train.png

* Restore walkthrough

* Update detailed_walkthrough.rst

* Update detailed_walkthrough.rst

editions

* Minor edits

---------

Co-authored-by: C-Achard <[email protected]>

* Added floats in small remove

* Try to fix issue with float/long

* Add except handling for layer removal in train

* Add first version of dedicated install page

- Add install page
- Refacto/clean up welcome page
- Add more useful plugins
- Update TODO

* Improve training guide

* Move M1 install

* Added label stats utils

* Added label stats doc

* Added check for dtype in stats labels

* Update utils_module_guide.rst

* Experimental classifier to reject bad preds on empty

* Experimental classifier to reject bad preds on empty

* Update classifier_test.ipynb

* WIP Trying to fix some QoL issues

- Better exception handling in inference
- Swapaxes at mode output
- Remove small in Voronoi-Otsu

* Fix exception handling

* Locating csv issue

* Enable ruff again

* Handle empty labels in csv stats

* Fix call to get_dict when stats is None

* Ensure consistent rotation

* Fix rotation checks + auto-channel select

* Fix test for review

* Update installation_guide.rst (#54)

refining

* Minor edits to install guide

* [WIP] GUI-less training example script (#52)

* Add remote train scripts

* mv dockerfile

* Paths for remote train

* Change device

* Update remote_training.py

* Change results path to include more info

* Update colab_training.py

* Delete Dockerfile.cellseg3d

* Make all wandb inits point to same project

* Remove deprecated call to AddChannel

* Fix tests issue with MONAI 1.3.0

* Create whole_brain_utils.py

Add segmentation correction scripts

* Update whole_brain_utils.py

* Update whole_brain_utils.py

* Update whole_brain_utils.py

* Update whole_brain_utils.py

* Update _config.yml

---------

Co-authored-by: Timokleia <[email protected]>
Co-authored-by: Mackenzie Mathis <[email protected]>
@MMathisLab MMathisLab requested a review from C-Achard November 15, 2023 12:04
@codecov-commenter
Copy link

Codecov Report

Attention: 544 lines in your changes are missing coverage. Please review.

Comparison is base (022ebad) 82.06% compared to head (6d84956) 80.89%.

Files Patch % Lines
napari_cellseg3d/code_models/worker_training.py 71.64% 186 Missing ⚠️
napari_cellseg3d/code_models/worker_inference.py 71.18% 100 Missing ⚠️
...ri_cellseg3d/code_plugins/plugin_model_training.py 74.40% 96 Missing ⚠️
napari_cellseg3d/code_plugins/plugin_base.py 47.82% 36 Missing ⚠️
...ari_cellseg3d/code_models/instance_segmentation.py 73.21% 30 Missing ⚠️
napari_cellseg3d/code_plugins/plugin_convert.py 80.00% 28 Missing ⚠️
...i_cellseg3d/code_plugins/plugin_model_inference.py 47.91% 25 Missing ⚠️
napari_cellseg3d/code_models/workers_utils.py 90.57% 13 Missing ⚠️
napari_cellseg3d/code_models/model_framework.py 74.28% 9 Missing ⚠️
napari_cellseg3d/code_plugins/plugin_utilities.py 81.81% 8 Missing ⚠️
... and 5 more
Additional details and impacted files
@@            Coverage Diff             @@
##             main      #55      +/-   ##
==========================================
- Coverage   82.06%   80.89%   -1.17%     
==========================================
  Files          43       46       +3     
  Lines        4594     5910    +1316     
==========================================
+ Hits         3770     4781    +1011     
- Misses        824     1129     +305     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@C-Achard
Copy link
Collaborator

This is already merged in #43 !

@C-Achard C-Achard closed this Nov 15, 2023
@C-Achard C-Achard deleted the cy/wnet-extras branch December 14, 2023 12:11
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.

4 participants