Skip to content

Conversation

@C-Achard
Copy link
Collaborator

Fixes issue #45

@C-Achard C-Achard added fix Something needs to be or has been fixed requirements Related to installation requirements and optional dependencies labels Jul 28, 2023
@C-Achard C-Achard requested a review from CYHSM July 28, 2023 08:55
@C-Achard C-Achard self-assigned this Jul 28, 2023
@codecov-commenter
Copy link

codecov-commenter commented Jul 28, 2023

Codecov Report

Merging #46 (514c301) into main (a1e363e) will increase coverage by 9.72%.
Report is 1 commits behind head on main.
The diff coverage is 83.58%.

@@            Coverage Diff             @@
##             main      #46      +/-   ##
==========================================
+ Coverage   72.33%   82.06%   +9.72%     
==========================================
  Files          50       43       -7     
  Lines        5209     4594     -615     
==========================================
+ Hits         3768     3770       +2     
+ Misses       1441      824     -617     
Files Changed Coverage Δ
napari_cellseg3d/code_models/crf.py 86.48% <ø> (ø)
...ri_cellseg3d/code_models/models/model_SegResNet.py 77.77% <ø> (+5.05%) ⬆️
...ri_cellseg3d/code_models/models/wnet/soft_Ncuts.py 100.00% <ø> (+37.68%) ⬆️
napari_cellseg3d/code_plugins/plugin_metrics.py 63.93% <ø> (-0.30%) ⬇️
...ri_cellseg3d/code_plugins/plugin_model_training.py 69.97% <0.00%> (+2.38%) ⬆️
napari_cellseg3d/code_plugins/plugin_base.py 68.39% <13.33%> (-0.17%) ⬇️
napari_cellseg3d/code_models/workers.py 71.79% <33.33%> (+9.09%) ⬆️
...i_cellseg3d/code_plugins/plugin_model_inference.py 71.94% <46.37%> (+9.36%) ⬆️
napari_cellseg3d/code_models/model_framework.py 85.96% <77.77%> (+30.51%) ⬆️
napari_cellseg3d/_tests/test_models.py 97.10% <89.47%> (-2.90%) ⬇️
... and 17 more

... and 10 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@C-Achard C-Achard merged commit 022ebad into main Jul 28, 2023
C-Achard added a commit that referenced this pull request Jul 28, 2023
C-Achard added a commit that referenced this pull request Jul 28, 2023
C-Achard added a commit that referenced this pull request Jul 28, 2023
@C-Achard C-Achard mentioned this pull request Jul 28, 2023
@C-Achard C-Achard deleted the cy/fix-crf branch July 28, 2023 12:29
C-Achard added a commit that referenced this pull request Sep 19, 2023
* Utils improvements

- Set new results path now remains across utils
- Utils generate one layer and update it on subsequent runs
- Layer choice tries to be conserved across utils

* Cleanup + CRF fixes

* Fragmenting utility

* Temp fix for CRF (#46)

* Update plugin_convert.py

* Update test_and_deploy.yml

* Update test_inference.py

* Fix tests + new weights

* Update test_models.py

* Fix dir for saving in tests

* Docstring update

* CRF and utils colormap adjustment

* Update plugin_crf.py

* Fix typo in crf.py

Co-authored-by: Jessy Lauer <[email protected]>

* Fix Pathlib typo in plugin_convert.py

Co-authored-by: Jessy Lauer <[email protected]>

* Fixed filepaths + comments cleanup

* Fixed merge comment deletion

---------

Co-authored-by: Jessy Lauer <[email protected]>
C-Achard added a commit that referenced this pull request Nov 10, 2023
* Add LayerNorm

* Change softmax arg

* Num group 2

* Update model.py

* Update model.py

* Reduce depth of WNet

* Started WNet training UI

* Workable WNet training prototype

* Fixes

* Test fixes

* Temp fix for CRF (#46)

* Minor fixes

* Tests & training

* Fix tests + new weights

* Fix ETA precision

* Docstring update

* Update plugin_model_training.py

* Update contrast limit when updating layers

* Update config.py

* Fixed normalization

* Update plugin_model_training.py

* Update workers_utils.py

* Trying to fix input normalization

* Fix name mismatch

* Fix decoder evaluation

* Update dice calculation

* Update dice coeff

* Update worker_training.py

* Fix eval detach

* Fix Dice list for WNet

* Updated validation UI

* Tooltips and show_results update

* Plots update

* Plot + log_parameters

* Update worker_training.py

* Disable WANDB for now + log param tweaks

* UI/log tweaks

* Functional WNet training

* Clean exit / free memory attempt

* Cleanup + tests

- Removed previous train script
- Fix tests
- Enable test workflow on GH

* Deploy memory usage fix in inference as well

* Memory usage fix

* UI tweak

* WNet cleanup + supervised training improvements

* Change Dice metric include_background for WNet

To avoid Max Dice calculation

* Set better default LR across un/supervised

* Update model.py

* Update WNet weights

* Fix default LR + sup. test

* Fix new unsup LR in tests

* Fix dir for saving in tests

* Testing fixes

Due to Singleton Trainer widget

* Test unsupervised training and raise coverage

* WNet eval test

* Fix order for model deletion

* Extend supervised train tests

* Started docs update

* Update plugin_model_training.py

* Fixed filepaths

* Fix paths in test (use pathlib)

* Updated workers config

* Fixed parse_default_path test

* Ignore wandb results in gitignore

* Enable GH Actions tests on branch temporarily

* Fixed deletion of Qt imports in interface

* Reverted include_background=True in Dice

* Reintroduced best Dice channel seeking + refacto

* Improve filepath messages

* Fix unsup image loading when not validating

* Fix training tests
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

fix Something needs to be or has been fixed requirements Related to installation requirements and optional dependencies

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants