Skip to content

Update WSIReader #4171

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.

Sign up for GitHub

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

Jump to bottom
Merged
Nic-Ma merged 2 commits into from
Apr 26, 2022
Merged

Update WSIReader #4171

Nic-Ma merged 2 commits into from
Apr 26, 2022

Conversation

@bhashemian
Copy link
Member

@bhashemian bhashemian commented Apr 25, 2022

Description

Updates WSIReader to move RGB and RBGA check to the base class.

Status

Ready

Types of changes

  • Non-breaking change (fix or new feature that would not break existing functionality).

@bhashemian bhashemian requested a review from Nic-Ma April 25, 2022 15:00
@bhashemian
Copy link
Member Author

bhashemian commented Apr 25, 2022

I moved the checks to the base class but I kept the read method separate for each concrete class. Since cuCIM and OpenSlide shares lots of similarities, it's tempting to move read to the base class (as I did initially) but let's keep it separate for know since other backends might have different way of calling whole slide objects. Later on, we can easily change it as it does not expose any API to the user.

@Nic-Ma
Copy link
Contributor

Nic-Ma commented Apr 26, 2022

/build

@Nic-Ma Nic-Ma enabled auto-merge (squash) April 26, 2022 02:25
@Nic-Ma Nic-Ma merged commit d63f490 into Project-MONAI:dev Apr 26, 2022
@bhashemian bhashemian deleted the update-wsireader branch April 26, 2022 13:36
wyli added a commit that referenced this pull request Apr 26, 2022
@wyli @yiheng-wang-nv
@pre-commit-ci @Nic-Ma @dongyang0122 @bhashemian @pxLi @ericspod
sync metatensor branch with dev (#4184)
724f73f 
* 4095 Add bundle download (#4114)

* draft download

Signed-off-by: Yiheng Wang <[email protected]>

* update bundle download

Signed-off-by: Yiheng Wang <[email protected]>

* add url and load

Signed-off-by: Yiheng Wang <[email protected]>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* rename args and remove a few places

Signed-off-by: Yiheng Wang <[email protected]>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix flake8 issue

Signed-off-by: Yiheng Wang <[email protected]>

* enhance with reviews

Signed-off-by: Yiheng Wang <[email protected]>

* add instantiate for load

Signed-off-by: Yiheng Wang <[email protected]>

* fix black error

Signed-off-by: Yiheng Wang <[email protected]>

* add unittest

Signed-off-by: Yiheng Wang <[email protected]>

* add load to docs

Signed-off-by: Yiheng Wang <[email protected]>

* add skip

Signed-off-by: Yiheng Wang <[email protected]>

* add schemaerror

Signed-off-by: Yiheng Wang <[email protected]>

* fix partial places

Signed-off-by: Yiheng Wang <[email protected]>

* download zip bundle

Signed-off-by: Yiheng Wang <[email protected]>

* [DLMED] restore Exception for test

Signed-off-by: Nic Ma <[email protected]>

* update ts features

Signed-off-by: Yiheng Wang <[email protected]>

* add config_files test case

Signed-off-by: Yiheng Wang <[email protected]>

* enhance docstring example for args_file

Signed-off-by: Yiheng Wang <[email protected]>

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Nic Ma <[email protected]>

* Disable pylint error and fix CI tests of new tifffile (#4162)

* workaround

Signed-off-by: Nic Ma <[email protected]>

* [DLMED] fix tifffile issue

Signed-off-by: Nic Ma <[email protected]>

* Fixed an error in DiNTS model implementation and enabled act and norm layer options (#4157)

* fixed a bug

Signed-off-by: dongy <[email protected]>

* autofix

Signed-off-by: dongy <[email protected]>

* update test case

Signed-off-by: dongy <[email protected]>

Co-authored-by: dongy <[email protected]>

* Split transform (#4153)

* Redesign whole slide image reading (#4107)

* Redesign BaseWSIReader,  WSIReader, CuCIMWSIReader

Signed-off-by: Behrooz <[email protected]>

* Add unittests for WSIReader

Signed-off-by: Behrooz <[email protected]>

* Add image mode for output validation

Signed-off-by: Behrooz <[email protected]>

* Update docs

Signed-off-by: Behrooz <[email protected]>

* Update references to new WSIReader

Signed-off-by: Behrooz <[email protected]>

* Remove legacy WSIReader

Signed-off-by: Behrooz <[email protected]>

* Update unittests

Signed-off-by: Behrooz <[email protected]>

* Update docs

Signed-off-by: Behrooz <[email protected]>

* sort imports

Signed-off-by: Behrooz <[email protected]>

* Clean up imports

Signed-off-by: Behrooz <[email protected]>

* Update docstrings

Signed-off-by: Behrooz <[email protected]>

* Update docs and docstrings

Signed-off-by: Behrooz <[email protected]>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Fix a typo

Signed-off-by: Behrooz <[email protected]>

* Remove redundant checking

Signed-off-by: Behrooz <[email protected]>

* Update read and other methods

Signed-off-by: Behrooz <[email protected]>

* Update wsireader to support multi image and update docstrings

Signed-off-by: Behrooz <[email protected]>

* Make workaround for CuImage objects

Signed-off-by: Behrooz <[email protected]>

* Add unittests for multi image reading

Signed-off-by: Behrooz <[email protected]>

* Update a note about cucim

Signed-off-by: Behrooz <[email protected]>

* Update type hints and docstrings

Signed-off-by: Behrooz <[email protected]>

* Implement Split transform

Signed-off-by: Behrooz <[email protected]>

* Add unittests

Signed-off-by: Behrooz <[email protected]>

* Update formatting

Signed-off-by: Behrooz <[email protected]>

* Implement SplitDict

Signed-off-by: Behrooz <[email protected]>

* Add unittests for SplitDict

Signed-off-by: Behrooz <[email protected]>

* Add docs

Signed-off-by: Behrooz <[email protected]>

* Remove images from docs

Signed-off-by: Behrooz <[email protected]>

* Address all comments

Signed-off-by: Behrooz <[email protected]>

* Add example and size check

Signed-off-by: Behrooz <[email protected]>

* Update docs

Signed-off-by: Behrooz <[email protected]>

* Revert references to new wsireader

Signed-off-by: Behrooz <[email protected]>

* Add missing comma

Signed-off-by: Behrooz <[email protected]>

* fix bundle download test issue (#4169)

Signed-off-by: Yiheng Wang <[email protected]>

* 4094 Enhance `ckpt_export` to save config files (#4159)

* [DLMED] enhance checkpoint export

Signed-off-by: Nic Ma <[email protected]>

* [DLMED] update according to comments

Signed-off-by: Nic Ma <[email protected]>

* Move RGB/RGBA checks to base class (#4171)

Signed-off-by: Behrooz <[email protected]>

Co-authored-by: Nic Ma <[email protected]>

* [CICD] To support temp dgx runner (#4175)

* Support new temp dgx runner

Signed-off-by: Peixin Li <[email protected]>

* atol 1e-5

Signed-off-by: Wenqi Li <[email protected]>

Co-authored-by: Wenqi Li <[email protected]>

* Test fix for AMP kwargs (#4178)

Signed-off-by: Eric Kerfoot <[email protected]>

Co-authored-by: Yiheng Wang <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Nic Ma <[email protected]>
Co-authored-by: dongyang0122 <[email protected]>
Co-authored-by: dongy <[email protected]>
Co-authored-by: Behrooz <[email protected]>
Co-authored-by: Peixin <[email protected]>
Co-authored-by: Eric Kerfoot <[email protected]>
Can-Zhao pushed a commit to Can-Zhao/MONAI that referenced this pull request May 10, 2022
@bhashemian @Nic-Ma @Can-Zhao
Move RGB/RGBA checks to base class (Project-MONAI#4171)
7e2d97b 
Signed-off-by: Behrooz <[email protected]>

Co-authored-by: Nic Ma <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Nic-Ma Nic-Ma Nic-Ma approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@bhashemian @Nic-Ma