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

Release version 4.0.0 #587

Merged
merged 56 commits into from
Feb 3, 2022
Merged

Release version 4.0.0 #587

merged 56 commits into from
Feb 3, 2022

Conversation

mathieuboudreau
Copy link
Member

@mathieuboudreau mathieuboudreau commented Jan 12, 2022

Checklist

  • I've given this PR a concise, self-descriptive, and meaningful title
  • I've linked relevant issues in the PR body
  • I've applied the relevant labels to this PR
  • I've added relevant tests for my contribution
  • I've updated the documentation and/or added correct docstrings
  • I've assigned a reviewer
  • I've consulted ADS's internal developer documentation to ensure my contribution is in line with any relevant design decisions

Description

Release version 4.0.0 of AxonDeepSeg that integrated IVADOMED into the project and provides Mac M1 compatibility.

Linked issues

Resolves #523 #536

mathieuboudreau and others added 4 commits July 15, 2021 11:48
…fter IVADOMED transition (#539)

* Delete files/functions we suspect will be no longer necessary after IVADOMED transition, see https://docs.google.com/document/d/1Ipd6_nK6I6CKlDI_KpkLXH_jY2C547W_ootalfKnFlU/edit?usp=sharing'

* Restore visualize segmentation

* Remove imports from files that have been deleted

* Remove imports from files that have been deleted

Co-authored-by: Mathieu Boudreau <mathieuboudreau@Mathieus-MacBook-Pro.local>
…entation. Remove FSLeyes (temporarily) (#546)

* Remove dependencies: TF, Keras, and Albumentation

* Remove TF import and tf reset graph calls in tests

* Update environment file for compatibility with Mac M1 ARM current setup with MiniForge (upgrade to python > 3.7 and update scikit versions

* Update run_tests.yaml

* Loosen fsleyes req

* Downgrade to Python 3.8 for IVADOMED-compatibility

* Downgrade python in the testing environment too
* Add IVADOMED in the requirements

* Add IVADOMED in environment files

* Add test IVADOMED SEM model

* Update download_model.py

* Update download_model.py

* Update model

* Early implementation of segmentation wrapper

* Update missing import

* Fix syntax

* Convert Path() object to str()

* Fix typo in string

* Fix full path

* Remove hardoced output filename

* Save merge mask

* Add missing import

* Cleanup

* Cleanup

* Cleanup

* Cleanup

* Cleanup

* Cleanup

* Debug

* Debug

* Add tests for segment module

* Try implementing segment_image

* Debug

* Initial implementation of segment_image for IVADOMED wrapper

* Initial implementation of segment_folders for ivadomed

* Make necessary changes to test_segment_folders_runs_with_relative_path

* Resolve failing tests

* Resolve test

* Implement CLI for ivadomed

* Update IVADOMED pixel_size option syntax

* Update ads plugin for IVADOMED compatibility

* Change ivadomed installation to pip

* Updated notebooks for IVADOMED; deleted training notebooks

* Update SEM model

* Fix broken link

* Refactor

* Fix typo

* Change missed line

* Debug

* Fix

* Add TEM model

* Final fixes

* Add TEM

* Fix typo

* Fix IVADOMED related folder name

* Add TEM option

* Update release versions

* Fix TEM model

* Update release

* Fix model names

* Add pytest ini file

* Resolve warnings

* Resolve warnings

* Test upgrading versions

* Try Windows fix

* Add find links

* Update test files link

* Update test files version

* Update release

* Update release version

* Add OM model

* Minor fixes

* Minor fixes

* Update release version

* Update release version

* Update release version

* Implement IVADOMED into the ADS plugin

* Fix bug where if no gratio and myelin stats were not initialized

* Update test files release versions

* Change convention from giving default NaNs to gratio and myelin stats to 0, for more robust save/load behaviours

* Update one test

* Change OM to BF nomenclature

* Minor cleanup. Add documentation

* Update environment.yml

* Update AxonDeepSeg/integrity_test.py

Co-authored-by: mariehbourget <54086142+mariehbourget@users.noreply.github.com>

* Update AxonDeepSeg/morphometrics/compute_morphometrics.py

Co-authored-by: mariehbourget <54086142+mariehbourget@users.noreply.github.com>

* Review changes

* Convert from 0 to np.nans

* Remove duplicate line

* Remove unnecessary line

* Minor fixes in notebooks

* Change filename convention

* Switch from is to == to remove warnings

* Add default pixel unit

* Workaround to testing saved and loaded morphometrics with NaNs

* #547 updated the plugin file

Co-authored-by: mariehbourget <54086142+mariehbourget@users.noreply.github.com>
Co-authored-by: Stoyan I. Asenov <43790661+Stoyan-I-A@users.noreply.github.com>
@mathieuboudreau mathieuboudreau added dependencies Pull requests that update a dependency file enhancement category: the change expands an existing functionality or refactoring feature category: the change introduces a new functionality to AxonDeepSeg installation category: the change alters the installation of AxonDeepSeg refactoring context: code refactoring labels Jan 12, 2022
@mathieuboudreau mathieuboudreau changed the title V4 Release Version 4 Jan 12, 2022
@mathieuboudreau
Copy link
Member Author

@mariehbourget this branch is ready for review.

@coveralls
Copy link

coveralls commented Jan 12, 2022

Coverage Status

Coverage remained the same at 87.769% when pulling 20aae92 on v4 into 45e7da0 on master.

@mathieuboudreau
Copy link
Member Author

Hmm the coverage dropped, but that may be because of all the tests we removed when we removed the training files. Let me look into it, I could increase the limit temporarily if that's the case.

@mariehbourget
Copy link
Member

Thank you @mathieuboudreau, I should be able to review by the end of the week.

Quick notes:

  • We will need to update the documentation for v4 in this PR.
  • We should probably do a "last" v3 release before the merge as well.

@mathieuboudreau
Copy link
Member Author

Looks like the cause was that we removed the tests for visualize.py, but we didn't remove the source file itself when we were doing cleanup in 3c903dc. I just deleted it

@mathieuboudreau
Copy link
Member Author

Hmm, not sure why the deleted file is still being counted in the number of lines during Coveralls

@mariehbourget
Copy link
Member

Hmm, not sure why the deleted file is still being counted in the number of lines during Coveralls

Looks good now with +5% 🚀

@mariehbourget
Copy link
Member

The training microscopy tutorial in ivadomed is now merged if we want to link to it in the documentation.

@mathieuboudreau
Copy link
Member Author

When we're ready to merge this branch, I'll update the checks settings from Python 3.7 to 3.8 to make them pass (we moved to 3.8 in this PR).

@mathieuboudreau
Copy link
Member Author

  • We should probably do a "last" v3 release before the merge as well.

Being done in #588

@mathieuboudreau
Copy link
Member Author

  • We will need to update the documentation for v4 in this PR.

Done in 61c59a3

@mathieuboudreau mathieuboudreau changed the title Release Version 4 Release Version 4.0.0 Jan 14, 2022
@mathieuboudreau mathieuboudreau changed the title Release Version 4.0.0 Release version 4.0.0 Jan 14, 2022
mathieuboudreau and others added 4 commits February 2, 2022 19:25
Co-authored-by: mariehbourget <54086142+mariehbourget@users.noreply.github.com>
Co-authored-by: mariehbourget <54086142+mariehbourget@users.noreply.github.com>
Co-authored-by: mariehbourget <54086142+mariehbourget@users.noreply.github.com>
@mathieuboudreau
Copy link
Member Author

@mariehbourget I just accepted all suggestions, and fixed the bug in reading resolutions in commit d0abfaa

mariehbourget
mariehbourget previously approved these changes Feb 3, 2022
Copy link
Member

@mariehbourget mariehbourget left a comment

Choose a reason for hiding this comment

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

Thank you @mathieuboudreau!

I think everything is working as expected.
I left some minor comment/suggestions but approve the PR since they are small details.

Question: I saw that #592 and #584 are approved, do we want to integrate them before merging?

AxonDeepSeg/apply_model.py Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
Co-authored-by: Armand <83031821+hermancollin@users.noreply.github.com>
Co-authored-by: mariehbourget <54086142+mariehbourget@users.noreply.github.com>
@mathieuboudreau
Copy link
Member Author

Question: I saw that #592 and #584 are approved, do we want to integrate them before merging?

Done, just merged them into this branch.

@mathieuboudreau
Copy link
Member Author

@mariehbourget I've merged the two PRs, accepted your suggestions, and updated the Changelog per your suggestion.

If this is ready to merge, please give it one final approval!

Copy link
Member

@mariehbourget mariehbourget left a comment

Choose a reason for hiding this comment

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

Thanks @mathieuboudreau!
2 small things, I promise to approve after that! :)

CHANGELOG.md Outdated Show resolved Hide resolved
AxonDeepSeg/segment.py Outdated Show resolved Hide resolved
@mathieuboudreau
Copy link
Member Author

Thanks @mathieuboudreau!
2 small things, I promise to approve after that! :)

Perfect! Done and done =)

Co-authored-by: mariehbourget <54086142+mariehbourget@users.noreply.github.com>
@mathieuboudreau
Copy link
Member Author

mathieuboudreau commented Feb 3, 2022 via email

mariehbourget
mariehbourget previously approved these changes Feb 3, 2022
Copy link
Member

@mariehbourget mariehbourget left a comment

Choose a reason for hiding this comment

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

Thank you so much @mathieuboudreau for coordinating this project. 🚀
Version 4 is ready! 😀

@mathieuboudreau
Copy link
Member Author

Thank you so much @mathieuboudreau for coordinating this project. 🚀
Version 4 is ready! 😀

Thank you for your very rigourous review @mariehbourget and all your suggestsions !!

@mathieuboudreau mathieuboudreau merged commit 805868e into master Feb 3, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file enhancement category: the change expands an existing functionality or refactoring feature category: the change introduces a new functionality to AxonDeepSeg installation category: the change alters the installation of AxonDeepSeg refactoring context: code refactoring
Projects
None yet
Development

Successfully merging this pull request may close these issues.

AxonDeepSeg v4
7 participants